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

Commit

Permalink
Merge branch 'master' of https://github.com/zendframework/zf2 into zf…
Browse files Browse the repository at this point in the history 
…-3371
  • Loading branch information
JustinV committed Jan 30, 2013
101 parents 754bd9a + c36f6c0 + 3ead99d + be05873 + 34e7aec + 2fcaf1c + 3f9b994 + ea3acc3 + fe35f10 + 45cc91b + aa77760 + 4959b82 + 35e2edb + 7717bd8 + 127fcbd + fc52973 + 528f461 + 8e251cd + d95b25a + 0f89697 + c941b0e + 3dc45ae + 180e140 + 67c3033 + 533cd3e + 29e7718 + 936c9be + 2d11657 + fa66751 + 2b778cc + ba628cd + ff761e1 + 5b64ee3 + 9456811 + 1c2d797 + 46b0d8f + 82264b3 + 39c88ce + cee064b + c303bed + ea247e3 + 1f87514 + 8896fc2 + 313a38d + 42848d4 + 8f5c457 + e035a2a + 544e341 + 467f8b2 + 30bb6f0 + f8cc896 + 2ee0afd + 656f0b0 + 7092cb4 + 5e1b259 + abb3ff8 + 39a873f + b6e6c92 + 83055d8 + 1dd5d72 + 9bc304a + 479b8c7 + 41fab24 + 80aee85 + 3962f1e + 6c6b004 + acb7af7 + 39aca71 + 9d55623 + c2210f2 + 50b7a31 + 327d366 + 00cfdb8 + 77c12db + 4a66170 + 4bd5c7f + 9549d20 + d3a95e2 + 5e04377 + d9da2cf + 1049b39 + 001d281 + ca437e5 + a5cb2da + e2db3b8 + 27f50b4 + 8008d6f + 4a6bead + e2df9ad + 9045ea9 + 0d18a05 + 48cc7df + dc08391 + ceec2bd + c5fc623 + 6335bda + 2a78ec6 + 56c198e + 3fab1eb + 6e15982 + 0f89452 commit 0c71387
Show file tree
Hide file tree
Showing 24 changed files with 167 additions and 110 deletions.
5 changes: 0 additions & 5 deletions src/AbstractFactoryInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;

/**
* @category Zend
* @package Zend_ServiceManager
*/
interface AbstractFactoryInterface
{
/**
Expand Down
10 changes: 1 addition & 9 deletions src/AbstractPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;
Expand All @@ -19,9 +18,6 @@
* the plugin when retrieved. Finally, enables the allowOverride property by
* default to allow registering factories, aliases, and invokables to take
* the place of those provided by the implementing class.
*
* @category Zend
* @package Zend_ServiceManager
*/
abstract class AbstractPluginManager extends ServiceManager implements ServiceLocatorAwareInterface
{
Expand All @@ -30,7 +26,7 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
*
* @var bool
*/
protected $allowOverride = true;
protected $allowOverride = true;

/**
* Whether or not to auto-add a class as an invokable class if it exists
Expand Down Expand Up @@ -69,9 +65,6 @@ public function __construct(ConfigInterface $configuration = null)
if ($instance instanceof ServiceLocatorAwareInterface) {
$instance->setServiceLocator($self);
}
if ($instance instanceof ServiceManagerAwareInterface) {
$instance->setServiceManager($self);
}
});
}

Expand Down Expand Up @@ -218,5 +211,4 @@ protected function createFromFactory($canonicalName, $requestedName)

return $instance;
}

}
6 changes: 0 additions & 6 deletions src/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;

/**
* @category Zend
* @package Zend_ServiceManager
*/
class Config implements ConfigInterface
{
/**
Expand Down Expand Up @@ -151,5 +146,4 @@ public function configureServiceManager(ServiceManager $serviceManager)
$serviceManager->setShared($name, $isShared);
}
}

}
5 changes: 0 additions & 5 deletions src/ConfigInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;

/**
* @category Zend
* @package Zend_ServiceManager
*/
interface ConfigInterface
{
/**
Expand Down
1 change: 0 additions & 1 deletion src/Di/DiAbstractServiceFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Di;
Expand Down
1 change: 0 additions & 1 deletion src/Di/DiInstanceManagerProxy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Di;
Expand Down
2 changes: 0 additions & 2 deletions src/Di/DiServiceFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Di;
Expand Down Expand Up @@ -120,5 +119,4 @@ public function get($name, array $params = array())
}

}

}
2 changes: 0 additions & 2 deletions src/Di/DiServiceInitializer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Di;
Expand Down Expand Up @@ -65,5 +64,4 @@ public function initialize($instance, ServiceLocatorInterface $serviceLocator)
throw $e;
}
}

}
6 changes: 0 additions & 6 deletions src/Exception/CircularDependencyFoundException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Exception;

/**
* @category Zend
* @package Zend_ServiceManager
* @subpackage Exception
*/
class CircularDependencyFoundException extends RuntimeException
{
}
6 changes: 0 additions & 6 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Exception;

/**
* @category Zend
* @package Zend_ServiceManager
* @subpackage Exception
*/
interface ExceptionInterface
{
}
6 changes: 0 additions & 6 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Exception;

/**
* @category Zend
* @package Zend_ServiceManager
* @subpackage Exception
*/
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
6 changes: 0 additions & 6 deletions src/Exception/InvalidServiceNameException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Exception;

/**
* @category Zend
* @package Zend_ServiceManager
* @subpackage Exception
*/
class InvalidServiceNameException extends RuntimeException
{
}
6 changes: 0 additions & 6 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Exception;

/**
* @category Zend
* @package Zend_ServiceManager
* @subpackage Exception
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
}
6 changes: 0 additions & 6 deletions src/Exception/ServiceNotCreatedException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Exception;

/**
* @category Zend
* @package Zend_ServiceManager
* @subpackage Exception
*/
class ServiceNotCreatedException extends RuntimeException
{
}
6 changes: 0 additions & 6 deletions src/Exception/ServiceNotFoundException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager\Exception;

/**
* @category Zend
* @package Zend_ServiceManager
* @subpackage Exception
*/
class ServiceNotFoundException extends InvalidArgumentException
{
}
5 changes: 0 additions & 5 deletions src/FactoryInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;

/**
* @category Zend
* @package Zend_ServiceManager
*/
interface FactoryInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/InitializerInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;

use Zend\ServiceManager\ServiceLocatorInterface;

/**
* @category Zend
* @package Zend_ServiceManager
*/
interface InitializerInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/ServiceLocatorAwareInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;

/**
* @category Zend
* @package Zend_ServiceManager
*/
interface ServiceLocatorAwareInterface
{
/**
Expand Down
43 changes: 43 additions & 0 deletions src/ServiceLocatorAwareTrait.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link https://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
*/

namespace Zend\ServiceManager;

use Zend\ServiceManager\ServiceLocatorInterface;

trait ServiceLocatorAwareTrait
{
/**
* @var ServiceLocator
*/
protected $serviceLocator = null;

/**
* Set service locator
*
* @param ServiceLocatorInterface $serviceLocator
* @return mixed
*/
public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
{
$this->serviceLocator = $serviceLocator;

return $this;
}

/**
* Get service locator
*
* @return ServiceLocator
*/
public function getServiceLocator()
{
return $this->serviceLocator;
}
}
4 changes: 0 additions & 4 deletions src/ServiceLocatorInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link https://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_ServiceManager
*/

namespace Zend\ServiceManager;

/**
* Service locator interface
*
* @category Zend
* @package Zend_ServiceManager
*/
interface ServiceLocatorInterface
{
Expand Down
Loading

0 comments on commit 0c71387

Please sign in to comment.