Merge branch '2.3'

* 2.3: (25 commits)
  bumped Symfony version to 2.2.11
  updated VERSION for 2.2.10
  update CONTRIBUTORS for 2.2.10
  updated CHANGELOG for 2.2.10
  fixed version
  Request::overrideGlobals() may call invalid ini value
  Force Luhn Validator to only work with strings
  Fixed bug with lazy services
  [Translation] fixed the error in the dumper test as described in #9475
  deleted mixing string concatenation inside a sprintf
  "__call()" should be displayed only if $this->magicCall is true
  [Console] fix phpdoc and constructor default value
  Add media-query for printing: Do not print the toolbar.
  Fix ProgressHelper redraw when redrawFreq is greater than 1
  Update toolbar.css.twig
  slovenian translations fixed
  slovenian translations fixed
  [DependencyInjection] fixed YamlDumper did not make services private.
  [FrameworkBundle] fix routing container parameter exception message
  [Form] fix and unify phpdoc
  ...

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/HttpKernel/Kernel.php

Author: fabpot

Button.php

@@ -22,7 +22,7 @@
 class Button implements \IteratorAggregate, FormInterface
 {
     /**
-     * @var FormInterface
+     * @var FormInterface|null
      */
     private $parent;
 

Extension/Validator/ValidatorTypeGuesser.php

@@ -82,7 +82,7 @@ public function guessPattern($class, $property)
      *
      * @param Constraint $constraint The constraint to guess for
      *
-     * @return TypeGuess The guessed field class and options
+     * @return TypeGuess|null The guessed field class and options
      */
     public function guessTypeForConstraint(Constraint $constraint)
     {
@@ -172,7 +172,7 @@ public function guessTypeForConstraint(Constraint $constraint)
      *
      * @param Constraint $constraint The constraint to guess for
      *
-     * @return Guess The guess whether the field is required
+     * @return ValueGuess|null The guess whether the field is required
      */
     public function guessRequiredForConstraint(Constraint $constraint)
     {
@@ -191,7 +191,7 @@ public function guessRequiredForConstraint(Constraint $constraint)
      *
      * @param Constraint $constraint The constraint to guess for
      *
-     * @return Guess The guess for the maximum length
+     * @return ValueGuess|null The guess for the maximum length
      */
     public function guessMaxLengthForConstraint(Constraint $constraint)
     {
@@ -229,7 +229,7 @@ public function guessMaxLengthForConstraint(Constraint $constraint)
      *
      * @param Constraint $constraint The constraint to guess for
      *
-     * @return Guess The guess for the pattern
+     * @return ValueGuess|null The guess for the pattern
      */
     public function guessPatternForConstraint(Constraint $constraint)
     {
@@ -281,7 +281,7 @@ public function guessPatternForConstraint(Constraint $constraint)
      * @param mixed    $defaultValue The default value assumed if no other value
      *                               can be guessed.
      *
-     * @return Guess The guessed value with the highest confidence
+     * @return Guess|null The guessed value with the highest confidence
      */
     protected function guess($class, $property, \Closure $closure, $defaultValue = null)
     {

Form.php

@@ -170,6 +170,8 @@ public function __construct(FormConfigInterface $config)
 
     public function __clone()
     {
+        $this->children = clone $this->children;
+        
         foreach ($this->children as $key => $child) {
             $this->children[$key] = clone $child;
         }

FormFactoryBuilderInterface.php

@@ -39,7 +39,7 @@ public function addExtension(FormExtensionInterface $extension);
     /**
      * Adds a list of extensions to be loaded by the factory.
      *
-     * @param array $extensions The extensions.
+     * @param FormExtensionInterface[] $extensions The extensions.
      *
      * @return FormFactoryBuilderInterface The builder.
      */
@@ -57,7 +57,7 @@ public function addType(FormTypeInterface $type);
     /**
      * Adds a list of form types to the factory.
      *
-     * @param array $types The form types.
+     * @param FormTypeInterface[] $types The form types.
      *
      * @return FormFactoryBuilderInterface The builder.
      */
@@ -75,7 +75,7 @@ public function addTypeExtension(FormTypeExtensionInterface $typeExtension);
     /**
      * Adds a list of form type extensions to the factory.
      *
-     * @param array $typeExtensions The form type extensions.
+     * @param FormTypeExtensionInterface[] $typeExtensions The form type extensions.
      *
      * @return FormFactoryBuilderInterface The builder.
      */
@@ -93,7 +93,7 @@ public function addTypeGuesser(FormTypeGuesserInterface $typeGuesser);
     /**
      * Adds a list of type guessers to the factory.
      *
-     * @param array $typeGuessers The type guessers.
+     * @param FormTypeGuesserInterface[] $typeGuessers The type guessers.
      *
      * @return FormFactoryBuilderInterface The builder.
      */

FormRegistryInterface.php

@@ -51,7 +51,7 @@ public function getTypeGuesser();
     /**
      * Returns the extensions loaded by the framework.
      *
-     * @return array
+     * @return FormExtensionInterface[]
      */
     public function getExtensions();
 }

FormTypeGuesserChain.php

@@ -21,7 +21,7 @@ class FormTypeGuesserChain implements FormTypeGuesserInterface
     /**
      * Constructor.
      *
-     * @param array $guessers Guessers as instances of FormTypeGuesserInterface
+     * @param FormTypeGuesserInterface[] $guessers Guessers as instances of FormTypeGuesserInterface
      *
      * @throws UnexpectedTypeException if any guesser does not implement FormTypeGuesserInterface
      */
@@ -87,7 +87,7 @@ public function guessPattern($class, $property)
      * @param \Closure $closure The closure to execute. Accepts a guesser
      *                            as argument and should return a Guess instance
      *
-     * @return Guess The guess with the highest confidence
+     * @return Guess|null The guess with the highest confidence
      */
     private function guess(\Closure $closure)
     {

FormTypeGuesserInterface.php

@@ -22,7 +22,7 @@ interface FormTypeGuesserInterface
      * @param string $class    The fully qualified class name
      * @param string $property The name of the property to guess for
      *
-     * @return Guess\TypeGuess A guess for the field's type and options
+     * @return Guess\TypeGuess|null A guess for the field's type and options
      */
     public function guessType($class, $property);
 
@@ -32,7 +32,7 @@ public function guessType($class, $property);
      * @param string $class    The fully qualified class name
      * @param string $property The name of the property to guess for
      *
-     * @return Guess\Guess A guess for the field's required setting
+     * @return Guess\ValueGuess A guess for the field's required setting
      */
     public function guessRequired($class, $property);
 
@@ -42,7 +42,7 @@ public function guessRequired($class, $property);
      * @param string $class    The fully qualified class name
      * @param string $property The name of the property to guess for
      *
-     * @return Guess\Guess A guess for the field's maximum length
+     * @return Guess\ValueGuess|null A guess for the field's maximum length
      */
     public function guessMaxLength($class, $property);
 
@@ -58,7 +58,7 @@ public function guessMaxLength($class, $property);
      * @param string $class    The fully qualified class name
      * @param string $property The name of the property to guess for
      *
-     * @return Guess\Guess A guess for the field's required pattern
+     * @return Guess\ValueGuess|null A guess for the field's required pattern
      */
     public function guessPattern($class, $property);
 }

Guess/Guess.php

@@ -59,14 +59,14 @@ abstract class Guess
     private $confidence;
 
     /**
-     * Returns the guess most likely to be correct from a list of guesses
+     * Returns the guess most likely to be correct from a list of guesses.
      *
      * If there are multiple guesses with the same, highest confidence, the
      * returned guess is any of them.
      *
-     * @param array $guesses A list of guesses
+     * @param Guess[] $guesses An array of guesses
      *
-     * @return Guess The guess with the highest confidence
+     * @return Guess|null The guess with the highest confidence
      */
     public static function getBestGuess(array $guesses)
     {
@@ -84,7 +84,7 @@ public static function getBestGuess(array $guesses)
     }
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param integer $confidence The confidence
      *
@@ -101,7 +101,7 @@ public function __construct($confidence)
     }
 
     /**
-     * Returns the confidence that the guessed value is correct
+     * Returns the confidence that the guessed value is correct.
      *
      * @return integer One of the constants VERY_HIGH_CONFIDENCE,
      *                 HIGH_CONFIDENCE, MEDIUM_CONFIDENCE and LOW_CONFIDENCE

PreloadedExtension.php

@@ -38,9 +38,9 @@ class PreloadedExtension implements FormExtensionInterface
     /**
      * Creates a new preloaded extension.
      *
-     * @param array                         $types          The types that the extension should support.
-     * @param array                         $typeExtensions The type extensions that the extension should support.
-     * @param FormTypeGuesserInterface|null $typeGuesser    The guesser that the extension should support.
+     * @param FormTypeInterface[]                 $types         The types that the extension should support.
+     * @param array[FormTypeExtensionInterface[]] typeExtensions The type extensions that the extension should support.
+     * @param FormTypeGuesserInterface|null       $typeGuesser   The guesser that the extension should support.
      */
     public function __construct(array $types, array $typeExtensions, FormTypeGuesserInterface $typeGuesser = null)
     {

ResolvedFormType.php

@@ -29,12 +29,12 @@ class ResolvedFormType implements ResolvedFormTypeInterface
     private $innerType;
 
     /**
-     * @var array
+     * @var FormTypeExtensionInterface[]
      */
     private $typeExtensions;
 
     /**
-     * @var ResolvedFormTypeInterface
+     * @var ResolvedFormTypeInterface|null
      */
     private $parent;
 

ResolvedFormTypeFactoryInterface.php

@@ -25,9 +25,9 @@ interface ResolvedFormTypeFactoryInterface
     /**
      * Resolves a form type.
      *
-     * @param FormTypeInterface         $type
-     * @param array                     $typeExtensions
-     * @param ResolvedFormTypeInterface $parent
+     * @param FormTypeInterface              $type
+     * @param FormTypeExtensionInterface[]   $typeExtensions
+     * @param ResolvedFormTypeInterface|null $parent
      *
      * @return ResolvedFormTypeInterface
      *

ResolvedFormTypeInterface.php

@@ -28,7 +28,7 @@ public function getName();
     /**
      * Returns the parent type.
      *
-     * @return ResolvedFormTypeInterface The parent type or null.
+     * @return ResolvedFormTypeInterface|null The parent type or null.
      */
     public function getParent();
 

Resources/translations/validators.sl.xlf

@@ -4,11 +4,11 @@
         <body>
             <trans-unit id="28">
                 <source>This form should not contain extra fields.</source>
-                <target>To področje ne sme vsebovati dodatnih polj.</target>
+                <target>Ta obrazec ne sme vsebovati dodatnih polj.</target>
             </trans-unit>
             <trans-unit id="29">
                 <source>The uploaded file was too large. Please try to upload a smaller file.</source>
-                <target>Naložena datoteka je prevelika. Prosim, poizkusite naložiti manjšo.</target>
+                <target>Naložena datoteka je prevelika. Prosimo, poizkusite naložiti manjšo.</target>
             </trans-unit>
             <trans-unit id="30">
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>

SubmitButtonBuilder.php

@@ -21,7 +21,7 @@ class SubmitButtonBuilder extends ButtonBuilder
     /**
      * Creates the button.
      *
-     * @return Button The button
+     * @return SubmitButton The button
      */
     public function getForm()
     {

Tests/CompoundFormTest.php

@@ -155,6 +155,7 @@ public function testCloneChildren()
 
         $this->assertNotSame($this->form, $clone);
         $this->assertNotSame($child, $clone['child']);
+        $this->assertNotSame($this->form['child'], $clone['child']);
     }
 
     public function testNotEmptyIfChildNotEmpty()