Skip to content

Commit d50182e

Browse files
Merge branch '3.4' into 4.3
* 3.4: (21 commits) [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations [Routing] Fix return type declarations ...
2 parents bdfbb68 + bec0a6f commit d50182e

File tree

6 files changed

+5
-9
lines changed

6 files changed

+5
-9
lines changed

Container.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,6 @@ public static function underscore($id)
365365

366366
/**
367367
* Creates a service by requiring its factory file.
368-
*
369-
* @return object The service created by the file
370368
*/
371369
protected function load($file)
372370
{

Definition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ public function setConfigurator($configurator)
807807
/**
808808
* Gets the configurator to call after the service is fully initialized.
809809
*
810-
* @return callable|null The PHP callable to call
810+
* @return callable|array|null
811811
*/
812812
public function getConfigurator()
813813
{

Dumper/DumperInterface.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ interface DumperInterface
2121
/**
2222
* Dumps the service container.
2323
*
24-
* @param array $options An array of options
25-
*
26-
* @return string The representation of the service container
24+
* @return string|array The representation of the service container
2725
*/
2826
public function dump(array $options = []);
2927
}

Extension/ExtensionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function getNamespace();
3737
/**
3838
* Returns the base path for the XSD files.
3939
*
40-
* @return string The XSD base path
40+
* @return string|false
4141
*/
4242
public function getXsdValidationBasePath();
4343

Loader/XmlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ private function loadFromExtensions(\DOMDocument $xml)
749749
*
750750
* @param \DOMElement $element A \DOMElement instance
751751
*
752-
* @return array A PHP array
752+
* @return mixed
753753
*/
754754
public static function convertDomElementToArray(\DOMElement $element)
755755
{

ParameterBag/ParameterBag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function resolveValue($value, array $resolving = [])
193193
* @param string $value The string to resolve
194194
* @param array $resolving An array of keys that are being resolved (used internally to detect circular references)
195195
*
196-
* @return string The resolved string
196+
* @return mixed The resolved string
197197
*
198198
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
199199
* @throws ParameterCircularReferenceException if a circular reference if detected

0 commit comments

Comments
 (0)