nystudio107 / craft-seomatic

src/helpers/Schema.php

Spacing +19 added lines, -19 removed lines

@@ -94,7 +94,7 @@ 
             // Go from most specific type to least specific type
             foreach (self::SCHEMA_TYPES as $schemaType) {
                 if (!empty($settings[$schemaType]) && ($settings[$schemaType] !== 'none')) {
-                    $result = $settings[$schemaType] . self::SCHEMA_PATH_DELIMITER . $result;
+                    $result = $settings[$schemaType].self::SCHEMA_PATH_DELIMITER.$result;
                 }
             }
         }
@@ -126,7 +126,7 @@ 
                 if (isset($result['schemaTypeDescription'])) {
                     $description = $result['schemaTypeDescription'];
                     $description = preg_replace("`\[\[([A-z]*)\]\]`", '[$1](https://schema.org/$1)', $description);
-                    $description = Markdown::process((string)$description);
+                    $description = Markdown::process((string) $description);
                     $description = str_replace(['<p>', '</p>', '\n'], ['', '', ' '], $description);
                     $result['schemaTypeDescription'] = $description;
                 }
@@ -147,7 +147,7 @@ 
     {
         $result = [];
         while ($schemaType) {
-            $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $schemaType;
+            $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$schemaType;
             if (class_exists($className)) {
                 try {
                     $classRef = new \ReflectionClass($className);
@@ -254,15 +254,15 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'schemaArray',
+                self::SCHEMA_CACHE_TAG.'schemaArray',
             ],
         ]);
         $cache = Craft::$app->getCache();
         $typesArray = $cache->getOrSet(
-            self::CACHE_KEY . 'schemaArray',
-            function () use ($path) {
+            self::CACHE_KEY.'schemaArray',
+            function() use ($path) {
                 Craft::info(
-                    'schemaArray cache miss: ' . $path,
+                    'schemaArray cache miss: '.$path,
                     __METHOD__
                 );
                 $filePath = Craft::getAlias('@nystudio107/seomatic/resources/schema/tree.jsonld');
@@ -355,13 +355,13 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'schemaTree',
+                self::SCHEMA_CACHE_TAG.'schemaTree',
             ],
         ]);
         $cache = Craft::$app->getCache();
         $typesArray = $cache->getOrSet(
-            self::CACHE_KEY . 'schemaArray',
-            function () {
+            self::CACHE_KEY.'schemaArray',
+            function() {
                 Craft::info(
                     'schemaTree cache miss',
                     __METHOD__
@@ -396,11 +396,11 @@ 
         foreach ($typesArray as $key => $value) {
             $indent = html_entity_decode(str_repeat('&nbsp;', $indentLevel));
             if (\is_array($value)) {
-                $result[$key] = $indent . $key;
+                $result[$key] = $indent.$key;
                 $value = self::flattenSchemaArray($value, $indentLevel + self::MENU_INDENT_STEP);
                 $result = array_merge($result, $value);
             } else {
-                $result[$key] = $indent . $value;
+                $result[$key] = $indent.$value;
             }
         }
 
@@ -494,7 +494,7 @@ 
             $children = [];
             $name = $typesArray['name'];
             // Construct a path-based $id, excluding the top-level `Thing` schema
-            $id = $name === 'Thing' ? '' : $path . self::SCHEMA_PATH_DELIMITER . $name;
+            $id = $name === 'Thing' ? '' : $path.self::SCHEMA_PATH_DELIMITER.$name;
             $id = ltrim($id, self::SCHEMA_PATH_DELIMITER);
             // Make sure we have at most 3 specifiers in the schema path
             $parts = explode(self::SCHEMA_PATH_DELIMITER, $id);
@@ -521,12 +521,12 @@ 
             $schemaPath = explode(self::SCHEMA_PATH_DELIMITER, $id);
             // Use only the specific (last) type for now, rather than the complete path of types
             $schemaPath = [end($schemaPath)];
-            if ((bool)array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
-                $name .= ' (' . Craft::t('seomatic', 'Google rich result') . ')';
+            if ((bool) array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) {
+                $name .= ' ('.Craft::t('seomatic', 'Google rich result').')';
             }
             // Mark it as pending, if applicable
             if (isset($typesArray['pending']) && $typesArray['pending']) {
-                $name .= ' (' . Craft::t('seomatic', 'pending') . ')';
+                $name .= ' ('.Craft::t('seomatic', 'pending').')';
             }
             $result['label'] = $name;
             $result['id'] = $id;
@@ -545,13 +545,13 @@ 
         $dependency = new TagDependency([
             'tags' => [
                 self::GLOBAL_SCHEMA_CACHE_TAG,
-                self::SCHEMA_CACHE_TAG . 'googleRichSnippets',
+                self::SCHEMA_CACHE_TAG.'googleRichSnippets',
             ],
         ]);
         $cache = Craft::$app->getCache();
         return $cache->getOrSet(
-            self::CACHE_KEY . 'googleRichSnippets',
-            function () {
+            self::CACHE_KEY.'googleRichSnippets',
+            function() {
                 Craft::info(
                     'googleRichSnippets cache miss',
                     __METHOD__

src/Seomatic.php

Spacing +39 added lines, -39 removed lines

@@ -270,7 +270,7 @@ 
         self::$cacheDuration = self::$devMode
             ? self::DEVMODE_CACHE_DURATION
             : self::$settings->metaCacheDuration ?? null;
-        self::$cacheDuration = self::$cacheDuration === null ? null : (int)self::$cacheDuration;
+        self::$cacheDuration = self::$cacheDuration === null ? null : (int) self::$cacheDuration;
         self::$environment = EnvironmentHelper::determineEnvironment();
         MetaValueHelper::cache();
         // Version helpers
@@ -345,7 +345,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();
@@ -366,7 +366,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -382,7 +382,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();
@@ -435,7 +435,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
@@ -456,7 +456,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = SeoSettingsField::class;
                 $event->types[] = Seomatic_MetaField::class;
             }
@@ -465,7 +465,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -485,7 +485,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_DELETE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_DELETE_ELEMENT',
                     __METHOD__
@@ -504,19 +504,19 @@ 
             Event::on(
                 Entry::class,
                 Entry::EVENT_REGISTER_PREVIEW_TARGETS,
-                function (RegisterPreviewTargetsEvent $e) {
+                function(RegisterPreviewTargetsEvent $e) {
                     /** @var Element $element */
                     $element = $e->sender;
                     if ($element->uri !== null) {
                         $e->previewTargets[] = [
-                            'label' => '