Skip to content

Commit a0d9633

Browse files
committed
fixed some deprecation messages
1 parent b3d2b8f commit a0d9633

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

Container.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function setParameter($name, $value)
158158
public function set($id, $service, $scope = self::SCOPE_CONTAINER)
159159
{
160160
if (!in_array($scope, array('container', 'request')) || ('request' === $scope && 'request' !== $id)) {
161-
@trigger_error('The concept of container scopes is deprecated since version 2.8 and will be removed in 3.0. Omit the third parameter.', E_USER_DEPRECATED);
161+
@trigger_error('The concept of container scopes is deprecated since Symfony 2.8 and will be removed in 3.0. Omit the third parameter.', E_USER_DEPRECATED);
162162
}
163163

164164
if (self::SCOPE_PROTOTYPE === $scope) {
@@ -384,7 +384,7 @@ public function getServiceIds()
384384
public function enterScope($name)
385385
{
386386
if ('request' !== $name) {
387-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
387+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
388388
}
389389

390390
if (!isset($this->scopes[$name])) {
@@ -436,7 +436,7 @@ public function enterScope($name)
436436
public function leaveScope($name)
437437
{
438438
if ('request' !== $name) {
439-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
439+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
440440
}
441441

442442
if (!isset($this->scopedServices[$name])) {
@@ -488,7 +488,7 @@ public function addScope(ScopeInterface $scope)
488488
$parentScope = $scope->getParentName();
489489

490490
if ('request' !== $name) {
491-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
491+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
492492
}
493493
if (self::SCOPE_CONTAINER === $name || self::SCOPE_PROTOTYPE === $name) {
494494
throw new InvalidArgumentException(sprintf('The scope "%s" is reserved.', $name));
@@ -522,7 +522,7 @@ public function addScope(ScopeInterface $scope)
522522
public function hasScope($name)
523523
{
524524
if ('request' !== $name) {
525-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
525+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
526526
}
527527

528528
return isset($this->scopes[$name]);
@@ -541,7 +541,7 @@ public function hasScope($name)
541541
*/
542542
public function isScopeActive($name)
543543
{
544-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
544+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
545545

546546
return isset($this->scopedServices[$name]);
547547
}

ContainerBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ public function getCompiler()
340340
public function getScopes($triggerDeprecationError = true)
341341
{
342342
if ($triggerDeprecationError) {
343-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
343+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
344344
}
345345

346346
return $this->scopes;
@@ -356,7 +356,7 @@ public function getScopes($triggerDeprecationError = true)
356356
public function getScopeChildren($triggerDeprecationError = true)
357357
{
358358
if ($triggerDeprecationError) {
359-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
359+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
360360
}
361361

362362
return $this->scopeChildren;

Definition.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ public function isShared()
596596
public function setScope($scope, $triggerDeprecationError = true)
597597
{
598598
if ($triggerDeprecationError) {
599-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
599+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
600600
}
601601

602602
if (ContainerInterface::SCOPE_PROTOTYPE === $scope) {
@@ -618,7 +618,7 @@ public function setScope($scope, $triggerDeprecationError = true)
618618
public function getScope($triggerDeprecationError = true)
619619
{
620620
if ($triggerDeprecationError) {
621-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
621+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
622622
}
623623

624624
return $this->scope;

Loader/XmlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ private function parseDefinition(\DOMElement $service, $file)
166166
$triggerDeprecation = 'request' !== (string) $service->getAttribute('id');
167167

168168
if ($triggerDeprecation) {
169-
@trigger_error(sprintf('The "scope" attribute of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
169+
@trigger_error(sprintf('The "scope" attribute of service "%s" in file "%s" is deprecated since Symfony 2.8 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
170170
}
171171

172172
$definition->setScope(XmlUtils::phpize($value), false);

Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private function parseDefinition($id, $service, $file)
171171

172172
if (isset($service['scope'])) {
173173
if ('request' !== $id) {
174-
@trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
174+
@trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since Symfony 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
175175
}
176176
$definition->setScope($service['scope'], false);
177177
}

Reference.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getInvalidBehavior()
6666
public function isStrict($triggerDeprecationError = true)
6767
{
6868
if ($triggerDeprecationError) {
69-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
69+
@trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
7070
}
7171

7272
return $this->strict;

0 commit comments

Comments
 (0)