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

Commit

Permalink
Merge branch
Browse files Browse the repository at this point in the history
  • Loading branch information
fdeleon committed Oct 31, 2013
126 parents 1cc7b7d + 8351cd1 + ae74582 + e1de8ec + 0025ee3 + ab493a2 + b380a05 + 6332964 + 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 + 586b2b0 + 8b3839b + 2acee5a + 755e362 + dd6a25d + 1ec6372 + 0bdf06b + 35ea51e + 7a27ea1 + 057899c + 20c564d + 4c20a75 + dc6841c + 405d814 + 608988f + 468fbb9 + 9c9addf + 84fb7ee + 47928d9 + 49c8fe8 + cad89d6 + 605fe17 + cc3d250 + 9afa768 + 09b2c2b + 706f11e + cf1e28b + cc3af21 + 169b58f + c72eb02 + 54a0999 + fa0b745 + d7b8221 + b6d70bc commit 1d53602
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 45 deletions.
4 changes: 0 additions & 4 deletions test/Cloud/CloudTest.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 ZendTest\Tag\Cloud;
Expand All @@ -18,9 +17,6 @@
use ZendTest\Tag\Cloud\TestAsset;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
* @group Zend_Tag
* @group Zend_Tag_Cloud
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Cloud/Decorator/HtmlCloudTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +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 ZendTest\Tag\Cloud\Decorator;

use Zend\Tag\Cloud\Decorator;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
* @group Zend_Tag
* @group Zend_Tag_Cloud
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Cloud/Decorator/HtmlTagTest.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 ZendTest\Tag\Cloud\Decorator;
Expand All @@ -15,9 +14,6 @@
use Zend\Tag\Cloud\Decorator\Exception\InvalidArgumentException;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
* @group Zend_Tag
* @group Zend_Tag_Cloud
*/
Expand Down
6 changes: 0 additions & 6 deletions test/Cloud/TestAsset/CloudDummy.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_Tag
*/

namespace ZendTest\Tag\Cloud\TestAsset;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
*/
class CloudDummy extends \Zend\Tag\Cloud\Decorator\HtmlCloud
{
protected $_foo;
Expand Down
6 changes: 0 additions & 6 deletions test/Cloud/TestAsset/CloudDummy1.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_Tag
*/

namespace ZendTest\Tag\Cloud\TestAsset;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
*/
class CloudDummy1 extends \Zend\Tag\Cloud\Decorator\HtmlCloud
{
protected $_foo;
Expand Down
6 changes: 0 additions & 6 deletions test/Cloud/TestAsset/CloudDummy2.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_Tag
*/

namespace ZendTest\Tag\Cloud\TestAsset;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
*/
class CloudDummy2 extends \Zend\Tag\Cloud\Decorator\HtmlCloud
{
protected $_foo;
Expand Down
6 changes: 0 additions & 6 deletions test/Cloud/TestAsset/TagDummy.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_Tag
*/

namespace ZendTest\Tag\Cloud\TestAsset;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
*/
class TagDummy extends \Zend\Tag\Cloud\Decorator\HtmlTag
{
protected $_foo;
Expand Down
4 changes: 0 additions & 4 deletions test/ItemListTest.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 ZendTest\Tag;
Expand All @@ -15,9 +14,6 @@
use Zend\Tag\Exception\OutOfBoundsException;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
* @group Zend_Tag
*/
class ItemListTest extends \PHPUnit_Framework_TestCase
Expand Down
6 changes: 1 addition & 5 deletions test/ItemTest.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 ZendTest\Tag;
Expand All @@ -14,14 +13,11 @@
use Zend\Tag\Exception\InvalidArgumentException;

/**
* @category Zend
* @package Zend_Tag
* @subpackage UnitTests
* @group Zend_Tag
*/
class ItemTest extends \PHPUnit_Framework_TestCase
{
public function testConstuctor()
public function testConstructor()
{
$tag = new Tag\Item(array(
'title' => 'foo',
Expand Down

0 comments on commit 1d53602

Please sign in to comment.