nystudio107 / craft-seomatic

src/services/MetaBundles.php

Spacing +56 added lines, -56 removed lines

@@ -59,22 +59,22 @@ 
     /**
      * @var MetaBundle[] indexed by [id]
      */
-    protected $metaBundles = [];
+    protected $metaBundles = [ ];
 
     /**
      * @var array indexed by [sourceId][sourceSiteId] = id
      */
-    protected $metaBundlesBySourceId = [];
+    protected $metaBundlesBySourceId = [ ];
 
     /**
      * @var array indexed by [sourceHandle][sourceSiteId] = id
      */
-    protected $metaBundlesBySourceHandle = [];
+    protected $metaBundlesBySourceHandle = [ ];
 
     /**
      * @var array indexed by [sourceSiteId] = id
      */
-    protected $globalMetaBundles = [];
+    protected $globalMetaBundles = [ ];
 
     // Public Methods
     // =========================================================================
@@ -90,11 +90,11 @@ 
     {
         $metaBundle = null;
         // See if we have the meta bundle cached
-        if (!empty($this->globalMetaBundles[$sourceSiteId])) {
-            return $this->globalMetaBundles[$sourceSiteId];
+        if (!empty($this->globalMetaBundles[ $sourceSiteId ])) {
+            return $this->globalMetaBundles[ $sourceSiteId ];
         }
         $metaBundleArray = (new Query())
-            ->from(['{{%seomatic_metabundles}}'])
+            ->from([ '{{%seomatic_metabundles}}' ])
             ->where([
                 'sourceBundleType' => self::GLOBAL_META_BUNDLE,
                 'sourceSiteId'     => $sourceSiteId,
@@ -110,7 +110,7 @@ 
             $metaBundle = $this->createGlobalMetaBundleForSite($sourceSiteId);
         }
         // Cache it for future accesses
-        $this->globalMetaBundles[$sourceSiteId] = $metaBundle;
+        $this->globalMetaBundles[ $sourceSiteId ] = $metaBundle;
 
         return $metaBundle;
     }
@@ -170,15 +170,15 @@ 
     {
         $metaBundle = null;
         // See if we have the meta bundle cached
-        if (!empty($this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId])) {
-            $id = $this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId];
-            if (!empty($this->metaBundles[$id])) {
-                return $this->metaBundles[$id];
+        if (!empty($this->metaBundlesBySourceId[ $sourceBundleType ][ $sourceId ][ $sourceSiteId ])) {
+            $id = $this->metaBundlesBySourceId[ $sourceBundleType ][ $sourceId ][ $sourceSiteId ];
+            if (!empty($this->metaBundles[ $id ])) {
+                return $this->metaBundles[ $id ];
             }
         }
         // Look for a matching meta bundle in the db
         $metaBundleArray = (new Query())
-            ->from(['{{%seomatic_metabundles}}'])
+            ->from([ '{{%seomatic_metabundles}}' ])
             ->where([
                 'sourceBundleType' => $sourceBundleType,
                 'sourceId'         => $sourceId,
@@ -191,8 +191,8 @@ 
             $metaBundle = MetaBundle::create($metaBundleArray);
             $this->syncBundleWithConfig($sourceBundleType, $metaBundle);
             $id = count($this->metaBundles);
-            $this->metaBundles[$id] = $metaBundle;
-            $this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId] = $id;
+            $this->metaBundles[ $id ] = $metaBundle;
+            $this->metaBundlesBySourceId[ $sourceBundleType ][ $sourceId ][ $sourceSiteId ] = $id;
         } else {
             // If it doesn't exist, create it
             switch ($sourceBundleType) {
@@ -224,15 +224,15 @@ 
     {
         $metaBundle = null;
         // See if we have the meta bundle cached
-        if (!empty($this->metaBundlesBySourceHandle[$sourceType][$sourceHandle][$sourceSiteId])) {
-            $id = $this->metaBundlesBySourceHandle[$sourceType][$sourceHandle][$sourceSiteId];
-            if (!empty($this->metaBundles[$id])) {
-                return $this->metaBundles[$id];
+        if (!empty($this->metaBundlesBySourceHandle[ $sourceType ][ $sourceHandle ][ $sourceSiteId ])) {
+            $id = $this->metaBundlesBySourceHandle[ $sourceType ][ $sourceHandle ][ $sourceSiteId ];
+            if (!empty($this->metaBundles[ $id ])) {
+                return $this->metaBundles[ $id ];
             }
         }
         // Look for a matching meta bundle in the db
         $metaBundleArray = (new Query())
-            ->from(['{{%seomatic_metabundles}}'])
+            ->from([ '{{%seomatic_metabundles}}' ])
             ->where([
                 'sourceHandle' => $sourceHandle,
                 'sourceSiteId' => $sourceSiteId,
@@ -242,8 +242,8 @@ 
             $metaBundleArray = array_diff_key($metaBundleArray, array_flip(self::IGNORE_DB_ATTRIBUTES));
             $metaBundle = MetaBundle::create($metaBundleArray);
             $id = count($this->metaBundles);
-            $this->metaBundles[$id] = $metaBundle;
-            $this->metaBundlesBySourceHandle[$sourceType][$sourceHandle][$sourceSiteId] = $id;
+            $this->metaBundles[ $id ] = $metaBundle;
+            $this->metaBundlesBySourceHandle[ $sourceType ][ $sourceHandle ][ $sourceSiteId ] = $id;
         } else {
             // If it doesn't exist, create it
             switch ($sourceType) {
@@ -463,7 +463,7 @@ 
             // @TODO: handle commerce products
         }
 
-        return [$sourceId, $sourceBundleType, $sourceHandle, $sourceSiteId];
+        return [ $sourceId, $sourceBundleType, $sourceHandle, $sourceSiteId ];
     }
 
     /**
@@ -475,26 +475,26 @@ 
      */
     public function getContentMetaBundles(bool $allSites = true): array
     {
-        $metaBundles = [];
-        $metaBundleSourceHandles = [];
+        $metaBundles = [ ];
+        $metaBundleSourceHandles = [ ];
         $metaBundleArrays = (new Query())
-            ->from(['{{%seomatic_metabundles}}'])
-            ->where(['!=', 'sourceBundleType', self::GLOBAL_META_BUNDLE])
+            ->from([ '{{%seomatic_metabundles}}' ])
+            ->where([ '!=', 'sourceBundleType', self::GLOBAL_META_BUNDLE ])
             ->all();
         /** @var  $metaBundleArray array */
         foreach ($metaBundleArrays as $metaBundleArray) {
             $addToMetaBundles = true;
             if (!$allSites) {
-                if (in_array($metaBundleArray['sourceHandle'], $metaBundleSourceHandles)) {
+                if (in_array($metaBundleArray[ 'sourceHandle' ], $metaBundleSourceHandles)) {
                     $addToMetaBundles = false;
                 }
-                $metaBundleSourceHandles[] = $metaBundleArray['sourceHandle'];
+                $metaBundleSourceHandles[ ] = $metaBundleArray[ 'sourceHandle' ];
             }
             if ($addToMetaBundles) {
                 $metaBundleArray = array_diff_key($metaBundleArray, array_flip(self::IGNORE_DB_ATTRIBUTES));
                 $metaBundle = MetaBundle::create($metaBundleArray);
                 if ($metaBundle) {
-                    $metaBundles[] = $metaBundle;
+                    $metaBundles[ ] = $metaBundle;
                 }
             }
         }
@@ -504,20 +504,20 @@ 
 
     public function getContentMetaBundlesForSiteId(int $sourceSiteId): array
     {
-        $metaBundles = [];
+        $metaBundles = [ ];
         $metaBundleArrays = (new Query())
-            ->from(['{{%seomatic_metabundles}}'])
+            ->from([ '{{%seomatic_metabundles}}' ])
             ->where([
                 'sourceSiteId' => $sourceSiteId,
             ])
-            ->andWhere(['!=', 'sourceBundleType', self::GLOBAL_META_BUNDLE])
+            ->andWhere([ '!=', 'sourceBundleType', self::GLOBAL_META_BUNDLE ])
             ->all();
         /** @var  $metaBundleArray array */
         foreach ($metaBundleArrays as $metaBundleArray) {
             $metaBundleArray = array_diff_key($metaBundleArray, array_flip(self::IGNORE_DB_ATTRIBUTES));
             $metaBundle = MetaBundle::create($metaBundleArray);
             if ($metaBundle) {
-                $metaBundles[] = $metaBundle;
+                $metaBundles[ ] = $metaBundle;
             }
         }
 
@@ -534,11 +534,11 @@ 
      */
     public function getContainerDataFromBundle(MetaBundle $bundle, string $type)
     {
-        $containerData = [];
+        $containerData = [ ];
         foreach ($bundle->metaContainers as $metaContainer) {
             if ($metaContainer::CONTAINER_TYPE == $type) {
                 foreach ($metaContainer->data as $dataHandle => $data) {
-                    $containerData[$dataHandle] = $data;
+                    $containerData[ $dataHandle ] = $data;
                 }
             }
         }
@@ -589,7 +589,7 @@ 
      */
     protected function syncBundleWithConfig(string $sourceType, MetaBundle &$metaBundle)
     {
-        $config = [];
+        $config = [ ];
         switch ($sourceType) {
             case self::GLOBAL_META_BUNDLE:
                 $config = ConfigHelper::getConfigFromFile('globalmeta/Bundle');
@@ -604,7 +604,7 @@ 
         }
         // If the config file has a newer version than the $metaBundleArray, merge them
         if (!empty($config)) {
-            if (version_compare($config['bundleVersion'], $metaBundle->bundleVersion, '>')) {
+            if (version_compare($config[ 'bundleVersion' ], $metaBundle->bundleVersion, '>')) {
                 $metaBundleArray = $metaBundle->toArray();
                 // Create a new meta bundle
                 switch ($sourceType) {
@@ -642,7 +642,7 @@ 
      *
      * @return MetaBundle
      */
-    protected function createGlobalMetaBundleForSite(int $siteId, $baseConfig = []): MetaBundle
+    protected function createGlobalMetaBundleForSite(int $siteId, $baseConfig = [ ]): MetaBundle
     {
         // Create a new meta bundle with propagated defaults
         $metaBundleDefaults = ArrayHelper::strictMerge(
@@ -654,7 +654,7 @@ 
         // Remove any empty keys from our file-based config
         $metaBundleDefaults = ArrayHelper::arrayFilterRecursive(
             $metaBundleDefaults,
-            [ArrayHelper::class, 'unsetEmptyChildren']
+            [ ArrayHelper::class, 'unsetEmptyChildren' ]
         );
         // Merge them together
         $metaBundle = MetaBundle::create(ArrayHelper::strictMerge(
@@ -675,32 +675,32 @@ 
      *
      * @return null|MetaBundle
      */
-    protected function createMetaBundleFromSection(Section $section, int $siteId, $baseConfig = [])
+    protected function createMetaBundleFromSection(Section $section, int $siteId, $baseConfig = [ ])
     {
         $metaBundle = null;
         // Get the site settings and turn them into arrays
         $siteSettings = $section->getSiteSettings();
-        if (!empty($siteSettings[$siteId])) {
-            $siteSettingsArray = [];
+        if (!empty($siteSettings[ $siteId ])) {
+            $siteSettingsArray = [ ];
             /** @var  $siteSetting Section_SiteSettings */
             foreach ($siteSettings as $siteSetting) {
                 if ($siteSetting->hasUrls) {
                     $siteSettingArray = $siteSetting->toArray();
                     // Get the site language
-                    $siteSettingArray['language'] = MetaValue::getSiteLanguage($siteSetting->siteId);
-                    $siteSettingsArray[] = $siteSettingArray;
+                    $siteSettingArray[ 'language' ] = MetaValue::getSiteLanguage($siteSetting->siteId);
+                    $siteSettingsArray[ ] = $siteSettingArray;
                 }
             }
             $siteSettingsArray = ArrayHelper::index($siteSettingsArray, 'siteId');
             // Create a MetaBundle for this site
-            $siteSetting = $siteSettings[$siteId];
+            $siteSetting = $siteSettings[ $siteId ];
             if ($siteSetting->hasUrls) {
                 // Get the most recent dateUpdated
                 $element = Entry::find()
                     ->section($section->handle)
                     ->siteId($siteSetting->siteId)
                     ->limit(1)
-                    ->orderBy(['elements.dateUpdated' => SORT_DESC])
+                    ->orderBy([ 'elements.dateUpdated' => SORT_DESC ])
                     ->one();
                 if ($element) {
                     $dateUpdated = $element->dateUpdated ?? $element->dateCreated;
@@ -724,7 +724,7 @@ 
                 // Remove any empty keys from our file-based config
                 $metaBundleDefaults = ArrayHelper::arrayFilterRecursive(
                     $metaBundleDefaults,
-                    [ArrayHelper::class, 'unsetEmptyChildren']
+                    [ ArrayHelper::class, 'unsetEmptyChildren' ]
                 );
                 // Merge them together
                 $metaBundle = MetaBundle::create(ArrayHelper::strictMerge(
@@ -747,32 +747,32 @@ 
      *
      * @return null|MetaBundle
      */
-    protected function createMetaBundleFromCategory(CategoryGroup $category, int $siteId, $baseConfig = [])
+    protected function createMetaBundleFromCategory(CategoryGroup $category, int $siteId, $baseConfig = [ ])
     {
         $metaBundle = null;
         // Get the site settings and turn them into arrays
         $siteSettings = $category->getSiteSettings();
-        if (!empty($siteSettings[$siteId])) {
-            $siteSettingsArray = [];
+        if (!empty($siteSettings[ $siteId ])) {
+            $siteSettingsArray = [ ];
             /** @var  $siteSetting CategoryGroup_SiteSettings */
             foreach ($siteSettings as $siteSetting) {
                 if ($siteSetting->hasUrls) {
                     $siteSettingArray = $siteSetting->toArray();
                     // Get the site language
-                    $siteSettingArray['language'] = MetaValue::getSiteLanguage($siteSetting->siteId);
-                    $siteSettingsArray[] = $siteSettingArray;
+                    $siteSettingArray[ 'language' ] = MetaValue::getSiteLanguage($siteSetting->siteId);
+                    $siteSettingsArray[ ] = $siteSettingArray;
                 }
             }
             $siteSettingsArray = ArrayHelper::index($siteSettingsArray, 'siteId');
             // Create a MetaBundle for this site
-            $siteSetting = $siteSettings[$siteId];
+            $siteSetting = $siteSettings[ $siteId ];
             if ($siteSetting->hasUrls) {
                 // Get the most recent dateUpdated
                 $element = Category::find()
                     ->group($category->handle)
                     ->siteId($siteSetting->siteId)
                     ->limit(1)
-                    ->orderBy(['elements.dateUpdated' => SORT_DESC])
+                    ->orderBy([ 'elements.dateUpdated' => SORT_DESC ])
                     ->one();
                 if ($element) {
                     $dateUpdated = $element->dateUpdated ?? $element->dateCreated;
@@ -795,7 +795,7 @@ 
                 // Remove any empty keys from our file-based config
                 $metaBundleDefaults = ArrayHelper::arrayFilterRecursive(
                     $metaBundleDefaults,
-                    [ArrayHelper::class, 'unsetEmptyChildren']
+                    [ ArrayHelper::class, 'unsetEmptyChildren' ]
                 );
                 // Merge them together
                 $metaBundle = MetaBundle::create(ArrayHelper::strictMerge(

src/helpers/ArrayHelper.php

Spacing +9 added lines, -9 removed lines

@@ -49,19 +49,19 @@ 
         while (!empty($args)) {
             foreach (array_shift($args) as $k => $v) {
                 if ($v instanceof UnsetArrayValue) {
-                    unset($res[$k]);
+                    unset($res[ $k ]);
                 } elseif ($v instanceof ReplaceArrayValue) {
-                    $res[$k] = $v->value;
+                    $res[ $k ] = $v->value;
                 } elseif (is_int($k)) {
                     if (array_key_exists($k, $res)) {
-                        $res[] = $v;
+                        $res[ ] = $v;
                     } else {
-                        $res[$k] = $v;
+                        $res[ $k ] = $v;
                     }
-                } elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) {
-                    $res[$k] = self::merge($res[$k], $v);
+                } elseif (is_array($v) && isset($res[ $k ]) && is_array($res[ $k ])) {
+                    $res[ $k ] = self::merge($res[ $k ], $v);
                 } else {
-                    $res[$k] = $v;
+                    $res[ $k ] = $v;
                 }
             }
         }
@@ -89,10 +89,10 @@ 
     {
         foreach ($array as $k => $v) {
             if (is_array($v)) {
-                $array[$k] = self::arrayFilterRecursive($v, $callback);
+                $array[ $k ] = self::arrayFilterRecursive($v, $callback);
             } else {
                 if ($callback($v, $k)) {
-                    unset($array[$k]);
+                    unset($array[ $k ]);
                 }
             }
         }