Skip to content

Commit 85ff9b2

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: Detect Mintty for color support on Windows Add a group for tests of the finder against the FTP server Fix license headers Forbid serializing a Crawler Fix phpdoc block of NativeSessionStorage class Added exception when setAutoInitialize is called when locked [FrameworkBundle] Advanced search templates of bundles [Security] Allow user providers to be defined in many files Use random_bytes function if it is available for random number generation
2 parents 5962e4d + 83cd1c1 commit 85ff9b2

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

FormConfigBuilder.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,10 @@ public function setRequestHandler(RequestHandlerInterface $requestHandler)
854854
*/
855855
public function setAutoInitialize($initialize)
856856
{
857+
if ($this->locked) {
858+
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
859+
}
860+
857861
$this->autoInitialize = (bool) $initialize;
858862

859863
return $this;

Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of the Symfony package.
55
*
6-
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
6+
* (c) Fabien Potencier <[email protected]>
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.

Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of the Symfony package.
55
*
6-
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
6+
* (c) Fabien Potencier <[email protected]>
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.

Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of the Symfony package.
55
*
6-
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
6+
* (c) Fabien Potencier <[email protected]>
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.

Tests/Extension/Core/Type/TypeTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of the Symfony package.
55
*
6-
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
6+
* (c) Fabien Potencier <[email protected]>
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.

Tests/Extension/Validator/Type/TypeTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of the Symfony package.
55
*
6-
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
6+
* (c) Fabien Potencier <[email protected]>
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.

Tests/Extension/Validator/ValidatorTypeGuesserTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

33
/*
4-
* This file is part of the Symfony package.
5-
*
6-
* (c) Fabien Potencier <[email protected]>
7-
*
8-
* For the full copyright and license information, please view the LICENSE
9-
* file that was distributed with this source code.
10-
*/
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Validator;
1313

0 commit comments

Comments
 (0)