Merge branch '2.8' into 3.1

fabpot · fabpot · commit b175857f99e5 · 2016-09-06T16:30:54.000-07:00
* 2.8:
  [FrameworkBundle] Fix Incorrect line break in exception message (500 debug page)
  [Security] Added note inside phpdoc.
  Minor cleanups and improvements
  [form] lazy trans `post_max_size_message`.
  [DI] Fix setting synthetic services on ContainerBuilder
  [ClassLoader] Fix ClassCollectionLoader inlining with declare(strict_types=1)
diff --git a/Compiler/RepeatedPass.php b/Compiler/RepeatedPass.php
@@ -56,14 +56,12 @@ public function __construct(array $passes)
      */
     public function process(ContainerBuilder $container)
     {
-        $this->repeat = false;
-        foreach ($this->passes as $pass) {
-            $pass->process($container);
-        }
-
-        if ($this->repeat) {
-            $this->process($container);
-        }
+        do {
+            $this->repeat = false;
+            foreach ($this->passes as $pass) {
+                $pass->process($container);
+            }
+        } while ($this->repeat);
     }
 
     /**
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -341,7 +341,8 @@ public function set($id, $service)
     {
         $id = strtolower($id);
 
-        if ($this->isFrozen() && (!isset($this->definitions[$id]) || !$this->definitions[$id]->isSynthetic())) {
+        if ($this->isFrozen() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
+            // setting a synthetic service on a frozen container is alright
             throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a frozen container is not allowed.', $id));
         }
 
diff --git a/Dumper/GraphvizDumper.php b/Dumper/GraphvizDumper.php
@@ -128,7 +128,7 @@ private function addEdges()
      *
      * @return array An array of edges
      */
-    private function findEdges($id, $arguments, $required, $name)
+    private function findEdges($id, array $arguments, $required, $name)
     {
         $edges = array();
         foreach ($arguments as $argument) {
@@ -241,7 +241,7 @@ private function endDot()
      *
      * @return string A comma separated list of attributes
      */
-    private function addAttributes($attributes)
+    private function addAttributes(array $attributes)
     {
         $code = array();
         foreach ($attributes as $k => $v) {
@@ -258,7 +258,7 @@ private function addAttributes($attributes)
      *
      * @return string A space separated list of options
      */
-    private function addOptions($options)
+    private function addOptions(array $options)
     {
         $code = array();
         foreach ($options as $k => $v) {
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -374,7 +374,7 @@ private function addServiceReturn($id, $definition)
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    private function addServiceInstance($id, $definition)
+    private function addServiceInstance($id, Definition $definition)
     {
         $class = $definition->getClass();
 
@@ -422,7 +422,7 @@ private function addServiceInstance($id, $definition)
      *
      * @return bool
      */
-    private function isSimpleInstance($id, $definition)
+    private function isSimpleInstance($id, Definition $definition)
     {
         foreach (array_merge(array($definition), $this->getInlinedDefinitions($definition)) as $sDefinition) {
             if ($definition !== $sDefinition && !$this->hasReference($id, $sDefinition->getMethodCalls())) {
@@ -446,7 +446,7 @@ private function isSimpleInstance($id, $definition)
      *
      * @return string
      */
-    private function addServiceMethodCalls($id, $definition, $variableName = 'instance')
+    private function addServiceMethodCalls($id, Definition $definition, $variableName = 'instance')
     {
         $calls = '';
         foreach ($definition->getMethodCalls() as $call) {
@@ -461,7 +461,7 @@ private function addServiceMethodCalls($id, $definition, $variableName = 'instan
         return $calls;
     }
 
-    private function addServiceProperties($id, $definition, $variableName = 'instance')
+    private function addServiceProperties($id, Definition $definition, $variableName = 'instance')
     {
         $code = '';
         foreach ($definition->getProperties() as $name => $value) {
@@ -481,7 +481,7 @@ private function addServiceProperties($id, $definition, $variableName = 'instanc
      *
      * @throws ServiceCircularReferenceException when the container contains a circular reference
      */
-    private function addServiceInlinedDefinitionsSetup($id, $definition)
+    private function addServiceInlinedDefinitionsSetup($id, Definition $definition)
     {
         $this->referenceVariables[$id] = new Variable('instance');
 
@@ -525,7 +525,7 @@ private function addServiceInlinedDefinitionsSetup($id, $definition)
      *
      * @return string
      */
-    private function addServiceConfigurator($id, $definition, $variableName = 'instance')
+    private function addServiceConfigurator($id, Definition $definition, $variableName = 'instance')
     {
         if (!$callable = $definition->getConfigurator()) {
             return '';
@@ -561,7 +561,7 @@ private function addServiceConfigurator($id, $definition, $variableName = 'insta
      *
      * @return string
      */
-    private function addService($id, $definition)
+    private function addService($id, Definition $definition)
     {
         $this->definitionVariables = new \SplObjectStorage();
         $this->referenceVariables = array();
@@ -1032,7 +1032,7 @@ protected function getDefaultParameters()
      *
      * @throws InvalidArgumentException
      */
-    private function exportParameters($parameters, $path = '', $indent = 12)
+    private function exportParameters(array $parameters, $path = '', $indent = 12)
     {
         $php = array();
         foreach ($parameters as $key => $value) {
diff --git a/Dumper/XmlDumper.php b/Dumper/XmlDumper.php
@@ -271,7 +271,7 @@ private function addServices(\DOMElement $parent)
      * @param \DOMElement $parent
      * @param string      $keyAttribute
      */
-    private function convertParameters($parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
+    private function convertParameters(array $parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
     {
         $withKeys = array_keys($parameters) !== range(0, count($parameters) - 1);
         foreach ($parameters as $key => $value) {
@@ -317,7 +317,7 @@ private function convertParameters($parameters, $type, \DOMElement $parent, $key
      *
      * @return array
      */
-    private function escape($arguments)
+    private function escape(array $arguments)
     {
         $args = array();
         foreach ($arguments as $k => $v) {
diff --git a/Dumper/YamlDumper.php b/Dumper/YamlDumper.php
@@ -307,7 +307,7 @@ private function getExpressionCall($expression)
      *
      * @return array
      */
-    private function prepareParameters($parameters, $escape = true)
+    private function prepareParameters(array $parameters, $escape = true)
     {
         $filtered = array();
         foreach ($parameters as $key => $value) {
@@ -330,7 +330,7 @@ private function prepareParameters($parameters, $escape = true)
      *
      * @return array
      */
-    private function escape($arguments)
+    private function escape(array $arguments)
     {
         $args = array();
         foreach ($arguments as $k => $v) {
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -425,9 +425,9 @@ private function resolveServices($value)
     {
         if (is_array($value)) {
             $value = array_map(array($this, 'resolveServices'), $value);
-        } elseif (is_string($value) &&  0 === strpos($value, '@=')) {
+        } elseif (is_string($value) && 0 === strpos($value, '@=')) {
             return new Expression(substr($value, 2));
-        } elseif (is_string($value) &&  0 === strpos($value, '@')) {
+        } elseif (is_string($value) && 0 === strpos($value, '@')) {
             if (0 === strpos($value, '@@')) {
                 $value = substr($value, 1);
                 $invalidBehavior = null;
diff --git a/Tests/ContainerBuilderTest.php b/Tests/ContainerBuilderTest.php
@@ -626,14 +626,12 @@ public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
         $container->set('a', new \stdClass());
     }
 
-    /**
-     * @expectedException \BadMethodCallException
-     */
     public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()
     {
         $container = new ContainerBuilder();
         $container->compile();
-        $container->set('a', new \stdClass());
+        $container->set('a', $foo = new \stdClass());
+        $this->assertSame($foo, $container->get('a'));
     }
 
     public function testNoExceptionWhenSetSyntheticServiceOnAFrozenContainer()
diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php
@@ -210,7 +210,7 @@ public function testGetCircularReference()
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExcepionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.
+     * @expectedExceptionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.
      */
     public function testGetSyntheticServiceAlwaysThrows()
     {

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,8 @@ public function set($id, $service)`
`341`	`341`	`{`
`342`	`342`	`$id = strtolower($id);`
`343`	`343`
`344`		`- if ($this->isFrozen() && (!isset($this->definitions[$id]) \|\| !$this->definitions[$id]->isSynthetic())) {`
	`344`	`+ if ($this->isFrozen() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {`
	`345`	`+ // setting a synthetic service on a frozen container is alright`
`345`	`346`	`throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a frozen container is not allowed.', $id));`
`346`	`347`	`}`
`347`	`348`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private function addEdges()`
`128`	`128`	`*`
`129`	`129`	`* @return array An array of edges`
`130`	`130`	`*/`
`131`		`- private function findEdges($id, $arguments, $required, $name)`
	`131`	`+ private function findEdges($id, array $arguments, $required, $name)`
`132`	`132`	`{`
`133`	`133`	`$edges = array();`
`134`	`134`	`foreach ($arguments as $argument) {`
`@@ -241,7 +241,7 @@ private function endDot()`
`241`	`241`	`*`
`242`	`242`	`* @return string A comma separated list of attributes`
`243`	`243`	`*/`
`244`		`- private function addAttributes($attributes)`
	`244`	`+ private function addAttributes(array $attributes)`
`245`	`245`	`{`
`246`	`246`	`$code = array();`
`247`	`247`	`foreach ($attributes as $k => $v) {`
`@@ -258,7 +258,7 @@ private function addAttributes($attributes)`
`258`	`258`	`*`
`259`	`259`	`* @return string A space separated list of options`
`260`	`260`	`*/`
`261`		`- private function addOptions($options)`
	`261`	`+ private function addOptions(array $options)`
`262`	`262`	`{`
`263`	`263`	`$code = array();`
`264`	`264`	`foreach ($options as $k => $v) {`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ private function addServiceReturn($id, $definition)`
`374`	`374`	`* @throws InvalidArgumentException`
`375`	`375`	`* @throws RuntimeException`
`376`	`376`	`*/`
`377`		`- private function addServiceInstance($id, $definition)`
	`377`	`+ private function addServiceInstance($id, Definition $definition)`
`378`	`378`	`{`
`379`	`379`	`$class = $definition->getClass();`
`380`	`380`
`@@ -422,7 +422,7 @@ private function addServiceInstance($id, $definition)`
`422`	`422`	`*`
`423`	`423`	`* @return bool`
`424`	`424`	`*/`
`425`		`- private function isSimpleInstance($id, $definition)`
	`425`	`+ private function isSimpleInstance($id, Definition $definition)`
`426`	`426`	`{`
`427`	`427`	`foreach (array_merge(array($definition), $this->getInlinedDefinitions($definition)) as $sDefinition) {`
`428`	`428`	`if ($definition !== $sDefinition && !$this->hasReference($id, $sDefinition->getMethodCalls())) {`
`@@ -446,7 +446,7 @@ private function isSimpleInstance($id, $definition)`
`446`	`446`	`*`
`447`	`447`	`* @return string`
`448`	`448`	`*/`
`449`		`- private function addServiceMethodCalls($id, $definition, $variableName = 'instance')`
	`449`	`+ private function addServiceMethodCalls($id, Definition $definition, $variableName = 'instance')`
`450`	`450`	`{`
`451`	`451`	`$calls = '';`
`452`	`452`	`foreach ($definition->getMethodCalls() as $call) {`
`@@ -461,7 +461,7 @@ private function addServiceMethodCalls($id, $definition, $variableName = 'instan`
`461`	`461`	`return $calls;`
`462`	`462`	`}`
`463`	`463`
`464`		`- private function addServiceProperties($id, $definition, $variableName = 'instance')`
	`464`	`+ private function addServiceProperties($id, Definition $definition, $variableName = 'instance')`
`465`	`465`	`{`
`466`	`466`	`$code = '';`
`467`	`467`	`foreach ($definition->getProperties() as $name => $value) {`
`@@ -481,7 +481,7 @@ private function addServiceProperties($id, $definition, $variableName = 'instanc`
`481`	`481`	`*`
`482`	`482`	`* @throws ServiceCircularReferenceException when the container contains a circular reference`
`483`	`483`	`*/`
`484`		`- private function addServiceInlinedDefinitionsSetup($id, $definition)`
	`484`	`+ private function addServiceInlinedDefinitionsSetup($id, Definition $definition)`
`485`	`485`	`{`
`486`	`486`	`$this->referenceVariables[$id] = new Variable('instance');`
`487`	`487`
`@@ -525,7 +525,7 @@ private function addServiceInlinedDefinitionsSetup($id, $definition)`
`525`	`525`	`*`
`526`	`526`	`* @return string`
`527`	`527`	`*/`
`528`		`- private function addServiceConfigurator($id, $definition, $variableName = 'instance')`
	`528`	`+ private function addServiceConfigurator($id, Definition $definition, $variableName = 'instance')`
`529`	`529`	`{`
`530`	`530`	`if (!$callable = $definition->getConfigurator()) {`
`531`	`531`	`return '';`
`@@ -561,7 +561,7 @@ private function addServiceConfigurator($id, $definition, $variableName = 'insta`
`561`	`561`	`*`
`562`	`562`	`* @return string`
`563`	`563`	`*/`
`564`		`- private function addService($id, $definition)`
	`564`	`+ private function addService($id, Definition $definition)`
`565`	`565`	`{`
`566`	`566`	`$this->definitionVariables = new \SplObjectStorage();`
`567`	`567`	`$this->referenceVariables = array();`
`@@ -1032,7 +1032,7 @@ protected function getDefaultParameters()`
`1032`	`1032`	`*`
`1033`	`1033`	`* @throws InvalidArgumentException`
`1034`	`1034`	`*/`
`1035`		`- private function exportParameters($parameters, $path = '', $indent = 12)`
	`1035`	`+ private function exportParameters(array $parameters, $path = '', $indent = 12)`
`1036`	`1036`	`{`
`1037`	`1037`	`$php = array();`
`1038`	`1038`	`foreach ($parameters as $key => $value) {`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ private function addServices(\DOMElement $parent)`
`271`	`271`	`* @param \DOMElement $parent`
`272`	`272`	`* @param string $keyAttribute`
`273`	`273`	`*/`
`274`		`- private function convertParameters($parameters, $type, \DOMElement $parent, $keyAttribute = 'key')`
	`274`	`+ private function convertParameters(array $parameters, $type, \DOMElement $parent, $keyAttribute = 'key')`
`275`	`275`	`{`
`276`	`276`	`$withKeys = array_keys($parameters) !== range(0, count($parameters) - 1);`
`277`	`277`	`foreach ($parameters as $key => $value) {`
`@@ -317,7 +317,7 @@ private function convertParameters($parameters, $type, \DOMElement $parent, $key`
`317`	`317`	`*`
`318`	`318`	`* @return array`
`319`	`319`	`*/`
`320`		`- private function escape($arguments)`
	`320`	`+ private function escape(array $arguments)`
`321`	`321`	`{`
`322`	`322`	`$args = array();`
`323`	`323`	`foreach ($arguments as $k => $v) {`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ private function getExpressionCall($expression)`
`307`	`307`	`*`
`308`	`308`	`* @return array`
`309`	`309`	`*/`
`310`		`- private function prepareParameters($parameters, $escape = true)`
	`310`	`+ private function prepareParameters(array $parameters, $escape = true)`
`311`	`311`	`{`
`312`	`312`	`$filtered = array();`
`313`	`313`	`foreach ($parameters as $key => $value) {`
`@@ -330,7 +330,7 @@ private function prepareParameters($parameters, $escape = true)`
`330`	`330`	`*`
`331`	`331`	`* @return array`
`332`	`332`	`*/`
`333`		`- private function escape($arguments)`
	`333`	`+ private function escape(array $arguments)`
`334`	`334`	`{`
`335`	`335`	`$args = array();`
`336`	`336`	`foreach ($arguments as $k => $v) {`
Original file line number	Diff line number	Diff line change
`@@ -626,14 +626,12 @@ public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()`
`626`	`626`	`$container->set('a', new \stdClass());`
`627`	`627`	`}`
`628`	`628`
`629`		`- /**`
`630`		`- * @expectedException \BadMethodCallException`
`631`		`- */`
`632`	`629`	`public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()`
`633`	`630`	`{`
`634`	`631`	`$container = new ContainerBuilder();`
`635`	`632`	`$container->compile();`
`636`		`- $container->set('a', new \stdClass());`
	`633`	`+ $container->set('a', $foo = new \stdClass());`
	`634`	`+ $this->assertSame($foo, $container->get('a'));`
`637`	`635`	`}`
`638`	`636`
`639`	`637`	`public function testNoExceptionWhenSetSyntheticServiceOnAFrozenContainer()`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public function testGetCircularReference()`
`210`	`210`
`211`	`211`	`/**`
`212`	`212`	`* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException`
`213`		`- * @expectedExcepionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.`
	`213`	`+ * @expectedExceptionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.`
`214`	`214`	`*/`
`215`	`215`	`public function testGetSyntheticServiceAlwaysThrows()`
`216`	`216`	`{`