Skip to content
This repository has been archived by the owner on Jan 29, 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
135 parents a6e6d31 + 69fb7fc + 57cb4a0 + c00c005 + fb107e5 + 98634df + 8d23ab7 + 19e17a6 + 98ac67f + 0a2d51c + 86db540 + efbb513 + 24c143c + 307427e + 4c7a822 + 25d3bd7 + 40bfe7f + 70ca2ff + 76fd684 + 82cff31 + 186a39c + 39a35fe + b0c8193 + 1a7e426 + 09ea754 + 8317963 + 950705c + bd78289 + 25f3e05 + 1c0577b + 6bcfccb + 0b2a1a9 + 7974490 + f3ba45e + 4357e80 + 7d43d02 + 421a0f4 + e7aa329 + 6d05bfe + f27c5e2 + 6cb3b21 + 1ecb5ed + b66b0e2 + 0b91e40 + 6bda391 + b932fa5 + a431b75 + 9ce83ec + a35dff6 + 60e4965 + 0f071e9 + 3fe17b4 + 196ca18 + 17cbc64 + 8f4a51f + 88ec12d + 31ab35e + 59c83c4 + d50da4c + 01af50b + 6a46af5 + 4308adc + 1c3d629 + 18a268d + 1987408 + abc72db + 175f7ab + 8a85704 + 7706019 + cc5d38c + fbaa5aa + 0555415 + 20ae04b + 0680687 + e65301c + 424e30a + d36a7f1 + 64bb794 + c74649b + b14bb6b + 4e73e4e + 0ee93d0 + e887bfd + f66ad20 + 66c5ff2 + f5b2841 + 717175b + 52c5e49 + 8f39d69 + 2003fce + 1ccb3fd + 315a9ac + 2b82c0f + 1565409 + fd7399e + cb27129 + 62ca6c9 + 7b73995 + 18f93e0 + 72fe59b + 9f5b116 + 28a04a3 + b56ee4d + 9287e61 + 1a420ec + 6a43cc1 + ad11b96 + cf95523 + f36ff90 + 5344247 + 5cdfa08 + 4925e55 + 25ef603 + e25b09c + dc5f609 + ccf1c7e + 251b79e + 78fbb55 + fcc04e7 + 9bf2948 + 9561532 + b614ad3 + 954a3b1 + dacc257 + 07a262d + 59c02c3 + 7064caa + 6f75739 + 747b7ed + eb24d30 + 8ff8298 + 97c61d8 + da4af46 + 11c9caf + 14dce2d commit 853c28f
Show file tree
Hide file tree
Showing 24 changed files with 0 additions and 136 deletions.
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_Config
*/

namespace Zend\Config;
Expand All @@ -21,9 +20,6 @@
*
* Implements Countable, Iterator and ArrayAccess
* to facilitate easy access to the data.
*
* @category Zend
* @package Zend_Config
*/
class Config implements Countable, Iterator, ArrayAccess
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/ExceptionInterface.php
View file
Expand Up @@ -5,15 +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_Config
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Exception
*/
interface ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/InvalidArgumentException.php
View file
Expand Up @@ -5,15 +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_Config
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Exception
*/
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/RuntimeException.php
View file
Expand Up @@ -5,15 +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_Config
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Exception
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Factory.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_Config
*/

namespace Zend\Config;

use Zend\Stdlib\ArrayUtils;

/**
* @category Zend
* @package Zend_Config
*/
class Factory
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Processor/Constant.php
View file
Expand Up @@ -5,16 +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_Config
*/

namespace Zend\Config\Processor;

/**
* @category Zend
* @package Zend_Config
* @subpackage Processor
*/
class Constant extends Token implements ProcessorInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Processor/Filter.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_Config
*/

namespace Zend\Config\Processor;
Expand All @@ -14,11 +13,6 @@
use Zend\Config\Exception;
use Zend\Filter\FilterInterface as ZendFilter;

/**
* @category Zend
* @package Zend_Config
* @subpackage Processor
*/
class Filter implements ProcessorInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Processor/ProcessorInterface.php
View file
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_Config
*/

namespace Zend\Config\Processor;

use Zend\Config\Config;

/**
* @category Zend
* @package Zend_Config
* @subpackage Processor
*/
interface ProcessorInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Processor/Queue.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_Config
*/

namespace Zend\Config\Processor;
Expand All @@ -14,11 +13,6 @@
use Zend\Config\Exception;
use Zend\Stdlib\PriorityQueue;

/**
* @category Zend
* @package Zend_Config
* @subpackage Processor
*/
class Queue extends PriorityQueue implements ProcessorInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Processor/Token.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_Config
*/

namespace Zend\Config\Processor;
Expand All @@ -14,11 +13,6 @@
use Zend\Config\Config;
use Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Processor
*/
class Token implements ProcessorInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Processor/Translator.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_Config
*/

namespace Zend\Config\Processor;
Expand All @@ -14,11 +13,6 @@
use Zend\Config\Exception;
use Zend\I18n\Translator\Translator as ZendTranslator;

/**
* @category Zend
* @package Zend_Config
* @subpackage Processor
*/
class Translator implements ProcessorInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Reader/Ini.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_Config
*/

namespace Zend\Config\Reader;
Expand All @@ -14,10 +13,6 @@

/**
* XML config reader.
*
* @category Zend
* @package Zend_Config
* @subpackage Reader
*/
class Ini implements ReaderInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Reader/Json.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_Config
*/

namespace Zend\Config\Reader;
Expand All @@ -16,10 +15,6 @@

/**
* JSON config reader.
*
* @category Zend
* @package Zend_Config
* @subpackage Reader
*/
class Json implements ReaderInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Reader/ReaderInterface.php
View file
Expand Up @@ -5,16 +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_Config
*/

namespace Zend\Config\Reader;

/**
* @category Zend
* @package Zend_Config
* @subpackage Reader
*/
interface ReaderInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Reader/Xml.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_Config
*/

namespace Zend\Config\Reader;
Expand All @@ -15,10 +14,6 @@

/**
* XML config reader.
*
* @category Zend
* @package Zend_Config
* @subpackage Reader
*/
class Xml implements ReaderInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Reader/Yaml.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_Config
*/

namespace Zend\Config\Reader;
Expand All @@ -14,10 +13,6 @@

/**
* YAML config reader.
*
* @category Zend
* @package Zend_Config
* @subpackage Reader
*/
class Yaml implements ReaderInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/ReaderPluginManager.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_Config
*/

namespace Zend\Config;

use Zend\ServiceManager\AbstractPluginManager;

/**
* @category Zend
* @package Zend_Config
*/
class ReaderPluginManager extends AbstractPluginManager
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Writer/AbstractWriter.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_Config
*/

namespace Zend\Config\Writer;
Expand All @@ -14,11 +13,6 @@
use Zend\Config\Exception;
use Zend\Stdlib\ArrayUtils;

/**
* @category Zend
* @package Zend_Config
* @subpackage Writer
*/
abstract class AbstractWriter implements WriterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Writer/Ini.php
View file
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_Config
*/

namespace Zend\Config\Writer;

use Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @subpackage Writer
*/
class Ini extends AbstractWriter
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Writer/Json.php
View file
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_Config
*/

namespace Zend\Config\Writer;

use Zend\Json\Json as JsonFormat;

/**
* @category Zend
* @package Zend_Config
* @subpackage Writer
*/
class Json extends AbstractWriter
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Writer/PhpArray.php
View file
Expand Up @@ -5,16 +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_Config
*/

namespace Zend\Config\Writer;

/**
* @category Zend
* @package Zend_Config
* @subpackage Writer
*/
class PhpArray extends AbstractWriter
{
/**
Expand Down

0 comments on commit 853c28f

Please sign in to comment.