Merge branch '2.3' into 2.7

fabpot · fabpot · commit 6a92f4e03fb2 · 2015-12-18T17:59:46.000+01:00
* 2.3: [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Yaml] do not remove "comments" in scalar blocks
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -631,6 +631,8 @@ public function asXml($namespace = null, $asDom = false)
      */
     public function renderException($e, $output)
     {
+        $output->writeln('', OutputInterface::VERBOSITY_QUIET);
+
         do {
             $title = sprintf('  [%s]  ', get_class($e));
 
@@ -653,15 +655,14 @@ public function renderException($e, $output)
                 }
             }
 
-            $messages = array('', '');
+            $messages = array();
             $messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));
             $messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title)))));
             foreach ($lines as $line) {
                 $messages[] = $formatter->format(sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1])));
             }
             $messages[] = $emptyLine;
             $messages[] = '';
-            $messages[] = '';
 
             $output->writeln($messages, OutputInterface::OUTPUT_RAW);
 
@@ -688,14 +689,12 @@ public function renderException($e, $output)
                 }
 
                 $output->writeln('');
-                $output->writeln('');
             }
         } while ($e = $e->getPrevious());
 
         if (null !== $this->runningCommand) {
             $output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())));
             $output->writeln('');
-            $output->writeln('');
         }
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
@@ -1,8 +1,6 @@
 
-
                                  
   [InvalidArgumentException]     
   Command "foo" is not defined.  
                                  
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -1,11 +1,8 @@
 
-
                                       
   [InvalidArgumentException]          
   The "--foo" option does not exist.  
                                       
 
-
 list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
@@ -1,27 +1,18 @@
 
-
                            
   [Exception]              
   Third exception comment  
                            
 
-
-
-
                             
   [Exception]               
   Second exception comment  
                             
 
-
-
-
                                        
   [Exception]                          
   First exception <p>this is html</p>  
                                        
 
-
 foo3:bar
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
@@ -1,27 +1,18 @@
 
-
 [37;41m                           [39;49m
 [37;41m  [Exception]              [39;49m
 [37;41m  Third exception [39;49m[34;41mcomment[39;49m[37;41m  [39;49m
 [37;41m                           [39;49m
 
-
-
-
 [37;41m                            [39;49m
 [37;41m  [Exception]               [39;49m
 [37;41m  Second exception [39;49m[33mcomment[39m[37;41m  [39;49m
 [37;41m                            [39;49m
 
-
-
-
 [37;41m                                       [39;49m
 [37;41m  [Exception]                          [39;49m
 [37;41m  First exception [39;49m[37;41m<p>[39;49m[37;41mthis is html[39;49m[37;41m</p>[39;49m[37;41m  [39;49m
 [37;41m                                       [39;49m
 
-
 [32mfoo3:bar[39m
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
@@ -1,9 +1,7 @@
 
-
                                
   [InvalidArgumentException]   
   Command "foo" is not define  
   d.                           
                                
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt
@@ -1,11 +1,8 @@
 
-
                     
   [Exception]       
   エラーメッセージ  
                     
 
-
 foo
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
@@ -1,11 +1,8 @@
 
-
 [37;41m                    [39;49m
 [37;41m  [Exception]       [39;49m
 [37;41m  エラーメッセージ  [39;49m
 [37;41m                    [39;49m
 
-
 [32mfoo[39m
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt
@@ -1,12 +1,9 @@
 
-
                               
   [Exception]                 
   コマンドの実行中にエラーが  
   発生しました。              
                               
 
-
 foo
 
-
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -28,6 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ($options['allow_add'] && $options['prototype']) {
             $prototype = $builder->create($options['prototype_name'], $options['type'], array_replace(array(
+                'required' => $options['required'],
                 'label' => $options['prototype_name'].'label__',
             ), $options['options']));
             $builder->setAttribute('prototype', $prototype->getForm());
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -274,4 +274,30 @@ public function testPrototypeDefaultLabel()
 
         $this->assertSame('__test__label__', $form->createView()->vars['prototype']->vars['label']);
     }
+
+    public function testPrototypeDefaultRequired()
+    {
+        $form = $this->factory->create('collection', array(), array(
+            'type' => 'file',
+            'allow_add' => true,
+            'prototype' => true,
+            'prototype_name' => '__test__',
+        ));
+
+        $this->assertTrue($form->createView()->vars['prototype']->vars['required']);
+    }
+
+    public function testPrototypeSetNotRequired()
+    {
+        $form = $this->factory->create('collection', array(), array(
+            'type' => 'file',
+            'allow_add' => true,
+            'prototype' => true,
+            'prototype_name' => '__test__',
+            'required' => false,
+        ));
+
+        $this->assertFalse($form->createView()->vars['required'], 'collection is not required');
+        $this->assertFalse($form->createView()->vars['prototype']->vars['required'], '"prototype" should not be required');
+    }
 }
diff --git a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
@@ -19,6 +19,8 @@
  */
 class BCryptPasswordEncoder extends BasePasswordEncoder
 {
+    const MAX_PASSWORD_LENGTH = 72;
+
     /**
      * @var string
      */
diff --git a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
@@ -95,6 +95,6 @@ protected function comparePasswords($password1, $password2)
      */
     protected function isPasswordTooLong($password)
     {
-        return strlen($password) > self::MAX_PASSWORD_LENGTH;
+        return strlen($password) > static::MAX_PASSWORD_LENGTH;
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
@@ -67,13 +67,15 @@ public function testEncodePasswordLength()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);
 
-        $encoder->encodePassword(str_repeat('a', 5000), 'salt');
+        $encoder->encodePassword(str_repeat('a', 73), 'salt');
     }
 
     public function testCheckPasswordLength()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);
+        $result = $encoder->encodePassword(str_repeat('a', 72), null);
 
-        $this->assertFalse($encoder->isPasswordValid('encoded', str_repeat('a', 5000), 'salt'));
+        $this->assertFalse($encoder->isPasswordValid($result, str_repeat('a', 73), 'salt'));
+        $this->assertTrue($encoder->isPasswordValid($result, str_repeat('a', 72), 'salt'));
     }
 }
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
@@ -278,6 +278,42 @@
                 <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
                 <target>Стойността не трябва да бъде идентична с {{ compared_value_type }} {{ compared_value }}.</target>
             </trans-unit>
+            <trans-unit id="73">
+                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
+                <target>Изображението е с твърде голяма пропорция ({{ ratio }}). Максималната пропорция трябва да е {{ max_ratio }}.</target>
+            </trans-unit>
+            <trans-unit id="74">
+                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
+                <target>Изображението е с твърде малка пропорция ({{ ratio }}). Минималната пропорция трябва да е {{ min_ratio }}.</target>
+            </trans-unit>
+            <trans-unit id="75">
+                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
+                <target>Изображението е квадрат ({{ width }}x{{ height }}px). Такива изображения не са разрешени.</target>
+            </trans-unit>
+            <trans-unit id="76">
+                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
+                <target>Изображението е с пейзажна ориентация ({{ width }}x{{ height }}px). Изображения с такава ориентация не са разрешени.</target>
+            </trans-unit>
+            <trans-unit id="77">
+                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
+                <target>Изображението е с портретна ориентация ({{ width }}x{{ height }}px). Изображения с такава ориентация не са разрешени.</target>
+            </trans-unit>
+            <trans-unit id="78">
+                <source>An empty file is not allowed.</source>
+                <target>Празни файлове не са разрешени.</target>
+            </trans-unit>
+            <trans-unit id="79">
+                <source>The host could not be resolved.</source>
+                <target>Хостът е недостъпен.</target>
+            </trans-unit>
+            <trans-unit id="80">
+                <source>This value does not match the expected {{ charset }} charset.</source>
+                <target>Стойността не съвпада с {{ charset }}.</target>
+            </trans-unit>
+            <trans-unit id="81">
+                <source>This is not a valid Business Identifier Code (BIC).</source>
+                <target>Невалиден бизнес идентификационен код (BIC).</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -339,6 +339,7 @@ private function getCurrentLineIndentation()
     private function getNextEmbedBlock($indentation = null, $inSequence = false)
     {
         $oldLineIndentation = $this->getCurrentLineIndentation();
+        $insideBlockScalar = $this->isBlockScalarHeader();
 
         if (!$this->moveToNextLine()) {
             return;
@@ -375,17 +376,21 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
 
         $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
 
-        // Comments must not be removed inside a block scalar
-        $removeCommentsPattern = '~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~';
-        $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
+        if (!$insideBlockScalar) {
+            $insideBlockScalar = $this->isBlockScalarHeader();
+        }
+
+        $previousLineIndentation = $this->getCurrentLineIndentation();
 
         while ($this->moveToNextLine()) {
             $indent = $this->getCurrentLineIndentation();
 
-            if ($indent === $newIndent) {
-                $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
+            if (!$insideBlockScalar && $indent === $previousLineIndentation) {
+                $insideBlockScalar = $this->isBlockScalarHeader();
             }
 
+            $previousLineIndentation = $indent;
+
             if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
                 $this->moveToPreviousLine();
                 break;
@@ -396,7 +401,8 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
                 continue;
             }
 
-            if ($removeComments && $this->isCurrentLineComment()) {
+            // we ignore "comment" lines only when we are not inside a scalar block
+            if (!$insideBlockScalar && $this->isCurrentLineComment()) {
                 continue;
             }
 
@@ -709,4 +715,14 @@ private function isStringUnIndentedCollectionItem()
     {
         return 0 === strpos($this->currentLine, '- ');
     }
+
+    /**
+     * Tests whether or not the current line is the header of a block scalar.
+     *
+     * @return bool
+     */
+    private function isBlockScalarHeader()
+    {
+        return (bool) preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine);
+    }
 }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php

Original file line number	Diff line number	Diff line change
`@@ -631,6 +631,8 @@ public function asXml($namespace = null, $asDom = false)`
`631`	`631`	`*/`
`632`	`632`	`public function renderException($e, $output)`
`633`	`633`	`{`
	`634`	`+ $output->writeln('', OutputInterface::VERBOSITY_QUIET);`
	`635`	`+`
`634`	`636`	`do {`
`635`	`637`	`$title = sprintf(' [%s] ', get_class($e));`
`636`	`638`
`@@ -653,15 +655,14 @@ public function renderException($e, $output)`
`653`	`655`	`}`
`654`	`656`	`}`
`655`	`657`
`656`		`- $messages = array('', '');`
	`658`	`+ $messages = array();`
`657`	`659`	`$messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));`
`658`	`660`	`$messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title)))));`
`659`	`661`	`foreach ($lines as $line) {`
`660`	`662`	`$messages[] = $formatter->format(sprintf('<error> %s %s</error>', $line[0], str_repeat(' ', $len - $line[1])));`
`661`	`663`	`}`
`662`	`664`	`$messages[] = $emptyLine;`
`663`	`665`	`$messages[] = '';`
`664`		`- $messages[] = '';`
`665`	`666`
`666`	`667`	`$output->writeln($messages, OutputInterface::OUTPUT_RAW);`
`667`	`668`
`@@ -688,14 +689,12 @@ public function renderException($e, $output)`
`688`	`689`	`}`
`689`	`690`
`690`	`691`	`$output->writeln('');`
`691`		`- $output->writeln('');`
`692`	`692`	`}`
`693`	`693`	`} while ($e = $e->getPrevious());`
`694`	`694`
`695`	`695`	`if (null !== $this->runningCommand) {`
`696`	`696`	`$output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())));`
`697`	`697`	`$output->writeln('');`
`698`		`- $output->writeln('');`
`699`	`698`	`}`
`700`	`699`	`}`
`701`	`700`
-Original file line number
+Diff line change
@@ @@ -1,8 +1,6 @@ @@
+-
   [InvalidArgumentException]
   Command "foo" is not defined.
+-
-Original file line number
+Diff line change
@@ @@ -1,27 +1,18 @@ @@
+-
 [37;41m                           [39;49m
 [37;41m  [Exception]              [39;49m
 [37;41m  Third exception [39;49m[34;41mcomment[39;49m[37;41m  [39;49m
 [37;41m                           [39;49m
+-
+-
+-
 [37;41m                            [39;49m
 [37;41m  [Exception]               [39;49m
 [37;41m  Second exception [39;49m[33mcomment[39m[37;41m  [39;49m
 [37;41m                            [39;49m
+-
+-
+-
 [37;41m                                       [39;49m
 [37;41m  [Exception]                          [39;49m
 [37;41m  First exception [39;49m[37;41m<p>[39;49m[37;41mthis is html[39;49m[37;41m</p>[39;49m[37;41m  [39;49m
 [37;41m                                       [39;49m
+-
 [32mfoo3:bar[39m
+-
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`28`	`28`	`{`
`29`	`29`	`if ($options['allow_add'] && $options['prototype']) {`
`30`	`30`	`$prototype = $builder->create($options['prototype_name'], $options['type'], array_replace(array(`
	`31`	`+ 'required' => $options['required'],`
`31`	`32`	`'label' => $options['prototype_name'].'label__',`
`32`	`33`	`), $options['options']));`
`33`	`34`	`$builder->setAttribute('prototype', $prototype->getForm());`