Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bfdd905

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.1'
* 3.1: [PropertyAccess] Fix for PHP 7.0.7 [Yaml] search for colons in strings only bumped Symfony version to 3.1.0 updated VERSION for 3.1.0-RC1 updated CHANGELOG for 3.1.0-RC1 fixed PHP 5.3 compat in tests
2 parents 4871079 + 8c65c0e commit bfdd905
Copy full SHA for bfdd905

File tree

Expand file treeCollapse file tree

5 files changed

+45
-5
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+45
-5
lines changed

‎CHANGELOG-3.1.md

Copy file name to clipboardExpand all lines: CHANGELOG-3.1.md
+21Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@ in 3.1 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.1.0...v3.1.1
99

10+
* 3.1.0-RC1 (2016-05-26)
11+
12+
* bug #18879 [Console] SymfonyStyle: Align multi-line/very-long-line blocks (chalasr)
13+
* bug #18881 [Security][Ldap] Fixed issue with password attribute containing an array of values. (csarrazi)
14+
* bug #18864 [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut (peterrehm)
15+
* bug #18883 Fix js comment in profiler (linnaea)
16+
* feature #18867 [Cache] Drop counting hit/miss in ProxyAdapter (nicolas-grekas)
17+
* bug #18837 [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called (dunglas)
18+
* bug #18838 [Serializer] ObjectNormalizer: add missing parameters (dunglas)
19+
* bug #18844 [Yaml] fix exception contexts (xabbuh)
20+
* bug #18840 [Yaml] properly handle unindented collections (xabbuh)
21+
* bug #18765 Catch \Throwable (fprochazka)
22+
* bug #18813 Catch \Throwable (fprochazka)
23+
* bug #18839 People - person singularization (Keeo)
24+
* bug #18820 [Config] Allow schemed paths in FileResource (nicolas-grekas)
25+
* bug #18828 [Yaml] chomp newlines only at the end of YAML documents (xabbuh)
26+
* bug #18814 Fixed server status command when port has been omitted (peterrehm)
27+
* bug #18759 [Validator] Support for DateTimeImmutable (krzysiekpiasecki)
28+
* bug #18799 Use levenshtein level for better Bundle matching (j0k3r)
29+
* bug #18413 [WebProfilerBundle] Fix CORS ajax security issues (romainneutron)
30+
1031
* 3.1.0-BETA1 (2016-05-13)
1132

1233
* feature #18725 [Ldap] Added the possibility to configure all available Ldap options for connection (csarrazi)

‎src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
//Ensure that all lines are aligned to the begin of the first line in a multi-line block
88
return function (InputInterface $input, OutputInterface $output) {
99
$output = new SymfonyStyleWithForcedLineLength($input, $output);
10-
$output->block(['Custom block', 'Second custom block line'], 'CUSTOM', 'fg=white;bg=green', 'X ', true);
10+
$output->block(array('Custom block', 'Second custom block line'), 'CUSTOM', 'fg=white;bg=green', 'X ', true);
1111
};

‎src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+9-3Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,9 @@ public function testSetValueThrowsNoExceptionIfIndexNotFoundAndIndexExceptionsEn
242242
*/
243243
public function testSetValueThrowsExceptionIfNotArrayAccess()
244244
{
245-
$this->propertyAccessor->setValue(new \stdClass(), '[index]', 'Updated');
245+
$object = new \stdClass();
246+
247+
$this->propertyAccessor->setValue($object, '[index]', 'Updated');
246248
}
247249

248250
public function testSetValueUpdatesMagicSet()
@@ -259,7 +261,9 @@ public function testSetValueUpdatesMagicSet()
259261
*/
260262
public function testSetValueThrowsExceptionIfThereAreMissingParameters()
261263
{
262-
$this->propertyAccessor->setValue(new TestClass('Bernhard'), 'publicAccessorWithMoreRequiredParameters', 'Updated');
264+
$object = new TestClass('Bernhard');
265+
266+
$this->propertyAccessor->setValue($object, 'publicAccessorWithMoreRequiredParameters', 'Updated');
263267
}
264268

265269
/**
@@ -527,7 +531,9 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)
527531
*/
528532
public function testThrowTypeError()
529533
{
530-
$this->propertyAccessor->setValue(new TypeHinted(), 'date', 'This is a string, \DateTime expected.');
534+
$object = new TypeHinted();
535+
536+
$this->propertyAccessor->setValue($object, 'date', 'This is a string, \DateTime expected.');
531537
}
532538

533539
public function testSetTypeHint()

‎src/Symfony/Component/Yaml/Parser.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Parser.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ private function parseValue($value, $flags, $context)
539539
try {
540540
$parsedValue = Inline::parse($value, $flags, $this->refs);
541541

542-
if ('mapping' === $context && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) {
542+
if ('mapping' === $context && is_string($parsedValue) && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) {
543543
throw new ParseException('A colon cannot be used in an unquoted mapping value.');
544544
}
545545

‎src/Symfony/Component/Yaml/Tests/ParserTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/ParserTest.php
+13Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,19 @@ public function getInvalidBinaryData()
12511251
),
12521252
);
12531253
}
1254+
1255+
public function testParseDateAsMappingValue()
1256+
{
1257+
$yaml = <<<EOT
1258+
date: 2002-12-14
1259+
EOT;
1260+
$expectedDate = new \DateTime();
1261+
$expectedDate->setTimeZone(new \DateTimeZone('UTC'));
1262+
$expectedDate->setDate(2002, 12, 14);
1263+
$expectedDate->setTime(0, 0, 0);
1264+
1265+
$this->assertEquals(array('date' => $expectedDate), $this->parser->parse($yaml, Yaml::PARSE_DATETIME));
1266+
}
12541267
}
12551268

12561269
class B

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.