Merge branch 'master' into acceptHandling

Conflicts:
	library/Zend/Mvc/Controller/RestfulController.php

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-di",
-    "description": "Zend\\Di component",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-di",
     "autoload": {
         "psr-4": {
-            "Zend\\Di\\": "src/"
+            "Zend\\Di": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-code": "self.version",
         "zendframework/zend-stdlib": "self.version"
     },

src/Configuration.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Di
+ */
 
 namespace Zend\Di;
 
@@ -7,15 +15,16 @@
 
 class Configuration
 {
-    protected $data = array();
-
     /**
-     * @var Zend\Di\DependencyInjector
+     * @var array
      */
-    protected $di = null;
-
+    protected $data = array();
+    
     /**
+     * Constructor
+     *
      * @param  array|Traversable $options
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct($options)
     {
@@ -30,7 +39,13 @@ public function __construct($options)
         }
         $this->data = $options;
     }
-
+
+    /**
+     * Configure
+     *
+     * @param Di $di
+     * @return void
+     */
     public function configure(Di $di)
     {
         if (isset($this->data['definition'])) {

src/Definition/Annotation/Inject.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Di
+ */
 
 namespace Zend\Di\Definition\Annotation;
 

src/Definition/Annotation/Instantiator.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Di
+ */
 
 namespace Zend\Di\Definition\Annotation;
 

src/Definition/ArrayDefinition.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Di
+ */
 
 namespace Zend\Di\Definition;
 

src/Definition/Builder/InjectionMethod.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Di
+ */
 
 namespace Zend\Di\Definition\Builder;
 

src/Definition/Builder/PhpClass.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Di
+ */
 
 namespace Zend\Di\Definition\Builder;
 
@@ -9,13 +17,24 @@ class PhpClass
     protected $instantiator         = '__construct';
     protected $injectionMethods     = array();
     protected $superTypes           = array();
-
+
+    /**
+     * Set name
+     *
+     * @param string $name
+     * @return PhpClass
+     */
     public function setName($name)
     {
         $this->name = $name;
         return $this;
     }
-
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
     public function getName()
     {
         return $this->name;
@@ -31,18 +50,29 @@ public function getInstantiator()
     {
         return $this->instantiator;
     }
-    
+
     public function addSuperType($superType)
     {
         $this->superTypes[] = $superType;
         return $this;
     }
-
+
+    /**
+     * Get super types
+     *
+     * @return array
+     */
     public function getSuperTypes()
     {
         return $this->superTypes;
     }
-
+
+    /**
+     * Add injection method
+     *
+     * @param InjectionMethod $injectionMethod
+     * @return PhpClass
+     */
     public function addInjectionMethod(InjectionMethod $injectionMethod)
     {
         $this->injectionMethods[] = $injectionMethod;