Remove legacy tag integration

README.md

@@ -135,7 +135,7 @@ class SomeEventListener
 
 
 
-## Legacy integration
+## Template output
 
 Be sure, `huh_head.use_contao_head` and/or `huh_head.use_contao_variables` are not set to true.
 
@@ -157,7 +157,7 @@ Make sure, that you remove (are outputted by $this->meta() if `huh_head.use_cont
 <meta name="description" content="<?= $this->description ?>">
 ```
 
-The `meta` function accepts currently one parameter that can contain service names (array) that should be skipped.
+The `meta` function accepts currently one parameter that can contain tag names (array) that should be skipped.
 
 ## Developers
 

config/services.yaml

@@ -2,12 +2,9 @@ services:
   _defaults:
     autowire: true
     autoconfigure: true
-    bind:
-      Psr\Container\ContainerInterface: '@service_container'
 
   HeimrichHannot\HeadBundle\:
     resource: '../src/{EventListener,Helper}/*'
-    exclude: '../src/Helper/LegacyHelper.php'
     bind:
       $bundleConfig: '%huh_head%'
 
@@ -18,9 +15,3 @@ services:
 
   HeimrichHannot\HeadBundle\HeadTag\HeadTagFactory:
     autoconfigure: true
-
-  huh.head.tag_manager:
-    class: HeimrichHannot\HeadBundle\Manager\TagManager
-    public: true
-    deprecated: ~
-  HeimrichHannot\HeadBundle\Manager\TagManager: '@huh.head.tag_manager'

src/DependencyInjection/HeimrichHannotHeadBundleExtension.php

@@ -25,7 +25,6 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.yaml');
-        $loader->load('tags.yaml');
 
         if (class_exists(DisableCanonicalFieldsListener::class)) {
             $container->removeDefinition(CanonicalListener::class);

src/EventListener/Contao/ParseTemplateListener.php

@@ -10,7 +10,6 @@
 
 use Contao\CoreBundle\ServiceAnnotation\Hook;
 use Contao\Template;
-use HeimrichHannot\HeadBundle\Helper\LegacyHelper;
 use HeimrichHannot\HeadBundle\Manager\HtmlHeadTagManager;
 
 /**
@@ -40,10 +39,6 @@ protected function addLegacyMetaMethod(Template $template): void
 
         if (!($this->bundleConfig['use_contao_variables'] ?? false)) {
             $template->meta = function (array $skip = []) {
-                foreach ($skip as &$tag) {
-                    $tag = LegacyHelper::mapServiceToTag($tag, $tag);
-                }
-
                 return $this->headTagManager->renderTags([
                     'skip_tags' => $skip,
                 ]);

src/HeadTag/BaseTag.php

@@ -11,7 +11,6 @@
 class BaseTag extends AbstractHeadTag
 {
     public const NAME = 'base';
-    public const LEGACY_NAME = 'huh.head.tag.base';
 
     public function __construct(string $href)
     {

src/HeadTag/HeadTagFactory.php

@@ -11,7 +11,6 @@
 use HeimrichHannot\HeadBundle\HeadTag\Meta\CharsetMetaTag;
 use HeimrichHannot\HeadBundle\HeadTag\Meta\HttpEquivMetaTag;
 use HeimrichHannot\HeadBundle\HeadTag\Meta\PropertyMetaTag;
-use HeimrichHannot\HeadBundle\Helper\LegacyHelper;
 use HeimrichHannot\HeadBundle\Helper\TagHelper;
 
 class HeadTagFactory
@@ -28,19 +27,9 @@ public function __construct(TagHelper $tagHelper)
      * For tags with multiple occurrences like meta, prefix name with tag name,
      * for example meta_ (meta_description, meta_og:title, ...) for meta tags.
      *
-     * Options:
-     * - skip_legacy_mapping: (bool) do not check for legacy tag service names
      */
-    public function createTagByName(string $name, ?string $value = null, array $options = []): ?AbstractHeadTag
+    public function createTagByName(string $name, ?string $value = null): ?AbstractHeadTag
     {
-        $options = array_merge([
-            'skip_legacy_mapping' => false,
-        ], $options);
-
-        if (!$options['skip_legacy_mapping']) {
-            $name = LegacyHelper::mapServiceToTag($name, $name);
-        }
-
         if ('base' === $name) {
             return new BaseTag($value);
         }

src/HeadTag/Link/CanonicalLink.php

@@ -13,7 +13,6 @@
 class CanonicalLink extends LinkTag
 {
     public const TYPE = 'canonical';
-    public const LEGACY_NAME = 'huh.head.tag.link.canonical';
 
     public function __construct(string $href)
     {

src/HeimrichHannotContaoHeadBundle.php

@@ -8,29 +8,12 @@
 
 namespace HeimrichHannot\HeadBundle;
 
-use HeimrichHannot\HeadBundle\DependencyInjection\Compiler\AdjustContainerPass;
 use HeimrichHannot\HeadBundle\DependencyInjection\HeimrichHannotHeadBundleExtension;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class HeimrichHannotContaoHeadBundle extends Bundle
 {
-    /**
-     * Builds the bundle.
-     *
-     * It is only ever called once when the cache is empty.
-     *
-     * This method can be overridden to register compilation passes,
-     * other extensions, ...
-     *
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     */
-    public function build(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(new AdjustContainerPass());
-    }
-
     public function getContainerExtension(): ?ExtensionInterface
     {
         return new HeimrichHannotHeadBundleExtension();