Merge 412b826 into ecdb841

src/DI/Annotation/Inject.php

@@ -1,18 +1,11 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Annotation;
 
 use DI\Definition\Exception\AnnotationException;
 
 /**
- * "Inject" annotation
+ * "Inject" annotation.
  *
  * Marks a property or method as an injection point
  *
@@ -24,13 +17,13 @@
 final class Inject
 {
     /**
-     * Entry name
+     * Entry name.
      * @var string
      */
     private $name;
 
     /**
-     * Parameters, indexed by the parameter number (index) or name
+     * Parameters, indexed by the parameter number (index) or name.
      *
      * Used if the annotation is set on a method
      * @var array
@@ -47,6 +40,7 @@ public function __construct(array $values)
         // @Inject(name="foo")
         if (isset($values['name']) && is_string($values['name'])) {
             $this->name = $values['name'];
+
             return;
         }
 

src/DI/Annotation/Injectable.php

@@ -1,19 +1,12 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Annotation;
 
 use DI\Scope;
 use UnexpectedValueException;
 
 /**
- * "Injectable" annotation
+ * "Injectable" annotation.
  *
  * Marks a class as injectable
  *
@@ -26,14 +19,14 @@
 final class Injectable
 {
     /**
-     * The scope of an class: prototype, singleton
+     * The scope of an class: prototype, singleton.
      * @var string|null
      */
     private $scope;
 
     /**
-     * Should the object be lazy-loaded
-     * @var boolean|null
+     * Should the object be lazy-loaded.
+     * @var bool|null
      */
     private $lazy;
 
@@ -65,7 +58,7 @@ public function getScope()
     }
 
     /**
-     * @return boolean|null
+     * @return bool|null
      */
     public function isLazy()
     {

src/DI/Cache/ArrayCache.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Cache;
 
@@ -31,7 +24,7 @@
 class ArrayCache implements Cache, FlushableCache, ClearableCache
 {
     /**
-     * @var array $data
+     * @var array
      */
     private $data = [];
 
@@ -67,7 +60,7 @@ public function getStats()
 
     public function flushAll()
     {
-        $this->data = array();
+        $this->data = [];
 
         return true;
     }

src/DI/Container.php

@@ -1,24 +1,17 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI;
 
-use DI\Definition\ObjectDefinition;
 use DI\Definition\Definition;
 use DI\Definition\FactoryDefinition;
+use DI\Definition\Helper\DefinitionHelper;
 use DI\Definition\InstanceDefinition;
+use DI\Definition\ObjectDefinition;
+use DI\Definition\Resolver\DefinitionResolver;
 use DI\Definition\Resolver\ResolverDispatcher;
 use DI\Definition\Source\CachedDefinitionSource;
 use DI\Definition\Source\DefinitionSource;
 use DI\Definition\Source\MutableDefinitionSource;
-use DI\Definition\Helper\DefinitionHelper;
-use DI\Definition\Resolver\DefinitionResolver;
 use DI\Invoker\DefinitionParameterResolver;
 use DI\Proxy\ProxyFactory;
 use Exception;
@@ -207,7 +200,7 @@ public function has($name)
     }
 
     /**
-     * Inject all dependencies on an existing instance
+     * Inject all dependencies on an existing instance.
      *
      * @param object $instance Object to perform injection upon
      * @throws InvalidArgumentException

src/DI/ContainerBuilder.php

@@ -1,20 +1,13 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI;
 
 use DI\Definition\Source\AnnotationReader;
-use DI\Definition\Source\DefinitionArray;
+use DI\Definition\Source\Autowiring;
 use DI\Definition\Source\CachedDefinitionSource;
-use DI\Definition\Source\DefinitionSource;
+use DI\Definition\Source\DefinitionArray;
 use DI\Definition\Source\DefinitionFile;
-use DI\Definition\Source\Autowiring;
+use DI\Definition\Source\DefinitionSource;
 use DI\Definition\Source\SourceChain;
 use DI\Proxy\ProxyFactory;
 use Doctrine\Common\Cache\Cache;
@@ -43,17 +36,17 @@ class ContainerBuilder
     private $containerClass;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $useAutowiring = true;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $useAnnotations = false;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $ignorePhpDocErrors = false;
 
@@ -64,7 +57,7 @@ class ContainerBuilder
 
     /**
      * If true, write the proxies to disk to improve performances.
-     * @var boolean
+     * @var bool
      */
     private $writeProxiesToFile = false;
 
@@ -93,6 +86,7 @@ class ContainerBuilder
     public static function buildDevContainer()
     {
         $builder = new self();
+
         return $builder->build();
     }
 
@@ -141,12 +135,13 @@ public function build()
      *
      * Enabled by default.
      *
-     * @param boolean $bool
+     * @param bool $bool
      * @return ContainerBuilder
      */
     public function useAutowiring($bool)
     {
         $this->useAutowiring = $bool;
+
         return $this;
     }
 
@@ -155,24 +150,26 @@ public function useAutowiring($bool)
      *
      * Disabled by default.
      *
-     * @param boolean $bool
+     * @param bool $bool
      * @return ContainerBuilder
      */
     public function useAnnotations($bool)
     {
         $this->useAnnotations = $bool;
+
         return $this;
     }
 
     /**
-     * Enable or disable ignoring phpdoc errors (non-existent classes in `@param` or `@var`)
+     * Enable or disable ignoring phpdoc errors (non-existent classes in `@param` or `@var`).
      *
-     * @param boolean $bool
+     * @param bool $bool
      * @return ContainerBuilder
      */
     public function ignorePhpDocErrors($bool)
     {
         $this->ignorePhpDocErrors = $bool;
+
         return $this;
     }
 
@@ -185,20 +182,20 @@ public function ignorePhpDocErrors($bool)
     public function setDefinitionCache(Cache $cache)
     {
         $this->cache = $cache;
+
         return $this;
     }
 
     /**
-     * Configure the proxy generation
+     * Configure the proxy generation.
      *
      * For dev environment, use writeProxiesToFile(false) (default configuration)
      * For production environment, use writeProxiesToFile(true, 'tmp/proxies')
      *
-     * @param boolean     $writeToFile    If true, write the proxies to disk to improve performances
+     * @param bool     $writeToFile    If true, write the proxies to disk to improve performances
      * @param string|null $proxyDirectory Directory where to write the proxies
-     * @return ContainerBuilder
-     *
      * @throws InvalidArgumentException when writeToFile is set to true and the proxy directory is null
+     * @return ContainerBuilder
      */
     public function writeProxiesToFile($writeToFile, $proxyDirectory = null)
     {

src/DI/Debug.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI;
 

src/DI/Definition/AliasDefinition.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Definition;
 
@@ -19,13 +12,13 @@
 class AliasDefinition implements CacheableDefinition
 {
     /**
-     * Entry name
+     * Entry name.
      * @var string
      */
     private $name;
 
     /**
-     * Name of the target entry
+     * Name of the target entry.
      * @var string
      */
     private $targetEntryName;

src/DI/Definition/ArrayDefinition.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Definition;
 
@@ -20,7 +13,7 @@
 class ArrayDefinition implements Definition
 {
     /**
-     * Entry name
+     * Entry name.
      * @var string
      */
     private $name;

src/DI/Definition/ArrayDefinitionExtension.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Definition;
 

src/DI/Definition/CacheableDefinition.php

@@ -1,16 +1,9 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Definition;
 
 /**
- * Cacheable definition
+ * Cacheable definition.
  *
  * @author Matthieu Napoli <matthieu@mnapoli.fr>
  */

src/DI/Definition/DecoratorDefinition.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * PHP-DI
- *
- * @link      http://php-di.org/
- * @copyright Matthieu Napoli (http://mnapoli.fr/)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace DI\Definition;