mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-26 12:08:47 +02:00
Updating Symfony lib and dependencies:
Package operations: 2 installs, 23 updates, 0 removals - Updating psr/log (1.1.0 => 1.1.2) - Updating symfony/debug (v3.4.30 => v3.4.35) - Updating symfony/console (v3.4.30 => v3.4.35) - Updating symfony/dotenv (v3.4.30 => v3.4.35) - Updating symfony/routing (v3.4.30 => v3.4.35) - Updating symfony/finder (v3.4.30 => v3.4.35) - Updating symfony/filesystem (v3.4.30 => v3.4.35) - Installing symfony/polyfill-util (v1.12.0) - Installing symfony/polyfill-php56 (v1.12.0) - Updating symfony/http-foundation (v3.4.30 => v3.4.35) - Updating symfony/event-dispatcher (v3.4.30 => v3.4.35) - Updating symfony/http-kernel (v3.4.30 => v3.4.35) - Updating symfony/config (v3.4.30 => v3.4.35) - Updating symfony/dependency-injection (v3.4.30 => v3.4.35) - Updating symfony/class-loader (v3.4.30 => v3.4.35) - Updating symfony/cache (v3.4.30 => v3.4.35) - Updating symfony/framework-bundle (v3.4.30 => v3.4.35) - Updating twig/twig (v1.42.2 => v1.42.4) - Updating symfony/twig-bridge (v3.4.30 => v3.4.35) - Updating symfony/twig-bundle (v3.4.30 => v3.4.35) - Updating symfony/yaml (v3.4.30 => v3.4.35) - Updating symfony/stopwatch (v3.4.30 => v3.4.35) - Updating symfony/var-dumper (v3.4.30 => v3.4.35) - Updating symfony/web-profiler-bundle (v3.4.30 => v3.4.35) - Updating symfony/css-selector (v3.4.30 => v3.4.35)
This commit is contained in:
@@ -86,8 +86,7 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Parses parameters.
|
||||
*
|
||||
* @param \DOMDocument $xml
|
||||
* @param string $file
|
||||
* @param string $file
|
||||
*/
|
||||
private function parseParameters(\DOMDocument $xml, $file)
|
||||
{
|
||||
@@ -99,8 +98,7 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Parses imports.
|
||||
*
|
||||
* @param \DOMDocument $xml
|
||||
* @param string $file
|
||||
* @param string $file
|
||||
*/
|
||||
private function parseImports(\DOMDocument $xml, $file)
|
||||
{
|
||||
@@ -121,8 +119,7 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Parses multiple definitions.
|
||||
*
|
||||
* @param \DOMDocument $xml
|
||||
* @param string $file
|
||||
* @param string $file
|
||||
*/
|
||||
private function parseDefinitions(\DOMDocument $xml, $file, $defaults)
|
||||
{
|
||||
@@ -193,9 +190,7 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Parses an individual Definition.
|
||||
*
|
||||
* @param \DOMElement $service
|
||||
* @param string $file
|
||||
* @param array $defaults
|
||||
* @param string $file
|
||||
*
|
||||
* @return Definition|null
|
||||
*/
|
||||
@@ -211,7 +206,7 @@ class XmlFileLoader extends FileLoader
|
||||
$alias->setPublic($defaults['public']);
|
||||
}
|
||||
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($this->isLoadingInstanceof) {
|
||||
@@ -394,9 +389,8 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Processes anonymous services.
|
||||
*
|
||||
* @param \DOMDocument $xml
|
||||
* @param string $file
|
||||
* @param array $defaults
|
||||
* @param string $file
|
||||
* @param array $defaults
|
||||
*/
|
||||
private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
|
||||
{
|
||||
@@ -456,10 +450,9 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Returns arguments as valid php types.
|
||||
*
|
||||
* @param \DOMElement $node
|
||||
* @param string $name
|
||||
* @param string $file
|
||||
* @param bool $lowercase
|
||||
* @param string $name
|
||||
* @param string $file
|
||||
* @param bool $lowercase
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
@@ -546,8 +539,7 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Get child elements by name.
|
||||
*
|
||||
* @param \DOMNode $node
|
||||
* @param mixed $name
|
||||
* @param mixed $name
|
||||
*
|
||||
* @return \DOMElement[]
|
||||
*/
|
||||
@@ -566,8 +558,6 @@ class XmlFileLoader extends FileLoader
|
||||
/**
|
||||
* Validates a documents XML schema.
|
||||
*
|
||||
* @param \DOMDocument $dom
|
||||
*
|
||||
* @return bool
|
||||
*
|
||||
* @throws RuntimeException When extension references a non-existent XSD file
|
||||
@@ -645,8 +635,7 @@ EOF
|
||||
/**
|
||||
* Validates an alias.
|
||||
*
|
||||
* @param \DOMElement $alias
|
||||
* @param string $file
|
||||
* @param string $file
|
||||
*/
|
||||
private function validateAlias(\DOMElement $alias, $file)
|
||||
{
|
||||
@@ -666,8 +655,7 @@ EOF
|
||||
/**
|
||||
* Validates an extension.
|
||||
*
|
||||
* @param \DOMDocument $dom
|
||||
* @param string $file
|
||||
* @param string $file
|
||||
*
|
||||
* @throws InvalidArgumentException When no extension is found corresponding to a tag
|
||||
*/
|
||||
@@ -688,8 +676,6 @@ EOF
|
||||
|
||||
/**
|
||||
* Loads from an extension.
|
||||
*
|
||||
* @param \DOMDocument $xml
|
||||
*/
|
||||
private function loadFromExtensions(\DOMDocument $xml)
|
||||
{
|
||||
@@ -724,7 +710,7 @@ EOF
|
||||
*
|
||||
* @param \DOMElement $element A \DOMElement instance
|
||||
*
|
||||
* @return array A PHP array
|
||||
* @return mixed
|
||||
*/
|
||||
public static function convertDomElementToArray(\DOMElement $element)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user