Merge branch '4.x' of github.com:contao/contao into feature/language-…

…dependent-module-configuration
contao · Dec 30, 2021 · e8d2d79 · e8d2d79
2 parents 4bd2ead + bfb9ea6
commit e8d2d79
Show file tree

Hide file tree

Showing 7 changed files with 187 additions and 107 deletions.
diff --git a/core-bundle/src/Resources/config/legacy_routing.yml b/core-bundle/src/Resources/config/legacy_routing.yml
@@ -10,19 +10,19 @@ services:
             - '%contao.prepend_locale%'
             - '%contao.url_suffix%'
 
-    contao.routing.frontend_loader:
-        class: Contao\CoreBundle\Routing\FrontendLoader
+    contao.routing.candidates:
+        class: Contao\CoreBundle\Routing\Candidates\LegacyCandidates
         arguments:
             - '%contao.prepend_locale%'
             - '%contao.url_suffix%'
-        tags:
-            - routing.loader
 
-    contao.routing.candidates:
-        class: Contao\CoreBundle\Routing\Candidates\LegacyCandidates
+    contao.routing.frontend_loader:
+        class: Contao\CoreBundle\Routing\FrontendLoader
         arguments:
             - '%contao.prepend_locale%'
             - '%contao.url_suffix%'
+        tags:
+            - routing.loader
 
     contao.routing.legacy_matcher:
         class: Contao\CoreBundle\Routing\Matcher\LegacyMatcher

diff --git a/core-bundle/src/Resources/config/listener.yml b/core-bundle/src/Resources/config/listener.yml
@@ -224,16 +224,6 @@ services:
             # and must be lower than the one of the CsrfTokenCookieSubscriber listener (defaults to -832)
             - { name: kernel.event_listener, priority: -896 }
 
-    contao.listener.menu.backend_logout:
-        class: Contao\CoreBundle\EventListener\Menu\BackendLogoutListener
-        arguments:
-            - '@security.helper'
-            - '@router'
-            - '@security.logout_url_generator'
-            - '@translator'
-        tags:
-            - kernel.event_listener
-
     contao.listener.menu.backend:
         class: Contao\CoreBundle\EventListener\Menu\BackendMenuListener
         arguments:
@@ -246,6 +236,16 @@ services:
             # Make sure this listener comes before the other ones adding to its tree
             - { name: kernel.event_listener, priority: 10 }
 
+    contao.listener.menu.backend_logout:
+        class: Contao\CoreBundle\EventListener\Menu\BackendLogoutListener
+        arguments:
+            - '@security.helper'
+            - '@router'
+            - '@security.logout_url_generator'
+            - '@translator'
+        tags:
+            - kernel.event_listener
+
     contao.listener.menu.backend_preview:
         class: Contao\CoreBundle\EventListener\Menu\BackendPreviewListener
         arguments:
@@ -427,13 +427,13 @@ services:
         tags:
             - kernel.event_listener
 
-    contao.listener.widget.http_url:
-        class: Contao\CoreBundle\EventListener\Widget\HttpUrlListener
+    contao.listener.widget.custom_rgxp:
+        class: Contao\CoreBundle\EventListener\Widget\CustomRgxpListener
         arguments:
             - '@translator'
 
-    contao.listener.widget.custom_rgxp:
-        class: Contao\CoreBundle\EventListener\Widget\CustomRgxpListener
+    contao.listener.widget.http_url:
+        class: Contao\CoreBundle\EventListener\Widget\HttpUrlListener
         arguments:
             - '@translator'
 

diff --git a/core-bundle/src/Resources/config/services.yml b/core-bundle/src/Resources/config/services.yml
@@ -140,15 +140,6 @@ services:
         tags:
             - { name: data_collector, template: '@ContaoCore/Collector/contao.html.twig', id: contao }
 
-    contao.doctrine.backup_manager:
-        class: Contao\CoreBundle\Doctrine\Backup\BackupManager
-        arguments:
-            - '@database_connection'
-            - '@contao.doctrine.backup.dumper'
-            - ~
-            - ~
-            - '@contao.doctrine.backup.retention_policy'
-
     contao.doctrine.backup.dumper:
         class: Contao\CoreBundle\Doctrine\Backup\Dumper
 
@@ -158,6 +149,15 @@ services:
             - ~
             - ~
 
+    contao.doctrine.backup_manager:
+        class: Contao\CoreBundle\Doctrine\Backup\BackupManager
+        arguments:
+            - '@database_connection'
+            - '@contao.doctrine.backup.dumper'
+            - ~
+            - ~
+            - '@contao.doctrine.backup.retention_policy'
+
     contao.doctrine.dca_schema_provider:
         class: Contao\CoreBundle\Doctrine\Schema\DcaSchemaProvider
         arguments:
@@ -525,26 +525,38 @@ services:
         arguments:
             - '@contao.security.token_checker'
 
-    contao.routing.nested_matcher:
+    contao.routing.nested_404_matcher:
         class: Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher
         public: true
         arguments:
-            - '@contao.routing.route_provider'
+            - '@contao.routing.route_404_provider'
             - '@contao.routing.url_matcher'
         calls:
             - [addRouteFilter, ['@contao.routing.matcher.domain_filter']]
             - [addRouteFilter, ['@contao.routing.matcher.published_filter']]
-            - [addRouteFilter, ['@contao.routing.matcher.language_filter']]
 
-    contao.routing.nested_404_matcher:
+    contao.routing.nested_matcher:
         class: Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher
         public: true
         arguments:
-            - '@contao.routing.route_404_provider'
+            - '@contao.routing.route_provider'
             - '@contao.routing.url_matcher'
         calls:
             - [addRouteFilter, ['@contao.routing.matcher.domain_filter']]
             - [addRouteFilter, ['@contao.routing.matcher.published_filter']]
+            - [addRouteFilter, ['@contao.routing.matcher.language_filter']]
+
+    contao.routing.page_404_router:
+        class: Symfony\Cmf\Component\Routing\DynamicRouter
+        arguments:
+            - '@router.request_context'
+            - '@contao.routing.nested_404_matcher'
+            - '@contao.routing.page_url_generator'
+            - ''
+            - '@event_dispatcher'
+            - '@contao.routing.route_404_provider'
+        tags:
+            - { name: router, priority: -200 }
 
     contao.routing.page_registry:
         class: Contao\CoreBundle\Routing\Page\PageRegistry
@@ -564,18 +576,6 @@ services:
         tags:
             - { name: router, priority: 20 }
 
-    contao.routing.page_404_router:
-        class: Symfony\Cmf\Component\Routing\DynamicRouter
-        arguments:
-            - '@router.request_context'
-            - '@contao.routing.nested_404_matcher'
-            - '@contao.routing.page_url_generator'
-            - ''
-            - '@event_dispatcher'
-            - '@contao.routing.route_404_provider'
-        tags:
-            - { name: router, priority: -200 }
-
     contao.routing.page_url_generator:
         class: Contao\CoreBundle\Routing\PageUrlGenerator
         arguments:
@@ -600,6 +600,13 @@ services:
             - '@request_stack'
             - '@contao.insert_tag.parser'
 
+    contao.routing.route_404_provider:
+        class: Contao\CoreBundle\Routing\Route404Provider
+        arguments:
+            - '@contao.framework'
+            - '@contao.routing.locale_candidates'
+            - '@contao.routing.page_registry'
+
     contao.routing.route_provider:
         class: Contao\CoreBundle\Routing\RouteProvider
         arguments:
@@ -609,13 +616,6 @@ services:
             - '%contao.legacy_routing%'
             - '%contao.prepend_locale%'
 
-    contao.routing.route_404_provider:
-        class: Contao\CoreBundle\Routing\Route404Provider
-        arguments:
-            - '@contao.framework'
-            - '@contao.routing.locale_candidates'
-            - '@contao.routing.page_registry'
-
     contao.routing.scope_matcher:
         class: Contao\CoreBundle\Routing\ScopeMatcher
         public: true
@@ -859,14 +859,6 @@ services:
         arguments:
             - 48
 
-    contao.translation.translator:
-        class: Contao\CoreBundle\Translation\Translator
-        decorates: translator
-        arguments:
-            - '@contao.translation.translator.inner'
-            - '@contao.framework'
-            - '@contao.resource_finder'
-
     contao.translation.data_collector_translator:
         class: Contao\CoreBundle\Translation\DataCollectorTranslator
         autoconfigure: false
@@ -875,6 +867,14 @@ services:
         tags:
             - { name: kernel.reset, method: reset }
 
+    contao.translation.translator:
+        class: Contao\CoreBundle\Translation\Translator
+        decorates: translator
+        arguments:
+            - '@contao.translation.translator.inner'
+            - '@contao.framework'
+            - '@contao.resource_finder'
+
     contao.twig.extension:
         class: Contao\CoreBundle\Twig\Extension\ContaoExtension
         public: true
@@ -926,6 +926,13 @@ services:
         class: Contao\CoreBundle\Twig\Interop\ContextFactory
         public: true
 
+    contao.twig.legacy_template_functions_runtime:
+        class: Contao\CoreBundle\Twig\Runtime\LegacyTemplateFunctionsRuntime
+        arguments:
+            - '@request_stack'
+            - '@contao.framework'
+            - '@contao.routing.scope_matcher'
+
     contao.twig.loader.template_locator:
         class: Contao\CoreBundle\Twig\Loader\TemplateLocator
         arguments:
@@ -938,13 +945,6 @@ services:
     contao.twig.loader.theme_namespace:
         class: Contao\CoreBundle\Twig\Loader\ThemeNamespace
 
-    contao.twig.legacy_template_functions_runtime:
-        class: Contao\CoreBundle\Twig\Runtime\LegacyTemplateFunctionsRuntime
-        arguments:
-            - '@request_stack'
-            - '@contao.framework'
-            - '@contao.routing.scope_matcher'
-
     contao.twig.picture_configuration_runtime:
         class: Contao\CoreBundle\Twig\Runtime\PictureConfigurationRuntime
 

diff --git a/maker-bundle/src/Resources/config/services.yaml b/maker-bundle/src/Resources/config/services.yaml
@@ -2,11 +2,6 @@ services:
     contao_maker.config.xliff_merger:
         class: Contao\MakerBundle\Config\XliffMerger
 
-    contao_maker.generator.template:
-        class: Contao\MakerBundle\Generator\TemplateGenerator
-        arguments:
-            - '@maker.generator'
-
     contao_maker.generator.class:
         class: Contao\MakerBundle\Generator\ClassGenerator
         arguments:
@@ -25,6 +20,11 @@ services:
             - '@contao_maker.config.xliff_merger'
             - '%kernel.project_dir%'
 
+    contao_maker.generator.template:
+        class: Contao\MakerBundle\Generator\TemplateGenerator
+        arguments:
+            - '@maker.generator'
+
     contao_maker.maker.make_content_element:
         class: Contao\MakerBundle\Maker\MakeContentElement
         arguments:

diff --git a/tools/service-linter/composer.json b/tools/service-linter/composer.json
@@ -15,6 +15,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
+        "phpspec/php-diff": "^1.0",
         "symfony/console": "^5.1",
         "symfony/dependency-injection": "^5.1",
         "symfony/finder": "^5.1",