Skip to content

Commit 2d6eff3

Browse files
Merge branch '4.3' into 4.4
* 4.3: (23 commits) fix merge [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 ...
2 parents 62f2f93 + d50182e commit 2d6eff3

File tree

8 files changed

+7
-9
lines changed

8 files changed

+7
-9
lines changed

Container.php

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

372372
/**
373373
* Creates a service by requiring its factory file.
374-
*
375-
* @return object The service created by the file
376374
*/
377375
protected function load($file)
378376
{

Definition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ public function setConfigurator($configurator)
814814
/**
815815
* Gets the configurator to call after the service is fully initialized.
816816
*
817-
* @return callable|null The PHP callable to call
817+
* @return callable|array|null
818818
*/
819819
public function getConfigurator()
820820
{

Dumper/DumperInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface DumperInterface
2121
/**
2222
* Dumps the service container.
2323
*
24-
* @return string The representation of the service container
24+
* @return string|array The representation of the service container
2525
*/
2626
public function dump(array $options = []);
2727
}

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
@@ -706,7 +706,7 @@ private function loadFromExtensions(\DOMDocument $xml)
706706
*
707707
* @param \DOMElement $element A \DOMElement instance
708708
*
709-
* @return array A PHP array
709+
* @return mixed
710710
*/
711711
public static function convertDomElementToArray(\DOMElement $element)
712712
{

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

Tests/Fixtures/includes/ProjectExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function load(array $configs, ContainerBuilder $configuration)
2525
return $configuration;
2626
}
2727

28-
public function getXsdValidationBasePath(): string
28+
public function getXsdValidationBasePath()
2929
{
3030
return false;
3131
}

Tests/Fixtures/includes/ProjectWithXsdExtension.php

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

33
class ProjectWithXsdExtension extends ProjectExtension
44
{
5-
public function getXsdValidationBasePath(): string
5+
public function getXsdValidationBasePath()
66
{
77
return __DIR__.'/schema';
88
}

0 commit comments

Comments
 (0)