Making tags under _defaults always apply and removing inherit_tags entirely

Now that inherit_tags has been removed, 3.3 has the same functionality as 3.2: tags are *never* cascaded from parent to child (but you tags do inherit from defaults to a service and instanceof to a service).

Author: weaverryan

src/Symfony/Component/DependencyInjection/CHANGELOG.md

@@ -22,8 +22,7 @@ CHANGELOG
  * added "iterator" argument type for lazy iteration over a set of values and services
  * added "closure-proxy" argument type for turning services' methods into lazy callables
  * added file-wide configurable defaults for service attributes "public", "tags",
- "autowire" and "inherit-tags"
- * added "inherit-tags" service attribute to control tags' inheritance from parent context
+ "autowire" and "autoconfigure"
  * made the "class" attribute optional, using the "id" as fallback
  * using the `PhpDumper` with an uncompiled `ContainerBuilder` is deprecated and
  will not be supported anymore in 4.0

src/Symfony/Component/DependencyInjection/ChildDefinition.php

@@ -23,7 +23,6 @@
 class ChildDefinition extends Definition
 {
  private $parent;
- private $inheritTags = false;
 
  /**
  * @param string $parent The id of Definition instance to decorate
@@ -57,30 +56,6 @@ public function setParent($parent)
  return $this;
  }
 
- /**
- * Sets whether tags should be inherited from the parent or not.
- *
- * @param bool $boolean
- *
- * @return $this
- */
- public function setInheritTags($boolean)
- {
- $this->inheritTags = (bool) $boolean;
-
- return $this;
- }
-
- /**
- * Returns whether tags should be inherited from the parent or not.
- *
- * @return bool
- */
- public function getInheritTags()
- {
- return $this->inheritTags;
- }
-
  /**
  * Gets an argument to pass to the service constructor/factory method.
  *

src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

@@ -43,7 +43,6 @@ public function __construct()
  100 => array(
  $resolveClassPass = new ResolveClassPass(),
  new ResolveInstanceofConditionalsPass(),
- new ResolveTagsInheritancePass(),
  ),
  );
 

src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php

@@ -77,7 +77,7 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
  foreach ($instanceofDefs as $key => $instanceofDef) {
  /** @var ChildDefinition $instanceofDef */
  $instanceofDef = clone $instanceofDef;
- $instanceofDef->setAbstract(true)->setInheritTags(false)->setParent($parent ?: 'abstract.instanceof.'.$id);
+ $instanceofDef->setAbstract(true)->setParent($parent ?: 'abstract.instanceof.'.$id);
  $parent = 'instanceof.'.$interface.'.'.$key.'.'.$id;
  $container->setDefinition($parent, $instanceofDef);
  $instanceofTags[] = $instanceofDef->getTags();

src/Symfony/Component/DependencyInjection/Compiler/ResolveTagsInheritancePass.php

@@ -178,9 +178,6 @@ private function getServiceDefaults(\DOMDocument $xml, $file)
  if ($defaultsNode->hasAttribute('public')) {
  $defaults['public'] = XmlUtils::phpize($defaultsNode->getAttribute('public'));
  }
- if ($defaultsNode->hasAttribute('inherit-tags')) {
- $defaults['inherit-tags'] = XmlUtils::phpize($defaultsNode->getAttribute('inherit-tags'));
- }
  if ($defaultsNode->hasAttribute('autoconfigure')) {
  $defaults['autoconfigure'] = XmlUtils::phpize($defaultsNode->getAttribute('autoconfigure'));
  }
@@ -225,13 +222,6 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults =
  }
 
  $definition = new ChildDefinition($parent);
-
- if ($value = $service->getAttribute('inherit-tags')) {
- $definition->setInheritTags(XmlUtils::phpize($value));
- } elseif (isset($defaults['inherit-tags'])) {
- $definition->setInheritTags($defaults['inherit-tags']);
- }
- $defaults = array();
  } else {
  $definition = new Definition();
 
@@ -318,13 +308,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults =
 
  $tags = $this->getChildren($service, 'tag');
 
- if (empty($defaults['tags'])) {
- // no-op
- } elseif (!$value = $service->getAttribute('inherit-tags')) {
- if (!$tags) {
- $tags = $defaults['tags'];
- }
- } elseif (XmlUtils::phpize($value)) {
+ if (!empty($defaults['tags'])) {
  $tags = array_merge($tags, $defaults['tags']);
  }
 

src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

@@ -51,7 +51,6 @@ class YamlFileLoader extends FileLoader
  'configurator' => 'configurator',
  'calls' => 'calls',
  'tags' => 'tags',
- 'inherit_tags' => 'inherit_tags',
  'decorates' => 'decorates',
  'decoration_inner_name' => 'decoration_inner_name',
  'decoration_priority' => 'decoration_priority',
@@ -74,7 +73,6 @@ class YamlFileLoader extends FileLoader
  'configurator' => 'configurator',
  'calls' => 'calls',
  'tags' => 'tags',
- 'inherit_tags' => 'inherit_tags',
  'autowire' => 'autowire',
  'autoconfigure' => 'autoconfigure',
  );
@@ -93,7 +91,6 @@ class YamlFileLoader extends FileLoader
  private static $defaultsKeywords = array(
  'public' => 'public',
  'tags' => 'tags',
- 'inherit_tags' => 'inherit_tags',
  'autowire' => 'autowire',
  'autoconfigure' => 'autoconfigure',
  );
@@ -365,12 +362,6 @@ private function parseDefinition($id, $service, $file, array $defaults)
  }
 
  $definition = new ChildDefinition($service['parent']);
-
- $inheritTag = isset($service['inherit_tags']) ? $service['inherit_tags'] : (isset($defaults['inherit_tags']) ? $defaults['inherit_tags'] : null);
- if (null !== $inheritTag) {
- $definition->setInheritTags($inheritTag);
- }
- $defaults = array();
  } else {
  $definition = new Definition();
 
@@ -458,13 +449,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
  throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
  }
 
- if (!isset($defaults['tags'])) {
- // no-op
- } elseif (!isset($service['inherit_tags'])) {
- if (!isset($service['tags'])) {
- $tags = $defaults['tags'];
- }
- } elseif ($service['inherit_tags']) {
+ if (isset($defaults['tags'])) {
  $tags = array_merge($tags, $defaults['tags']);
  }
 

src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

@@ -103,7 +103,6 @@
  </xsd:choice>
  <xsd:attribute name="public" type="boolean" />
  <xsd:attribute name="autowire" type="boolean" />
- <xsd:attribute name="inherit-tags" type="boolean" />
  <xsd:attribute name="autoconfigure" type="boolean" />
  </xsd:complexType>
 
@@ -132,7 +131,6 @@
  <xsd:attribute name="decoration-inner-name" type="xsd:string" />
  <xsd:attribute name="decoration-priority" type="xsd:integer" />
  <xsd:attribute name="autowire" type="boolean" />
- <xsd:attribute name="inherit-tags" type="boolean" />
  <xsd:attribute name="autoconfigure" type="boolean" />
  </xsd:complexType>
 
@@ -169,7 +167,6 @@
  <xsd:attribute name="abstract" type="boolean" />
  <xsd:attribute name="parent" type="xsd:string" />
  <xsd:attribute name="autowire" type="boolean" />
- <xsd:attribute name="inherit-tags" type="boolean" />
  <xsd:attribute name="autoconfigure" type="boolean" />
  </xsd:complexType>
 

src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd

@@ -15,7 +15,6 @@
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\ResolveInstanceofConditionalsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
-use Symfony\Component\DependencyInjection\Compiler\ResolveTagsInheritancePass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class ResolveInstanceofConditionalsPassTest extends TestCase
@@ -35,7 +34,6 @@ public function testProcess()
  $this->assertEmpty($def->getInstanceofConditionals());
  $this->assertInstanceof(ChildDefinition::class, $def);
  $this->assertTrue($def->isAutowired());
- $this->assertFalse($def->getInheritTags());
  $this->assertSame($parent, $def->getParent());
  $this->assertSame(array('tag' => array(array()), 'baz' => array(array('attr' => 123))), $def->getTags());
 
@@ -121,7 +119,6 @@ public function testProcessUsesAutoconfiguredInstanceof()
  ->setFactory('autoconfigured_factory');
 
  (new ResolveInstanceofConditionalsPass())->process($container);
- (new ResolveTagsInheritancePass())->process($container);
  (new ResolveDefinitionTemplatesPass())->process($container);
 
  $def = $container->getDefinition('normal_service');