Applied coding standard review

symfony · j92 · Oct 27, 2017 · Oct 27, 2017 · Oct 27, 2017 · Oct 27, 2017
commit 70721a5573a608d41f52f841e2995568735d2b86
diff --git a/src/Symfony/Component/DependencyInjection/Alias.php b/src/Symfony/Component/DependencyInjection/Alias.php
@@ -89,7 +89,7 @@ public function isPrivate()
     * Whether this alias is deprecated, that means it should not be called
     * anymore.
     *
-     * @param bool   $status Defaults to true
+     * @param bool   $status   Defaults to true
     * @param string $template Optional template message to use if the alias is deprecated
     *
     * @return $this
@@ -116,7 +116,7 @@ public function setDeprecated($status = true, $template = null)
    }

    /**
-     * Returns whether this alias is deprecated
+     * Returns whether this alias is deprecated.
     *
     * @return bool
     */

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -547,7 +547,8 @@ private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_
            if ($aliasDefinition->isDeprecated()) {
                @trigger_error($aliasDefinition->getDeprecationMessage($id), E_USER_DEPRECATED);
            }
-            return $this->doGet((string) $this->aliasDefinitions[$id], $invalidBehavior, $inlineServices);
+
+            return $this->doGet((string) $aliasDefinition, $invalidBehavior, $inlineServices);
        }

        try {

diff --git a/src/Symfony/Component/DependencyInjection/Tests/AliasTest.php b/src/Symfony/Component/DependencyInjection/Tests/AliasTest.php
@@ -1,11 +1,13 @@
 <?php
-/**
- * (c) BKV
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
-declare(strict_types=1);

 namespace Symfony\Component\DependencyInjection\Tests;

@@ -18,23 +20,23 @@ public function testConstructor()
    {
        $alias = new Alias('foo');

-        $this->assertEquals('foo', (string)$alias);
+        $this->assertEquals('foo', (string) $alias);
        $this->assertTrue($alias->isPublic());
    }

    public function testCanConstructANonPublicAlias()
    {
        $alias = new Alias('foo', false);

-        $this->assertEquals('foo', (string)$alias);
+        $this->assertEquals('foo', (string) $alias);
        $this->assertFalse($alias->isPublic());
    }

    public function testCanConstructAPrivateAlias()
    {
        $alias = new Alias('foo', false, false);

-        $this->assertEquals('foo', (string)$alias);
+        $this->assertEquals('foo', (string) $alias);
        $this->assertFalse($alias->isPublic());
        $this->assertFalse($alias->isPrivate());
    }
@@ -54,7 +56,7 @@ public function testCanDeprecateAnAlias()

        $this->assertTrue($alias->isDeprecated());
    }
-    
+
    public function testItHasADefaultDeprecationMessage()
    {
        $alias = new Alias('foo', false);

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -352,7 +352,7 @@ public function testDeprecated()
    public function testDeprecatedAliases()
    {
        $container = new ContainerBuilder();
-        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath . '/xml'));
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
        $loader->load('deprecated_alias_definitions.xml');

        $this->assertTrue($container->getAlias('alias_for_foo')->isDeprecated());