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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Preparing to tag 2.1.0 -- all new features from develop are now merged to master.
  • Loading branch information
@weierophinney
weierophinney committed Jan 29, 2013
100 parents 586b2b0 + 8b3839b + 04e8ff0 + b40d57a + e7c04f9 + 7015d6e + 67d62a9 + 9acf647 + 33f48c3 + db34ff9 + c4d0f17 + f6b222a + fb9a1b3 + 9b34c27 + 457dc51 + bd1a8cd + 21c6816 + e63ad13 + ebb65de + feaeb97 + 6d76c21 + 8080e99 + 3d8fc08 + 376eb68 + 846ff4b + a0b34c2 + 40bdf5a + e01831f + f22306a + 8248197 + 740d2ca + 3e4973e + 1f71371 + f945a68 + 6737231 + 7554e22 + f43a14f + 5680e05 + 8c71fbe + 7640752 + 17fca5b + 3e4bdb7 + a1ec0e4 + 73e93c4 + 954b983 + 5a4d447 + 08d604f + a198091 + 3b2d396 + ed13b76 + 8c1c902 + 66db3c0 + 88e5c45 + 4766aaf + af7efc8 + 2c6ae34 + ea85a56 + d1750df + 665f6e2 + 3e28dac + edefcee + fed5933 + 55c0906 + 067d44c + 694c574 + 1ea7f1a + e705000 + 5b6a369 + ce9b366 + 61eaaee + 1c21891 + 1302107 + b74ab9c + 031d20b + d5b278f + 9115e94 + 65eecd8 + 3beca1c + 8d86ba5 + 71f73d2 + f41cf4b + 34b4e0f + 5441ea0 + 2817c6f + 6332964 + ffbf051 + 3a82d12 + 2acee5a + 755e362 + dd6a25d + 1ec6372 + 0bdf06b + 35ea51e + 7a27ea1 + 057899c + 20c564d + 4c20a75 + dc6841c + 405d814 + 608988f commit b380a05
Show file tree
Hide file tree
Showing 18 changed files with 0 additions and 63 deletions.
5 changes: 0 additions & 5 deletions src/Cloud.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +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_Tag
*/

namespace Zend\Tag;

use Traversable;
use Zend\Stdlib\ArrayUtils;

/**
* @category Zend
* @package Zend_Tag
*/
class Cloud
{
/**
Expand Down
4 changes: 0 additions & 4 deletions src/Cloud/Decorator/AbstractCloud.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator;

/**
* Abstract class for cloud decorators
*
* @category Zend
* @package Zend_Tag
*/
abstract class AbstractCloud extends AbstractDecorator
{
Expand Down
4 changes: 0 additions & 4 deletions src/Cloud/Decorator/AbstractDecorator.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator;
Expand All @@ -18,9 +17,6 @@

/**
* Abstract class for decorators
*
* @category Zend
* @package Zend_Tag
*/
abstract class AbstractDecorator implements Decorator
{
Expand Down
4 changes: 0 additions & 4 deletions src/Cloud/Decorator/AbstractTag.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator;

/**
* Abstract class for tag decorators
*
* @category Zend
* @package Zend_Tag
*/
abstract class AbstractTag extends AbstractDecorator
{
Expand Down
5 changes: 0 additions & 5 deletions src/Cloud/Decorator/DecoratorInterface.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator;

/**
* Interface for decorators
*
* @category Zend
* @package Zend_Tag
* @subpackage Cloud
*/
interface DecoratorInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Cloud/Decorator/Exception/ExceptionInterface.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator\Exception;
Expand All @@ -14,9 +13,6 @@

/**
* Exception class for Zend_Tag_Cloud_Decorator
*
* @category Zend
* @package Zend_Tag
*/
interface ExceptionInterface extends Exception
{}
1 change: 0 additions & 1 deletion src/Cloud/Decorator/Exception/InvalidArgumentException.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator\Exception;
Expand Down
4 changes: 0 additions & 4 deletions src/Cloud/Decorator/HtmlCloud.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator;

/**
* Simple HTML decorator for clouds
*
* @category Zend
* @package Zend_Tag
*/
class HtmlCloud extends AbstractCloud
{
Expand Down
4 changes: 0 additions & 4 deletions src/Cloud/Decorator/HtmlTag.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_Tag
*/

namespace Zend\Tag\Cloud\Decorator;
Expand All @@ -15,9 +14,6 @@

/**
* Simple HTML decorator for tags
*
* @category Zend
* @package Zend_Tag
*/
class HtmlTag extends AbstractTag
{
Expand Down
5 changes: 0 additions & 5 deletions src/Cloud/DecoratorPluginManager.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_Tag
*/

namespace Zend\Tag\Cloud;
Expand All @@ -19,10 +18,6 @@
* Enforces that decorators retrieved are instances of
* Decorator\DecoratorInterface. Additionally, it registers a number of default
* decorators available.
*
* @category Zend
* @package Zend_Tag
* @subpackage Cloud
*/
class DecoratorPluginManager extends AbstractPluginManager
{
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/ExceptionInterface.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_Tag
*/

namespace Zend\Tag\Exception;

/**
* Exception interface for Zend\Tag
*
* @category Zend
* @package Zend_Tag
*/
interface ExceptionInterface
{
Expand Down
1 change: 0 additions & 1 deletion src/Exception/InvalidArgumentException.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_Tag
*/

namespace Zend\Tag\Exception;
Expand Down
1 change: 0 additions & 1 deletion src/Exception/InvalidAttributeNameException.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_Tag
*/

namespace Zend\Tag\Exception;
Expand Down
1 change: 0 additions & 1 deletion src/Exception/InvalidElementNameException.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_Tag
*/

namespace Zend\Tag\Exception;
Expand Down
1 change: 0 additions & 1 deletion src/Exception/OutOfBoundsException.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_Tag
*/

namespace Zend\Tag\Exception;
Expand Down
5 changes: 0 additions & 5 deletions src/Item.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +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_Tag
*/

namespace Zend\Tag;

use Traversable;
use Zend\Stdlib\ArrayUtils;

/**
* @category Zend
* @package Zend_Tag
*/
class Item implements TaggableInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/ItemList.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_Tag
*/

namespace Zend\Tag;
Expand All @@ -16,10 +15,6 @@
use Zend\Tag\Exception\InvalidArgumentException;
use Zend\Tag\Exception\OutOfBoundsException;

/**
* @category Zend
* @package Zend_Tag
*/
class ItemList implements Countable, SeekableIterator, ArrayAccess
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/TaggableInterface.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_Tag
*/

namespace Zend\Tag;

/**
* @category Zend
* @package Zend_Tag
*/
interface TaggableInterface
{
/**
Expand Down

0 comments on commit b380a05

Please sign in to comment.