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

Commit

Permalink
Merge branch 'feature/docblock-simplification' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Jan 21, 2013
54 parents 0b9b10b + 20cb06f + 3d198b0 + 01191de + b81deab + 60cfdd6 + 27c9604 + 5fe6f9b + ff3afa0 + b658b6a + 8a67cfa + c13245d + 4c0c206 + d20df42 + 84cabf6 + 4daeba0 + 660eb19 + 587b0dd + 13e8cbe + 7100033 + 50b1c92 + 94eb741 + 1ca385c + 86e6515 + 58c378d + 061dbfa + 897f6bf + e3cc86e + 6524484 + 8243aea + 627112b + 710ddb9 + 65adbd2 + d5316ee + f060e74 + 820c39f + f2e79ab + 330c7bd + badbfbb + f707041 + a5c1623 + a9e8be8 + fa084a3 + cfd4b79 + 251bb65 + b4e109b + 9fee000 + bae22c4 + 3328b9a + 3f6ed6f + 584f62b + 1262a33 + 6baf7f7 + 42eacae commit a98174e
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 80 deletions.
5 changes: 0 additions & 5 deletions src/AutoloaderFactory.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;
Expand All @@ -19,10 +18,6 @@
return;
}

/**
* @category Zend
* @package Zend_Loader
*/
abstract class AutoloaderFactory
{
const STANDARD_AUTOLOADER = 'Zend\Loader\StandardAutoloader';
Expand Down
4 changes: 0 additions & 4 deletions src/ClassMapAutoloader.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;
Expand All @@ -19,9 +18,6 @@
* Class-map autoloader
*
* Utilizes class-map files to lookup classfile locations.
*
* @category Zend
* @package Zend_Loader
*/
class ClassMapAutoloader implements SplAutoloader
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/BadMethodCallException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +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_Loader
*/

namespace Zend\Loader\Exception;

require_once __DIR__ . '/ExceptionInterface.php';

/**
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/DomainException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
* @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_Loader
*/

namespace Zend\Loader\Exception;

require_once __DIR__ . '/ExceptionInterface.php';

/**
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class DomainException extends \DomainException implements ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
* @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_Loader
*/

namespace Zend\Loader\Exception;

/**
* @category Zend
* @package Zend_Loader
*/
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,18 +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_Loader
*/

namespace Zend\Loader\Exception;

require_once __DIR__ . '/ExceptionInterface.php';

/**
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/InvalidPathException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
* @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_Loader
*/

namespace Zend\Loader\Exception;

require_once __DIR__ . '/ExceptionInterface.php';

/**
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class InvalidPathException extends \Exception implements ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/MissingResourceNamespaceException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +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_Loader
*/

namespace Zend\Loader\Exception;

require_once __DIR__ . '/ExceptionInterface.php';

/**
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class MissingResourceNamespaceException extends \Exception implements
ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Exception/PluginLoaderException.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader\Exception;
Expand All @@ -14,10 +13,6 @@

/**
* Plugin class loader exceptions
*
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class PluginLoaderException extends DomainException
{
Expand Down
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,17 +5,11 @@
* @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_Loader
*/

namespace Zend\Loader\Exception;

require_once __DIR__ . '/ExceptionInterface.php';

/**
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/SecurityException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
* @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_Loader
*/

namespace Zend\Loader\Exception;

require_once __DIR__ . '/DomainException.php';

/**
* @category Zend
* @package Zend_Loader
* @subpackage Exception
*/
class SecurityException extends DomainException
{}
1 change: 0 additions & 1 deletion src/ModuleAutoloader.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;
Expand Down
4 changes: 0 additions & 4 deletions src/PluginClassLoader.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;
Expand All @@ -16,9 +15,6 @@

/**
* Plugin class locator interface
*
* @category Zend
* @package Zend_Loader
*/
class PluginClassLoader implements PluginClassLocator
{
Expand Down
4 changes: 0 additions & 4 deletions src/PluginClassLocator.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;
Expand All @@ -14,9 +13,6 @@

/**
* Plugin class locator interface
*
* @category Zend
* @package Zend_Loader
*/
interface PluginClassLocator extends ShortNameLocator, \IteratorAggregate
{
Expand Down
4 changes: 0 additions & 4 deletions src/ShortNameLocator.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;

/**
* Short name locator interface
*
* @category Zend
* @package Zend_Loader
*/
interface ShortNameLocator
{
Expand Down
3 changes: 0 additions & 3 deletions src/SplAutoloader.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;
Expand All @@ -17,8 +16,6 @@
/**
* Defines an interface for classes that may register with the spl_autoload
* registry
*
* @package Zend_Loader
*/
interface SplAutoloader
{
Expand Down
3 changes: 0 additions & 3 deletions src/StandardAutoloader.php
View file
Original file line number Diff line number Diff line change
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_Loader
*/

namespace Zend\Loader;
Expand All @@ -19,8 +18,6 @@
* Allows autoloading both namespaced and vendor-prefixed classes. Class
* lookups are performed on the filesystem. If a class file for the referenced
* class is not found, a PHP warning will be raised by include().
*
* @package Zend_Loader
*/
class StandardAutoloader implements SplAutoloader
{
Expand Down

0 comments on commit a98174e

Please sign in to comment.