Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
160 parents 2d28bc3 + 5b19875 + 560d3a2 + ddfdb8f + fd4ce84 + 9e4c786 + 0c0695c + 500c51d + 2f2ebee + 145abe5 + bf5d8d7 + fe0fb99 + 5f7322a + c3af80d + cf95a03 + 6a80fae + 10ed584 + 053ab77 + 495f1ba + d688369 + 56b2490 + 47a689e + f52f94e + fec9c74 + 28a9d88 + ac66d19 + 041ae5a + 63454d4 + da02d07 + 698a4d6 + 35967e7 + 427640f + 64a533c + e408635 + c004297 + b38b581 + 9a9f950 + 47a731a + 0967316 + 37f548b + 0df2db0 + e43587e + 5784352 + 93b4f40 + 3208a48 + f5dfded + 8301af5 + d4a4329 + eaf7585 + 12feb56 + 387d3ed + eb7fedd + a9a0285 + 44fa883 + 08a171a + a4b0e54 + 730ce14 + c24c880 + 80e40b3 + 20961e5 + 8cb611e + c958861 + b8b41bc + f82d7c5 + 7784cd5 + 4ed737c + 785b23e + b537b08 + 34ecc47 + 45265ad + df6c341 + efa67eb + 736f9f8 + d3b33d9 + be06520 + be3997d + e7fb236 + 104e613 + 9e0f279 + a19bb44 + 8553b0b + 02a1820 + e9dd8c9 + 5b5a91a + db9fc36 + f8b7f2b + 09edbcb + 6a99da4 + 4a9dd4d + cc4af6e + 8a07675 + c30b083 + 0c6e411 + be4dae7 + 7465e5d + 1b64e7d + 1f50979 + 92b6722 + 1d54f79 + ab5cea3 + 4f0b000 + c18caa3 + 98036b5 + 3b5c10e + a248769 + ed60259 + ae0af2f + 761379e + 118bbd6 + 9ce360b + 4d4425a + cc47b49 + c4aa2e1 + c152f67 + bd774aa + a95f940 + fb3126d + f420aa3 + 288aa3f + 9fa9257 + 82606a6 + cbe2b1f + 46ed6e3 + 085bc16 + 5f35882 + 61d8584 + 24a5c98 + c8f7092 + ebdb37c + 3c57460 + d38a8d4 + 5725284 + 9bc667a + 5eedb7e + 0e7a856 + fc7c32a + d1f2eb1 + 5c87eda + 71d8d27 + a365923 + 7f777b6 + c62bcc9 + 4bd3bc3 + a183e11 + 84e6810 + edad949 + 043bfb5 + 8e6f606 + 1c2b629 + e4251d2 + e8c20f9 + 6de8d76 + e529dce + 24f43fa + 336bb38 + d86e872 + 41e010c + 6a5ab3d + ca50dd5 + 8b8277a commit a847f61
Show file tree
Hide file tree
Showing 38 changed files with 60 additions and 158 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Expand Up @@ -28,8 +28,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down
4 changes: 0 additions & 4 deletions src/Config.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -17,9 +16,6 @@

/**
* Configures Di instances
*
* @category Zend
* @package Zend_Di
*/
class Config
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/Annotation/Inject.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -14,9 +13,6 @@

/**
* Annotation for injection endpoints for dependencies
*
* @category Zend
* @package Zend_Di
*/
class Inject implements AnnotationInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/Annotation/Instantiator.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -14,9 +13,6 @@

/**
* Annotation for instantiator
*
* @category Zend
* @package Zend_Di
*/
class Instantiator implements AnnotationInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/ArrayDefinition.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* Class definitions based on a given array
*
* @category Zend
* @package Zend_Di
*/
class ArrayDefinition implements DefinitionInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/Builder/InjectionMethod.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* Definitions for an injection endpoint method
*
* @category Zend
* @package Zend_Di
*/
class InjectionMethod
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/Builder/PhpClass.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* Object containing definitions for a single class
*
* @category Zend
* @package Zend_Di
*/
class PhpClass
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/BuilderDefinition.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -14,9 +13,6 @@

/**
* Class definitions based on a configuration array
*
* @category Zend
* @package Zend_Di
*/
class BuilderDefinition implements DefinitionInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/ClassDefinition.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* Class definitions for a single class
*
* @category Zend
* @package Zend_Di
*/
class ClassDefinition implements DefinitionInterface, PartialMarker
{
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/CompilerDefinition.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -20,9 +19,6 @@

/**
* Class definitions based on a set of directories to be scanned
*
* @category Zend
* @package Zend_Di
*/
class CompilerDefinition implements DefinitionInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Definition/DefinitionInterface.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* @category Zend
* @package Zend_Di
*/
interface DefinitionInterface
{
/**
Expand Down
4 changes: 0 additions & 4 deletions src/Definition/IntrospectionStrategy.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -16,9 +15,6 @@
/**
* Strategy used to discover methods to be considered as endpoints for dependency injection based on implemented
* interfaces, annotations and method names
*
* @category Zend
* @package Zend_Di
*/
class IntrospectionStrategy
{
Expand Down
5 changes: 0 additions & 5 deletions src/Definition/PartialMarker.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* @category Zend
* @package Zend_Di
*/
interface PartialMarker
{
}
4 changes: 0 additions & 4 deletions src/Definition/RuntimeDefinition.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -16,9 +15,6 @@

/**
* Class definitions based on runtime reflection
*
* @category Zend
* @package Zend_Di
*/
class RuntimeDefinition implements DefinitionInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/DefinitionList.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -14,9 +13,6 @@

/**
* Class definition based on multiple definitions
*
* @category Zend
* @package Zend_Di
*/
class DefinitionList extends SplDoublyLinkedList implements Definition\DefinitionInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/DependencyInjectionInterface.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;

/**
* @category Zend
* @package Zend_Di
*/
interface DependencyInjectionInterface extends LocatorInterface
{
/**
Expand Down
15 changes: 6 additions & 9 deletions src/Di.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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;
Expand All @@ -15,9 +14,6 @@

/**
* Dependency injector that can generate instances using class definitions and configured instance parameters
*
* @category Zend
* @package Zend_Di
*/
class Di implements DependencyInjectionInterface
{
Expand Down Expand Up @@ -167,13 +163,14 @@ public function get($name, array $params = array())
array_pop($this->instanceContext);
return $im->getSharedInstanceWithParameters(null, array(), $fastHash);
}
} else {
if ($im->hasSharedInstance($name, $callParameters)) {
array_pop($this->instanceContext);
return $im->getSharedInstance($name, $callParameters);
}
}

if ($im->hasSharedInstance($name, $callParameters)) {
array_pop($this->instanceContext);
return $im->getSharedInstance($name, $callParameters);
}


$config = $im->getConfig($name);
$instance = $this->newInstance($name, $params, $config['shared']);
array_pop($this->instanceContext);
Expand Down
4 changes: 0 additions & 4 deletions src/Display/Console.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Display;
Expand All @@ -14,9 +13,6 @@

/**
* Exporter for class definitions
*
* @category Zend
* @package Zend_Di
*/
class Console
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/CircularDependencyException.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Exception;

use DomainException;

/**
* @category Zend
* @package Zend_Di
*/
class CircularDependencyException extends DomainException implements ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/ClassNotFoundException.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Exception;

use DomainException;

/**
* @category Zend
* @package Zend_Di
*/
class ClassNotFoundException extends DomainException implements ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Exception;

/**
* @category Zend
* @package Zend_Di
*/
interface ExceptionInterface
{
}
5 changes: 0 additions & 5 deletions src/Exception/InvalidArgumentException.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 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\Exception;

/**
* @category Zend
* @package Zend_Di
*/
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}

0 comments on commit a847f61

Please sign in to comment.