Skip to content

Commit 026499e

Browse files
committed
Merge branch '3.1'
* 3.1: [CS] Respect PSR2 4.2 [Form] fix `empty_data` option in expanded `ChoiceType` [Console] removed unneeded private methods updated Http-Kernel dependency [Security] [Guard] Improve comment with working example sync min email validator version [TwigBridge] Fix inconsistency in LintCommand help explicitly forbid e-mail validator 2.0 or higher Fixed SymfonyQuestionHelper multi-choice with defaults [DoctrineBridge] Don't use object IDs in DoctrineChoiceLoader when passing a value closure Differentiate between the first time a progress bar is displayed and subsequent times finished previous commit No more exception for malformed input name fix post_max_size_message translation [Process] Fix pipes cleaning on Windows Avoid phpunit 5.4 warnings on getMock [Form] Add exception to FormRenderer about non-unique block names [FrameworkBundle] templating can be fully disabled [Form] Consider a violation even if the form is not submitted
2 parents 678ec7e + c402383 commit 026499e

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Tests/ContainerTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,9 @@ public function testThatCloningIsNotSupported()
310310

311311
class ProjectServiceContainer extends Container
312312
{
313-
public $__bar, $__foo_bar, $__foo_baz;
313+
public $__bar;
314+
public $__foo_bar;
315+
public $__foo_baz;
314316

315317
public function __construct()
316318
{

Tests/Fixtures/includes/foo.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
class FooClass
66
{
7-
public $foo, $moo;
8-
9-
public $bar = null, $initialized = false, $configured = false, $called = false, $arguments = array();
7+
public $foo;
8+
public $moo;
9+
10+
public $bar = null;
11+
public $initialized = false;
12+
public $configured = false;
13+
public $called = false;
14+
public $arguments = array();
1015

1116
public function __construct($arguments = array())
1217
{

0 commit comments

Comments
 (0)