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

Commit

Permalink
Revert "Merge branch 'superdweebie-rand-bugfix'"
Browse files Browse the repository at this point in the history 
This reverts commit 002ce3dee6107f2c71af8e7ce0ed1f43693ddadf, reversing
changes made to 0023a96e4756112661c11dbf4e293f4be110809a.

Note: we will need to revert this revert when merging develop to master for the
2.3.0 release. See http://git-scm.com/blog/2010/03/02/undoing-merges.html - the
section on "Reverting the Revert," for details.
  • Loading branch information
@weierophinney
weierophinney committed Aug 19, 2013
117 parents d7b8221 + 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 commit 169b58f
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 247 deletions.
2 changes: 1 addition & 1 deletion src/Cloud/Decorator/HtmlCloud.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class HtmlCloud extends AbstractCloud
* @var array
*/
protected $htmlTags = array(
'ul' => array('class' => 'zend-tag-cloud'),
'ul' => array('class' => 'Zend\Tag\Cloud')
);

/**
Expand Down
181 changes: 43 additions & 138 deletions test/Cloud/CloudTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

namespace ZendTest\Tag\Cloud;

use stdClass;
use Zend\Tag;
use Zend\Tag\Cloud;
use Zend\Tag\Cloud\DecoratorPluginManager;
Expand All @@ -30,68 +29,62 @@ class CloudTest extends \PHPUnit_Framework_TestCase
public function testGetAndSetItemList()
{
$cloud = $this->_getCloud();
$this->assertInstanceOf('Zend\Tag\ItemList', $cloud->getItemList());
$this->assertTrue($cloud->getItemList() instanceof Tag\ItemList);

$cloud->setItemList(new ItemListDummy);
$this->assertInstanceOf('ZendTest\Tag\Cloud\ItemListDummy', $cloud->getItemList());
$this->assertTrue($cloud->getItemList() instanceof ItemListDummy);
}

public function testSetCloudDecoratorViaArray()
{
$cloud = $this->_getCloud();

$cloud->setCloudDecorator(array(
'decorator' => 'CloudDummy',
'options' => array('foo' => 'bar'),
));
$this->assertInstanceOf('ZendTest\Tag\Cloud\TestAsset\CloudDummy', $cloud->getCloudDecorator());
$cloud->setCloudDecorator(array('decorator' => 'CloudDummy', 'options' => array('foo' => 'bar')));
$this->assertTrue($cloud->getCloudDecorator() instanceof TestAsset\CloudDummy);
$this->assertEquals('bar', $cloud->getCloudDecorator()->getFoo());
}

public function testGetAndSetCloudDecorator()
{
$cloud = $this->_getCloud();
$this->assertInstanceOf('Zend\Tag\Cloud\Decorator\HtmlCloud', $cloud->getCloudDecorator());
$this->assertTrue($cloud->getCloudDecorator() instanceof \Zend\Tag\Cloud\Decorator\HtmlCloud);

$cloud->setCloudDecorator(new TestAsset\CloudDummy());
$this->assertInstanceOf('ZendTest\Tag\Cloud\TestAsset\CloudDummy', $cloud->getCloudDecorator());
$this->assertTrue($cloud->getCloudDecorator() instanceof TestAsset\CloudDummy);
}

public function testSetInvalidCloudDecorator()
{
$cloud = $this->_getCloud();

$this->setExpectedException('Zend\Tag\Exception\InvalidArgumentException', 'DecoratorInterface');
$cloud->setCloudDecorator(new stdClass());
$cloud->setCloudDecorator(new \stdClass());
}

public function testSetTagDecoratorViaArray()
{
$cloud = $this->_getCloud();

$cloud->setTagDecorator(array(
'decorator' => 'TagDummy',
'options' => array('foo' => 'bar'),
));
$this->assertInstanceOf('ZendTest\Tag\Cloud\TestAsset\TagDummy', $cloud->getTagDecorator());
$cloud->setTagDecorator(array('decorator' => 'TagDummy', 'options' => array('foo' => 'bar')));
$this->assertTrue($cloud->getTagDecorator() instanceof TestAsset\TagDummy);
$this->assertEquals('bar', $cloud->getTagDecorator()->getFoo());
}

public function testGetAndSetTagDecorator()
{
$cloud = $this->_getCloud();
$this->assertInstanceOf('Zend\Tag\Cloud\Decorator\HtmlTag', $cloud->getTagDecorator());
$this->assertTrue($cloud->getTagDecorator() instanceof \Zend\Tag\Cloud\Decorator\HtmlTag);

$cloud->setTagDecorator(new TestAsset\TagDummy());
$this->assertInstanceOf('ZendTest\Tag\Cloud\TestAsset\TagDummy', $cloud->getTagDecorator());
$this->assertTrue($cloud->getTagDecorator() instanceof TestAsset\TagDummy);
}

public function testSetInvalidTagDecorator()
{
$cloud = $this->_getCloud();

$this->setExpectedException('Zend\Tag\Exception\InvalidArgumentException', 'DecoratorInterface');
$cloud->setTagDecorator(new stdClass());
$cloud->setTagDecorator(new \stdClass());
}

public function testSetDecoratorPluginManager()
Expand All @@ -105,10 +98,7 @@ public function testSetDecoratorPluginManager()
public function testSetDecoratorPluginManagerViaOptions()
{
$decorators = new DecoratorPluginManager();
$cloud = $this->_getCloud(
array('decoratorPluginManager' => $decorators),
null
);
$cloud = $this->_getCloud(array('decoratorPluginManager' => $decorators), null);
$this->assertSame($decorators, $cloud->getDecoratorPluginManager());
}

Expand All @@ -117,10 +107,7 @@ public function testAppendTagAsArray()
$cloud = $this->_getCloud();
$list = $cloud->getItemList();

$cloud->appendTag(array(
'title' => 'foo',
'weight' => 1,
));
$cloud->appendTag(array('title' => 'foo', 'weight' => 1));

$this->assertEquals('foo', $list[0]->getTitle());
}
Expand All @@ -130,10 +117,7 @@ public function testAppendTagAsItem()
$cloud = $this->_getCloud();
$list = $cloud->getItemList();

$cloud->appendTag(new Tag\Item(array(
'title' => 'foo',
'weight' => 1,
)));
$cloud->appendTag(new Tag\Item(array('title' => 'foo', 'weight' => 1)));

$this->assertEquals('foo', $list[0]->getTitle());
}
Expand All @@ -151,16 +135,8 @@ public function testSetTagsAsArray()
$cloud = $this->_getCloud();
$list = $cloud->getItemList();

$cloud->setTags(array(
array(
'title' => 'foo',
'weight' => 1,
),
array(
'title' => 'bar',
'weight' => 2,
)
));
$cloud->setTags(array(array('title' => 'foo', 'weight' => 1),
array('title' => 'bar', 'weight' => 2)));

$this->assertEquals('foo', $list[0]->getTitle());
$this->assertEquals('bar', $list[1]->getTitle());
Expand All @@ -171,16 +147,8 @@ public function testSetTagsAsItem()
$cloud = $this->_getCloud();
$list = $cloud->getItemList();

$cloud->setTags(array(
new Tag\Item( array(
'title' => 'foo',
'weight' => 1,
)),
new Tag\Item( array(
'title' => 'bar',
'weight' => 2,
)),
));
$cloud->setTags(array(new Tag\Item(array('title' => 'foo', 'weight' => 1)),
new Tag\Item(array('title' => 'bar', 'weight' => 2))));

$this->assertEquals('foo', $list[0]->getTitle());
$this->assertEquals('bar', $list[1]->getTitle());
Expand All @@ -191,16 +159,8 @@ public function testSetTagsMixed()
$cloud = $this->_getCloud();
$list = $cloud->getItemList();

$cloud->setTags(array(
array(
'title' => 'foo',
'weight' => 1,
),
new Tag\Item(array(
'title' => 'bar',
'weight' => 2,
)),
));
$cloud->setTags(array(array('title' => 'foo', 'weight' => 1),
new Tag\Item(array('title' => 'bar', 'weight' => 2))));

$this->assertEquals('foo', $list[0]->getTitle());
$this->assertEquals('bar', $list[1]->getTitle());
Expand All @@ -216,29 +176,15 @@ public function testSetInvalidTags()

public function testConstructorWithArray()
{
$cloud = $this->_getCloud(array(
'tags' => array(
array(
'title' => 'foo',
'weight' => 1,
),
),
));
$cloud = $this->_getCloud(array('tags' => array(array('title' => 'foo', 'weight' => 1))));
$list = $cloud->getItemList();

$this->assertEquals('foo', $list[0]->getTitle());
}

public function testConstructorWithConfig()
{
$cloud = $this->_getCloud( new \Zend\Config\Config(array(
'tags' => array(
array(
'title' => 'foo',
'weight' => 1,
),
),
)));
$cloud = $this->_getCloud(new \Zend\Config\Config(array('tags' => array(array('title' => 'foo', 'weight' => 1)))));
$list = $cloud->getItemList();

$this->assertEquals('foo', $list[0]->getTitle());
Expand All @@ -247,15 +193,8 @@ public function testConstructorWithConfig()
public function testSetOptions()
{
$cloud = $this->_getCloud();
$cloud->setOptions(array(
'tags' => array(
array(
'title' => 'foo',
'weight' => 1,
),
),
));
$list = $cloud->getItemList();
$cloud->setOptions(array('tags' => array(array('title' => 'foo', 'weight' => 1))));
$list = $cloud->getItemList();

$this->assertEquals('foo', $list[0]->getTitle());
}
Expand All @@ -268,22 +207,11 @@ public function testSkipOptions()

public function testRender()
{
$cloud = $this->_getCloud(array(
'tags' => array(
array(
'title' => 'foo',
'weight' => 1,
),
array(
'title' => 'bar',
'weight' => 3,
),
),
));
$expected = '<ul class="zend-tag-cloud">'
. '<li><a href="" style="font-size: 10px;">foo</a></li> '
. '<li><a href="" style="font-size: 20px;">bar</a></li>'
. '</ul>';
$cloud = $this->_getCloud(array('tags' => array(array('title' => 'foo', 'weight' => 1), array('title' => 'bar', 'weight' => 3))));
$expected = '<ul class="Zend&#x5C;Tag&#x5C;Cloud">'
. '<li><a href="" style="font-size: 10px;">foo</a></li> '
. '<li><a href="" style="font-size: 20px;">bar</a></li>'
. '</ul>';
$this->assertEquals($expected, $cloud->render());
}

Expand All @@ -295,51 +223,28 @@ public function testRenderEmptyCloud()

public function testRenderViaToString()
{
$cloud = $this->_getCloud(array(
'tags' => array(
array(
'title' => 'foo',
'weight' => 1,
),
array(
'title' => 'bar',
'weight' => 3,
),
),
));
$expected = '<ul class="zend-tag-cloud">'
. '<li><a href="" style="font-size: 10px;">foo</a></li> '
. '<li><a href="" style="font-size: 20px;">bar</a></li>'
. '</ul>';
$this->assertEquals($expected, (string)$cloud);
$cloud = $this->_getCloud(array('tags' => array(array('title' => 'foo', 'weight' => 1), array('title' => 'bar', 'weight' => 3))));
$expected = '<ul class="Zend&#x5C;Tag&#x5C;Cloud">'
. '<li><a href="" style="font-size: 10px;">foo</a></li> '
. '<li><a href="" style="font-size: 20px;">bar</a></li>'
. '</ul>';
$this->assertEquals($expected, (string) $cloud);
}

protected function _getCloud(
$options = null,
$setDecoratorPluginManager = true
) {
protected function _getCloud($options = null, $setDecoratorPluginManager = true)
{
$cloud = new Tag\Cloud($options);

if ($setDecoratorPluginManager) {
$decorators = $cloud->getDecoratorPluginManager();
$decorators->setInvokableClass(
'clouddummy', 'ZendTest\Tag\Cloud\TestAsset\CloudDummy'
);
$decorators->setInvokableClass(
'clouddummy1', 'ZendTest\Tag\Cloud\TestAsset\CloudDummy1'
);
$decorators->setInvokableClass(
'clouddummy2', 'ZendTest\Tag\Cloud\TestAsset\CloudDummy2'
);
$decorators->setInvokableClass(
'tagdummy', 'ZendTest\Tag\Cloud\TestAsset\TagDummy'
);
$decorators->setInvokableClass('clouddummy', 'ZendTest\Tag\Cloud\TestAsset\CloudDummy');
$decorators->setInvokableClass('clouddummy1', 'ZendTest\Tag\Cloud\TestAsset\CloudDummy1');
$decorators->setInvokableClass('clouddummy2', 'ZendTest\Tag\Cloud\TestAsset\CloudDummy2');
$decorators->setInvokableClass('tagdummy', 'ZendTest\Tag\Cloud\TestAsset\TagDummy');
}

return $cloud;
}
}

class ItemListDummy extends Tag\ItemList
{
}
class ItemListDummy extends Tag\ItemList {}
Loading

0 comments on commit 169b58f

Please sign in to comment.