Revert "Support the new service ID in Contao 4.13"

This reverts commit 396ad48.
richardhj · Dec 7, 2021 · eeb6413 · eeb6413
1 parent 8b48960
commit eeb6413
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
   },
   "require": {
     "php": ">=7.4",
-    "contao/core-bundle": "^4.12.2",
+    "contao/core-bundle": "^4.12.2,<4.13.0",
     "symfony/config": "^4.4 || ^5.0",
     "webmozart/path-util": "^2.3",
     "symfony/webpack-encore-bundle": "^1.11"

diff --git a/config/services.yml b/config/services.yml
@@ -48,20 +48,14 @@ services:
       - '%kernel.project_dir%'
 
   Richardhj\ContaoThemeFramework\Twig\EncoreEntryFilesTwigExtension:
-    tags: [ 'twig.extension' ]
+    tags: ['twig.extension']
     arguments:
       - '@Richardhj\ContaoThemeFramework\Encore\EncoreEntrypointLookupCollection'
       - '@contao.themes.tag_renderer'
 
   Richardhj\ContaoThemeFramework\Twig\Loader\ThemeNamespace:
-    decorates: 'contao.twig.loader.theme_namespace'
-    arguments: [ '@Richardhj\ContaoThemeFramework\Twig\Loader\ThemeNamespace.inner' ]
-
-  # Only needed for Contao 4.12 compatibility
-  richardhj.contao_theme_frameowrk.twig_namespace_loader_legacy:
-    class: Richardhj\ContaoThemeFramework\Twig\Loader\ThemeNamespace
-    decorates: 'Contao\CoreBundle\Twig\Loader\ThemeNamespace'
-    arguments: [ '@Richardhj\ContaoThemeFramework\Twig\Loader\ThemeNamespace.inner' ]
+      decorates: 'Contao\CoreBundle\Twig\Loader\ThemeNamespace'
+      arguments: ['@Richardhj\ContaoThemeFramework\Twig\Loader\ThemeNamespace.inner']
 
   Richardhj\ContaoThemeFramework\Encore\EncoreEntrypointLookupCollection:
     arguments: