@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | 'name' => static::getName(), |
| 81 | 81 | 'fields' => self::class.'::getFieldDefinitions', |
| 82 | 82 | 'description' => 'This is the interface implemented by SEOmatic.', |
| 83 | - 'resolveType' => function (array $value) { |
|
| 83 | + 'resolveType' => function(array $value) { |
|
| 84 | 84 | return GqlEntityRegistry::getEntity(SeomaticGenerator::getName()); |
| 85 | 85 | }, |
| 86 | 86 | ])); |
@@ -119,27 +119,27 @@ discard block |
||
| 119 | 119 | 'name' => 'sitemaps', |
| 120 | 120 | 'args' => SitemapArguments::getArguments(), |
| 121 | 121 | 'type' => Type::listOf(FileContentsType::getType()), |
| 122 | - 'resolve' => SitemapResolver::class .'::getSitemaps' |
|
| 122 | + 'resolve' => SitemapResolver::class.'::getSitemaps' |
|
| 123 | 123 | ]; |
| 124 | 124 | |
| 125 | 125 | $fields['sitemapIndexes'] = [ |
| 126 | 126 | 'name' => 'sitemapIndexes', |
| 127 | 127 | 'args' => SitemapIndexArguments::getArguments(), |
| 128 | 128 | 'type' => Type::listOf(FileContentsType::getType()), |
| 129 | - 'resolve' => SitemapResolver::class .'::getSitemapIndexes' |
|
| 129 | + 'resolve' => SitemapResolver::class.'::getSitemapIndexes' |
|
| 130 | 130 | ]; |
| 131 | 131 | |
| 132 | 132 | $fields['sitemapStyles'] = [ |
| 133 | 133 | 'name' => 'sitemapStyles', |
| 134 | 134 | 'type' => FileContentsType::getType(), |
| 135 | - 'resolve' => SitemapResolver::class .'::getSitemapStyles' |
|
| 135 | + 'resolve' => SitemapResolver::class.'::getSitemapStyles' |
|
| 136 | 136 | ]; |
| 137 | 137 | |
| 138 | 138 | $fields['frontendTemplates'] = [ |
| 139 | 139 | 'name' => 'frontendTemplates', |
| 140 | 140 | 'args' => FrontendContainerArguments::getArguments(), |
| 141 | 141 | 'type' => Type::listOf(FileContentsType::getType()), |
| 142 | - 'resolve' => FrontendContainerResolver::class .'::getContainerFiles' |
|
| 142 | + 'resolve' => FrontendContainerResolver::class.'::getContainerFiles' |
|
| 143 | 143 | ]; |
| 144 | 144 | |
| 145 | 145 | return $fields; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | // Handle trailing slashes properly for generated URLs |
| 48 | 48 | $generalConfig = Craft::$app->getConfig()->getGeneral(); |
| 49 | 49 | if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/\.[^\/]+$/', $url)) { |
| 50 | - $url = rtrim($url, '/') . '/'; |
|
| 50 | + $url = rtrim($url, '/').'/'; |
|
| 51 | 51 | } |
| 52 | 52 | if (!$generalConfig->addTrailingSlashesToUrls) { |
| 53 | 53 | $url = rtrim($url, '/'); |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | // Handle trailing slashes properly for generated URLs |
| 125 | 125 | $generalConfig = Craft::$app->getConfig()->getGeneral(); |
| 126 | 126 | if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/\.[^\/]+$/', $url)) { |
| 127 | - $url = rtrim($url, '/') . '/'; |
|
| 127 | + $url = rtrim($url, '/').'/'; |
|
| 128 | 128 | } |
| 129 | 129 | if (!$generalConfig->addTrailingSlashesToUrls) { |
| 130 | 130 | $url = rtrim($url, '/'); |
@@ -160,11 +160,11 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) { |
| 162 | 162 | $url_parts = parse_url($pathOrUrl); |
| 163 | - $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host']; |
|
| 163 | + $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host']; |
|
| 164 | 164 | $result['path'] = $url_parts['path'] ?? ''; |
| 165 | 165 | $result['suffix'] = ''; |
| 166 | - $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query']; |
|
| 167 | - $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment']; |
|
| 166 | + $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query']; |
|
| 167 | + $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment']; |
|
| 168 | 168 | } else { |
| 169 | 169 | $result['prefix'] = ''; |
| 170 | 170 | $result['path'] = $pathOrUrl; |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | $metaBundle->metaSitemapVars->sitemapLimit = null; |
| 119 | 119 | } |
| 120 | 120 | $totalElements = $seoElement::sitemapElementsQuery($metaBundle)->count(); |
| 121 | - if ($metaBundle->metaSitemapVars->sitemapLimit && ($totalElements > $metaBundle->metaSitemapVars->sitemapLimit)) { |
|
| 121 | + if ($metaBundle->metaSitemapVars->sitemapLimit && ($totalElements > $metaBundle->metaSitemapVars->sitemapLimit)) { |
|
| 122 | 122 | $totalElements = $metaBundle->metaSitemapVars->sitemapLimit; |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -140,8 +140,8 @@ discard block |
||
| 140 | 140 | while ($currentElement < $totalElements) { |
| 141 | 141 | $elements = $paginator->getPageResults(); |
| 142 | 142 | if (Craft::$app instanceof ConsoleApplication) { |
| 143 | - echo 'Query ' . $paginator->getCurrentPage() . '/' . $paginator->getTotalPages() |
|
| 144 | - . ' - elements: ' . $paginator->getTotalResults() |
|
| 143 | + echo 'Query '.$paginator->getCurrentPage().'/'.$paginator->getTotalPages() |
|
| 144 | + . ' - elements: '.$paginator->getTotalResults() |
|
| 145 | 145 | . PHP_EOL; |
| 146 | 146 | } |
| 147 | 147 | /** @var ElementInterface $element */ |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | } |
| 191 | 191 | $canonicalUrl = UrlHelper::absoluteUrlWithProtocol($canonicalUrl); |
| 192 | 192 | if ($url !== $canonicalUrl) { |
| 193 | - Craft::info("Excluding URL: {$url} from the sitemap because it does not match the Canonical URL: {$canonicalUrl} - " . $metaBundle->metaGlobalVars->canonicalUrl . " - " . $element->uri); |
|
| 193 | + Craft::info("Excluding URL: {$url} from the sitemap because it does not match the Canonical URL: {$canonicalUrl} - ".$metaBundle->metaGlobalVars->canonicalUrl." - ".$element->uri); |
|
| 194 | 194 | continue; |
| 195 | 195 | } |
| 196 | 196 | } |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | */ |
| 480 | 480 | protected static function assetSitemapItem(Asset $asset, MetaBundle $metaBundle, array &$lines) |
| 481 | 481 | { |
| 482 | - if ((bool)$asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 482 | + if ((bool) $asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 483 | 483 | switch ($asset->kind) { |
| 484 | 484 | case 'image': |
| 485 | 485 | $lines[] = '<image:image>'; |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | */ |
| 528 | 528 | protected static function assetFilesSitemapLink(Asset $asset, MetaBundle $metaBundle, array &$lines) |
| 529 | 529 | { |
| 530 | - if ((bool)$asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 530 | + if ((bool) $asset->enabledForSite && $asset->getUrl() !== null) { |
|
| 531 | 531 | if (\in_array($asset->kind, SitemapTemplate::FILE_TYPES, false)) { |
| 532 | 532 | $dateUpdated = $asset->dateUpdated ?? $asset->dateCreated ?? new \DateTime; |
| 533 | 533 | $lines[] = '<url>'; |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | 'name' => 'Frontend Templates', |
| 23 | 23 | 'description' => 'Templates that are rendered on the frontend', |
| 24 | 24 | 'handle' => FrontendTemplates::FRONTENDTEMPLATES_CONTAINER, |
| 25 | - 'class' => (string)FrontendTemplateContainer::class, |
|
| 25 | + 'class' => (string) FrontendTemplateContainer::class, |
|
| 26 | 26 | 'include' => true, |
| 27 | 27 | 'data' => [ |
| 28 | 28 | FrontendTemplates::HUMANS_TXT_HANDLE => [ |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | { |
| 85 | 85 | if ($pageInfo !== null && $pageInfo->currentPage !== null) { |
| 86 | 86 | // Let the meta containers know that this page is paginated |
| 87 | - Seomatic::$plugin->metaContainers->paginationPage = (string)$pageInfo->currentPage; |
|
| 87 | + Seomatic::$plugin->metaContainers->paginationPage = (string) $pageInfo->currentPage; |
|
| 88 | 88 | // See if we should strip the query params |
| 89 | 89 | $stripQueryParams = true; |
| 90 | 90 | $pageTrigger = Craft::$app->getConfig()->getGeneral()->pageTrigger; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | if (is_array($content)) { |
| 158 | 158 | $headerValue = ''; |
| 159 | 159 | foreach ($content as $contentVal) { |
| 160 | - $headerValue .= ($contentVal . ','); |
|
| 160 | + $headerValue .= ($contentVal.','); |
|
| 161 | 161 | } |
| 162 | 162 | $headerValue = rtrim($headerValue, ','); |
| 163 | 163 | } else { |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | if (is_array($href)) { |
| 177 | 177 | $headerValue = ''; |
| 178 | 178 | foreach ($href as $hrefVal) { |
| 179 | - $headerValue .= ('<' . $hrefVal . '>' . ','); |
|
| 179 | + $headerValue .= ('<'.$hrefVal.'>'.','); |
|
| 180 | 180 | } |
| 181 | 181 | $headerValue = rtrim($headerValue, ','); |
| 182 | 182 | } else { |
| 183 | - $headerValue = '<' . $href . '>'; |
|
| 183 | + $headerValue = '<'.$href.'>'; |
|
| 184 | 184 | } |
| 185 | 185 | $headerValue .= "; rel='canonical'"; |
| 186 | 186 | $response->headers->add('Link', $headerValue); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | if (is_array($content)) { |
| 197 | 197 | $headerValue = ''; |
| 198 | 198 | foreach ($content as $contentVal) { |
| 199 | - $headerValue .= ($contentVal . ','); |
|
| 199 | + $headerValue .= ($contentVal.','); |
|
| 200 | 200 | } |
| 201 | 201 | $headerValue = rtrim($headerValue, ','); |
| 202 | 202 | } else { |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | if ($lastElement && $element) { |
| 383 | 383 | if ($lastElement->uri !== '__home__' && $element->uri) { |
| 384 | 384 | $path = $lastElement->uri; |
| 385 | - $segments = array_values(array_filter(explode('/', $path), function ($segment) { |
|
| 385 | + $segments = array_values(array_filter(explode('/', $path), function($segment) { |
|
| 386 | 386 | return $segment !== ''; |
| 387 | 387 | })); |
| 388 | 388 | } |
@@ -542,7 +542,7 @@ discard block |
||
| 542 | 542 | $element = $elements->getElementByUri($url, $site->id, false); |
| 543 | 543 | } |
| 544 | 544 | if ($element !== null) { |
| 545 | - if (isset($element->enabledForSite) && !(bool)$element->enabledForSite) { |
|
| 545 | + if (isset($element->enabledForSite) && !(bool) $element->enabledForSite) { |
|
| 546 | 546 | $includeUrl = false; |
| 547 | 547 | } |
| 548 | 548 | /** @var MetaBundle $metaBundle */ |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | if (isset($value[$day][$time]) |
| 796 | 796 | && ($date = DateTimeHelper::toDateTime($value[$day][$time])) !== false |
| 797 | 797 | ) { |
| 798 | - $normalized[$day][$time] = (array)($date); |
|
| 798 | + $normalized[$day][$time] = (array) ($date); |
|
| 799 | 799 | } else { |
| 800 | 800 | $normalized[$day][$time] = null; |
| 801 | 801 | } |
@@ -81,24 +81,24 @@ |
||
| 81 | 81 | $metaContainers = Seomatic::$plugin->metaContainers; |
| 82 | 82 | // Get our cache key |
| 83 | 83 | $asArrayKey = $asArray ? 'true' : 'false'; |
| 84 | - $cacheKey = $uri . $siteId . implode($containerKeys) . $asArrayKey . Seomatic::$environment; |
|
| 84 | + $cacheKey = $uri.$siteId.implode($containerKeys).$asArrayKey.Seomatic::$environment; |
|
| 85 | 85 | // Load the meta containers |
| 86 | 86 | $dependency = new TagDependency([ |
| 87 | 87 | 'tags' => [ |
| 88 | 88 | $metaContainers::GLOBAL_METACONTAINER_CACHE_TAG, |
| 89 | - $metaContainers::METACONTAINER_CACHE_TAG . $sourceId . $sourceBundleType . $siteId, |
|
| 90 | - $metaContainers::METACONTAINER_CACHE_TAG . $uri . $siteId, |
|
| 91 | - $metaContainers::METACONTAINER_CACHE_TAG . $cacheKey, |
|
| 89 | + $metaContainers::METACONTAINER_CACHE_TAG.$sourceId.$sourceBundleType.$siteId, |
|
| 90 | + $metaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId, |
|
| 91 | + $metaContainers::METACONTAINER_CACHE_TAG.$cacheKey, |
|
| 92 | 92 | ], |
| 93 | 93 | ]); |
| 94 | 94 | |
| 95 | 95 | $cache = Craft::$app->getCache(); |
| 96 | 96 | $result = $cache->getOrSet( |
| 97 | - self::CACHE_KEY . $cacheKey, |
|
| 98 | - function () use ($uri, $siteId, $containerKeys, $asArray) { |
|
| 97 | + self::CACHE_KEY.$cacheKey, |
|
| 98 | + function() use ($uri, $siteId, $containerKeys, $asArray) { |
|
| 99 | 99 | $result = []; |
| 100 | 100 | Craft::info( |
| 101 | - 'Meta controller container cache miss: ' . $uri . '/' . $siteId, |
|
| 101 | + 'Meta controller container cache miss: '.$uri.'/'.$siteId, |
|
| 102 | 102 | __METHOD__ |
| 103 | 103 | ); |
| 104 | 104 | // Load the meta containers and parse our globals |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | $metaValue = Craft::t( |
| 295 | 295 | 'seomatic', |
| 296 | 296 | 'Error rendering `{template}` -> {error}', |
| 297 | - ['template' => $metaValue, 'error' => $e->getMessage() . ' - ' . print_r($metaValue, true)] |
|
| 297 | + ['template' => $metaValue, 'error' => $e->getMessage().' - '.print_r($metaValue, true)] |
|
| 298 | 298 | ); |
| 299 | 299 | Craft::error($metaValue, __METHOD__); |
| 300 | 300 | Craft::$app->getErrorHandler()->logException($e); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | // Handle being passed in an object |
| 314 | 314 | if (is_object($metaValue)) { |
| 315 | 315 | if ($metaValue instanceof Markup) { |
| 316 | - return trim(html_entity_decode((string)$metaValue, ENT_NOQUOTES, 'UTF-8')); |
|
| 316 | + return trim(html_entity_decode((string) $metaValue, ENT_NOQUOTES, 'UTF-8')); |
|
| 317 | 317 | } |
| 318 | 318 | if ($metaValue instanceof Asset) { |
| 319 | 319 | /** @var Asset $metaValue */ |
@@ -19,11 +19,11 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaTitleContainer::CONTAINER_TYPE . TitleService::GENERAL_HANDLE => [ |
|
| 22 | + MetaTitleContainer::CONTAINER_TYPE.TitleService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'Meta Title Tag', |
| 25 | 25 | 'handle' => TitleService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaTitleContainer::class, |
|
| 26 | + 'class' => (string) MetaTitleContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |
@@ -19,11 +19,11 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | return [ |
| 22 | - MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE => [ |
|
| 22 | + MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE => [ |
|
| 23 | 23 | 'name' => 'General', |
| 24 | 24 | 'description' => 'JsonLd Tags', |
| 25 | 25 | 'handle' => JsonLdService::GENERAL_HANDLE, |
| 26 | - 'class' => (string)MetaJsonLdContainer::class, |
|
| 26 | + 'class' => (string) MetaJsonLdContainer::class, |
|
| 27 | 27 | 'include' => true, |
| 28 | 28 | 'dependencies' => [ |
| 29 | 29 | ], |