CS

contao · Jul 20, 2020 · 3295ed8 · 3295ed8
1 parent b895744
commit 3295ed8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/core-bundle/src/DependencyInjection/Compiler/RegisterPagesPass.php b/core-bundle/src/DependencyInjection/Compiler/RegisterPagesPass.php
@@ -13,8 +13,8 @@
 namespace Contao\CoreBundle\DependencyInjection\Compiler;
 
 use Contao\CoreBundle\Routing\Page\ContentCompositionInterface;
-use Contao\CoreBundle\Routing\Page\PageRegistry;
 use Contao\CoreBundle\Routing\Page\DynamicRouteInterface;
+use Contao\CoreBundle\Routing\Page\PageRegistry;
 use Contao\CoreBundle\Routing\Page\RouteConfig;
 use Contao\FrontendIndex;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/core-bundle/src/Routing/Candidates/PageCandidates.php b/core-bundle/src/Routing/Candidates/PageCandidates.php
@@ -82,8 +82,9 @@ private function addRegexQuery(QueryBuilder $queryBuilder, string $pathInfo): bo
         }
 
         $paths = [];
+
         foreach ($pathMap as $type => $pathRegex) {
-            $paths[] = '(?P<'.$type.'>'.substr($pathRegex, 2, strrpos($pathRegex, '$')-2).')';
+            $paths[] = '(?P<'.$type.'>'.substr($pathRegex, 2, strrpos($pathRegex, '$') - 2).')';
         }
 
         preg_match_all(

diff --git a/core-bundle/src/Routing/Page/PageRegistry.php b/core-bundle/src/Routing/Page/PageRegistry.php
@@ -171,11 +171,11 @@ private function initializePrefixAndSuffix(): void
         $urlSuffixes = [
             array_column($results, 'urlSuffix'),
             array_filter(array_map(
-                function (RouteConfig $config) {
+                static function (RouteConfig $config) {
                     return $config->getUrlSuffix();
                 },
                 $this->routeConfigs
-            ))
+            )),
         ];
 
         foreach ($this->routeConfigs as $config) {

diff --git a/core-bundle/tests/Routing/Page/PageRegistryTest.php b/core-bundle/tests/Routing/Page/PageRegistryTest.php
@@ -13,9 +13,9 @@
 namespace Contao\CoreBundle\Tests\Routing\Page;
 
 use Contao\CoreBundle\Routing\Page\ContentCompositionInterface;
+use Contao\CoreBundle\Routing\Page\DynamicRouteInterface;
 use Contao\CoreBundle\Routing\Page\PageRegistry;
 use Contao\CoreBundle\Routing\Page\PageRoute;
-use Contao\CoreBundle\Routing\Page\DynamicRouteInterface;
 use Contao\CoreBundle\Routing\Page\RouteConfig;
 use Contao\CoreBundle\Tests\TestCase;
 use Contao\PageModel;