Skip to content

Commit 0218507

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.4
* 2.8: Fix CS Allow reuse of Session between requests Provide debug_backtrace with proper args forward false label option to nested types forward the invalid_message option in date types
2 parents 31e96f7 + 76c2de0 commit 0218507

File tree

16 files changed

+179
-128
lines changed

16 files changed

+179
-128
lines changed

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public static function register($mode = 0)
112112
return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
113113
}
114114

115-
$trace = debug_backtrace(true);
115+
$trace = debug_backtrace();
116116
$group = 'other';
117117
$isVendor = DeprecationErrorHandler::MODE_WEAK_VENDORS === $mode && $inVendors($file);
118118

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ public function testFirewalls()
173173
null,
174174
null,
175175
array(
176-
'simple_form',
177-
'anonymous',
176+
'simple_form',
177+
'anonymous',
178178
),
179179
null,
180180
),

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public function provideUndefinedMethodData()
6464
),
6565
array(
6666
array(
67-
'type' => 1,
68-
'message' => 'Call to undefined method class@anonymous::test()',
69-
'file' => '/home/possum/work/symfony/test.php',
70-
'line' => 11,
67+
'type' => 1,
68+
'message' => 'Call to undefined method class@anonymous::test()',
69+
'file' => '/home/possum/work/symfony/test.php',
70+
'line' => 11,
7171
),
7272
'Attempted to call an undefined method named "test" of class "class@anonymous".',
7373
),

‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ public function testResolvedBase64EnvParameters()
390390
$container->compile(true);
391391

392392
$expected = array(
393-
'env(foo)' => 'd29ybGQ=',
394-
'hello' => 'world',
393+
'env(foo)' => 'd29ybGQ=',
394+
'hello' => 'world',
395395
);
396396
$this->assertSame($expected, $container->getParameterBag()->all());
397397
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -948,12 +948,12 @@ public function testgetPhpValuesWithEmptyTextarea()
948948
{
949949
$dom = new \DOMDocument();
950950
$dom->loadHTML('
951-
<html>
952-
<form>
953-
<textarea name="example"></textarea>
954-
</form>
955-
</html>
956-
');
951+
<html>
952+
<form>
953+
<textarea name="example"></textarea>
954+
</form>
955+
</html>'
956+
);
957957

958958
$nodes = $dom->getElementsByTagName('form');
959959
$form = new Form($nodes->item(0), 'http://example.com');

‎src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ public function __construct($param)
2929
parent::__construct($param);
3030
} elseif (\is_array($param)) {
3131
$defaults = array(
32-
'name' => 'file.txt',
33-
'contents' => null,
34-
'mode' => null,
35-
'type' => null,
36-
'relativePath' => null,
37-
'relativePathname' => null,
32+
'name' => 'file.txt',
33+
'contents' => null,
34+
'mode' => null,
35+
'type' => null,
36+
'relativePath' => null,
37+
'relativePathname' => null,
3838
);
3939
$defaults = array_merge($defaults, $param);
4040
parent::__construct($defaults['name']);

‎src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
119119
'invalid_message_parameters',
120120
)));
121121

122+
if (false === $options['label']) {
123+
$dateOptions['label'] = false;
124+
$timeOptions['label'] = false;
125+
}
126+
122127
if (null !== $options['date_widget']) {
123128
$dateOptions['widget'] = $options['date_widget'];
124129
}

‎src/Symfony/Component/Form/Extension/Core/Type/DateType.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
7777
'error_bubbling' => true,
7878
);
7979

80+
if (isset($options['invalid_message'])) {
81+
$dayOptions['invalid_message'] = $options['invalid_message'];
82+
$monthOptions['invalid_message'] = $options['invalid_message'];
83+
$yearOptions['invalid_message'] = $options['invalid_message'];
84+
}
85+
86+
if (isset($options['invalid_message_parameters'])) {
87+
$dayOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
88+
$monthOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
89+
$yearOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
90+
}
91+
8092
$formatter = new \IntlDateFormatter(
8193
\Locale::getDefault(),
8294
$dateFormat,

‎src/Symfony/Component/Form/Extension/Core/Type/TimeType.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
7272
'error_bubbling' => true,
7373
);
7474

75+
if (isset($options['invalid_message'])) {
76+
$hourOptions['invalid_message'] = $options['invalid_message'];
77+
$minuteOptions['invalid_message'] = $options['invalid_message'];
78+
$secondOptions['invalid_message'] = $options['invalid_message'];
79+
}
80+
81+
if (isset($options['invalid_message_parameters'])) {
82+
$hourOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
83+
$minuteOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
84+
$secondOptions['invalid_message_parameters'] = $options['invalid_message_parameters'];
85+
}
86+
7587
if ('choice' === $options['widget']) {
7688
$hours = $minutes = array();
7789

‎src/Symfony/Component/HttpFoundation/Session/Session.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ public function getId()
209209
*/
210210
public function setId($id)
211211
{
212-
$this->storage->setId($id);
212+
if ($this->storage->getId() !== $id) {
213+
$this->storage->setId($id);
214+
}
213215
}
214216

215217
/**

0 commit comments

Comments
 (0)