diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DependencyInjection] Improve missing package/version deprecation

Browse Source
This commit is contained in:
Jeroen Thora 2020-05-31 13:14:43 +02:00
parent 2af156d6fe
commit f603317363
No known key found for this signature in database
GPG Key ID: 6875186A15599DA9
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
View File

@ -205,11 +205,11 @@ class XmlFileLoader extends FileLoader
$version = $deprecated[0]->getAttribute('version') ?: ''; $version = $deprecated[0]->getAttribute('version') ?: '';
if (!$deprecated[0]->hasAttribute('package')) { if (!$deprecated[0]->hasAttribute('package')) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the node "deprecated" is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the node "deprecated" in "%s" is deprecated.', $file);
} }
if (!$deprecated[0]->hasAttribute('version')) { if (!$deprecated[0]->hasAttribute('version')) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the node "deprecated" is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the node "deprecated" in "%s" is deprecated.', $file);
} }
$alias->setDeprecated($package, $version, $message); $alias->setDeprecated($package, $version, $message);
@ -265,11 +265,11 @@ class XmlFileLoader extends FileLoader
$version = $deprecated[0]->getAttribute('version') ?: ''; $version = $deprecated[0]->getAttribute('version') ?: '';
if ('' === $package) { if ('' === $package) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the node "deprecated" is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the node "deprecated" in "%s" is deprecated.', $file);
} }
if ('' === $version) { if ('' === $version) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the node "deprecated" is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the node "deprecated" in "%s" is deprecated.', $file);
} }
$definition->setDeprecated($package, $version, $message); $definition->setDeprecated($package, $version, $message);

8
src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
View File

@ -409,11 +409,11 @@ class YamlFileLoader extends FileLoader
$deprecation = \is_array($value) ? $value : ['message' => $value]; $deprecation = \is_array($value) ? $value : ['message' => $value];
if (!isset($deprecation['package'])) { if (!isset($deprecation['package'])) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the "deprecated" option is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the "deprecated" option in "%s" is deprecated.', $file);
} }
if (!isset($deprecation['version'])) { if (!isset($deprecation['version'])) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the "deprecated" option is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the "deprecated" option in "%s" is deprecated.', $file);
} }
$alias->setDeprecated($deprecation['package'] ?? '', $deprecation['version'] ?? '', $deprecation['message']); $alias->setDeprecated($deprecation['package'] ?? '', $deprecation['version'] ?? '', $deprecation['message']);
@ -478,11 +478,11 @@ class YamlFileLoader extends FileLoader
$deprecation = \is_array($service['deprecated']) ? $service['deprecated'] : ['message' => $service['deprecated']]; $deprecation = \is_array($service['deprecated']) ? $service['deprecated'] : ['message' => $service['deprecated']];
if (!isset($deprecation['package'])) { if (!isset($deprecation['package'])) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the "deprecated" option is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "package" of the "deprecated" option in "%s" is deprecated.', $file);
} }
if (!isset($deprecation['version'])) { if (!isset($deprecation['version'])) {
trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the "deprecated" option is deprecated.'); trigger_deprecation('symfony/dependency-injection', '5.1', 'Not setting the attribute "version" of the "deprecated" option in "%s" is deprecated.', $file);
} }
$definition->setDeprecated($deprecation['package'] ?? '', $deprecation['version'] ?? '', $deprecation['message']); $definition->setDeprecated($deprecation['package'] ?? '', $deprecation['version'] ?? '', $deprecation['message']);

4
src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
View File

@ -409,7 +409,7 @@ class XmlFileLoaderTest extends TestCase
*/ */
public function testDeprecatedWithoutPackageAndVersion() public function testDeprecatedWithoutPackageAndVersion()
{ {
$this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "package" of the node "deprecated" is deprecated.'); $this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "package" of the node "deprecated" in "%s" is deprecated.');
$container = new ContainerBuilder(); $container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')); $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
@ -442,7 +442,7 @@ class XmlFileLoaderTest extends TestCase
*/ */
public function testDeprecatedAliaseWithoutPackageAndVersion() public function testDeprecatedAliaseWithoutPackageAndVersion()
{ {
$this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "package" of the node "deprecated" is deprecated.'); $this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "package" of the node "deprecated" in "%s" is deprecated.');
$container = new ContainerBuilder(); $container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')); $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));

4
src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
View File

@ -238,8 +238,8 @@ class YamlFileLoaderTest extends TestCase
*/ */
public function testDeprecatedAliasesWithoutPackageAndVersion() public function testDeprecatedAliasesWithoutPackageAndVersion()
{ {
$this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "package" of the "deprecated" option is deprecated.'); $this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "package" of the "deprecated" option in "%s" is deprecated.');
$this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "version" of the "deprecated" option is deprecated.'); $this->expectDeprecation('Since symfony/dependency-injection 5.1: Not setting the attribute "version" of the "deprecated" option in "%s" is deprecated.');
$container = new ContainerBuilder(); $container = new ContainerBuilder();
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')); $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));