8000 Merge branch '2.8' · symfony/symfony@924ac40 · GitHub
[go: up one dir, main page]
Skip to content

Commit 924ac40

Browse files
fabpotfabpot
committed
Merge branch '2.8'
* 2.8: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [Serializer] Fix ClassMetadata::sleep() [2.6] Static Code Analysis for Components and Bundles [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs [Serializer] Fix Groups tests. Remove duplicate example Remove var not used due to returning early (introduced in 8982c32) [Serializer] Fix Groups PHPDoc Enhance hhvm test skip message fix for legacy asset() with EmptyVersionStrategy [Form] Added upgrade notes for #15061
2 parents 5d4368a + f5fefef commit 924ac40

File tree

50 files changed

+312
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+312
-67
lines changed

‎UPGRADE-3.0.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,6 @@ UPGRADE FROM 2.x to 3.0
304304
echo $form->getErrors(true, false);
305305
```
306306

307-
```php
308-
echo $form->getErrors(true, false);
309-
```
310-
311307
### FrameworkBundle
312308

313309
* The `config:debug`, `container:debug`, `router:debug`, `translation:debug`

‎src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function testLogNonUtf8Array()
9191
'utf8' => 'foo',
9292
array(
9393
'nonutf8' => DbalLogger::BINARY_DATA_VALUE,
94-
)
94+
),
9595
)
9696
)
9797
;
@@ -100,7 +100,7 @@ public function testLogNonUtf8Array()
100100
'utf8' => 'foo',
101101
array(
102102
'nonutf8' => "\x7F\xFF",
103-
)
103+
),
104104
));
105105
}
106106

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "bootstrap_3_layout.html.twig" %}
1+
{% use "bootstrap_3_layout.html.twig" %}
22

33
{% block form_start -%}
44
{% set attr = attr|merge({class: (attr.class|default('') ~ ' form-horizontal')|trim}) %}

‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
121121
$extractor = $this->getContainer()->get('translation.extractor');
122122
$extractor->setPrefix($input->getOption('prefix'));
123123
foreach ($transPaths as $path) {
124-
$path = $path.'views';
124+
$path .= 'views';
125125
if (is_dir($path)) {
126126
$extractor->extract($path, $extractedCatalogue);
127127
}
@@ -132,7 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
132132
$output->text('Loading translation files');
133133
$loader = $this->getContainer()->get('translation.loader');
134134
foreach ($transPaths as $path) {
135-
$path = $path.'translations';
135+
$path .= 'translations';
136136
if (is_dir($path)) {
137137
$loader->loadMessages($path, $currentCatalogue);
138138
}
@@ -183,7 +183,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
183183

184184
$bundleTransPath = false;
185185
foreach ($transPaths as $path) {
186-
$path = $path.'translations';
186+
$path .= 'translations';
187187
if (is_dir($path)) {
188188
$bundleTransPath = $path;
189189
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
266266
$description[] = sprintf('<comment>Abstract</comment> %s', $definition->isAbstract() ? 'yes' : 'no');
267267

268268
if ($definition->getFile()) {
269-
$description[] = sprintf('<comment>Required File</comment> %s', $definition->getFile() ? $definition->getFile() : '-');
269+
$description[] = sprintf('<comment>Required File</comment> %s', $definition->getFile() ?: '-');
270270
}
271271

272272
if ($factory = $definition->getFactory()) {

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,22 +670,22 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
670670
if (class_exists('Symfony\Component\Validator\Validation')) {
671671
$r = new \ReflectionClass('Symfony\Component\Validator\Validation');
672672

673-
$dirs[] = dirname($r->getFilename()).'/Resources/translations';
673+
$dirs[] = dirname($r->getFileName()).'/Resources/translations';
674674
}
675675
if (class_exists('Symfony\Component\Form\Form')) {
676676
$r = new \ReflectionClass('Symfony\Component\Form\Form');
677677

678-
$dirs[] = dirname($r->getFilename()).'/Resources/translations';
678+
$dirs[] = dirname($r->getFileName()).'/Resources/translations';
679679
}
680680
if (class_exists('Symfony\Component\Security\Core\Exception\AuthenticationException')) {
681681
$r = new \ReflectionClass('Symfony\Component\Security\Core\Exception\AuthenticationException');
682682

683-
$dirs[] = dirname($r->getFilename()).'/../Resources/translations';
683+
$dirs[] = dirname($r->getFileName()).'/../Resources/translations';
684684
}
685685
$overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
686686
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
687687
$reflection = new \ReflectionClass($class);
688-
if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/translations')) {
688+
if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) {
689689
$dirs[] = $dir;
690690
}
691691
if (is_dir($dir = sprintf($overridePath, $bundle))) {
@@ -807,7 +807,7 @@ private function getValidatorMappingFiles(ContainerBuilder $container)
807807
$bundles = $container->getParameter('kernel.bundles');
808808
foreach ($bundles as $bundle) {
809809
$reflection = new \ReflectionClass($bundle);
810-
$dirname = dirname($reflection->getFilename());
810+
$dirname = dirname($reflection->getFileName());
811811

812812
if (is_file($file = $dirname.'/Resources/config/validation.xml')) {
813813
$files[0][] = realpath($file);
@@ -827,7 +827,15 @@ private function getValidatorMappingFiles(ContainerBuilder $container)
827827
$files[1][] = $file->getRealpath();
828828
}
829829

830+
<<<<<<< HEAD
830831
$container->addResource(new DirectoryResource($dir));
832+
=======
833+
foreach ($container->getParameter('kernel.bundles') as $bundle) {
834+
$reflection = new \ReflectionClass($bundle);
835+
if (is_file($file = dirname($reflection->getFileName()).'/Resources/config/validation.yml')) {
836+
$files[] = realpath($file);
837+
$container->addResource(new FileResource($file));
838+
>>>>>>> 2.6
831839
}
832840
}
833841

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected function setUp()
2424
{
2525
$this->fs = new Filesystem();
2626
$this->kernel = new TestAppKernel('test', true);
27-
$this->rootDir = sys_get_temp_dir().DIRECTORY_SEPARATOR.uniqid('sf2_cache_');
27+
$this->rootDir = sys_get_temp_dir().DIRECTORY_SEPARATOR.uniqid('sf2_cache_', true);
2828
$this->kernel->setRootDir($this->rootDir);
2929
$this->fs->mkdir($this->rootDir);
3030
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function testDebugInvalidDirectory()
9595
protected function setUp()
9696
{
9797
$this->fs = new Filesystem();
98-
$this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation');
98+
$this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
9999
$this->fs->mkdir($this->translationDir.'/Resources/translations');
100100
$this->fs->mkdir($this->translationDir.'/Resources/views');
101101
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function getDescribeContainerParameterTestData()
9898
{
9999
$data = $this->getDescriptionTestData(ObjectsProvider::getContainerParameter());
100100

101-
array_push($data[0], array('parameter' => 'database_name'));
101+
$data[0][] = array('parameter' => 'database_name');
102102

103103
return $data;
104104
}

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
162162
->cannotBeOverwritten()
163163
->prototype('array')
164164
->fixXmlConfig('ip')
165+
->fixXmlConfig('method')
165166
->children()
166167
->scalarNode('requires_channel')->defaultNull()->end()
167168
->scalarNode('path')
@@ -300,7 +301,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
300301
})
301302
->end()
302303
->children()
303-
->scalarNode('secret')->defaultValue(uniqid())->end()
304+
->scalarNode('secret')->defaultValue(uniqid('', true))->end()
304305
->end()
305306
->end()
306307
->arrayNode('switch_user')

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function addConfiguration(NodeDefinition $node)
5454
->useAttributeAsKey('name')
5555
->prototype('array')
5656
->children()
57-
->scalarNode('password')->defaultValue(uniqid())->end()
57+
->scalarNode('password')->defaultValue(uniqid('', true))->end()
5858
->arrayNode('roles')
5959
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
6060
->prototype('scalar')->end()

‎src/Symfony/Bundle/TwigBundle/Command/DebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
1717

1818
/**
19-
* Lists twig functions, filters, globals and tests present in the current project
19+
* Lists twig functions, filters, globals and tests present in the current project.
2020
*
2121
* @author Jordi Boggiano <j.boggiano@seld.be>
2222
*/

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function load(array $configs, ContainerBuilder $container)
8888
$container->addResource(new FileExistenceResource($dir));
8989

9090
$reflection = new \ReflectionClass($class);
91-
$dir = dirname($reflection->getFilename()).'/Resources/views';
91+
$dir = dirname($reflection->getFileName()).'/Resources/views';
9292
if (is_dir($dir)) {
9393
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
9494
}

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,8 @@ public function testTwigLoaderPaths($format)
154154
$def = $container->getDefinition('twig.loader.filesystem');
155155
$paths = array();
156156
foreach ($def->getMethodCalls() as $call) {
157-
if ('addPath' === $call[0]) {
158-
if (false === strpos($call[1][0], 'Form')) {
159-
$paths[] = $call[1];
160-
}
157+
if ('addPath' === $call[0] && false === strpos($call[1][0], 'Form')) {
158+
$paths[] = $call[1];
161159
}
162160
}
163161

‎src/Symfony/Component/BrowserKit/Cookie.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ public function __construct($name, $value, $expires = null, $path = null, $domai
8282

8383
$this->expires = $timestampAsDateTime->getTimestamp();
8484
}
85-
8685
}
8786

8887
/**

‎src/Symfony/Component/Config/Util/XmlUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public static function phpize($value)
196196
return '0' == $value[0] ? octdec($value) : (((string) $raw === (string) $cast) ? $cast : $raw);
197197
case isset($value[1]) && '-' === $value[0] && ctype_digit(substr($value, 1)):
198198
$raw = $value;
199-
$cast = intval($value);
199+
$cast = (int) $value;
200200

201201
return '0' == $value[1] ? octdec($value) : (((string) $raw === (string) $cast) ? $cast : $raw);
202202
case 'true' === $lowercaseValue:

‎src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
2929
'magenta' => array('set' => 35, 'unset' => 39),
3030
'cyan' => array('set' => 36, 'unset' => 39),
3131
'white' => array('set' => 37, 'unset' => 39),
32+
'default' => array('set' => 39, 'unset' => 39),
3233
);
3334
private static $availableBackgroundColors = array(
3435
'black' => array('set' => 40, 'unset' => 49),
@@ -39,6 +40,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
3940
'magenta' => array('set' => 45, 'unset' => 49),
4041
'cyan' => array('set' => 46, 'unset' => 49),
4142
'white' => array('set' => 47, 'unset' => 49),
43+
'default' => array('set' => 49, 'unset' => 49),
4244
);
4345
private static $availableOptions = array(
4446
'bold' => array('set' => 1, 'unset' => 22),

‎src/Symfony/Component/Console/Helper/DebugFormatterHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
class DebugFormatterHelper extends Helper
2222
{
23-
private $colors = array('black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white');
23+
private $colors = array('black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default');
2424
private $started = array();
2525
private $count = -1;
2626

‎src/Symfony/Component/Console/Helper/ProgressBar.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ public function advance($step = 1)
342342
}
343343

344344
/**
345-
* Sets whether to overwrite the progressbar, false for new line
345+
* Sets whether to overwrite the progressbar, false for new line.
346346
*
347347
* @param bool $overwrite
348348
*/
@@ -369,8 +369,8 @@ public function setProgress($step)
369369
$this->max = $step;
370370
}
371371

372-
$prevPeriod = intval($this->step / $this->redrawFreq);
373-
$currPeriod = intval($step / $this->redrawFreq);
372+
$prevPeriod = (int) ($this->step / $this->redrawFreq);
373+
$currPeriod = (int) ($step / $this->redrawFreq);
374374
$this->step = $step;
375375
$this->percent = $this->max ? (float) $this->step / $this->max : 0;
376376
if ($prevPeriod !== $currPeriod || $this->max === $step) {

‎src/Symfony/Component/Console/Question/ChoiceQuestion.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ private function getDefaultValidator()
161161
if (false === $result) {
162162
throw new \InvalidArgumentException(sprintf($errorMessage, $value));
163163
}
164-
array_push($multiselectChoices, (string) $result);
164+
165+
$multiselectChoices[] = $choices[(string) $result];
165166
}
166167

167168
if ($multiselect) {

‎src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public function testForeground()
3737
$style->setForeground('blue');
3838
$this->assertEquals("\033[34mfoo\033[39m", $style->apply('foo'));
3939

40+
$style->setForeground('default');
41+
$this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo'));
42+
4043
$this->setExpectedException('InvalidArgumentException');
4144
$style->setForeground('undefined-color');
4245
}
@@ -51,6 +54,9 @@ public function testBackground()
5154
$style->setBackground('yellow');
5255
$this->assertEquals("\033[43mfoo\033[49m", $style->apply('foo'));
5356

57+
$style->setBackground('default');
58+
$this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo'));
59+
5460
$this->setExpectedException('InvalidArgumentException');
5561
$style->setBackground('undefined-color');
5662
}

‎src/Symfony/Component/Debug/DebugClassLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public function loadClass($class)
195195
}
196196
if (self::$caseCheck && preg_match('#([/\\\\][a-zA-Z_\x7F-\xFF][a-zA-Z0-9_\x7F-\xFF]*)+\.(php|hh)$#D', $file, $tail)) {
197197
$tail = $tail[0];
198-
$real = $refl->getFilename();
198+
$real = $refl->getFileName();
199199

200200
if (2 === self::$caseCheck) {
201201
// realpath() on MacOSX doesn't normalize the case of characters

‎src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
112112
restore_exception_handler();
113113
$this->assertStringStartsWith(__FILE__, $exception->getFile());
114114
if (PHP_VERSION_ID < 70000) {
115-
$this->assertRegexp('/^Runtime Notice: Declaration/', $exception->getMessage());
115+
$this->assertRegExp('/^Runtime Notice: Declaration/', $exception->getMessage());
116116
$this->assertEquals(E_STRICT, $exception->getSeverity());
117117
} else {
118-
$this->assertRegexp('/^Warning: Declaration/', $exception->getMessage());
118+
$this->assertRegExp('/^Warning: Declaration/', $exception->getMessage());
119119
$this->assertEquals(E_WARNING, $exception->getSeverity());
120120
}
121121
} catch (\Exception $exception) {

‎src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testNotice()
7777

7878
$this->assertEquals(E_NOTICE, $exception->getSeverity());
7979
$this->assertEquals(__FILE__, $exception->getFile());
80-
$this->assertRegexp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
80+
$this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
8181
$this->assertArrayHasKey('foobar', $exception->getContext());
8282

8383
$trace = $exception->getTrace();

‎src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader
6060
array_map('spl_autoload_register', $autoloaders);
6161
}
6262

63-
$this->assertInstanceof('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
63+
$this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
6464
$this->assertSame($translatedMessage, $exception->getMessage());
6565
$this->assertSame($error['type'], $exception->getSeverity());
6666
$this->assertSame($error['file'], $exception->getFile());
@@ -173,6 +173,6 @@ public function testCannotRedeclareClass()
173173
$handler = new ClassNotFoundFatalErrorHandler();
174174
$exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
175175

176-
$this->assertInstanceof('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
176+
$this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
177177
}
178178
}

‎src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function testUndefinedFunction($error, $translatedMessage)
2424
$handler = new UndefinedFunctionFatalErrorHandler();
2525
$exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
2626

27-
$this->assertInstanceof('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
27+
$this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
2828
// class names are case insensitive and PHP/HHVM do not return the same
2929
$this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage()));
3030
$this->assertSame($error['type'], $exception->getSeverity());

‎src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php

Lines changed: 1 addition & 1 d 10000 eletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function testUndefinedMethod($error, $translatedMessage)
2424
$handler = new UndefinedMethodFatalErrorHandler();
2525
$exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
2626

27-
$this->assertInstanceof('Symfony\Component\Debug\Exception\UndefinedMethodException', $exception);
27+
$this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedMethodException', $exception);
2828
$this->assertSame($translatedMessage, $exception->getMessage());
2929
$this->assertSame($error['type'], $exception->getSeverity());
3030
$this->assertSame($error['file'], $exception->getFile());

‎src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,14 @@ public function set($name, $value)
6969
{
7070
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
7171
}
72+
73+
/**
74+
* {@inheritdoc}
75+
*
76+
* @api
77+
*/
78+
public function remove($name)
79+
{
80+
throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
81+
}
7282
}

‎src/Symfony/Component/DomCrawler/Tests/FormTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,6 @@ public function testFormRegistrySetValueOnCompoundField()
825825
*/
826826
public function testFormRegistrySetArrayOnNotCompoundField()
827827
{
828-
829828
$registry = new FormFieldRegistry();
830829
$registry->add($this->getFormFieldMock('bar'));
831830

0 commit comments

Comments
 (0)
0