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

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Quoc Vu committed May 9, 2013
113 parents ffbf051 + 3a82d12 + 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 + ae74582 + e1de8ec + 0025ee3 + ab493a2 + b380a05 + 6332964 + 586b2b0 + 8b3839b + 2acee5a + 755e362 + dd6a25d + 1ec6372 + 0bdf06b + 35ea51e + 7a27ea1 + 057899c + 20c564d + 4c20a75 + dc6841c + 405d814 + 608988f + 468fbb9 + 9c9addf + 84fb7ee + 47928d9 + 49c8fe8 + cad89d6 + 605fe17 + cc3d250 commit 9afa768
Show file tree
Hide file tree
Showing 28 changed files with 36 additions and 99 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
}
},
"autoload-dev": {
Expand Down
7 changes: 1 addition & 6 deletions src/Cloud.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
6 changes: 1 addition & 5 deletions src/Cloud/Decorator/AbstractCloud.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
6 changes: 1 addition & 5 deletions src/Cloud/Decorator/AbstractDecorator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
6 changes: 1 addition & 5 deletions src/Cloud/Decorator/AbstractTag.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
7 changes: 1 addition & 6 deletions src/Cloud/Decorator/DecoratorInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
6 changes: 1 addition & 5 deletions src/Cloud/Decorator/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
{}
3 changes: 1 addition & 2 deletions src/Cloud/Decorator/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
6 changes: 1 addition & 5 deletions src/Cloud/Decorator/HtmlCloud.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
12 changes: 4 additions & 8 deletions src/Cloud/Decorator/HtmlTag.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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 Expand Up @@ -55,14 +51,14 @@ class HtmlTag extends AbstractTag
/**
* Maximum fontsize
*
* @var integer
* @var int
*/
protected $maxFontSize = 20;

/**
* Minimum fontsize
*
* @var integer
* @var int
*/
protected $minFontSize = 10;

Expand Down Expand Up @@ -156,7 +152,7 @@ public function getHTMLTags()
/**
* Set maximum font size
*
* @param integer $maxFontSize
* @param int $maxFontSize
* @throws InvalidArgumentException When fontsize is not numeric
* @return HTMLTag
*/
Expand Down
7 changes: 1 addition & 6 deletions src/Cloud/DecoratorPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
6 changes: 1 addition & 5 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
3 changes: 1 addition & 2 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
3 changes: 1 addition & 2 deletions src/Exception/InvalidAttributeNameException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
3 changes: 1 addition & 2 deletions src/Exception/InvalidElementNameException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
3 changes: 1 addition & 2 deletions src/Exception/OutOfBoundsException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
7 changes: 1 addition & 6 deletions src/Item.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
15 changes: 5 additions & 10 deletions src/ItemList.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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 All @@ -32,7 +27,7 @@ class ItemList implements Countable, SeekableIterator, ArrayAccess
/**
* Count all items
*
* @return integer
* @return int
*/
public function count()
{
Expand Down Expand Up @@ -102,7 +97,7 @@ public function spreadWeightValues(array $values)
/**
* Seek to an absolute position
*
* @param integer $index
* @param int $index
* @throws OutOfBoundsException When the seek position is invalid
* @return void
*/
Expand Down Expand Up @@ -154,7 +149,7 @@ public function key()
/**
* Check if there is a current element after calls to rewind() or next()
*
* @return boolean
* @return bool
*/
public function valid()
{
Expand All @@ -175,7 +170,7 @@ public function rewind()
* Check if an offset exists
*
* @param mixed $offset
* @return boolean
* @return bool
*/
public function offsetExists($offset)
{
Expand Down
7 changes: 1 addition & 6 deletions src/TaggableInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
Loading

0 comments on commit 9afa768

Please sign in to comment.