PHP-DI · mnapoli · Jun 4, 2017 · Jun 4, 2017 · Jun 4, 2017 · Jun 4, 2017
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,16 @@
+preset: recommended
+
+enabled:
+    - phpdoc_no_empty_return
+    - concat_with_spaces
+    - declare_strict_types
+
+disabled:
+    - phpdoc_to_comment
+    - unary_operators_spaces
+    - concat_without_spaces
+    - empty_return
+    - new_with_braces
+    - phpdoc_align
+    - phpdoc_separation
+    - align_double_arrow
diff --git a/src/DI/Annotation/Inject.php b/src/DI/Annotation/Inject.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Annotation;
 
 use DI\Definition\Exception\AnnotationException;

diff --git a/src/DI/Annotation/Injectable.php b/src/DI/Annotation/Injectable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Annotation;
 
 /**

diff --git a/src/DI/CompiledContainer.php b/src/DI/CompiledContainer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Compiler/ObjectCreationCompiler.php b/src/DI/Compiler/ObjectCreationCompiler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Compiler;
 
 use DI\Compiler;

diff --git a/src/DI/Container.php b/src/DI/Container.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI;
 
 use DI\Definition\Definition;

diff --git a/src/DI/ContainerBuilder.php b/src/DI/ContainerBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI;
 
 use DI\Definition\Source\AnnotationBasedAutowiring;

diff --git a/src/DI/Definition/AliasDefinition.php b/src/DI/Definition/AliasDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use Psr\Container\ContainerInterface;

diff --git a/src/DI/Definition/ArrayDefinition.php b/src/DI/Definition/ArrayDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use DI\Definition\Helper\DefinitionHelper;

diff --git a/src/DI/Definition/ArrayDefinitionExtension.php b/src/DI/Definition/ArrayDefinitionExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use DI\Definition\Exception\InvalidDefinition;

diff --git a/src/DI/Definition/AutowireDefinition.php b/src/DI/Definition/AutowireDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use DI\Definition\ObjectDefinition\MethodInjection;

diff --git a/src/DI/Definition/DecoratorDefinition.php b/src/DI/Definition/DecoratorDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 /**

diff --git a/src/DI/Definition/Definition.php b/src/DI/Definition/Definition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use DI\Factory\RequestedEntry;

diff --git a/src/DI/Definition/Dumper/ObjectDefinitionDumper.php b/src/DI/Definition/Dumper/ObjectDefinitionDumper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Dumper;
 
 use DI\Definition\EntryReference;

diff --git a/src/DI/Definition/EntryReference.php b/src/DI/Definition/EntryReference.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use DI\Definition\Helper\DefinitionHelper;

diff --git a/src/DI/Definition/EnvironmentVariableDefinition.php b/src/DI/Definition/EnvironmentVariableDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use DI\Definition\Helper\DefinitionHelper;

diff --git a/src/DI/Definition/Exception/AnnotationException.php b/src/DI/Definition/Exception/AnnotationException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Exception;
 
 /**

diff --git a/src/DI/Definition/Exception/InvalidDefinition.php b/src/DI/Definition/Exception/InvalidDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Exception;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/FactoryDefinition.php b/src/DI/Definition/FactoryDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 /**

diff --git a/src/DI/Definition/HasSubDefinition.php b/src/DI/Definition/HasSubDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 /**

diff --git a/src/DI/Definition/Helper/ArrayDefinitionExtensionHelper.php b/src/DI/Definition/Helper/ArrayDefinitionExtensionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\ArrayDefinitionExtension;

diff --git a/src/DI/Definition/Helper/AutowireDefinitionHelper.php b/src/DI/Definition/Helper/AutowireDefinitionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\AutowireDefinition;
@@ -21,12 +23,12 @@ class AutowireDefinitionHelper extends CreateDefinitionHelper
      * avoid defining all the parameters (letting them being resolved using annotations or autowiring)
      * and only define one.
      *
-     * @param string $parameter Parameter for which the value will be given.
+     * @param string|int $parameter Parameter name of position for which the value will be given.
      * @param mixed $value Value to give to this parameter.
      *
      * @return $this
      */
-    public function constructorParameter(string $parameter, $value)
+    public function constructorParameter($parameter, $value)
     {
         $this->constructor[$parameter] = $value;
 
@@ -45,12 +47,12 @@ public function constructorParameter(string $parameter, $value)
      * then this method only overrides the parameter for the *first* call.
      *
      * @param string $method Name of the method to call.
-     * @param string $parameter Name or index of the parameter for which the value will be given.
+     * @param string|int $parameter Parameter name of position for which the value will be given.
      * @param mixed $value Value to give to this parameter.
      *
      * @return $this
      */
-    public function methodParameter(string $method, string $parameter, $value)
+    public function methodParameter(string $method, $parameter, $value)
     {
         // Special case for the constructor
         if ($method === '__construct') {

diff --git a/src/DI/Definition/Helper/CreateDefinitionHelper.php b/src/DI/Definition/Helper/CreateDefinitionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Helper/DefinitionHelper.php b/src/DI/Definition/Helper/DefinitionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Helper/EnvironmentVariableDefinitionHelper.php b/src/DI/Definition/Helper/EnvironmentVariableDefinitionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Helper/FactoryDefinitionHelper.php b/src/DI/Definition/Helper/FactoryDefinitionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\DecoratorDefinition;

diff --git a/src/DI/Definition/Helper/StringDefinitionHelper.php b/src/DI/Definition/Helper/StringDefinitionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Helper/ValueDefinitionHelper.php b/src/DI/Definition/Helper/ValueDefinitionHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Helper;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/InstanceDefinition.php b/src/DI/Definition/InstanceDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 /**

diff --git a/src/DI/Definition/ObjectDefinition.php b/src/DI/Definition/ObjectDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use DI\Definition\Dumper\ObjectDefinitionDumper;

diff --git a/src/DI/Definition/ObjectDefinition/MethodInjection.php b/src/DI/Definition/ObjectDefinition/MethodInjection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\ObjectDefinition;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/ObjectDefinition/PropertyInjection.php b/src/DI/Definition/ObjectDefinition/PropertyInjection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\ObjectDefinition;
 
 /**

diff --git a/src/DI/Definition/Resolver/ArrayResolver.php b/src/DI/Definition/Resolver/ArrayResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\ArrayDefinition;
@@ -57,7 +59,7 @@ public function isResolvable(Definition $definition, array $parameters = []) : b
         return true;
     }
 
-    private function resolveDefinition(DefinitionHelper $value, ArrayDefinition $definition, string $key)
+    private function resolveDefinition(DefinitionHelper $value, ArrayDefinition $definition, $key)
     {
         try {
             return $this->definitionResolver->resolve($value->getDefinition(''));

diff --git a/src/DI/Definition/Resolver/DecoratorResolver.php b/src/DI/Definition/Resolver/DecoratorResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\DecoratorDefinition;

diff --git a/src/DI/Definition/Resolver/DefinitionResolver.php b/src/DI/Definition/Resolver/DefinitionResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Resolver/EnvironmentVariableResolver.php b/src/DI/Definition/Resolver/EnvironmentVariableResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Resolver/FactoryResolver.php b/src/DI/Definition/Resolver/FactoryResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Resolver/InstanceInjector.php b/src/DI/Definition/Resolver/InstanceInjector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Resolver/ObjectCreator.php b/src/DI/Definition/Resolver/ObjectCreator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/Resolver/ParameterResolver.php b/src/DI/Definition/Resolver/ParameterResolver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\Exception\InvalidDefinition;

diff --git a/src/DI/Definition/Resolver/ResolverDispatcher.php b/src/DI/Definition/Resolver/ResolverDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Resolver;
 
 use DI\Definition\Definition;

diff --git a/src/DI/Definition/SelfResolvingDefinition.php b/src/DI/Definition/SelfResolvingDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition;
 
 use Psr\Container\ContainerInterface;

diff --git a/src/DI/Definition/Source/AnnotationBasedAutowiring.php b/src/DI/Definition/Source/AnnotationBasedAutowiring.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Source;
 
 use DI\Annotation\Inject;

diff --git a/src/DI/Definition/Source/Autowiring.php b/src/DI/Definition/Source/Autowiring.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DI\Definition\Source;
 
 use DI\Definition\AutowireDefinition;