diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DependencyInjection] Add missing parameter type declarations to loader classes.

Browse Source
This commit is contained in:
Alexander M. Turek 2020-12-02 19:36:59 +01:00
parent 1bf434139a
commit de0dbd88d2
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/argon2i_encoder.php
View File

@ -1,6 +1,6 @@
<?php
$this->load('container1.php', $container);
$this->load('container1.php');
$container->loadFromExtension('security', [
'encoders' => [

2
src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/bcrypt_encoder.php
View File

@ -1,6 +1,6 @@
<?php
$this->load('container1.php', $container);
$this->load('container1.php');
$container->loadFromExtension('security', [
'encoders' => [

2
src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/migrating_encoder.php
View File

@ -1,6 +1,6 @@
<?php
$this->load('container1.php', $container);
$this->load('container1.php');
$container->loadFromExtension('security', [
'encoders' => [

8
src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
View File

@ -50,7 +50,7 @@ abstract class FileLoader extends BaseFileLoader
*
* @param bool|string $ignoreErrors Whether errors should be ignored; pass "not_found" to ignore only when the loaded resource is not found
*/
public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null, $exclude = null)
public function import($resource, string $type = null, $ignoreErrors = false, string $sourceResource = null, $exclude = null)
{
$args = \func_get_args();
@ -87,7 +87,7 @@ abstract class FileLoader extends BaseFileLoader
* @param string $resource The directory to look for classes, glob-patterns allowed
* @param string|string[]|null $exclude A globbed path of files to exclude or an array of globbed paths of files to exclude
*/
public function registerClasses(Definition $prototype, $namespace, $resource, $exclude = null)
public function registerClasses(Definition $prototype, string $namespace, string $resource, $exclude = null)
{
if ('\\' !== substr($namespace, -1)) {
throw new InvalidArgumentException(sprintf('Namespace prefix must end with a "\\": "%s".', $namespace));
@ -134,10 +134,8 @@ abstract class FileLoader extends BaseFileLoader
/**
* Registers a definition in the container with its instanceof-conditionals.
*
* @param string $id
*/
protected function setDefinition($id, Definition $definition)
protected function setDefinition(string $id, Definition $definition)
{
$this->container->removeBindings($id);

2
src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
View File

@ -28,7 +28,7 @@ class PhpFileLoader extends FileLoader
/**
* {@inheritdoc}
*/
public function load($resource, $type = null)
public function load($resource, string $type = null)
{
// the container and loader variables are exposed to the included file below
$container = $this->container;

2
src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php
View File

@ -38,7 +38,7 @@ class GlobFileLoaderTest extends TestCase
class GlobFileLoaderWithoutImport extends GlobFileLoader
{
public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null, $exclude = null)
public function import($resource, string $type = null, $ignoreErrors = false, string $sourceResource = null, $exclude = null)
{
}
}