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
88 parents e8c607f + a09c5c7 + 21afa5c + 8faa67f + ae87c49 + fb156fb + 9c474de + 1a75c72 + 47d1cd2 + de058f6 + 67b97f6 + 40d86d0 + b5234cc + 17b4e13 + 8af24aa + 1a9df55 + 2c85c99 + 5557fac + fe78a35 + f6430c3 + 6041a1e + 86b9031 + 674bd75 + 67a1bfb + 4d4dd8b + c655082 + dbb18b2 + 97a9134 + 80367df + 98d5255 + 7946c9f + ea67c13 + 44df0b2 + 38e090d + 7af74e7 + 8b311b1 + e2c2b94 + 51601cb + dcc1eaf + 6f4b805 + a30a64f + ee7347d + 8b04bfe + b487f00 + ecdfdf6 + d8cde75 + b7a33bb + 65ecb58 + 571d938 + 625a786 + 6fe4efc + f94838d + 76607e3 + 492076c + 17b56b8 + c5509fe + e0fa433 + 7d74e99 + 309136e + f1dd38a + 7be533f + 6a618c2 + 3a454e3 + f66ca80 + f1bebf2 + 850249d + a937ea3 + 597ff82 + 1731915 + efa1bb3 + 5576455 + 86d3ae8 + de3fd70 + 398a3c4 + 5c56554 + 7ad896f + fa91c9b + 1372a45 + 4219922 + a9b7779 + 674d7ba + a0c8737 + e368d53 + 31f8c80 + 462b1f7 + 49e380f + 39cb2e2 + 22f13c5 commit b606220
Show file tree
Hide file tree
Showing 47 changed files with 0 additions and 258 deletions.
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_Log
*/

namespace Zend\Log\Exception;

/**
* @category Zend
* @package Zend_Log
*/
interface ExceptionInterface
{}
5 changes: 0 additions & 5 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
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_Log
*/

namespace Zend\Log\Exception;

/**
* Invalid argument exception
*
* @category Zend
* @package Zend_Log
* @subpackage Exception
*/
class InvalidArgumentException
extends \InvalidArgumentException
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
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_Log
*/

namespace Zend\Log\Exception;

/**
* Runtime argument exception
*
* @category Zend
* @package Zend_Log
* @subpackage Exception
*/
class RuntimeException
extends \RuntimeException
Expand Down
5 changes: 0 additions & 5 deletions src/Filter/FilterInterface.php
View file
Original file line number Diff line number Diff line change
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_Log
*/

namespace Zend\Log\Filter;

/**
* @category Zend
* @package Zend_Log
*/
interface FilterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Filter/Mock.php
View file
Original file line number Diff line number Diff line change
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_Log
*/

namespace Zend\Log\Filter;

/**
* @category Zend
* @package Zend_Log
* @subpackage Writer
*/
class Mock implements FilterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Filter/Priority.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @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_Log
*/

namespace Zend\Log\Filter;

use Traversable;
use Zend\Log\Exception;

/**
* @category Zend
* @package Zend_Log
* @subpackage Filter
*/
class Priority implements FilterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Filter/Regex.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_Log
*/

namespace Zend\Log\Filter;
Expand All @@ -14,11 +13,6 @@
use Zend\Log\Exception;
use Zend\Stdlib\ErrorHandler;

/**
* @category Zend
* @package Zend_Log
* @subpackage Filter
*/
class Regex implements FilterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Filter/SuppressFilter.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_Log
*/

namespace Zend\Log\Filter;


/**
* @category Zend
* @package Zend_Log
* @subpackage Filter
*/
class SuppressFilter implements FilterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Filter/Validator.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_Log
*/

namespace Zend\Log\Filter;
Expand All @@ -14,11 +13,6 @@
use Zend\Log\Exception;
use Zend\Validator\ValidatorInterface as ZendValidator;

/**
* @category Zend
* @package Zend_Log
* @subpackage Filter
*/
class Validator implements FilterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/Base.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @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_Log
*/

namespace Zend\Log\Formatter;

use DateTime;
use Traversable;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class Base implements FormatterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/ChromePhp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @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_Log
*/

namespace Zend\Log\Formatter;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class ChromePhp implements FormatterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/Db.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @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_Log
*/

namespace Zend\Log\Formatter;

use DateTime;
use Traversable;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class Db implements FormatterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/ErrorHandler.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_Log
*/

namespace Zend\Log\Formatter;

use DateTime;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class ErrorHandler extends Simple
{
const DEFAULT_FORMAT = '%timestamp% %priorityName% (%priority%) %message% (errno %extra[errno]%) in %extra[file]% on line %extra[line]%';
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/ExceptionHandler.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_Log
*/

namespace Zend\Log\Formatter;

use DateTime;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class ExceptionHandler implements FormatterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/FirePhp.php
View file
Original file line number Diff line number Diff line change
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_Log
*/

namespace Zend\Log\Formatter;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class FirePhp implements FormatterInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Formatter/FormatterInterface.php
View file
Original file line number Diff line number Diff line change
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_Log
*/

namespace Zend\Log\Formatter;

/**
* @category Zend
* @package Zend_Log
*/
interface FormatterInterface
{
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/Simple.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* @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_Log
*/

namespace Zend\Log\Formatter;

use Traversable;
use Zend\Log\Exception;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class Simple extends Base
{
const DEFAULT_FORMAT = '%timestamp% %priorityName% (%priority%): %message% %extra%';
Expand Down
6 changes: 0 additions & 6 deletions src/Formatter/Xml.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_Log
*/

namespace Zend\Log\Formatter;
Expand All @@ -17,11 +16,6 @@
use Zend\Escaper\Escaper;
use Zend\Stdlib\ArrayUtils;

/**
* @category Zend
* @package Zend_Log
* @subpackage Formatter
*/
class Xml implements FormatterInterface
{
/**
Expand Down
4 changes: 0 additions & 4 deletions src/Logger.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_Log
*/

namespace Zend\Log;
Expand All @@ -17,9 +16,6 @@

/**
* Logging messages with a stack of backends
*
* @category Zend
* @package Zend_Log
*/
class Logger implements LoggerInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/LoggerAwareInterface.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_Log
*/

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

/**
* Logger aware interface
*
* @category Zend
* @package Zend_Log
*/
interface LoggerAwareInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/LoggerAwareTrait.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@
* @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_Log
*/

namespace Zend\Log;

use Zend\Log\LoggerInterface;

/**
* @category Zend
* @package Zend_Log
*/
trait LoggerAwareTrait
{
/**
Expand Down
Loading

0 comments on commit b606220

Please sign in to comment.