@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | if (!empty($string)) { |
| 77 | 77 | $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']); |
| 78 | 78 | $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8'); |
| 79 | - $result = (string)Stringy::create($string)->truncate($length, $substring); |
|
| 79 | + $result = (string) Stringy::create($string)->truncate($length, $substring); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | return $result; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | if (!empty($string)) { |
| 102 | 102 | $string = HtmlPurifier::process($string, ['HTML.Allowed' => '']); |
| 103 | 103 | $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8'); |
| 104 | - $result = (string)Stringy::create($string)->safeTruncate($length, $substring); |
|
| 104 | + $result = (string) Stringy::create($string)->safeTruncate($length, $substring); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | return $result; |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | $result = self::smartStripTags(Doxter::$plugin->getService()->parseMarkdown($field->getRaw())); |
| 136 | 136 | } else { |
| 137 | 137 | if (\is_array($field)) { |
| 138 | - $result = self::smartStripTags((string)$field[0]); |
|
| 138 | + $result = self::smartStripTags((string) $field[0]); |
|
| 139 | 139 | } else { |
| 140 | - $result = self::smartStripTags((string)$field); |
|
| 140 | + $result = self::smartStripTags((string) $field); |
|
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | |
| 344 | 344 | $result = \is_array($keywords) |
| 345 | 345 | ? implode(', ', \array_slice(array_keys($keywords), 0, $limit)) |
| 346 | - : (string)$keywords; |
|
| 346 | + : (string) $keywords; |
|
| 347 | 347 | |
| 348 | 348 | return self::sanitizeUserInput($result); |
| 349 | 349 | } |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | |
| 382 | 382 | $result = \is_array($sentences) |
| 383 | 383 | ? implode(' ', $sentences) |
| 384 | - : (string)$sentences; |
|
| 384 | + : (string) $sentences; |
|
| 385 | 385 | |
| 386 | 386 | return self::sanitizeUserInput($result); |
| 387 | 387 | } |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8'); |
| 402 | 402 | $str = rawurldecode($str); |
| 403 | 403 | // Remove any linebreaks |
| 404 | - $str = (string)preg_replace("/\r|\n/", "", $str); |
|
| 404 | + $str = (string) preg_replace("/\r|\n/", "", $str); |
|
| 405 | 405 | $str = HtmlPurifier::process($str, ['HTML.Allowed' => '']); |
| 406 | 406 | $str = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8'); |
| 407 | 407 | // Remove any embedded Twig code |
@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | return [ |
| 23 | - MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [ |
|
| 23 | + MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [ |
|
| 24 | 24 | 'name' => 'General', |
| 25 | 25 | 'description' => 'General Meta Tags', |
| 26 | 26 | 'handle' => TagService::GENERAL_HANDLE, |
| 27 | - 'class' => (string)MetaTagContainer::class, |
|
| 27 | + 'class' => (string) MetaTagContainer::class, |
|
| 28 | 28 | 'include' => true, |
| 29 | 29 | 'dependencies' => [ |
| 30 | 30 | ], |
@@ -76,11 +76,11 @@ discard block |
||
| 76 | 76 | ], |
| 77 | 77 | ], |
| 78 | 78 | ], |
| 79 | - MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [ |
|
| 79 | + MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [ |
|
| 80 | 80 | 'name' => 'Facebook', |
| 81 | 81 | 'description' => 'Facebook OpenGraph Meta Tags', |
| 82 | 82 | 'handle' => TagService::FACEBOOK_HANDLE, |
| 83 | - 'class' => (string)MetaTagContainer::class, |
|
| 83 | + 'class' => (string) MetaTagContainer::class, |
|
| 84 | 84 | 'include' => true, |
| 85 | 85 | 'dependencies' => [ |
| 86 | 86 | ], |
@@ -206,12 +206,12 @@ discard block |
||
| 206 | 206 | ], |
| 207 | 207 | ], |
| 208 | 208 | ], |
| 209 | - MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [ |
|
| 209 | + MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [ |
|
| 210 | 210 | 'name' => 'Twitter', |
| 211 | 211 | 'description' => 'Twitter Card Meta Tags', |
| 212 | 212 | 'handle' => TagService::TWITTER_HANDLE, |
| 213 | 213 | 'include' => true, |
| 214 | - 'class' => (string)MetaTagContainer::class, |
|
| 214 | + 'class' => (string) MetaTagContainer::class, |
|
| 215 | 215 | 'data' => [ |
| 216 | 216 | 'twitter:card' => [ |
| 217 | 217 | 'charset' => '', |
@@ -287,11 +287,11 @@ discard block |
||
| 287 | 287 | ], |
| 288 | 288 | ], |
| 289 | 289 | ], |
| 290 | - MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [ |
|
| 290 | + MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [ |
|
| 291 | 291 | 'name' => 'Miscellaneous', |
| 292 | 292 | 'description' => 'Miscellaneous Meta Tags', |
| 293 | 293 | 'handle' => TagService::MISC_HANDLE, |
| 294 | - 'class' => (string)MetaTagContainer::class, |
|
| 294 | + 'class' => (string) MetaTagContainer::class, |
|
| 295 | 295 | 'include' => true, |
| 296 | 296 | 'dependencies' => [ |
| 297 | 297 | ], |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | // Go from most specific type to least specific type |
| 95 | 95 | foreach (self::SCHEMA_TYPES as $schemaType) { |
| 96 | 96 | if (!empty($settings[$schemaType]) && ($settings[$schemaType] !== 'none')) { |
| 97 | - $result = $settings[$schemaType] . self::SCHEMA_PATH_DELIMITER . $result; |
|
| 97 | + $result = $settings[$schemaType].self::SCHEMA_PATH_DELIMITER.$result; |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | if (isset($result['schemaTypeDescription'])) { |
| 127 | 127 | $description = $result['schemaTypeDescription']; |
| 128 | 128 | $description = preg_replace("`\[\[([A-z]*)\]\]`", '[$1](https://schema.org/$1)', $description); |
| 129 | - $description = Markdown::process((string)$description); |
|
| 129 | + $description = Markdown::process((string) $description); |
|
| 130 | 130 | $description = str_replace(['<p>', '</p>', '\n'], ['', '', ' '], $description); |
| 131 | 131 | $result['schemaTypeDescription'] = $description; |
| 132 | 132 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | { |
| 148 | 148 | $result = []; |
| 149 | 149 | while ($schemaType) { |
| 150 | - $className = 'nystudio107\\seomatic\\models\\jsonld\\' . $schemaType; |
|
| 150 | + $className = 'nystudio107\\seomatic\\models\\jsonld\\'.$schemaType; |
|
| 151 | 151 | if (class_exists($className)) { |
| 152 | 152 | try { |
| 153 | 153 | $classRef = new \ReflectionClass($className); |
@@ -254,15 +254,15 @@ discard block |
||
| 254 | 254 | $dependency = new TagDependency([ |
| 255 | 255 | 'tags' => [ |
| 256 | 256 | self::GLOBAL_SCHEMA_CACHE_TAG, |
| 257 | - self::SCHEMA_CACHE_TAG . 'schemaArray', |
|
| 257 | + self::SCHEMA_CACHE_TAG.'schemaArray', |
|
| 258 | 258 | ], |
| 259 | 259 | ]); |
| 260 | 260 | $cache = Craft::$app->getCache(); |
| 261 | 261 | $typesArray = $cache->getOrSet( |
| 262 | - self::CACHE_KEY . 'schemaArray', |
|
| 263 | - function () use ($path) { |
|
| 262 | + self::CACHE_KEY.'schemaArray', |
|
| 263 | + function() use ($path) { |
|
| 264 | 264 | Craft::info( |
| 265 | - 'schemaArray cache miss: ' . $path, |
|
| 265 | + 'schemaArray cache miss: '.$path, |
|
| 266 | 266 | __METHOD__ |
| 267 | 267 | ); |
| 268 | 268 | $filePath = Craft::getAlias('@nystudio107/seomatic/resources/schema/tree.jsonld'); |
@@ -355,13 +355,13 @@ discard block |
||
| 355 | 355 | $dependency = new TagDependency([ |
| 356 | 356 | 'tags' => [ |
| 357 | 357 | self::GLOBAL_SCHEMA_CACHE_TAG, |
| 358 | - self::SCHEMA_CACHE_TAG . 'schemaTree', |
|
| 358 | + self::SCHEMA_CACHE_TAG.'schemaTree', |
|
| 359 | 359 | ], |
| 360 | 360 | ]); |
| 361 | 361 | $cache = Craft::$app->getCache(); |
| 362 | 362 | $typesArray = $cache->getOrSet( |
| 363 | - self::CACHE_KEY . 'schemaTree', |
|
| 364 | - function () { |
|
| 363 | + self::CACHE_KEY.'schemaTree', |
|
| 364 | + function() { |
|
| 365 | 365 | Craft::info( |
| 366 | 366 | 'schemaTree cache miss', |
| 367 | 367 | __METHOD__ |
@@ -396,11 +396,11 @@ discard block |
||
| 396 | 396 | foreach ($typesArray as $key => $value) { |
| 397 | 397 | $indent = html_entity_decode(str_repeat(' ', $indentLevel)); |
| 398 | 398 | if (\is_array($value)) { |
| 399 | - $result[$key] = $indent . $key; |
|
| 399 | + $result[$key] = $indent.$key; |
|
| 400 | 400 | $value = self::flattenSchemaArray($value, $indentLevel + self::MENU_INDENT_STEP); |
| 401 | 401 | $result = array_merge($result, $value); |
| 402 | 402 | } else { |
| 403 | - $result[$key] = $indent . $value; |
|
| 403 | + $result[$key] = $indent.$value; |
|
| 404 | 404 | } |
| 405 | 405 | } |
| 406 | 406 | |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | $children = []; |
| 495 | 495 | $name = $typesArray['name']; |
| 496 | 496 | // Construct a path-based $id, excluding the top-level `Thing` schema |
| 497 | - $id = $name === 'Thing' ? '' : $path . self::SCHEMA_PATH_DELIMITER . $name; |
|
| 497 | + $id = $name === 'Thing' ? '' : $path.self::SCHEMA_PATH_DELIMITER.$name; |
|
| 498 | 498 | $id = ltrim($id, self::SCHEMA_PATH_DELIMITER); |
| 499 | 499 | // Make sure we have at most 3 specifiers in the schema path |
| 500 | 500 | $parts = explode(self::SCHEMA_PATH_DELIMITER, $id); |
@@ -521,12 +521,12 @@ discard block |
||
| 521 | 521 | $schemaPath = explode(self::SCHEMA_PATH_DELIMITER, $id); |
| 522 | 522 | // Use only the specific (last) type for now, rather than the complete path of types |
| 523 | 523 | $schemaPath = [end($schemaPath)]; |
| 524 | - if ((bool)array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) { |
|
| 525 | - $name .= ' (' . Craft::t('seomatic', 'Google rich result') . ')'; |
|
| 524 | + if ((bool) array_intersect($schemaPath, array_keys($googleRichSnippetTypes))) { |
|
| 525 | + $name .= ' ('.Craft::t('seomatic', 'Google rich result').')'; |
|
| 526 | 526 | } |
| 527 | 527 | // Mark it as pending, if applicable |
| 528 | 528 | if (isset($typesArray['pending']) && $typesArray['pending']) { |
| 529 | - $name .= ' (' . Craft::t('seomatic', 'pending') . ')'; |
|
| 529 | + $name .= ' ('.Craft::t('seomatic', 'pending').')'; |
|
| 530 | 530 | } |
| 531 | 531 | $result['label'] = $name; |
| 532 | 532 | $result['id'] = $id; |
@@ -545,13 +545,13 @@ discard block |
||
| 545 | 545 | $dependency = new TagDependency([ |
| 546 | 546 | 'tags' => [ |
| 547 | 547 | self::GLOBAL_SCHEMA_CACHE_TAG, |
| 548 | - self::SCHEMA_CACHE_TAG . 'googleRichSnippets', |
|
| 548 | + self::SCHEMA_CACHE_TAG.'googleRichSnippets', |
|
| 549 | 549 | ], |
| 550 | 550 | ]); |
| 551 | 551 | $cache = Craft::$app->getCache(); |
| 552 | 552 | return $cache->getOrSet( |
| 553 | - self::CACHE_KEY . 'googleRichSnippets', |
|
| 554 | - function () { |
|
| 553 | + self::CACHE_KEY.'googleRichSnippets', |
|
| 554 | + function() { |
|
| 555 | 555 | Craft::info( |
| 556 | 556 | 'googleRichSnippets cache miss', |
| 557 | 557 | __METHOD__ |
@@ -40,12 +40,12 @@ discard block |
||
| 40 | 40 | $siteUrl = MetaValue::parseString($siteUrl); |
| 41 | 41 | // Extract out just the path part |
| 42 | 42 | $parts = self::decomposeUrl($path); |
| 43 | - $path = $parts['path'] . $parts['suffix']; |
|
| 44 | - $url = rtrim($siteUrl, '/') . '/' . ltrim($path, '/'); |
|
| 43 | + $path = $parts['path'].$parts['suffix']; |
|
| 44 | + $url = rtrim($siteUrl, '/').'/'.ltrim($path, '/'); |
|
| 45 | 45 | // Handle trailing slashes properly for generated URLs |
| 46 | 46 | $generalConfig = Craft::$app->getConfig()->getGeneral(); |
| 47 | 47 | if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/\.[^\/]+$/', $url)) { |
| 48 | - $url = rtrim($url, '/') . '/'; |
|
| 48 | + $url = rtrim($url, '/').'/'; |
|
| 49 | 49 | } |
| 50 | 50 | if (!$generalConfig->addTrailingSlashesToUrls) { |
| 51 | 51 | $url = rtrim($url, '/'); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | // Handle trailing slashes properly for generated URLs |
| 123 | 123 | $generalConfig = Craft::$app->getConfig()->getGeneral(); |
| 124 | 124 | if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/\.[^\/]+$/', $url)) { |
| 125 | - $url = rtrim($url, '/') . '/'; |
|
| 125 | + $url = rtrim($url, '/').'/'; |
|
| 126 | 126 | } |
| 127 | 127 | if (!$generalConfig->addTrailingSlashesToUrls) { |
| 128 | 128 | $url = rtrim($url, '/'); |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | $urlParts = parse_url($url); |
| 143 | 143 | $encodedUrl = ""; |
| 144 | 144 | if (isset($urlParts['scheme'])) { |
| 145 | - $encodedUrl .= $urlParts['scheme'] . '://'; |
|
| 145 | + $encodedUrl .= $urlParts['scheme'].'://'; |
|
| 146 | 146 | } |
| 147 | 147 | if (isset($urlParts['host'])) { |
| 148 | 148 | $encodedUrl .= $urlParts['host']; |
| 149 | 149 | } |
| 150 | 150 | if (isset($urlParts['port'])) { |
| 151 | - $encodedUrl .= ':' . $urlParts['port']; |
|
| 151 | + $encodedUrl .= ':'.$urlParts['port']; |
|
| 152 | 152 | } |
| 153 | 153 | if (isset($urlParts['path'])) { |
| 154 | 154 | $encodedUrl .= $urlParts['path']; |
@@ -158,15 +158,15 @@ discard block |
||
| 158 | 158 | foreach ($query as $j => $value) { |
| 159 | 159 | $value = explode('=', $value, 2); |
| 160 | 160 | if (count($value) === 2) { |
| 161 | - $query[$j] = urlencode($value[0]) . '=' . urlencode($value[1]); |
|
| 161 | + $query[$j] = urlencode($value[0]).'='.urlencode($value[1]); |
|
| 162 | 162 | } else { |
| 163 | 163 | $query[$j] = urlencode($value[0]); |
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | - $encodedUrl .= '?' . implode('&', $query); |
|
| 166 | + $encodedUrl .= '?'.implode('&', $query); |
|
| 167 | 167 | } |
| 168 | 168 | if (isset($urlParts['fragment'])) { |
| 169 | - $encodedUrl .= '#' . $urlParts['fragment']; |
|
| 169 | + $encodedUrl .= '#'.$urlParts['fragment']; |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | return $encodedUrl; |
@@ -199,11 +199,11 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) { |
| 201 | 201 | $url_parts = parse_url($pathOrUrl); |
| 202 | - $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host']; |
|
| 202 | + $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host']; |
|
| 203 | 203 | $result['path'] = $url_parts['path'] ?? ''; |
| 204 | 204 | $result['suffix'] = ''; |
| 205 | - $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query']; |
|
| 206 | - $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment']; |
|
| 205 | + $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query']; |
|
| 206 | + $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment']; |
|
| 207 | 207 | } else { |
| 208 | 208 | $result['prefix'] = ''; |
| 209 | 209 | $result['path'] = $pathOrUrl; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | // Output some info if this is a console app |
| 81 | 81 | if ($job && Craft::$app instanceof ConsoleApplication) { |
| 82 | - echo $job->description . PHP_EOL; |
|
| 82 | + echo $job->description.PHP_EOL; |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | $lines = []; |
@@ -139,8 +139,8 @@ discard block |
||
| 139 | 139 | while ($currentElement < $totalElements) { |
| 140 | 140 | $elements = $paginator->getPageResults(); |
| 141 | 141 | if (Craft::$app instanceof ConsoleApplication) { |
| 142 | - echo 'Query ' . $paginator->getCurrentPage() . '/' . $paginator->getTotalPages() |
|
| 143 | - . ' - elements: ' . $paginator->getTotalResults() |
|
| 142 | + echo 'Query '.$paginator->getCurrentPage().'/'.$paginator->getTotalPages() |
|
| 143 | + . ' - elements: '.$paginator->getTotalResults() |
|
| 144 | 144 | . PHP_EOL; |
| 145 | 145 | } |
| 146 | 146 | /** @var ElementInterface $element */ |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | // Output some info if this is a console app |
| 154 | 154 | if (Craft::$app instanceof ConsoleApplication) { |
| 155 | - echo "Processing element {$currentElement}/{$totalElements} - {$element->title}" . PHP_EOL; |
|
| 155 | + echo "Processing element {$currentElement}/{$totalElements} - {$element->title}".PHP_EOL; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | $metaBundle->metaSitemapVars->setAttributes($stashedSitemapAttrs, false); |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | $canonicalUrl = UrlHelper::absoluteUrlWithProtocol($canonicalUrl); |
| 191 | 191 | if ($url !== $canonicalUrl) { |
| 192 | - Craft::info("Excluding URL: {$url} from the sitemap because it does not match the Canonical URL: {$canonicalUrl} - " . $metaBundle->metaGlobalVars->canonicalUrl . " - " . $element->uri); |
|
| 192 | + Craft::info("Excluding URL: {$url} from the sitemap because it does not match the Canonical URL: {$canonicalUrl} - ".$metaBundle->metaGlobalVars->canonicalUrl." - ".$element->uri); |
|
| 193 | 193 | continue; |
| 194 | 194 | } |
| 195 | 195 | } |
@@ -246,12 +246,12 @@ discard block |
||
| 246 | 246 | if ($primarySiteId === $altSourceSiteId && Seomatic::$settings->addXDefaultHrefLang) { |
| 247 | 247 | $lines[] = '<xhtml:link rel="alternate"' |
| 248 | 248 | . ' hreflang="x-default"' |
| 249 | - . ' href="' . Html::encode($altUrl) . '"' |
|
| 249 | + . ' href="'.Html::encode($altUrl).'"' |
|
| 250 | 250 | . ' />'; |
| 251 | 251 | } |
| 252 | 252 | $lines[] = '<xhtml:link rel="alternate"' |
| 253 | - . ' hreflang="' . $altSiteSettings['language'] . '"' |
|
| 254 | - . ' href="' . Html::encode($altUrl) . '"' |
|
| 253 | + . ' hreflang="'.$altSiteSettings['language'].'"' |
|
| 254 | + . ' href="'.Html::encode($altUrl).'"' |
|
| 255 | 255 | . ' />'; |
| 256 | 256 | } |
| 257 | 257 | } |
@@ -351,11 +351,11 @@ discard block |
||
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | $cache = Craft::$app->getCache(); |
| 354 | - $cacheKey = SitemapTemplate::CACHE_KEY . $groupId . $type . $handle . $siteId; |
|
| 354 | + $cacheKey = SitemapTemplate::CACHE_KEY.$groupId.$type.$handle.$siteId; |
|
| 355 | 355 | $dependency = new TagDependency([ |
| 356 | 356 | 'tags' => [ |
| 357 | 357 | SitemapTemplate::GLOBAL_SITEMAP_CACHE_TAG, |
| 358 | - SitemapTemplate::SITEMAP_CACHE_TAG . $handle . $siteId, |
|
| 358 | + SitemapTemplate::SITEMAP_CACHE_TAG.$handle.$siteId, |
|
| 359 | 359 | ], |
| 360 | 360 | ]); |
| 361 | 361 | $lines = implode('', $lines); |
@@ -368,10 +368,10 @@ discard block |
||
| 368 | 368 | $result = $cache->set($cacheKey, $lines, $cacheDuration, $dependency); |
| 369 | 369 | // Remove the queue job id from the cache too |
| 370 | 370 | $cache->delete($queueJobCacheKey); |
| 371 | - Craft::debug('Sitemap cache result: ' . print_r($result, true) . ' for cache key: ' . $cacheKey, __METHOD__); |
|
| 371 | + Craft::debug('Sitemap cache result: '.print_r($result, true).' for cache key: '.$cacheKey, __METHOD__); |
|
| 372 | 372 | // Output some info if this is a console app |
| 373 | 373 | if (Craft::$app instanceof ConsoleApplication) { |
| 374 | - echo 'Sitemap cache result: ' . print_r($result, true) . ' for cache key: ' . $cacheKey . PHP_EOL; |
|
| 374 | + echo 'Sitemap cache result: '.print_r($result, true).' for cache key: '.$cacheKey.PHP_EOL; |
|
| 375 | 375 | } |
| 376 | 376 | // If the FastCGI Cache Bust plugin is installed, clear its caches too |
| 377 | 377 | $plugin = Craft::$app->getPlugins()->getPlugin('fastcgi-cache-bust'); |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | */ |
| 485 | 485 | protected static function assetSitemapItem(Asset $asset, MetaBundle $metaBundle, array &$lines) |
| 486 | 486 | { |
| 487 | - if ((bool)$asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 487 | + if ((bool) $asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 488 | 488 | switch ($asset->kind) { |
| 489 | 489 | case 'image': |
| 490 | 490 | $lines[] = '<image:image>'; |
@@ -496,9 +496,9 @@ discard block |
||
| 496 | 496 | $fieldName = $row['field'] ?? ''; |
| 497 | 497 | $propName = $row['property'] ?? ''; |
| 498 | 498 | if (!empty($asset[$fieldName]) && !empty($propName)) { |
| 499 | - $lines[] = '<image:' . $propName . '>'; |
|
| 499 | + $lines[] = '<image:'.$propName.'>'; |
|
| 500 | 500 | $lines[] = Html::encode($asset[$fieldName]); |
| 501 | - $lines[] = '</image:' . $propName . '>'; |
|
| 501 | + $lines[] = '</image:'.$propName.'>'; |
|
| 502 | 502 | } |
| 503 | 503 | } |
| 504 | 504 | $lines[] = '</image:image>'; |
@@ -514,9 +514,9 @@ discard block |
||
| 514 | 514 | $fieldName = $row['field'] ?? ''; |
| 515 | 515 | $propName = $row['property'] ?? ''; |
| 516 | 516 | if (!empty($asset[$fieldName]) && !empty($propName)) { |
| 517 | - $lines[] = '<video:' . $propName . '>'; |
|
| 517 | + $lines[] = '<video:'.$propName.'>'; |
|
| 518 | 518 | $lines[] = Html::encode($asset[$fieldName]); |
| 519 | - $lines[] = '</video:' . $propName . '>'; |
|
| 519 | + $lines[] = '</video:'.$propName.'>'; |
|
| 520 | 520 | } |
| 521 | 521 | } |
| 522 | 522 | $lines[] = '</video:video>'; |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | */ |
| 533 | 533 | protected static function assetFilesSitemapLink(Asset $asset, MetaBundle $metaBundle, array &$lines) |
| 534 | 534 | { |
| 535 | - if ((bool)$asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 535 | + if ((bool) $asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 536 | 536 | if (\in_array($asset->kind, SitemapTemplate::FILE_TYPES, false)) { |
| 537 | 537 | $dateUpdated = $asset->dateUpdated ?? $asset->dateCreated ?? new \DateTime; |
| 538 | 538 | $lines[] = '<url>'; |
@@ -20,11 +20,11 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | return [ |
| 23 | - MetaScriptContainer::CONTAINER_TYPE . ScriptService::GENERAL_HANDLE => [ |
|
| 23 | + MetaScriptContainer::CONTAINER_TYPE.ScriptService::GENERAL_HANDLE => [ |
|
| 24 | 24 | 'name' => 'General', |
| 25 | 25 | 'description' => 'Script Tags', |
| 26 | 26 | 'handle' => ScriptService::GENERAL_HANDLE, |
| 27 | - 'class' => (string)MetaScriptContainer::class, |
|
| 27 | + 'class' => (string) MetaScriptContainer::class, |
|
| 28 | 28 | 'include' => true, |
| 29 | 29 | 'dependencies' => [ |
| 30 | 30 | ], |
@@ -33,10 +33,10 @@ |
||
| 33 | 33 | $enabled = $metaContainer['data']['googleAnalytics']['include'] ?? null; |
| 34 | 34 | if ($enabled) { |
| 35 | 35 | Craft::$app->announcements->push( |
| 36 | - function ($language) { |
|
| 36 | + function($language) { |
|
| 37 | 37 | return Craft::t('seomatic', 'Google Universal Analytics deprecated', [], $language); |
| 38 | 38 | }, |
| 39 | - function ($language) { |
|
| 39 | + function($language) { |
|
| 40 | 40 | return Craft::t('seomatic', 'Universal Analytics (which is used on this site via the SEOmatic plugin) is being [discontinued on July 1st, 2023]({url}). You should use Google gtag.js or Google Tag Manager instead and transition to a new GA4 property.', [ |
| 41 | 41 | 'url' => 'https://support.google.com/analytics/answer/11583528', |
| 42 | 42 | ], $language); |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | self::$cacheDuration = self::$devMode |
| 271 | 271 | ? self::DEVMODE_CACHE_DURATION |
| 272 | 272 | : self::$settings->metaCacheDuration ?? null; |
| 273 | - self::$cacheDuration = self::$cacheDuration === null ? null : (int)self::$cacheDuration; |
|
| 273 | + self::$cacheDuration = self::$cacheDuration === null ? null : (int) self::$cacheDuration; |
|
| 274 | 274 | self::$environment = EnvironmentHelper::determineEnvironment(); |
| 275 | 275 | MetaValueHelper::cache(); |
| 276 | 276 | // Version helpers |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | Event::on( |
| 346 | 346 | Plugins::class, |
| 347 | 347 | Plugins::EVENT_AFTER_INSTALL_PLUGIN, |
| 348 | - function (PluginEvent $event) { |
|
| 348 | + function(PluginEvent $event) { |
|
| 349 | 349 | if ($event->plugin === $this) { |
| 350 | 350 | // Invalidate our caches after we've been installed |
| 351 | 351 | $this->clearAllCaches(); |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | Event::on( |
| 367 | 367 | ClearCaches::class, |
| 368 | 368 | ClearCaches::EVENT_REGISTER_CACHE_OPTIONS, |
| 369 | - function (RegisterCacheOptionsEvent $event) { |
|
| 369 | + function(RegisterCacheOptionsEvent $event) { |
|
| 370 | 370 | Craft::debug( |
| 371 | 371 | 'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS', |
| 372 | 372 | __METHOD__ |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | Event::on( |
| 383 | 383 | Plugins::class, |
| 384 | 384 | Plugins::EVENT_BEFORE_SAVE_PLUGIN_SETTINGS, |
| 385 | - function (PluginEvent $event) { |
|
| 385 | + function(PluginEvent $event) { |
|
| 386 | 386 | if ($event->plugin === $this && !Craft::$app->getDb()->getSupportsMb4()) { |
| 387 | 387 | // For all the emojis |
| 388 | 388 | $settingsModel = $this->getSettings(); |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | Event::on( |
| 436 | 436 | Plugins::class, |
| 437 | 437 | Plugins::EVENT_AFTER_LOAD_PLUGINS, |
| 438 | - function () { |
|
| 438 | + function() { |
|
| 439 | 439 | // Delay registering SEO Elements to give other plugins a chance to load first |
| 440 | 440 | $this->seoElements->getAllSeoElementTypes(false); |
| 441 | 441 | // Delay installing GQL handlers to give other plugins a chance to register their own first |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | Event::on( |
| 457 | 457 | Fields::class, |
| 458 | 458 | Fields::EVENT_REGISTER_FIELD_TYPES, |
| 459 | - function (RegisterComponentTypesEvent $event) { |
|
| 459 | + function(RegisterComponentTypesEvent $event) { |
|
| 460 | 460 | $event->types[] = SeoSettingsField::class; |
| 461 | 461 | $event->types[] = Seomatic_MetaField::class; |
| 462 | 462 | } |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | Event::on( |
| 466 | 466 | Elements::class, |
| 467 | 467 | Elements::EVENT_AFTER_SAVE_ELEMENT, |
| 468 | - function (ElementEvent $event) { |
|
| 468 | + function(ElementEvent $event) { |
|
| 469 | 469 | Craft::debug( |
| 470 | 470 | 'Elements::EVENT_AFTER_SAVE_ELEMENT', |
| 471 | 471 | __METHOD__ |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | Event::on( |
| 486 | 486 | Elements::class, |
| 487 | 487 | Elements::EVENT_AFTER_DELETE_ELEMENT, |
| 488 | - function (ElementEvent $event) { |
|
| 488 | + function(ElementEvent $event) { |
|
| 489 | 489 | Craft::debug( |
| 490 | 490 | 'Elements::EVENT_AFTER_DELETE_ELEMENT', |
| 491 | 491 | __METHOD__ |
@@ -504,19 +504,19 @@ discard block |
||
| 504 | 504 | Event::on( |
| 505 | 505 | Entry::class, |
| 506 | 506 | Entry::EVENT_REGISTER_PREVIEW_TARGETS, |
| 507 | - function (RegisterPreviewTargetsEvent $e) { |
|
| 507 | + function(RegisterPreviewTargetsEvent $e) { |
|
| 508 | 508 | /** @var Element $element */ |
| 509 | 509 | $element = $e->sender; |
| 510 | 510 | if ($element->uri !== null) { |
| 511 | 511 | $e->previewTargets[] = [ |
| 512 | - 'label' => ' |
|