Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commita3c60c8

Browse files
committed
[DependencyInjection] Deprecate SimpleXMLElement
1 parent33c91f9 commita3c60c8

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

‎src/Symfony/Component/DependencyInjection/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CHANGELOG
55
-----
66

77
* added DecoratorServicePass and a way to override a service definition (Definition::setDecoratedService())
8+
* deprecated SimpleXMLElement class.
89

910
2.4.0
1011
-----

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -197,37 +197,20 @@ private function parseDefinition($id, \DOMElement $service, $file)
197197
$parameters[$normalizedName] = XmlUtils::phpize($node->nodeValue);
198198
}
199199
// keep not normalized key for BC too
200-
$parameters[$name] =SimpleXMLElement::phpize($value);
200+
$parameters[$name] =XmlUtils::phpize($node->nodeValue);
201201
}
202202

203-
// $definition->addTag((string) $tag['name'], $parameters);
204203
$definition->addTag($tag->getAttribute('name'),$parameters);
205204
}
206205

207-
if (isset($service['decorates'])) {
208-
$renameId =isset($service['decoration-inner-name']) ?(string)$service['decoration-inner-name'] :null;
209-
$definition->setDecoratedService((string)$service['decorates'],$renameId);
206+
if ($value =$service->getAttribute('decorates')) {
207+
$renameId =$service->hasAttribute('decoration-inner-name') ?$service->getAttribute('decoration-inner-name') :null;
208+
$definition->setDecoratedService($value,$renameId);
210209
}
211210

212211
$this->container->setDefinition($id,$definition);
213212
}
214213

215-
/**
216-
* Parses a XML file.
217-
*
218-
* @param string $file Path to a file
219-
*
220-
* @return SimpleXMLElement
221-
*
222-
* @throws InvalidArgumentException When loading of XML file returns error
223-
*/
224-
protectedfunctionparseFile($file)
225-
{
226-
$dom =$this->parseFileToDOM($file);
227-
228-
returnsimplexml_import_dom($dom,'Symfony\\Component\\DependencyInjection\\SimpleXMLElement');
229-
}
230-
231214
/**
232215
* Parses a XML file to a \DOMDocument
233216
*
@@ -237,7 +220,7 @@ protected function parseFile($file)
237220
*
238221
* @throws InvalidArgumentException When loading of XML file returns error
239222
*/
240-
protectedfunctionparseFileToDOM($file)
223+
privatefunctionparseFileToDOM($file)
241224
{
242225
try {
243226
$dom = XmlUtils::loadFile($file,array($this,'validateSchema'));

‎src/Symfony/Component/DependencyInjection/SimpleXMLElement.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* SimpleXMLElement class.
1919
*
2020
* @author Fabien Potencier <fabien@symfony.com>
21+
*
22+
* @deprecated Deprecated since version 2.5, to be removed in 3.0.
2123
*/
2224
class SimpleXMLElementextends \SimpleXMLElement
2325
{

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp