8000 fixed some deprecation messages · symfony/dependency-injection@1abf60f · GitHub
[go: up one dir, main page]
Skip to content

Commit 1abf60f

Browse files
fabpotfabpot
committed
fixed some deprecation messages
1 parent 0f1a730 commit 1abf60f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

‎Definition.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function getFactory()
9191
*/
9292
public function setFactoryClass($factoryClass)
9393
{
94-
@trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
94+
@trigger_error(sprintf('%s(%s) is deprecated since Symfony 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
9595

9696
$this->factoryClass = $factoryClass;
9797

@@ -125,7 +125,7 @@ public function getFactoryClass($triggerDeprecationError = true)
125125
*/
126126
public function setFactoryMethod($factoryMethod)
127127
{
128-
@trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
128+
@trigger_error(sprintf('%s(%s) is deprecated since Symfony 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
129129

130130
$this->factoryMethod = $factoryMethod;
131131

@@ -195,7 +195,7 @@ public function getFactoryMethod($triggerDeprecationError = true)
195195
public function setFactoryService($factoryService, $triggerDeprecationError = true)
196196
{
197197
if ($triggerDeprecationError) {
198-
@trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
198+
@trigger_error(sprintf('%s(%s) is deprecated since Symfony 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
199199
}
200200

201201
$this->factoryService = $factoryService;

‎Loader/XmlFileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private function parseDefinition(\DOMElement $service, $file)
151151
foreach (array('class', 'scope', 'public', 'factory-class', 'factory-method', 'factory-service', 'synthetic', 'lazy', 'abstract') as $key) {
152152
if ($value = $service->getAttribute($key)) {
153153
if (in_array($key, array('factory-class', 'factory-method', 'factory-service'))) {
154-
@trigger_error(sprintf('The "%s" attribute of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
154+
@trigger_error(sprintf('The "%s" attribute of service "%s" in file "%s" is deprecated since Symfony 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
155155
}
156156
$method = 'set'.str_replace('-', '', $key);
157157
$definition->$method(XmlUtils::phpize($value));
@@ -162,7 +162,7 @@ private function parseDefinition(\DOMElement $service, $file)
162162
$triggerDeprecation = 'request' !== (string) $service->getAttribute('id');
163163

164164
if ($triggerDeprecation) {
165-
@trigger_error(sprintf('The "synchronized" attribute of service "%s" in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
165+
@trigger_error(sprintf('The "synchronized" attribute of service "%s" in file "%s" is deprecated since Symfony 2.7 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
166166
}
167167

168168
$definition->setSynchronized(XmlUtils::phpize($value), $triggerDeprecation);

‎Loader/YamlFileLoader.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ private function parseDefinition($id, $service, $file)
174174
}
175175

176176
if (isset($service['synchronized'])) {
177-
@trigger_error(sprintf('The "synchronized" key of service "%s" in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
177+
@trigger_error(sprintf('The "synchronized" key of service "%s" in file "%s" is deprecated since Symfony 2.7 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
178178
$definition->setSynchronized($service['synchronized'], 'request' !== $id);
179179
}
180180

@@ -204,17 +204,17 @@ private function parseDefinition($id, $service, $file)
204204
}
205205

206206
if (isset($service['factory_class'])) {
207-
@trigger_error(sprintf('The "factory_class" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
207+
@trigger_error(sprintf('The "factory_class" key of service "%s" in file "%s" is deprecated since Symfony 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
208208
$definition->setFactoryClass($service['factory_class']);
209209
}
210210

211211
if (isset($service['factory_method'])) {
212-
@trigger_error(sprintf('The "factory_method" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
212+
@trigger_error(sprintf('The "factory_method" key of service "%s" in file "%s" is deprecated since Symfony 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
213213
$definition->setFactoryMethod($service['factory_method']);
214214
}
215215

216216
if (isset($service['factory_service'])) {
217-
@trigger_error(sprintf('The "factory_service" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
217+
@trigger_error(sprintf('The "factory_service" key of service "%s" in file "%s" is deprecated since Symfony 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
218218
$definition->setFactoryService($service['factory_service']);
219219
}
220220

‎SimpleXMLElement.php

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

1212
namespace Symfony\Component\DependencyInjection;
1313

14-
@trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
14+
@trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement class is deprecated since Symfony 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
1515

1616
use Symfony\Component\Config\Util\XmlUtils;
1717
use Symfony\Component\ExpressionLanguage\Expression;

0 commit comments

Comments
 (0)
0