fisharebest / webtrees

app/GedcomRecordFactory.php

Indentation +1 added lines, -1 removed lines

@@ -24,5 +24,5 @@
 
 interface GedcomRecordFactory {
 
-  public function createRecord(string $xref, string $gedcom, ?string $pending, Tree $tree): GedcomRecord;
+    public function createRecord(string $xref, string $gedcom, ?string $pending, Tree $tree): GedcomRecord;
 }

Braces +2 added lines, -1 removed lines

@@ -22,7 +22,8 @@
 use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\Tree;
 
-interface GedcomRecordFactory {
+interface GedcomRecordFactory
+{
 
   public function createRecord(string $xref, string $gedcom, ?string $pending, Tree $tree): GedcomRecord;
 }

app/GedcomRecord.php

Indentation +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
     public static function getInstance(string $xref, Tree $tree, string $gedcom = null)
     {        
         if (!Application::getInstance()->bound(GedcomRecordFactories::class)) {
-          Application::getInstance()->singleton(GedcomRecordFactories::class);
+            Application::getInstance()->singleton(GedcomRecordFactories::class);
         }        
         $factories = app(GedcomRecordFactories::class);
         $ret = $factories->getInstance($xref, $tree, $gedcom);      
@@ -195,7 +195,7 @@ 
 
     public static function retrieveGedcomRecord(string $xref, int $tree_id): ?string
     {
-      return self::fetchGedcomRecord($xref, $tree_id);
+        return self::fetchGedcomRecord($xref, $tree_id);
     } 
     
     /**

Braces +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
      * @throws Exception
      */
     public static function getInstance(string $xref, Tree $tree, string $gedcom = null)
-    {        
+    {
         if (!Application::getInstance()->bound(GedcomRecordFactories::class)) {
           Application::getInstance()->singleton(GedcomRecordFactories::class);
         }        

app/GedcomRecordFactories.php

Indentation +54 added lines, -54 removed lines

@@ -35,49 +35,49 @@ 
 
 class GedcomRecordFactories {
 
-  /** @var GedcomRecord[][] Allow getInstance() to return references to existing objects */
-  protected $gedcom_record_cache;
+    /** @var GedcomRecord[][] Allow getInstance() to return references to existing objects */
+    protected $gedcom_record_cache;
 
-  /** @var stdClass[][] Fetch all pending edits in one database query */
-  protected $pending_record_cache;
+    /** @var stdClass[][] Fetch all pending edits in one database query */
+    protected $pending_record_cache;
   
-  protected $factories = [];
+    protected $factories = [];
 
-  public function __construct() {
-  }
+    public function __construct() {
+    }
   
-  public function addFactory(string $type, GedcomRecordFactory $factory) {
+    public function addFactory(string $type, GedcomRecordFactory $factory) {
     $this->factories[$type] = $factory;
-  }
-
-  /**
-   * Get an instance of a GedcomRecord object. For single records,
-   * we just receive the XREF. For bulk records (such as lists
-   * and search results) we can receive the GEDCOM data as well.
-   *
-   * @param string      $xref
-   * @param Tree        $tree
-   * @param string|null $gedcom
-   *
-   * @throws Exception
-   * @return GedcomRecord|Individual|Family|Source|Repository|Media|Note|null
-   */
-  public function getInstance(string $xref, Tree $tree, string $gedcom = null) {
+    }
+
+    /**
+     * Get an instance of a GedcomRecord object. For single records,
+     * we just receive the XREF. For bulk records (such as lists
+     * and search results) we can receive the GEDCOM data as well.
+     *
+     * @param string      $xref
+     * @param Tree        $tree
+     * @param string|null $gedcom
+     *
+     * @throws Exception
+     * @return GedcomRecord|Individual|Family|Source|Repository|Media|Note|null
+     */
+    public function getInstance(string $xref, Tree $tree, string $gedcom = null) {
     $tree_id = $tree->id();
 
     // Is this record already in the cache?
     if (isset($this->gedcom_record_cache[$xref][$tree_id])) {
-      return $this->gedcom_record_cache[$xref][$tree_id];
+        return $this->gedcom_record_cache[$xref][$tree_id];
     }
 
     // Do we need to fetch the record from the database?
     if ($gedcom === null) {
-      $gedcom = GedcomRecord::retrieveGedcomRecord($xref, $tree_id);
+        $gedcom = GedcomRecord::retrieveGedcomRecord($xref, $tree_id);
     }
 
     // If we can edit, then we also need to be able to see pending records.
     if (Auth::isEditor($tree)) {
-      if (!isset($this->pending_record_cache[$tree_id])) {
+        if (!isset($this->pending_record_cache[$tree_id])) {
         // Fetch all pending records in one database query
         $this->pending_record_cache[$tree_id] = [];
         $rows = DB::table('change')
@@ -88,70 +88,70 @@ 
                 ->get();
 
         foreach ($rows as $row) {
-          $this->pending_record_cache[$tree_id][$row->xref] = $row->new_gedcom;
+            $this->pending_record_cache[$tree_id][$row->xref] = $row->new_gedcom;
+        }
         }
-      }
 
-      $pending = $this->pending_record_cache[$tree_id][$xref] ?? null;
+        $pending = $this->pending_record_cache[$tree_id][$xref] ?? null;
     } else {
-      // There are no pending changes for this record
-      $pending = null;
+        // There are no pending changes for this record
+        $pending = null;
     }
 
     // No such record exists
     if ($gedcom === null && $pending === null) {
-      return null;
+        return null;
     }
 
     // No such record, but a pending creation exists
     if ($gedcom === null) {
-      $gedcom = '';
+        $gedcom = '';
     }
 
     // Create the object
     if (preg_match('/^0 @(' . Gedcom::REGEX_XREF . ')@ (' . Gedcom::REGEX_TAG . ')/', $gedcom . $pending, $match)) {
-      $xref = $match[1]; // Collation - we may have requested I123 and found i123
-      $type = $match[2];
+        $xref = $match[1]; // Collation - we may have requested I123 and found i123
+        $type = $match[2];
     } elseif (preg_match('/^0 (HEAD|TRLR)/', $gedcom . $pending, $match)) {
-      $xref = $match[1];
-      $type = $match[1];
+        $xref = $match[1];
+        $type = $match[1];
     } elseif ($gedcom . $pending) {
-      throw new Exception('Unrecognized GEDCOM record: ' . $gedcom);
+        throw new Exception('Unrecognized GEDCOM record: ' . $gedcom);
     } else {
-      // A record with both pending creation and pending deletion
-      $type = static::RECORD_TYPE;
+        // A record with both pending creation and pending deletion
+        $type = static::RECORD_TYPE;
     }
 
     $factory = $this->factories[$type] ?? null;
     if ($factory !== null) {
-      $record = $factory->createRecord($xref, $gedcom, $pending, $tree);
+        $record = $factory->createRecord($xref, $gedcom, $pending, $tree);
 
-      // Store it in the cache
-      $this->gedcom_record_cache[$xref][$tree_id] = $record;
+        // Store it in the cache
+        $this->gedcom_record_cache[$xref][$tree_id] = $record;
 
-      return $record;
+        return $record;
     }
 
     switch ($type) {
-      case 'INDI':
+        case 'INDI':
         $record = new Individual($xref, $gedcom, $pending, $tree);
         break;
-      case 'FAM':
+        case 'FAM':
         $record = new Family($xref, $gedcom, $pending, $tree);
         break;
-      case 'SOUR':
+        case 'SOUR':
         $record = new Source($xref, $gedcom, $pending, $tree);
         break;
-      case 'OBJE':
+        case 'OBJE':
         $record = new Media($xref, $gedcom, $pending, $tree);
         break;
-      case 'REPO':
+        case 'REPO':
         $record = new Repository($xref, $gedcom, $pending, $tree);
         break;
-      case 'NOTE':
+        case 'NOTE':
         $record = new Note($xref, $gedcom, $pending, $tree);
         break;
-      default:
+        default:
         $record = new GedcomRecord($xref, $gedcom, $pending, $tree);
         break;
     }
@@ -160,12 +160,12 @@ 
     $this->gedcom_record_cache[$xref][$tree_id] = $record;
 
     return $record;
-  }
+    }
 
-  public function clearCache() {
+    public function clearCache() {
     // Clear the cache
     $this->gedcom_record_cache = [];
     $this->pending_record_cache = [];
-  }
+    }
 
 }

Braces +10 added lines, -5 removed lines

@@ -33,7 +33,8 @@ 
 use Fisharebest\Webtrees\Source;
 use stdClass;
 
-class GedcomRecordFactories {
+class GedcomRecordFactories
+{
 
   /** @var GedcomRecord[][] Allow getInstance() to return references to existing objects */
   protected $gedcom_record_cache;
@@ -43,10 +44,12 @@ 
   
   protected $factories = [];
 
-  public function __construct() {
+  public function __construct()
+  {
   }
   
-  public function addFactory(string $type, GedcomRecordFactory $factory) {
+  public function addFactory(string $type, GedcomRecordFactory $factory)
+  {
     $this->factories[$type] = $factory;
   }
 
@@ -62,7 +65,8 @@ 
    * @throws Exception
    * @return GedcomRecord|Individual|Family|Source|Repository|Media|Note|null
    */
-  public function getInstance(string $xref, Tree $tree, string $gedcom = null) {
+  public function getInstance(string $xref, Tree $tree, string $gedcom = null)
+  {
     $tree_id = $tree->id();
 
     // Is this record already in the cache?
@@ -162,7 +166,8 @@ 
     return $record;
   }
 
-  public function clearCache() {
+  public function clearCache()
+  {
     // Clear the cache
     $this->gedcom_record_cache = [];
     $this->pending_record_cache = [];