Skip to content

Commit 2ff3b20

Browse files
committed
fixed some deprecation messages
1 parent 0d531ca commit 2ff3b20

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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.

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

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
}

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);

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
}

0 commit comments

Comments
 (0)