Merge branch '2.8' into 3.1

fabpot · fabpot · commit 61fea5a3f1b9 · 2016-11-14T08:20:02.000-08:00
* 2.8:
  [TwigBridge] fix tests
  Tag the FormFieldRegistry as being internal
  [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds
  [Validator] Added missing swedish translation
  [TranslationDebug] workaround for getFallbackLocales.
  [Translation] fixed nested fallback catalogue  using multiple locales.
  fixed phpdoc
  [Command] Fixed method comments as phpDoc syntax
  Added single quotes for upgrade guides.
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -1902,5 +1902,5 @@ UPGRADE FROM 2.x to 3.0
    After:
 
    ```php
-   $request->query->get('foo')[bar];
+   $request->query->get('foo')['bar'];
    ```
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
@@ -80,7 +80,12 @@ public function testOneVar()
 }
 
 EOTXT;
-        $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
+
+        if (PHP_VERSION_ID >= 70000) {
+            $expected = preg_replace('/%(.*?)%/', '($context["$1"] ?? null)', $expected);
+        } else {
+            $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
+        }
 
         $this->assertSame($expected, $compiler->compile($node)->getSource());
     }
@@ -106,7 +111,12 @@ public function testMultiVars()
 }
 
 EOTXT;
-        $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
+
+        if (PHP_VERSION_ID >= 70000) {
+            $expected = preg_replace('/%(.*?)%/', '($context["$1"] ?? null)', $expected);
+        } else {
+            $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
+        }
 
         $this->assertSame($expected, $compiler->compile($node)->getSource());
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
@@ -66,6 +66,10 @@ public function testCompile()
 
     protected function getVariableGetter($name)
     {
+        if (PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? null)', $name, $name);
+        }
+
         return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php
@@ -263,6 +263,10 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
 
     protected function getVariableGetter($name)
     {
+        if (PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? null)', $name, $name);
+        }
+
         return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
@@ -39,15 +39,23 @@ public function testCompileStrict()
 
     protected function getVariableGetterWithoutStrictCheck($name)
     {
+        if (PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? null)', $name, $name);
+        }
+
         return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
     }
 
     protected function getVariableGetterWithStrictCheck($name)
     {
-        if (version_compare(\Twig_Environment::VERSION, '2.0.0-DEV', '>=')) {
+        if (\Twig_Environment::MAJOR_VERSION >= 2) {
             return sprintf('(isset($context["%s"]) || array_key_exists("%s", $context) ? $context["%s"] : $this->notFound("%s", 0))', $name, $name, $name, $name);
         }
 
-        return sprintf('(isset($context["%1$s"]) ? $context["%1$s"] : $this->getContext($context, "%1$s"))', $name);
+        if (PHP_VERSION_ID >= 70000) {
+            return sprintf('($context["%s"] ?? $this->getContext($context, "%s"))', $name, $name, $name);
+        }
+
+        return sprintf('(isset($context["%s"]) ? $context["%s"] : $this->getContext($context, "%s"))', $name, $name, $name);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "twig/twig": "~1.27|~2.0"
+        "twig/twig": "~1.28|~2.0"
     },
     "require-dev": {
         "symfony/asset": "~2.8|~3.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -21,6 +21,8 @@
 use Symfony\Component\Translation\Catalogue\MergeOperation;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Translator;
+use Symfony\Component\Translation\DataCollectorTranslator;
+use Symfony\Component\Translation\LoggingTranslator;
 
 /**
  * Helps finding unused or missing translation messages in a given locale
@@ -295,7 +297,7 @@ private function loadFallbackCatalogues($locale, $transPaths, TranslationLoader
     {
         $fallbackCatalogues = array();
         $translator = $this->getContainer()->get('translator');
-        if ($translator instanceof Translator) {
+        if ($translator instanceof Translator || $translator instanceof DataCollectorTranslator || $translator instanceof LoggingTranslator) {
             foreach ($translator->getFallbackLocales() as $fallbackLocale) {
                 if ($fallbackLocale === $locale) {
                     continue;
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -202,8 +202,6 @@ protected function initialize(InputInterface $input, OutputInterface $output)
      *
      * @return int The command exit code
      *
-     * @throws \Exception
-     *
      * @see setCode()
      * @see execute()
      */
diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -15,6 +15,8 @@
 
 /**
  * This is an internal class that must not be used directly.
+ *
+ * @internal
  */
 class FormFieldRegistry
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\ReversedTransformer;
@@ -54,6 +56,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         if ('single_text' === $options['widget']) {
             $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));
+
+            // handle seconds ignored by user's browser when with_seconds enabled
+            // https://codereview.chromium.org/450533009/
+            if ($options['with_seconds']) {
+                $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) {
+                    $data = $e->getData();
+                    if ($data && preg_match('/^\d{2}:\d{2}$/', $data)) {
+                        $e->setData($data.':00');
+                    }
+                });
+            }
         } else {
             $hourOptions = $minuteOptions = $secondOptions = array(
                 'error_bubbling' => true,
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -221,6 +221,22 @@ public function testSubmitStringSingleTextWithoutMinutes()
         $this->assertEquals('03', $form->getViewData());
     }
 
+    public function testSubmitWithSecondsAndBrowserOmissionSeconds()
+    {
+        $form = $this->factory->create('time', null, array(
+            'model_timezone' => 'UTC',
+            'view_timezone' => 'UTC',
+            'input' => 'string',
+            'widget' => 'single_text',
+            'with_seconds' => true,
+        ));
+
+        $form->submit('03:04');
+
+        $this->assertEquals('03:04:00', $form->getData());
+        $this->assertEquals('03:04:00', $form->getViewData());
+    }
+
     public function testSetDataWithoutMinutes()
     {
         $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -88,6 +88,20 @@ public function getCatalogue($locale = null)
         return $this->translator->getCatalogue($locale);
     }
 
+    /**
+     * Gets the fallback locales.
+     *
+     * @return array $locales The fallback locales
+     */
+    public function getFallbackLocales()
+    {
+        if ($this->translator instanceof Translator) {
+            return $this->translator->getFallbackLocales();
+        }
+
+        return array();
+    }
+
     /**
      * Passes through all unknown calls onto the translator object.
      */
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -88,6 +88,20 @@ public function getCatalogue($locale = null)
         return $this->translator->getCatalogue($locale);
     }
 
+    /**
+     * Gets the fallback locales.
+     *
+     * @return array $locales The fallback locales
+     */
+    public function getFallbackLocales()
+    {
+        if ($this->translator instanceof Translator) {
+            return $this->translator->getFallbackLocales();
+        }
+
+        return array();
+    }
+
     /**
      * Passes through all unknown calls onto the translator object.
      */
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -273,6 +273,16 @@ public function testWhenAResourceHasNoRegisteredLoader()
         $translator->trans('foo');
     }
 
+    public function testNestedFallbackCatalogueWhenUsingMultipleLocales()
+    {
+        $translator = new Translator('fr');
+        $translator->setFallbackLocales(array('ru', 'en'));
+
+        $translator->getCatalogue('fr');
+
+        $this->assertNotNull($translator->getCatalogue('ru')->getFallbackCatalogue());
+    }
+
     public function testFallbackCatalogueResources()
     {
         $translator = new Translator('en_GB', new MessageSelector());
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -380,7 +380,7 @@ private function loadFallbackCatalogues($locale)
 
         foreach ($this->computeFallbackLocales($locale) as $fallback) {
             if (!isset($this->catalogues[$fallback])) {
-                $this->doLoadCatalogue($fallback);
+                $this->loadCatalogue($fallback);
             }
 
             $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf
@@ -310,6 +310,10 @@
                 <source>This value does not match the expected {{ charset }} charset.</source>
                 <target>Detta värde har inte den förväntade teckenkodningen {{ charset }}.</target>
             </trans-unit>
+            <trans-unit id="81">
+                <source>This is not a valid Business Identifier Code (BIC).</source>
+                <target>Detta är inte en giltig BIC-kod.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -30,13 +30,13 @@ class Inline
     private static $objectForMap = false;
 
     /**
-     * Converts a YAML string to a PHP array.
+     * Converts a YAML string to a PHP value.
      *
      * @param string $value      A YAML string
      * @param int    $flags      A bit field of PARSE_* constants to customize the YAML parser behavior
      * @param array  $references Mapping of variable names to values
      *
-     * @return array A PHP array representing the YAML string
+     * @return mixed A PHP value
      *
      * @throws ParseException
      */
@@ -121,7 +121,7 @@ public static function parse($value, $flags = 0, $references = array())
      * @param mixed $value The PHP variable to convert
      * @param int   $flags A bit field of Yaml::DUMP_* constants to customize the dumped YAML string
      *
-     * @return string The YAML string representing the PHP array
+     * @return string The YAML string representing the PHP value
      *
      * @throws DumpException When trying to dump PHP resource
      */
@@ -266,7 +266,7 @@ private static function dumpArray($value, $flags)
     }
 
     /**
-     * Parses a scalar to a YAML string.
+     * Parses a YAML scalar.
      *
      * @param string $scalar
      * @param int    $flags
@@ -276,7 +276,7 @@ private static function dumpArray($value, $flags)
      * @param bool   $evaluate
      * @param array  $references
      *
-     * @return string A YAML string
+     * @return string
      *
      * @throws ParseException When malformed inline YAML string is parsed
      *
@@ -329,12 +329,12 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, $str
     }
 
     /**
-     * Parses a quoted scalar to YAML.
+     * Parses a YAML quoted scalar.
      *
      * @param string $scalar
      * @param int    &$i
      *
-     * @return string A YAML string
+     * @return string
      *
      * @throws ParseException When malformed inline YAML string is parsed
      */
@@ -359,14 +359,14 @@ private static function parseQuotedScalar($scalar, &$i)
     }
 
     /**
-     * Parses a sequence to a YAML string.
+     * Parses a YAML sequence.
      *
      * @param string $sequence
      * @param int    $flags
      * @param int    &$i
      * @param array  $references
      *
-     * @return string A YAML string
+     * @return array
      *
      * @throws ParseException When malformed inline YAML string is parsed
      */
@@ -419,14 +419,14 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references =
     }
 
     /**
-     * Parses a mapping to a YAML string.
+     * Parses a YAML mapping.
      *
      * @param string $mapping
      * @param int    $flags
      * @param int    &$i
      * @param array  $references
      *
-     * @return string A YAML string
+     * @return array|\stdClass
      *
      * @throws ParseException When malformed inline YAML string is parsed
      */

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,12 @@ public function testOneVar()`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`EOTXT;`
`83`		`- $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);`
	`83`	`+`
	`84`	`+ if (PHP_VERSION_ID >= 70000) {`
	`85`	`+ $expected = preg_replace('/%(.*?)%/', '($context["$1"] ?? null)', $expected);`
	`86`	`+ } else {`
	`87`	`+ $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);`
	`88`	`+ }`
`84`	`89`
`85`	`90`	`$this->assertSame($expected, $compiler->compile($node)->getSource());`
`86`	`91`	`}`
`@@ -106,7 +111,12 @@ public function testMultiVars()`
`106`	`111`	`}`
`107`	`112`
`108`	`113`	`EOTXT;`
`109`		`- $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);`
	`114`	`+`
	`115`	`+ if (PHP_VERSION_ID >= 70000) {`
	`116`	`+ $expected = preg_replace('/%(.*?)%/', '($context["$1"] ?? null)', $expected);`
	`117`	`+ } else {`
	`118`	`+ $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);`
	`119`	`+ }`
`110`	`120`
`111`	`121`	`$this->assertSame($expected, $compiler->compile($node)->getSource());`
`112`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ public function testCompile()`
`66`	`66`
`67`	`67`	`protected function getVariableGetter($name)`
`68`	`68`	`{`
	`69`	`+ if (PHP_VERSION_ID >= 70000) {`
	`70`	`+ return sprintf('($context["%s"] ?? null)', $name, $name);`
	`71`	`+ }`
	`72`	`+`
`69`	`73`	`return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);`
`70`	`74`	`}`
`71`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,10 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()`
`263`	`263`
`264`	`264`	`protected function getVariableGetter($name)`
`265`	`265`	`{`
	`266`	`+ if (PHP_VERSION_ID >= 70000) {`
	`267`	`+ return sprintf('($context["%s"] ?? null)', $name, $name);`
	`268`	`+ }`
	`269`	`+`
`266`	`270`	`return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);`
`267`	`271`	`}`
`268`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,23 @@ public function testCompileStrict()`
`39`	`39`
`40`	`40`	`protected function getVariableGetterWithoutStrictCheck($name)`
`41`	`41`	`{`
	`42`	`+ if (PHP_VERSION_ID >= 70000) {`
	`43`	`+ return sprintf('($context["%s"] ?? null)', $name, $name);`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`protected function getVariableGetterWithStrictCheck($name)`
`46`	`50`	`{`
`47`		`- if (version_compare(\Twig_Environment::VERSION, '2.0.0-DEV', '>=')) {`
	`51`	`+ if (\Twig_Environment::MAJOR_VERSION >= 2) {`
`48`	`52`	`return sprintf('(isset($context["%s"]) \|\| array_key_exists("%s", $context) ? $context["%s"] : $this->notFound("%s", 0))', $name, $name, $name, $name);`
`49`	`53`	`}`
`50`	`54`
`51`		`- return sprintf('(isset($context["%1$s"]) ? $context["%1$s"] : $this->getContext($context, "%1$s"))', $name);`
	`55`	`+ if (PHP_VERSION_ID >= 70000) {`
	`56`	`+ return sprintf('($context["%s"] ?? $this->getContext($context, "%s"))', $name, $name, $name);`
	`57`	`+ }`
	`58`	`+`
	`59`	`+ return sprintf('(isset($context["%s"]) ? $context["%s"] : $this->getContext($context, "%s"))', $name, $name, $name);`
`52`	`60`	`}`
`53`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,6 @@ protected function initialize(InputInterface $input, OutputInterface $output)`
`202`	`202`	`*`
`203`	`203`	`* @return int The command exit code`
`204`	`204`	`*`
`205`		`- * @throws \Exception`
`206`		`- *`
`207`	`205`	`* @see setCode()`
`208`	`206`	`* @see execute()`
`209`	`207`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* This is an internal class that must not be used directly.`
	`18`	`+ *`
	`19`	`+ * @internal`
`18`	`20`	`*/`
`19`	`21`	`class FormFieldRegistry`
`20`	`22`	`{`