Skip to content

Commit b61daeb

Browse files
fabpotfabpot
committed
minor symfony#25640 Fix some deprecation messages (fabpot)
This PR was merged into the 2.8 branch. Discussion ---------- Fix some deprecation messages | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a <!-- - Bug fixes must be submitted against the lowest branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too). - Features and deprecations must be submitted against the master branch. - Replace this comment by a description of what your PR is solving. --> Commits ------- 351b234 fixed some deprecation messages
2 parents 2dd70c8 + 351b234 commit b61daeb

File tree

86 files changed

+117
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+117
-117
lines changed

‎src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function loadUserByUsername($username)
5555
throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, get_class($repository)));
5656
}
5757

58-
@trigger_error('Implementing Symfony\Component\Security\Core\User\UserProviderInterface in a Doctrine repository when using the entity provider is deprecated since version 2.8 and will not be supported in 3.0. Make the repository implement Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.', E_USER_DEPRECATED);
58+
@trigger_error('Implementing Symfony\Component\Security\Core\User\UserProviderInterface in a Doctrine repository when using the entity provider is deprecated since Symfony 2.8 and will not be supported in 3.0. Make the repository implement Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.', E_USER_DEPRECATED);
5959
}
6060

6161
$user = $repository->loadUserByUsername($username);

‎src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function testLoadUserByUsernameWithUserLoaderRepositoryAndWithoutProperty
8282

8383
/**
8484
* @group legacy
85-
* @expectedDeprecation Implementing Symfony\Component\Security\Core\User\UserProviderInterface in a Doctrine repository when using the entity provider is deprecated since version 2.8 and will not be supported in 3.0. Make the repository implement Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.
85+
* @expectedDeprecation Implementing Symfony\Component\Security\Core\User\UserProviderInterface in a Doctrine repository when using the entity provider is deprecated since Symfony 2.8 and will not be supported in 3.0. Make the repository implement Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.
8686
*/
8787
public function testLoadUserByUsernameWithUserProviderRepositoryAndWithoutProperty()
8888
{

‎src/Symfony/Bundle/FrameworkBundle/DataCollector/AjaxDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector as BaseAjaxDataCollector;
1515

16-
@trigger_error('The '.__NAMESPACE__.'\AjaxDataCollector class is deprecated since version 2.8 and will be removed in 3.0. Use Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector instead.', E_USER_DEPRECATED);
16+
@trigger_error('The '.__NAMESPACE__.'\AjaxDataCollector class is deprecated since Symfony 2.8 and will be removed in 3.0. Use Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector instead.', E_USER_DEPRECATED);
1717

1818
/**
1919
* AjaxDataCollector.

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public function process(ContainerBuilder $container)
6464
if (isset($tag[0]['extended_type'])) {
6565
$extendedType = $tag[0]['extended_type'];
6666
} elseif (isset($tag[0]['alias'])) {
67-
@trigger_error(sprintf('The alias option of the form.type_extension tag of service "%s" is deprecated since version 2.8 and will be removed in 3.0. Use the extended_type option instead.', $serviceId), E_USER_DEPRECATED);
67+
@trigger_error(sprintf('The alias option of the form.type_extension tag of service "%s" is deprecated since Symfony 2.8 and will be removed in 3.0. Use the extended_type option instead.', $serviceId), E_USER_DEPRECATED);
6868
$extendedType = $tag[0]['alias'];
6969
} else {
70-
@trigger_error(sprintf('The extended_type option of the form.type_extension tag of service "%s" is required since version 2.8.', $serviceId), E_USER_DEPRECATED);
70+
@trigger_error(sprintf('The extended_type option of the form.type_extension tag of service "%s" is required since Symfony 2.8.', $serviceId), E_USER_DEPRECATED);
7171
$extendedType = $serviceId;
7272
}
7373

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
282282
->beforeNormalization()
283283
->ifTrue(function ($v) { return 'file:' !== substr($v, 0, 5); })
284284
->then(function ($v) {
285-
@trigger_error('The profiler.dsn configuration key must start with "file:" because all the storages except the filesystem are deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
285+
@trigger_error('The profiler.dsn configuration key must start with "file:" because all the storages except the filesystem are deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
286286

287287
return $v;
288288
})
@@ -293,7 +293,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
293293
->beforeNormalization()
294294
->always()
295295
->then(function ($v) {
296-
@trigger_error('The profiler.username configuration key is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
296+
@trigger_error('The profiler.username configuration key is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
297297

298298
return $v;
299299
})
@@ -304,7 +304,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
304304
->beforeNormalization()
305305
->always()
306306
->then(function ($v) {
307-
@trigger_error('The profiler.password configuration key is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
307+
@trigger_error('The profiler.password configuration key is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
308308

309309
return $v;
310310
})
@@ -315,7 +315,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
315315
->beforeNormalization()
316316
->always()
317317
->then(function ($v) {
318-
@trigger_error('The profiler.lifetime configuration key is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
318+
@trigger_error('The profiler.lifetime configuration key is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
319319

320320
return $v;
321321
})
@@ -663,7 +663,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
663663
// Can be removed in 3.0, once ApcCache support is dropped
664664
->ifString()->then(function ($v) {
665665
if ('apc' === $v) {
666-
@trigger_error('The ability to pass "apc" as the framework.validation.cache configuration key value is deprecated since version 2.8 and will be removed in 3.0. Use the "validator.mapping.cache.doctrine.apc" service id instead.', E_USER_DEPRECATED);
666+
@trigger_error('The ability to pass "apc" as the framework.validation.cache configuration key value is deprecated since Symfony 2.8 and will be removed in 3.0. Use the "validator.mapping.cache.doctrine.apc" service id instead.', E_USER_DEPRECATED);
667667

668668
return 'validator.mapping.cache.apc';
669669
}

‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct(ControllerNameParser $parser, $resolver, $r = null)
4545
$this->logger = $resolver;
4646
$resolver = $r;
4747

48-
@trigger_error('Passing a LoggerInterface instance as the second argument of the '.__METHOD__.' method is deprecated since version 2.8 and will not be supported anymore in 3.0.', E_USER_DEPRECATED);
48+
@trigger_error('Passing a LoggerInterface instance as the second argument of the '.__METHOD__.' method is deprecated since Symfony 2.8 and will not be supported anymore in 3.0.', E_USER_DEPRECATED);
4949
}
5050

5151
parent::__construct($resolver);

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(UrlGeneratorInterface $router)
4141
*/
4242
public function generate($name, $parameters = array(), $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
4343
{
44-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the "path" or "url" method instead.', E_USER_DEPRECATED);
44+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0. Use the "path" or "url" method instead.', E_USER_DEPRECATED);
4545

4646
return $this->generator->generate($name, $parameters, $referenceType);
4747
}

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
236236
->beforeNormalization()
237237
->ifTrue(function ($v) { return isset($v['csrf_provider']); })
238238
->then(function ($v) {
239-
@trigger_error("Setting the 'csrf_provider' configuration key on a security firewall is deprecated since version 2.8 and will be removed in 3.0. Use the 'csrf_token_generator' configuration key instead.", E_USER_DEPRECATED);
239+
@trigger_error("Setting the 'csrf_provider' configuration key on a security firewall is deprecated since Symfony 2.8 and will be removed in 3.0. Use the 'csrf_token_generator' configuration key instead.", E_USER_DEPRECATED);
240240

241241
$v['csrf_token_generator'] = $v['csrf_provider'];
242242
unset($v['csrf_provider']);
@@ -247,7 +247,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
247247
->beforeNormalization()
248248
->ifTrue(function ($v) { return isset($v['intention']); })
249249
->then(function ($v) {
250-
@trigger_error("Setting the 'intention' configuration key on a security firewall is deprecated since version 2.8 and will be removed in 3.0. Use the 'csrf_token_id' key instead.", E_USER_DEPRECATED);
250+
@trigger_error("Setting the 'intention' configuration key on a security firewall is deprecated since Symfony 2.8 and will be removed in 3.0. Use the 'csrf_token_id' key instead.", E_USER_DEPRECATED);
251251

252252
$v['csrf_token_id'] = $v['intention'];
253253
unset($v['intention']);
@@ -296,7 +296,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
296296
throw new \LogicException('Cannot set both key and secret options for security.firewall.anonymous, use only secret instead.');
297297
}
298298

299-
@trigger_error('security.firewall.anonymous.key is deprecated since version 2.8 and will be removed in 3.0. Use security.firewall.anonymous.secret instead.', E_USER_DEPRECATED);
299+
@trigger_error('security.firewall.anonymous.key is deprecated since Symfony 2.8 and will be removed in 3.0. Use security.firewall.anonymous.secret instead.', E_USER_DEPRECATED);
300300

301301
$v['secret'] = $v['key'];
302302

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function addConfiguration(NodeDefinition $node)
5959
->beforeNormalization()
6060
->ifTrue(function ($v) { return isset($v['csrf_provider']); })
6161
->then(function ($v) {
62-
@trigger_error("Setting the 'csrf_provider' configuration key on a security firewall is deprecated since version 2.8 and will be removed in 3.0. Use the 'csrf_token_generator' configuration key instead.", E_USER_DEPRECATED);
62+
@trigger_error("Setting the 'csrf_provider' configuration key on a security firewall is deprecated since Symfony 2.8 and will be removed in 3.0. Use the 'csrf_token_generator' configuration key instead.", E_USER_DEPRECATED);
6363

6464
$v['csrf_token_generator'] = $v['csrf_provider'];
6565
unset($v['csrf_provider']);
@@ -70,7 +70,7 @@ public function addConfiguration(NodeDefinition $node)
7070
->beforeNormalization()
7171
->ifTrue(function ($v) { return isset($v['intention']); })
7272
->then(function ($v) {
73-
@trigger_error("Setting the 'intention' configuration key on a security firewall is deprecated since version 2.8 and will be removed in 3.0. Use the 'csrf_token_id' key instead.", E_USER_DEPRECATED);
73+
@trigger_error("Setting the 'intention' configuration key on a security firewall is deprecated since Symfony 2.8 and will be removed in 3.0. Use the 'csrf_token_id' key instead.", E_USER_DEPRECATED);
7474

7575
$v['csrf_token_id'] = $v['intention'];
7676
unset($v['intention']);

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function addConfiguration(NodeDefinition $node)
6666
throw new \LogicException('Cannot set both key and secret options for http_digest, use only secret instead.');
6767
}
6868

69-
@trigger_error('http_digest.key is deprecated since version 2.8 and will be removed in 3.0. Use http_digest.secret instead.', E_USER_DEPRECATED);
69+
@trigger_error('http_digest.key is deprecated since Symfony 2.8 and will be removed in 3.0. Use http_digest.secret instead.', E_USER_DEPRECATED);
7070

7171
$v['secret'] = $v['key'];
7272

0 commit comments

Comments
 (0)