nystudio107 / craft-seomatic

src/models/MetaJsonLd.php

Spacing +4 added lines, -4 removed lines

@@ -118,7 +118,7 @@ 
     public static function create($schemaType, array $config = []): MetaJsonLd
     {
         // Try the passed in $schemaType
-        $className = self::SCHEMA_NAMESPACE_PREFIX . $schemaType;
+        $className = self::SCHEMA_NAMESPACE_PREFIX.$schemaType;
         /** @var $model MetaJsonLd */
         if (class_exists($className)) {
             self::cleanProperties($className, $config);
@@ -126,7 +126,7 @@ 
             return new $className($config);
         }
         // Try the prefixed $schemaType
-        $className = self::SCHEMA_NAMESPACE_PREFIX . self::SCHEMA_NAME_PREFIX . $schemaType;
+        $className = self::SCHEMA_NAMESPACE_PREFIX.self::SCHEMA_NAME_PREFIX.$schemaType;
         /** @var $model MetaJsonLd */
         if (class_exists($className)) {
             self::cleanProperties($className, $config);
@@ -374,7 +374,7 @@ 
             foreach ($dataToValidate as $data) {
                 /** @var array $expectedTypes */
                 foreach ($expectedTypes as $expectedType) {
-                    $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $expectedType;
+                    $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$expectedType;
                     switch ($expectedType) {
                         // Text always validates
                         case 'Text':
@@ -455,7 +455,7 @@ 
                     }
                 }
                 if (!$validated) {
-                    $this->addError($attribute, 'Must be one of these types: ' . implode(', ', $expectedTypes));
+                    $this->addError($attribute, 'Must be one of these types: '.implode(', ', $expectedTypes));
                 }
             }
         }

src/models/metatag/TwitterTitleTag.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
                     $suffix = '';
                     break;
             }
-            $lengthAdjust = mb_strlen($prefix . $suffix);
+            $lengthAdjust = mb_strlen($prefix.$suffix);
             // Truncate the twitter:title tag content
             $truncLen = Seomatic::$settings->maxTitleLength - $lengthAdjust;
             if ($truncLen < 0) {
@@ -138,7 +138,7 @@ 
                     '…'
                 );
             }
-            $data['content'] = $prefix . $data['content'] . $suffix;
+            $data['content'] = $prefix.$data['content'].$suffix;
         }
 
         return $shouldRender;

src/models/metatag/OgTitleTag.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
                     $suffix = '';
                     break;
             }
-            $lengthAdjust = mb_strlen($prefix . $suffix);
+            $lengthAdjust = mb_strlen($prefix.$suffix);
             // Truncate the og:title tag content
             $truncLen = Seomatic::$settings->maxTitleLength - $lengthAdjust;
             if ($truncLen < 0) {
@@ -138,7 +138,7 @@ 
                     '…'
                 );
             }
-            $data['content'] = $prefix . $data['content'] . $suffix;
+            $data['content'] = $prefix.$data['content'].$suffix;
         }
 
         return $shouldRender;

src/models/MetaTitle.php

Spacing +5 added lines, -5 removed lines

@@ -143,16 +143,16 @@ 
                     break;
             }
             // Handle the case of empty titles
-            if ($prefix === (' ' . $separator . ' ')) {
+            if ($prefix === (' '.$separator.' ')) {
                 $prefix = '';
             }
-            if ($suffix === (' ' . $separator)) {
+            if ($suffix === (' '.$separator)) {
                 $suffix = '';
             }
             // Remove potential double spaces
             $prefix = preg_replace('/\s+/', ' ', $prefix);
             $suffix = preg_replace('/\s+/', ' ', $suffix);
-            $lengthAdjust = mb_strlen($prefix . $suffix);
+            $lengthAdjust = mb_strlen($prefix.$suffix);
             // Parse the data
             $scenario = $this->scenario;
             $this->setScenario('render');
@@ -171,7 +171,7 @@ 
                         '…'
                     );
                 }
-                $data = $prefix . $data . $suffix;
+                $data = $prefix.$data.$suffix;
             } else {
                 // If no title is provided, just use the site name
                 $data = MetaValueHelper::parseString($this->siteName);
@@ -180,7 +180,7 @@ 
             $data = trim($data);
             // devMode
             if (Seomatic::$devMode) {
-                $data = Seomatic::$settings->devModeTitlePrefix . $data;
+                $data = Seomatic::$settings->devModeTitlePrefix.$data;
             }
         }
 

src/services/MetaBundles.php

Spacing +15 added lines, -15 removed lines

@@ -178,7 +178,7 @@ 
      * @param MetaBundle $metaBundle
      * @param bool $forceUpdate
      */
-    public function syncBundleWithConfig(MetaBundle &$metaBundle, bool $forceUpdate = false)
+    public function syncBundleWithConfig(MetaBundle & $metaBundle, bool $forceUpdate = false)
     {
         $prevMetaBundle = $metaBundle;
         $config = [];
@@ -259,8 +259,8 @@ 
      */
     public function updateMetaBundle(MetaBundle $metaBundle, int $siteId)
     {
-        $metaBundle->sourceName = (string)$metaBundle->sourceName;
-        $metaBundle->sourceTemplate = (string)$metaBundle->sourceTemplate;
+        $metaBundle->sourceName = (string) $metaBundle->sourceName;
+        $metaBundle->sourceTemplate = (string) $metaBundle->sourceTemplate;
         // Make sure it validates
         if ($metaBundle->validate(null, true)) {
             // Save it out to a record
@@ -270,7 +270,7 @@ 
                 'sourceSiteId' => $siteId,
             ];
             if ($metaBundle->typeId !== null) {
-                $metaBundle->typeId = (int)$metaBundle->typeId;
+                $metaBundle->typeId = (int) $metaBundle->typeId;
             }
             if (!empty($metaBundle->typeId)) {
                 $params['typeId'] = $metaBundle->typeId;
@@ -286,7 +286,7 @@ 
             // @TODO remove this hack that doesn't allow environment-transformed settings to be saved in a meta bundle with a proper system to address it
             // The issue was that the containers were getting saved to the db with a hard-coded setting in them, because they'd
             // been set that way by the environment, whereas to be changeable via the GUI, it needs to be set to {seomatic.meta.robots}
-            $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE]->data['robots'] ?? null;
+            $robotsTag = $metaBundle->metaContainers[MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE]->data['robots'] ?? null;
             if (!empty($robotsTag)) {
                 $robotsTag->content = $robotsTag->environment['live']['content'] ?? '{{ seomatic.meta.robots }}';
             }
@@ -368,7 +368,7 @@ 
                 $metaBundleDefaults = ArrayHelper::merge(
                     $seoElement::metaBundleConfig($sourceModel),
                     [
-                        'sourceTemplate' => (string)$siteSetting->template,
+                        'sourceTemplate' => (string) $siteSetting->template,
                         'sourceSiteId' => $siteSetting->siteId,
                         'sourceAltSiteSettings' => $siteSettingsArray,
                         'sourceDateUpdated' => $dateUpdated,
@@ -416,7 +416,7 @@ 
     public function getMetaBundleBySourceHandle(string $sourceBundleType, string $sourceHandle, int $sourceSiteId, $typeId = null)
     {
         $metaBundle = null;
-        $typeId = (int)$typeId;
+        $typeId = (int) $typeId;
         // See if we have the meta bundle cached
         if (!empty($this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId])) {
             $id = $this->metaBundlesBySourceHandle[$sourceBundleType][$sourceHandle][$sourceSiteId][$typeId];
@@ -503,7 +503,7 @@ 
                             /** @var Section|CategoryGroup|ProductType $sourceModel */
                             $sourceModel = $seoElement::sourceModelFromId($sourceId);
                             if ($sourceModel !== null) {
-                                $metaBundle->sourceName = (string)$sourceModel->name;
+                                $metaBundle->sourceName = (string) $sourceModel->name;
                                 $metaBundle->sourceHandle = $sourceModel->handle;
                             }
                         }
@@ -544,7 +544,7 @@ 
     public function getMetaBundleBySourceId(string $sourceBundleType, int $sourceId, int $sourceSiteId, $typeId = null)
     {
         $metaBundle = null;
-        $typeId = (int)$typeId;
+        $typeId = (int) $typeId;
         // See if we have the meta bundle cached
         if (!empty($this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId])) {
             $id = $this->metaBundlesBySourceId[$sourceBundleType][$sourceId][$sourceSiteId][$typeId];
@@ -739,7 +739,7 @@ 
                 ->from(['{{%seomatic_metabundles}}'])
                 ->where(['=', 'sourceBundleType', $seoElement::META_BUNDLE_TYPE]);
 
-            if ((int)$sourceSiteId !== 0) {
+            if ((int) $sourceSiteId !== 0) {
                 $subQuery->andWhere(['sourceSiteId' => $sourceSiteId]);
             }
             if ($filter !== '') {
@@ -776,7 +776,7 @@ 
     public function getContentMetaBundleForElement(Element $element)
     {
         $source = $this->getMetaSourceFromElement($element);
-        $key = implode(".", $source) . '.' . $element->siteId;
+        $key = implode(".", $source).'.'.$element->siteId;
 
         if (empty($this->elementContentMetaBundles[$key])) {
             $this->elementContentMetaBundles[$key] = $this->getMetaBundleBySourceId($source[1], $source[0], $element->siteId, $source[4]);
@@ -798,10 +798,10 @@ 
         $seoSettingsField = Craft::$app->getFields()->getFieldByHandle($fieldHandle);
         if ($seoSettingsField) {
             $seoSettingsEnabledFields = array_flip(array_merge(
-                (array)$seoSettingsField->generalEnabledFields,
-                (array)$seoSettingsField->twitterEnabledFields,
-                (array)$seoSettingsField->facebookEnabledFields,
-                (array)$seoSettingsField->sitemapEnabledFields
+                (array) $seoSettingsField->generalEnabledFields,
+                (array) $seoSettingsField->twitterEnabledFields,
+                (array) $seoSettingsField->facebookEnabledFields,
+                (array) $seoSettingsField->sitemapEnabledFields
             ));
             // Always include some fields, as they are calculated even if not explicitly included
             $seoSettingsEnabledFields = array_merge(

src/Seomatic.php

Spacing +38 added lines, -38 removed lines

@@ -341,7 +341,7 @@ 
             $lastSegment = end($segments);
             $site = Craft::$app->getSites()->getSiteByHandle($lastSegment);
             if ($site !== null) {
-                $siteSuffix = '/' . $lastSegment;
+                $siteSuffix = '/'.$lastSegment;
             }
         }
         $currentUser = Craft::$app->getUser()->getIdentity();
@@ -349,31 +349,31 @@ 
         if ($currentUser->can('seomatic:dashboard')) {
             $subNavs['dashboard'] = [
                 'label' => Craft::t('seomatic', 'Dashboard'),
-                'url' => 'seomatic/dashboard' . $siteSuffix,
+                'url' => 'seomatic/dashboard'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:global-meta')) {
             $subNavs['global'] = [
                 'label' => Craft::t('seomatic', 'Global SEO'),
-                'url' => 'seomatic/global/general' . $siteSuffix,
+                'url' => 'seomatic/global/general'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:content-meta')) {
             $subNavs['content'] = [
                 'label' => Craft::t('seomatic', 'Content SEO'),
-                'url' => 'seomatic/content' . $siteSuffix,
+                'url' => 'seomatic/content'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:site-settings')) {
             $subNavs['site'] = [
                 'label' => Craft::t('seomatic', 'Site Settings'),
-                'url' => 'seomatic/site/identity' . $siteSuffix,
+                'url' => 'seomatic/site/identity'.$siteSuffix,
             ];
         }
         if ($currentUser->can('seomatic:tracking-scripts')) {
             $subNavs['tracking'] = [
                 'label' => Craft::t('seomatic', 'Tracking Scripts'),
-                'url' => 'seomatic/tracking/gtag' . $siteSuffix,
+                'url' => 'seomatic/tracking/gtag'.$siteSuffix,
             ];
         }
         $editableSettings = true;
@@ -418,7 +418,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     // Invalidate our caches after we've been installed
                     $this->clearAllCaches();
@@ -439,7 +439,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -455,7 +455,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_BEFORE_SAVE_PLUGIN_SETTINGS,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this && !Craft::$app->getDb()->getSupportsMb4()) {
                     // For all the emojis
                     $settingsModel = $this->getSettings();
@@ -485,7 +485,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            function () {
+            function() {
                 // Delay registering SEO Elements to give other plugins a chance to load first
                 $this->seoElements->getAllSeoElementTypes(false);
                 // Delay installing GQL handlers to give other plugins a chance to register their own first
@@ -506,7 +506,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            static function (RegisterComponentTypesEvent $event) {
+            static function(RegisterComponentTypesEvent $event) {
                 $event->types[] = SeoSettingsField::class;
                 $event->types[] = Seomatic_MetaField::class;
             }
@@ -515,7 +515,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            static function (ElementEvent $event) {
+            static function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -535,7 +535,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_DELETE_ELEMENT,
-            static function (ElementEvent $event) {
+            static function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_DELETE_ELEMENT',
                     __METHOD__
@@ -554,19 +554,19 @@ 
             Event::on(
                 Entry::class,
                 Element::EVENT_REGISTER_PREVIEW_TARGETS,
-                static function (RegisterPreviewTargetsEvent $e) {
+                static function(RegisterPreviewTargetsEvent $e) {
                     /** @var Element $element */
                     $element = $e->sender;
                     if ($element->uri !== null) {
                         $e->previewTargets[] = [
-                            'label' => '