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 44b573f

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.0
* 3.4: [HttpFoundation] update phpdoc of FlashBagInterface::add() [ProxyManagerBridge] Fix support of private services (bis) bug #27701 [SecurityBundle] Dont throw if "security.http_utils" is not found (nicolas-grekas) [Form] relax fixtures for forward compat [Validator] Fix the namespace of RegexTest [Lock] fix locale dependent test case
2 parents 9aecd2b + 493ce7a commit 44b573f
Copy full SHA for 44b573f

File tree

9 files changed

+22
-9
lines changed
Filter options

9 files changed

+22
-9
lines changed

‎src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
5454
$instantiation = 'return';
5555

5656
if ($definition->isShared()) {
57-
$instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', $id);
57+
$instantiation .= sprintf(' $this->%s[\'%s\'] =', \method_exists(ContainerBuilder::class, 'addClassResource') || ($definition->isPublic() && !$definition->isPrivate()) ? 'services' : 'privates', $id);
5858
}
5959

6060
if (null === $factoryCode) {

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
16+
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Definition;
1718

1819
/**
@@ -98,7 +99,7 @@ public function getPrivatePublicDefinitions()
9899
array(
99100
(new Definition(__CLASS__))
100101
->setPublic(false),
101-
'privates',
102+
\method_exists(ContainerBuilder::class, 'addClassResource') ? 'services' : 'privates',
102103
),
103104
array(
104105
(new Definition(__CLASS__))

‎src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain
1515
---------------- --------------------%s
1616
Allowed values - %s
1717
---------------- --------------------%s
18-
Normalizer Closure { %s
18+
Normalizer Closure%s{ %s
1919
parameters: 2 %s
2020
file: "%s%eExtension%eCore%eType%eChoiceType.php"
2121
line: "%s to %s" %s

‎src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
88
Default Value: null %s
99
%s
1010
Closure(s): [ %s
11-
Closure { %s
11+
Closure%s{ %s
1212
parameters: 1 %s
1313
file: "%s%eExtension%eCore%eType%eFormType.php"
1414
line: "%s to %s" %s
1515
}, %s
16-
Closure { %s
16+
Closure%s{ %s
1717
parameters: 2 %s
1818
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"
1919
line: "%s to %s" %s

‎src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo)
1616
"baz" %s
1717
] %s
1818
---------------- --------------------%s
19-
Normalizer Closure { %s
19+
Normalizer Closure%s{ %s
2020
parameters: 2 %s
2121
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"
2222
line: "%s to %s" %s

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ interface FlashBagInterface extends SessionBagInterface
2424
* Adds a flash message for type.
2525
*
2626
* @param string $type
27-
* @param string $message
27+
* @param mixed $message
2828
*/
2929
public function add($type, $message);
3030

‎src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@ public function testPeek()
7474
$this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
7575
}
7676

77+
public function testAdd()
78+
{
79+
$tab = array('bar' => 'baz');
80+
$this->bag->add('string_message', 'lorem');
81+
$this->bag->add('object_message', new \stdClass());
82+
$this->bag->add('array_message', $tab);
83+
84+
$this->assertEquals(array('lorem'), $this->bag->get('string_message'));
85+
$this->assertEquals(array(new \stdClass()), $this->bag->get('object_message'));
86+
$this->assertEquals(array($tab), $this->bag->get('array_message'));
87+
}
88+
7789
public function testGet()
7890
{
7991
$this->assertEquals(array(), $this->bag->get('non_existing'));

‎src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testResourceRemoval()
4646

4747
private function getOpenedSemaphores()
4848
{
49-
$lines = explode(PHP_EOL, trim(`ipcs -su`));
49+
$lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
5050
if ('------ Semaphore Status --------' !== $lines[0]) {
5151
throw new \Exception('Failed to extract list of opend semaphores. Expect a Semaphore status, got '.implode(PHP_EOL, $lines));
5252
}

‎src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Constraints;
12+
namespace Symfony\Component\Validator\Tests\Constraints;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Validator\Constraints\Regex;

0 commit comments

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