Skip to content

Commit 8e5692c

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix wrong namespaces [Validator] Fixed calling getters before resolving groups [HttpKernel][LoggerDataCollector] Prevent keys collisions in the sanitized logs processing
2 parents 80cdda8 + e481189 commit 8e5692c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php

Lines 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 Symfony\Bundle\FrameworkBundle\Tests;
12+
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\CustomPathBundle;
1313

1414
use Symfony\Component\HttpKernel\Bundle\Bundle;
1515

Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php

Lines 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 Symfony\Bundle\FrameworkBundle\Tests;
12+
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\TestBundle;
1313

1414
use Symfony\Component\HttpKernel\Bundle\Bundle;
1515

0 commit comments

Comments
 (0)