Merge branch '2.3' into 2.7

* 2.3: [DependencyInjection] Remove YAML check in CrossCheckTest [DependencyInjection] fix phpDoc
symfony · Apr 14, 2016 · 44efeaa · 44efeaa
2 parents 6400b70 + 8c89a3a
commit 44efeaa
Show file tree

Hide file tree

Showing 22 changed files with 16 additions and 82 deletions.
diff --git a/src/Symfony/Component/DependencyInjection/Alias.php b/src/Symfony/Component/DependencyInjection/Alias.php
@@ -17,8 +17,6 @@ class Alias
     private $public;
 
     /**
-     * Constructor.
-     *
      * @param string $id     Alias identifier
      * @param bool   $public If this alias is public
      */

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -34,8 +34,6 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface
     private $onlyConstructorArguments;
 
     /**
-     * Constructor.
-     *
      * @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
      */
     public function __construct($onlyConstructorArguments = false)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -25,9 +25,6 @@ class Compiler
     private $loggingFormatter;
     private $serviceReferenceGraph;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->passConfig = new PassConfig();

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -35,9 +35,6 @@ class PassConfig
     private $optimizationPasses;
     private $removingPasses;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->mergePass = new MergeExtensionConfigurationPass();

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php
@@ -32,8 +32,6 @@ class RepeatedPass implements CompilerPassInterface
     private $passes;
 
     /**
-     * Constructor.
-     *
      * @param RepeatablePassInterface[] $passes An array of RepeatablePassInterface objects
      *
      * @throws InvalidArgumentException when the passes don't implement RepeatablePassInterface

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
@@ -25,8 +25,6 @@ class ServiceReferenceGraphEdge
     private $value;
 
     /**
-     * Constructor.
-     *
      * @param ServiceReferenceGraphNode $sourceNode
      * @param ServiceReferenceGraphNode $destNode
      * @param string                    $value

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
@@ -29,8 +29,6 @@ class ServiceReferenceGraphNode
     private $value;
 
     /**
-     * Constructor.
-     *
      * @param string $id    The node identifier
      * @param mixed  $value The node value
      */

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -77,8 +77,6 @@ class Container implements IntrospectableContainerInterface
     private $underscoreMap = array('_' => '', '.' => '_', '\\' => '_');
 
     /**
-     * Constructor.
-     *
      * @param ParameterBagInterface $parameterBag A ParameterBagInterface instance
      */
     public function __construct(ParameterBagInterface $parameterBag = null)

diff --git a/src/Symfony/Component/DependencyInjection/ContainerAware.php b/src/Symfony/Component/DependencyInjection/ContainerAware.php
@@ -24,9 +24,7 @@ abstract class ContainerAware implements ContainerAwareInterface
     protected $container;
 
     /**
-     * Sets the container.
-     *
-     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     * {@inheritdoc}
      */
     public function setContainer(ContainerInterface $container = null)
     {

diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -42,8 +42,6 @@ class Definition
     protected $arguments;
 
     /**
-     * Constructor.
-     *
      * @param string|null $class     The service class
      * @param array       $arguments An array of arguments to pass to the service constructor
      */

diff --git a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
@@ -25,8 +25,6 @@ class DefinitionDecorator extends Definition
     private $changes = array();
 
     /**
-     * Constructor.
-     *
      * @param string $parent The id of Definition instance to decorate.
      */
     public function __construct($parent)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/Dumper.php b/src/Symfony/Component/DependencyInjection/Dumper/Dumper.php
@@ -23,8 +23,6 @@ abstract class Dumper implements DumperInterface
     protected $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerBuilder $container The service container to dump
      */
     public function __construct(ContainerBuilder $container)

diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
@@ -24,8 +24,6 @@ class ParameterNotFoundException extends InvalidArgumentException
     private $alternatives;
 
     /**
-     * Constructor.
-     *
      * @param string     $key          The requested parameter key
      * @param string     $sourceId     The service id that references the non-existent parameter
      * @param string     $sourceKey    The parameter key that references the non-existent parameter

diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -27,19 +27,15 @@
 abstract class Extension implements ExtensionInterface, ConfigurationExtensionInterface
 {
     /**
-     * Returns the base path for the XSD files.
-     *
-     * @return string The XSD base path
+     * {@inheritdoc}
      */
     public function getXsdValidationBasePath()
     {
         return false;
     }
 
     /**
-     * Returns the namespace to be used for this extension (XML namespace).
-     *
-     * @return string The XML namespace
+     * {@inheritdoc}
      */
     public function getNamespace()
     {

diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
@@ -26,8 +26,6 @@ class ClosureLoader extends Loader
     private $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerBuilder $container A ContainerBuilder instance
      */
     public function __construct(ContainerBuilder $container)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -25,8 +25,6 @@ abstract class FileLoader extends BaseFileLoader
     protected $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerBuilder     $container A ContainerBuilder instance
      * @param FileLocatorInterface $locator   A FileLocator instance
      */

diff --git a/src/Symfony/Component/DependencyInjection/Parameter.php b/src/Symfony/Component/DependencyInjection/Parameter.php
@@ -21,8 +21,6 @@ class Parameter
     private $id;
 
     /**
-     * Constructor.
-     *
      * @param string $id The parameter key
      */
     public function __construct($id)
@@ -31,8 +29,6 @@ public function __construct($id)
     }
 
     /**
-     * __toString.
-     *
      * @return string The parameter key
      */
     public function __toString()

diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
@@ -21,8 +21,6 @@
 class FrozenParameterBag extends ParameterBag
 {
     /**
-     * Constructor.
-     *
      * For performance reasons, the constructor assumes that
      * all keys are already lowercased.
      *

diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -26,8 +26,6 @@ class ParameterBag implements ParameterBagInterface
     protected $resolved = false;
 
     /**
-     * Constructor.
-     *
      * @param array $parameters An array of parameters
      */
     public function __construct(array $parameters = array())
@@ -56,23 +54,15 @@ public function add(array $parameters)
     }
 
     /**
-     * Gets the service container parameters.
-     *
-     * @return array An array of parameters
+     * {@inheritdoc}
      */
     public function all()
     {
         return $this->parameters;
     }
 
     /**
-     * Gets a service container parameter.
-     *
-     * @param string $name The parameter name
-     *
-     * @return mixed The parameter value
-     *
-     * @throws ParameterNotFoundException if the parameter is not defined
+     * {@inheritdoc}
      */
     public function get($name)
     {
@@ -109,11 +99,7 @@ public function set($name, $value)
     }
 
     /**
-     * Returns true if a parameter name is defined.
-     *
-     * @param string $name The parameter name
-     *
-     * @return bool true if the parameter name is defined, false otherwise
+     * {@inheritdoc}
      */
     public function has($name)
     {
@@ -131,7 +117,7 @@ public function remove($name)
     }
 
     /**
-     * Replaces parameter placeholders (%name%) by their values for all parameters.
+     * {@inheritdoc}
      */
     public function resolve()
     {
@@ -266,6 +252,9 @@ public function escapeValue($value)
         return $value;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function unescapeValue($value)
     {
         if (is_string($value)) {

diff --git a/src/Symfony/Component/DependencyInjection/Reference.php b/src/Symfony/Component/DependencyInjection/Reference.php
@@ -23,8 +23,6 @@ class Reference
     private $strict;
 
     /**
-     * Constructor.
-     *
      * @param string $id              The service identifier
      * @param int    $invalidBehavior The behavior when the service does not exist
      * @param bool   $strict          Sets how this reference is validated
@@ -39,8 +37,6 @@ public function __construct($id, $invalidBehavior = ContainerInterface::EXCEPTIO
     }
 
     /**
-     * __toString.
-     *
      * @return string The service identifier
      */
     public function __toString()

diff --git a/src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php b/src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php
@@ -73,24 +73,17 @@ public function testCrossCheck($fixture, $type)
 
     public function crossCheckLoadersDumpers()
     {
-        $tests = array(
+        return array(
             array('services1.xml', 'xml'),
             array('services2.xml', 'xml'),
             array('services6.xml', 'xml'),
             array('services8.xml', 'xml'),
             array('services9.xml', 'xml'),
+            array('services1.yml', 'yaml'),
+            array('services2.yml', 'yaml'),
+            array('services6.yml', 'yaml'),
+            array('services8.yml', 'yaml'),
+            array('services9.yml', 'yaml'),
         );
-
-        if (class_exists('Symfony\Component\Yaml\Yaml')) {
-            $tests = array_merge($tests, array(
-                array('services1.yml', 'yaml'),
-                array('services2.yml', 'yaml'),
-                array('services6.yml', 'yaml'),
-                array('services8.yml', 'yaml'),
-                array('services9.yml', 'yaml'),
-            ));
-        }
-
-        return $tests;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Variable.php b/src/Symfony/Component/DependencyInjection/Variable.php
@@ -29,8 +29,6 @@ class Variable
     private $name;
 
     /**
-     * Constructor.
-     *
      * @param string $name
      */
     public function __construct($name)