Merge branch '3.0'

nicolas-grekas · nicolas-grekas · commit b4228df525aa · 2016-04-20T13:42:08.000+02:00
* 3.0:
  [DI] Fix internal caching in AutowirePass
  [PropertyInfo] Remove useless return statement
  [Console] use ANSI escape sequences in ProgressBar overwrite method
  [HttpKernel] Fix wrong number of arguments in call of ExceptionListener::logException()
  Replace iconv_*() uses by mb_*(), add mbstring polyfill when required
  [DependencyInjection] Remove YAML check in CrossCheckTest
  [Process] Consistently use getProcess() in tests
  [LDAP] Free the search result after a search to free memory
  [DependencyInjection] fix phpDoc

Conflicts:
	src/Symfony/Component/Ldap/LdapClient.php
diff --git a/Alias.php b/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/Compiler/AnalyzeServiceReferencesPass.php b/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/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -278,7 +278,7 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)
      * @param string     $id
      * @param Definition $definition
      *
-     * @return \ReflectionClass|null
+     * @return \ReflectionClass|false
      */
     private function getReflectionClass($id, Definition $definition)
     {
@@ -288,16 +288,18 @@ private function getReflectionClass($id, Definition $definition)
 
         // Cannot use reflection if the class isn't set
         if (!$class = $definition->getClass()) {
-            return;
+            return false;
         }
 
         $class = $this->container->getParameterBag()->resolveValue($class);
 
         try {
-            return $this->reflectionClasses[$id] = new \ReflectionClass($class);
+            $reflector = new \ReflectionClass($class);
         } catch (\ReflectionException $reflectionException) {
-            // return null
+            $reflector = false;
         }
+
+        return $this->reflectionClasses[$id] = $reflector;
     }
 
     private function addServiceToAmbiguousType($id, $type)
diff --git a/Compiler/Compiler.php b/Compiler/Compiler.php
@@ -25,9 +25,6 @@ class Compiler
     private $loggingFormatter;
     private $serviceReferenceGraph;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->passConfig = new PassConfig();
diff --git a/Compiler/PassConfig.php b/Compiler/PassConfig.php
@@ -35,9 +35,6 @@ class PassConfig
     private $optimizationPasses;
     private $removingPasses;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->mergePass = new MergeExtensionConfigurationPass();
diff --git a/Compiler/RepeatedPass.php b/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/Compiler/ServiceReferenceGraphEdge.php b/Compiler/ServiceReferenceGraphEdge.php
@@ -25,8 +25,6 @@ class ServiceReferenceGraphEdge
     private $value;
 
     /**
-     * Constructor.
-     *
      * @param ServiceReferenceGraphNode $sourceNode
      * @param ServiceReferenceGraphNode $destNode
      * @param string                    $value
diff --git a/Compiler/ServiceReferenceGraphNode.php b/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/Container.php b/Container.php
@@ -71,8 +71,6 @@ class Container implements ResettableContainerInterface
     private $underscoreMap = array('_' => '', '.' => '_', '\\' => '_');
 
     /**
-     * Constructor.
-     *
      * @param ParameterBagInterface $parameterBag A ParameterBagInterface instance
      */
     public function __construct(ParameterBagInterface $parameterBag = null)
diff --git a/Definition.php b/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/DefinitionDecorator.php b/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/Dumper/Dumper.php b/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/Exception/ParameterNotFoundException.php b/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/Extension/Extension.php b/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/Loader/ClosureLoader.php b/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/Loader/FileLoader.php b/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/Parameter.php b/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/ParameterBag/FrozenParameterBag.php b/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/ParameterBag/ParameterBag.php b/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()
     {
@@ -264,6 +250,9 @@ public function escapeValue($value)
         return $value;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function unescapeValue($value)
     {
         if (is_string($value)) {
diff --git a/Reference.php b/Reference.php
@@ -22,8 +22,6 @@ class Reference
     private $invalidBehavior;
 
     /**
-     * Constructor.
-     *
      * @param string $id              The service identifier
      * @param int    $invalidBehavior The behavior when the service does not exist
      *
@@ -36,8 +34,6 @@ public function __construct($id, $invalidBehavior = ContainerInterface::EXCEPTIO
     }
 
     /**
-     * __toString.
-     *
      * @return string The service identifier
      */
     public function __toString()
diff --git a/Tests/CrossCheckTest.php b/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/Variable.php b/Variable.php
@@ -29,8 +29,6 @@ class Variable
     private $name;
 
     /**
-     * Constructor.
-     *
      * @param string $name
      */
     public function __construct($name)

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)`
`278`	`278`	`* @param string $id`
`279`	`279`	`* @param Definition $definition`
`280`	`280`	`*`
`281`		`- * @return \ReflectionClass\|null`
	`281`	`+ * @return \ReflectionClass\|false`
`282`	`282`	`*/`
`283`	`283`	`private function getReflectionClass($id, Definition $definition)`
`284`	`284`	`{`
`@@ -288,16 +288,18 @@ private function getReflectionClass($id, Definition $definition)`
`288`	`288`
`289`	`289`	`// Cannot use reflection if the class isn't set`
`290`	`290`	`if (!$class = $definition->getClass()) {`
`291`		`- return;`
	`291`	`+ return false;`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`$class = $this->container->getParameterBag()->resolveValue($class);`
`295`	`295`
`296`	`296`	`try {`
`297`		`- return $this->reflectionClasses[$id] = new \ReflectionClass($class);`
	`297`	`+ $reflector = new \ReflectionClass($class);`
`298`	`298`	`} catch (\ReflectionException $reflectionException) {`
`299`		`- // return null`
	`299`	`+ $reflector = false;`
`300`	`300`	`}`
	`301`	`+`
	`302`	`+ return $this->reflectionClasses[$id] = $reflector;`
`301`	`303`	`}`
`302`	`304`
`303`	`305`	`private function addServiceToAmbiguousType($id, $type)`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ class Compiler`
`25`	`25`	`private $loggingFormatter;`
`26`	`26`	`private $serviceReferenceGraph;`
`27`	`27`
`28`		`- /**`
`29`		`- * Constructor.`
`30`		`- */`
`31`	`28`	`public function __construct()`
`32`	`29`	`{`
`33`	`30`	`$this->passConfig = new PassConfig();`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ class PassConfig`
`35`	`35`	`private $optimizationPasses;`
`36`	`36`	`private $removingPasses;`
`37`	`37`
`38`		`- /**`
`39`		`- * Constructor.`
`40`		`- */`
`41`	`38`	`public function __construct()`
`42`	`39`	`{`
`43`	`40`	`$this->mergePass = new MergeExtensionConfigurationPass();`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ class RepeatedPass implements CompilerPassInterface`
`32`	`32`	`private $passes;`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * Constructor.`
`36`		`- *`
`37`	`35`	`* @param RepeatablePassInterface[] $passes An array of RepeatablePassInterface objects`
`38`	`36`	`*`
`39`	`37`	`* @throws InvalidArgumentException when the passes don't implement RepeatablePassInterface`