Fixed a type and made the deprecation template clearer

symfony · j92 · Oct 27, 2017 · Oct 27, 2017 · Oct 27, 2017 · Oct 27, 2017
commit 34ce7bfa815b6621d6e42b7cc2ef8a8f7f8f0072
diff --git a/src/Symfony/Component/DependencyInjection/Alias.php b/src/Symfony/Component/DependencyInjection/Alias.php
@@ -21,7 +21,7 @@ class Alias
    private $deprecated;
    private $deprecationTemplate;

-    private static $defaultDeprecationTemplate = 'The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.';
+    private static $defaultDeprecationTemplate = 'The "%service_id%" service alias is deprecated. You should stop using it, as it will soon be removed.';

    public function __construct(string $id, bool $public = true)
    {

diff --git a/src/Symfony/Component/DependencyInjection/Tests/AliasTest.php b/src/Symfony/Component/DependencyInjection/Tests/AliasTest.php
@@ -62,7 +62,7 @@ public function testItHasADefaultDeprecationMessage()
        $alias = new Alias('foo', false);
        $alias->setDeprecated();

-        $expectedMessage = 'The "foo" service is deprecated. You should stop using it, as it will soon be removed.';
+        $expectedMessage = 'The "foo" service alias is deprecated. You should stop using it, as it will soon be removed.';
        $this->assertEquals($expectedMessage, $alias->getDeprecationMessage('foo'));
    }

@@ -104,7 +104,7 @@ public function invalidDeprecationMessageProvider()
            "With \rs" => array("invalid \r message %service_id%"),
            "With \ns" => array("invalid \n message %service_id%"),
            'With */s' => array('invalid */ message %service_id%'),
-            'message not containing require %service_id% variable' => array('this is deprecated'),
+            'message not containing required %service_id% variable' => array('this is deprecated'),
        );
    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -261,7 +261,7 @@ public function testAliases()

    /**
     * @group legacy
-     * @expectedDeprecation The "foobar" service is deprecated. You should stop using it, as it will soon be removed.
+     * @expectedDeprecation The "foobar" service alias is deprecated. You should stop using it, as it will soon be removed.
     */
    public function testDeprecatedAlias()
    {

diff --git a/...Symfony/Component/DependencyInjection/Tests/Fixtures/xml/deprecated_alias_definitions.xml b/...Symfony/Component/DependencyInjection/Tests/Fixtures/xml/deprecated_alias_definitions.xml
@@ -7,7 +7,7 @@
      <deprecated />
    </service>
    <service id="alias_for_foobar" alias="foobar">
-      <deprecated>The "%service_id%" service is deprecated.</deprecated>
+      <deprecated>The "%service_id%" service alias is deprecated.</deprecated>
    </service>
  </services>
 </container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -356,11 +356,11 @@ public function testDeprecatedAliases()
        $loader->load('deprecated_alias_definitions.xml');

        $this->assertTrue($container->getAlias('alias_for_foo')->isDeprecated());
-        $message = 'The "alias_for_foo" service is deprecated. You should stop using it, as it will soon be removed.';
+        $message = 'The "alias_for_foo" service alias is deprecated. You should stop using it, as it will soon be removed.';
        $this->assertSame($message, $container->getAlias('alias_for_foo')->getDeprecationMessage('alias_for_foo'));

        $this->assertTrue($container->getAlias('alias_for_foobar')->isDeprecated());
-        $message = 'The "alias_for_foobar" service is deprecated.';
+        $message = 'The "alias_for_foobar" service alias is deprecated.';
        $this->assertSame($message, $container->getAlias('alias_for_foobar')->getDeprecationMessage('alias_for_foobar'));
    }