Skip to content

Commit 2691d16

Browse files
committed
Fix tests for the DI component.
1 parent fa4b0fa commit 2691d16

File tree

10 files changed

+10
-18
lines changed

10 files changed

+10
-18
lines changed

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,9 +1992,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
19921992
}
19931993

19941994
/**
1995-
* Returns the base path for the XSD files.
1996-
*
1997-
* @return string The XSD base path
1995+
* {@inheritdoc}
19981996
*/
19991997
public function getXsdValidationBasePath()
20001998
{

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -787,9 +787,7 @@ public function addUserProviderFactory(UserProviderFactoryInterface $factory)
787787
}
788788

789789
/**
790-
* Returns the base path for the XSD files.
791-
*
792-
* @return string The XSD base path
790+
* {@inheritdoc}
793791
*/
794792
public function getXsdValidationBasePath()
795793
{

src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,7 @@ private function normalizeBundleName(string $name)
207207
}
208208

209209
/**
210-
* Returns the base path for the XSD files.
211-
*
212-
* @return string The XSD base path
210+
* {@inheritdoc}
213211
*/
214212
public function getXsdValidationBasePath()
215213
{

src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ public function load(array $configs, ContainerBuilder $container)
6161
}
6262

6363
/**
64-
* Returns the base path for the XSD files.
65-
*
66-
* @return string The XSD base path
64+
* {@inheritdoc}
6765
*/
6866
public function getXsdValidationBasePath()
6967
{

src/Symfony/Component/DependencyInjection/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
{

src/Symfony/Component/DependencyInjection/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

src/Symfony/Component/DependencyInjection/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
{

src/Symfony/Component/DependencyInjection/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

src/Symfony/Component/DependencyInjection/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
}

src/Symfony/Component/DependencyInjection/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)