Skip to content

Commit d1230dc

Browse files
Merge branch '7.4' into 8.0
* 7.4: (28 commits) [Console] Rename `#[Input]` to `#[MapInput]` [FrameworkBundle] Fix support of dumping workflow when workflow is decorated by TraceableWorkflow [JsonStreamer] Fix documentation link in README [Meta] Better exception when symfony link cannot read a JSON [Form] Add new `active_at`, `not_active_at` and `legal_tender` options to `CurrencyType` [Intl] Support time in generated data in currencies validity [Validator] Improve and complete Japanese translations [HtmlSanitizer] Remove redundant assignment to promoted property $config in constructor [Validator] Fix Polish translation for word count validation message [DependencyInjection][Routing] Deprecate XML configuration format [Validator] Review and fix Czech translation [DependencyInjection][Routing] Handle declaring services and routes using PHP arrays that follow the same shape as corresponding yaml files [Mailer][MailJet] Fix forbidden headers case-sensitive comparison [DependencyInjection][Config][Routing] Deprecate using `$this` or the internal scope of the loader from PHP config files [Config] Add array-shapes to generated config builders [DependencyInjection] Handle returning arrays and config-builders from config files [WebProfilerBundle] Simplify toolbar CSS do not use deprecated PHPUnit features replace PHPUnit annotation with attribute [Serializer] xml empty array encoding ...
2 parents e2bd257 + 49e275b commit d1230dc

File tree

11 files changed

+23
-18
lines changed

11 files changed

+23
-18
lines changed

Tests/DependencyInjection/Fixtures/php/argon2i_hasher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$this->load('container1.php');
3+
$loader->load('container1.php');
44

55
$container->loadFromExtension('security', [
66
'password_hashers' => [

Tests/DependencyInjection/Fixtures/php/bcrypt_hasher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$this->load('container1.php');
3+
$loader->load('container1.php');
44

55
$container->loadFromExtension('security', [
66
'password_hashers' => [

Tests/DependencyInjection/Fixtures/php/merge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$this->load('merge_import.php');
3+
$loader->load('merge_import.php');
44

55
$container->loadFromExtension('security', [
66
'providers' => [

Tests/DependencyInjection/Fixtures/php/migrating_hasher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$this->load('container1.php');
3+
$loader->load('container1.php');
44

55
$container->loadFromExtension('security', [
66
'password_hashers' => [

Tests/DependencyInjection/Fixtures/php/sodium_hasher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$this->load('container1.php');
3+
$loader->load('container1.php');
44

55
$container->loadFromExtension('security', [
66
'password_hashers' => [

Tests/DependencyInjection/XmlCompleteConfigurationTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection;
1313

14+
use PHPUnit\Framework\Attributes\Group;
15+
use PHPUnit\Framework\Attributes\IgnoreDeprecations;
1416
use Symfony\Component\Config\FileLocator;
1517
use Symfony\Component\DependencyInjection\ContainerBuilder;
1618
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
1719

20+
#[IgnoreDeprecations]
21+
#[Group('legacy')]
1822
class XmlCompleteConfigurationTest extends CompleteConfigurationTestCase
1923
{
2024
public function testFirewallPatterns()

Tests/DependencyInjection/XmlCustomAuthenticatorTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@
1212
namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection;
1313

1414
use PHPUnit\Framework\Attributes\DataProvider;
15+
use PHPUnit\Framework\Attributes\Group;
16+
use PHPUnit\Framework\Attributes\IgnoreDeprecations;
1517
use PHPUnit\Framework\TestCase;
1618
use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
1719
use Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Fixtures\Authenticator\CustomAuthenticator;
1820
use Symfony\Component\Config\FileLocator;
1921
use Symfony\Component\DependencyInjection\ContainerBuilder;
2022
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
2123

24+
#[IgnoreDeprecations]
25+
#[Group('legacy')]
2226
class XmlCustomAuthenticatorTest extends TestCase
2327
{
2428
#[DataProvider('provideXmlConfigurationFile')]

Tests/DependencyInjection/XmlCustomProviderTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@
1212
namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection;
1313

1414
use PHPUnit\Framework\Attributes\DataProvider;
15+
use PHPUnit\Framework\Attributes\Group;
16+
use PHPUnit\Framework\Attributes\IgnoreDeprecations;
1517
use PHPUnit\Framework\TestCase;
1618
use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
1719
use Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Fixtures\UserProvider\CustomProvider;
1820
use Symfony\Component\Config\FileLocator;
1921
use Symfony\Component\DependencyInjection\ContainerBuilder;
2022
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
2123

24+
#[IgnoreDeprecations]
25+
#[Group('legacy')]
2226
class XmlCustomProviderTest extends TestCase
2327
{
2428
#[DataProvider('provideXmlConfigurationFile')]

Tests/Functional/Bundle/FirewallEntryPointBundle/DependencyInjection/FirewallEntryPointExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
use Symfony\Component\Config\FileLocator;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Component\DependencyInjection\Extension\Extension;
17-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
17+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
1818

1919
class FirewallEntryPointExtension extends Extension
2020
{
2121
public function load(array $configs, ContainerBuilder $container): void
2222
{
23-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
24-
$loader->load('services.xml');
23+
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
24+
$loader->load('services.yml');
2525
}
2626
}

Tests/Functional/Bundle/FirewallEntryPointBundle/Resources/config/services.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)