From cf195d02f120858e5e4f11741aa55adba094b223 Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Fri, 16 Aug 2013 15:24:42 -0700 Subject: [PATCH 01/20] Applied trim and strtolower to Gravatar email per Gravatar docs: https://en.gravatar.com/site/implement/hash/ --- src/Helper/Gravatar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Helper/Gravatar.php b/src/Helper/Gravatar.php index ad1fb2b5..52bdb047 100644 --- a/src/Helper/Gravatar.php +++ b/src/Helper/Gravatar.php @@ -239,7 +239,7 @@ public function getDefaultImg() public function setEmail($email) { $this->emailIsHashed = (bool) preg_match('/^[A-Za-z0-9]{32}$/', $email); - $this->email = $email; + $this->email = strtolower(trim($email)); return $this; } From bdd7659b9c9ba2777b92106dbaeb4cb63f1a89c8 Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Fri, 16 Aug 2013 16:01:12 -0700 Subject: [PATCH 02/20] Added unit test for properly normalizing emails --- test/Helper/GravatarTest.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/Helper/GravatarTest.php b/test/Helper/GravatarTest.php index 1b39c241..d8fe09e9 100644 --- a/test/Helper/GravatarTest.php +++ b/test/Helper/GravatarTest.php @@ -274,4 +274,11 @@ public function testInvalidKeyPassedToSetOptionsMethod() ); $this->helper->__invoke()->setOptions($options); } + + public function testEmailIsProperlyNormalized() + { + $this->assertEquals('example@example.com', + $this->helper->__invoke('Example@Example.com ')->getEmail() + ); + } } From 00546c499036ad17d315eafbe79f043d87bf369f Mon Sep 17 00:00:00 2001 From: tranba Date: Sat, 17 Aug 2013 10:47:34 +0700 Subject: [PATCH 03/20] Add test --- test/Helper/PartialLoopTest.php | 28 ++++++++++++++++++- ...opShouldNotConvertToArrayRecursively.phtml | 5 ++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml diff --git a/test/Helper/PartialLoopTest.php b/test/Helper/PartialLoopTest.php index e70eff07..59d2bf49 100644 --- a/test/Helper/PartialLoopTest.php +++ b/test/Helper/PartialLoopTest.php @@ -13,6 +13,8 @@ use ArrayObject; use Iterator; use PHPUnit_Framework_TestCase as TestCase; +use Zend\Form\Element\Collection; +use Zend\Form\Form; use Zend\View\Helper\PartialLoop; use Zend\View\Renderer\PhpRenderer as View; @@ -297,6 +299,30 @@ public function testPartialLoopPartialCounterResets() $this->helper->__invoke('partialLoopCouter.phtml', $data); $this->assertEquals(4, $this->helper->getPartialCounter()); } + + public function testShouldNotConvertToArrayRecursivelyIfModelIsTraversable() + { + $rIterator = new RecursiveIteratorTest(); + for ($i = 0; $i < 5; ++$i) { + $data = array( + 'message' => 'foo' . $i, + ); + $rIterator->addItem(new IteratorTest($data)); + } + + $view = new View(); + $view->resolver()->addPath($this->basePath . '/application/views/scripts'); + $this->helper->setView($view); + $this->helper->setObjectKey('obj'); + + $result = $this->helper->__invoke('partialLoopShouldNotConvertToArrayRecursively.phtml', $rIterator); + + foreach ($rIterator as $item) { + foreach ($item as $key => $value) { + $this->assertContains('This is an iteration: ' . $value, $result, var_export($value, 1)); + } + } + } } class IteratorTest implements Iterator @@ -453,4 +479,4 @@ public function toArray() { return $this->_info; } -} +} \ No newline at end of file diff --git a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml new file mode 100644 index 00000000..ee8a0a9f --- /dev/null +++ b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml @@ -0,0 +1,5 @@ +obj)): ?> +No object model passed +obj->current() . "\n"; +endif; \ No newline at end of file From d63f0b47eb7ec0030e5c2647a8254337ab59aa38 Mon Sep 17 00:00:00 2001 From: tranba Date: Sat, 17 Aug 2013 10:47:34 +0700 Subject: [PATCH 04/20] Add test --- test/Helper/PartialLoopTest.php | 26 ++++++++++++++++++- ...opShouldNotConvertToArrayRecursively.phtml | 5 ++++ ...pShouldNotConvertToArrayRecursively2.phtml | 5 ++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml create mode 100644 test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml diff --git a/test/Helper/PartialLoopTest.php b/test/Helper/PartialLoopTest.php index e70eff07..eaf7ae46 100644 --- a/test/Helper/PartialLoopTest.php +++ b/test/Helper/PartialLoopTest.php @@ -297,6 +297,30 @@ public function testPartialLoopPartialCounterResets() $this->helper->__invoke('partialLoopCouter.phtml', $data); $this->assertEquals(4, $this->helper->getPartialCounter()); } + + public function testShouldNotConvertToArrayRecursivelyIfModelIsTraversable() + { + $rIterator = new RecursiveIteratorTest(); + for ($i = 0; $i < 5; ++$i) { + $data = array( + 'message' => 'foo' . $i, + ); + $rIterator->addItem(new IteratorTest($data)); + } + + $view = new View(); + $view->resolver()->addPath($this->basePath . '/application/views/scripts'); + $this->helper->setView($view); + $this->helper->setObjectKey('obj'); + + $result = $this->helper->__invoke('partialLoopShouldNotConvertToArrayRecursively.phtml', $rIterator); + + foreach ($rIterator as $item) { + foreach ($item as $key => $value) { + $this->assertContains('This is an iteration: ' . $value, $result, var_export($value, 1)); + } + } + } } class IteratorTest implements Iterator @@ -453,4 +477,4 @@ public function toArray() { return $this->_info; } -} +} \ No newline at end of file diff --git a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml new file mode 100644 index 00000000..ee8a0a9f --- /dev/null +++ b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml @@ -0,0 +1,5 @@ +obj)): ?> +No object model passed +obj->current() . "\n"; +endif; \ No newline at end of file diff --git a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml new file mode 100644 index 00000000..ea523970 --- /dev/null +++ b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml @@ -0,0 +1,5 @@ +color)): ?> +No object model passed +color->getValue() . "\n"; +endif; \ No newline at end of file From 6aded487210c5de65f79e8b810f3364295bf431f Mon Sep 17 00:00:00 2001 From: tranba Date: Sat, 17 Aug 2013 12:58:21 +0700 Subject: [PATCH 05/20] Added unit test for should not convert to array recursively if model is traversable --- test/Helper/PartialLoopTest.php | 2 -- .../partialLoopShouldNotConvertToArrayRecursively2.phtml | 5 ----- 2 files changed, 7 deletions(-) delete mode 100644 test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml diff --git a/test/Helper/PartialLoopTest.php b/test/Helper/PartialLoopTest.php index 59d2bf49..eaf7ae46 100644 --- a/test/Helper/PartialLoopTest.php +++ b/test/Helper/PartialLoopTest.php @@ -13,8 +13,6 @@ use ArrayObject; use Iterator; use PHPUnit_Framework_TestCase as TestCase; -use Zend\Form\Element\Collection; -use Zend\Form\Form; use Zend\View\Helper\PartialLoop; use Zend\View\Renderer\PhpRenderer as View; diff --git a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml deleted file mode 100644 index ea523970..00000000 --- a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively2.phtml +++ /dev/null @@ -1,5 +0,0 @@ -color)): ?> -No object model passed -color->getValue() . "\n"; -endif; \ No newline at end of file From 0724c51316e97cf3235caa8d3eeeea62d48d4ac7 Mon Sep 17 00:00:00 2001 From: Daniele Princiotta Date: Sat, 17 Aug 2013 16:49:43 +0200 Subject: [PATCH 06/20] Zend\Navigation currently uses only one text domain for translating page labels. This commit adds the new option key "textdomain" to Navigation and its (translatable) view helpers. If the option is present, it is used during translation. If the key is not present, the old behavior is applied. --- src/Helper/Navigation/AbstractHelper.php | 4 +- src/Helper/Navigation/Breadcrumbs.php | 5 +- src/Helper/Navigation/Menu.php | 4 +- test/Helper/Navigation/AbstractTest.php | 43 +++++++ test/Helper/Navigation/BreadcrumbsTest.php | 9 ++ test/Helper/Navigation/MenuTest.php | 9 ++ .../_files/expected/bc/textdomain.html | 1 + .../_files/expected/menu/textdomain.html | 48 +++++++ test/Helper/Navigation/_files/navigation.xml | 118 ++++++++++++++++++ 9 files changed, 238 insertions(+), 3 deletions(-) create mode 100644 test/Helper/Navigation/_files/expected/bc/textdomain.html create mode 100644 test/Helper/Navigation/_files/expected/menu/textdomain.html diff --git a/src/Helper/Navigation/AbstractHelper.php b/src/Helper/Navigation/AbstractHelper.php index b8c4ee53..41ae6d5b 100644 --- a/src/Helper/Navigation/AbstractHelper.php +++ b/src/Helper/Navigation/AbstractHelper.php @@ -397,7 +397,9 @@ public function htmlify(AbstractPage $page) $title = $page->getTitle(); if (null !== ($translator = $this->getTranslator())) { - $textDomain = $this->getTranslatorTextDomain(); + if (null === ($textDomain = $page->getTextdomain())) { + $textDomain = $this->getTranslatorTextDomain(); + } if (is_string($label) && !empty($label)) { $label = $translator->translate($label, $textDomain); } diff --git a/src/Helper/Navigation/Breadcrumbs.php b/src/Helper/Navigation/Breadcrumbs.php index a52350ee..1ff435cd 100644 --- a/src/Helper/Navigation/Breadcrumbs.php +++ b/src/Helper/Navigation/Breadcrumbs.php @@ -109,7 +109,10 @@ public function renderStraight($container = null) } else { $html = $active->getLabel(); if (null !== ($translator = $this->getTranslator())) { - $html = $translator->translate($html, $this->getTranslatorTextDomain()); + if (null === ($textDomain = $active->getTextdomain())) { + $textDomain = $this->getTranslatorTextDomain(); + } + $html = $translator->translate($html, $textDomain); } $escaper = $this->view->plugin('escapeHtml'); $html = $escaper($html); diff --git a/src/Helper/Navigation/Menu.php b/src/Helper/Navigation/Menu.php index 88806857..02ffbd3e 100644 --- a/src/Helper/Navigation/Menu.php +++ b/src/Helper/Navigation/Menu.php @@ -477,7 +477,9 @@ public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToList // translate label and title? if (null !== ($translator = $this->getTranslator())) { - $textDomain = $this->getTranslatorTextDomain(); + if (null === ($textDomain = $page->getTextdomain())) { + $textDomain = $this->getTranslatorTextDomain(); + } if (is_string($label) && !empty($label)) { $label = $translator->translate($label, $textDomain); } diff --git a/test/Helper/Navigation/AbstractTest.php b/test/Helper/Navigation/AbstractTest.php index ea224188..fb03505b 100644 --- a/test/Helper/Navigation/AbstractTest.php +++ b/test/Helper/Navigation/AbstractTest.php @@ -75,6 +75,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase */ protected $_nav2; + /** + * The third container in the config file (files/navigation.xml) + * + * @var Navigation\Navigation + */ + protected $_nav3; + private $_oldControllerDir; /** @@ -92,6 +99,7 @@ protected function setUp() // setup containers from config $this->_nav1 = new Navigation($config->get('nav_test1')); $this->_nav2 = new Navigation($config->get('nav_test2')); + $this->_nav3 = new Navigation($config->get('nav_test3')); // setup view $view = new PhpRenderer(); @@ -204,4 +212,39 @@ protected function _getTranslator() $translator->addTranslationFile('default', null); return $translator; } + + /** + * Returns translator with text domain + * + * @return Translator + */ + protected function _getTranslatorWithTextDomain() + { + $loader1 = new TestAsset\ArrayTranslator(); + $loader1->translations = array( + 'Page 1' => 'TextDomain1 1', + 'Page 1.1' => 'TextDomain1 1.1', + 'Page 2' => 'TextDomain1 2', + 'Page 2.3' => 'TextDomain1 2.3', + 'Page 2.3.3' => 'TextDomain1 2.3.3', + 'Page 2.3.3.1' => 'TextDomain1 2.3.3.1', + ); + + $loader2 = new TestAsset\ArrayTranslator(); + $loader2->translations = array( + 'Page 1' => 'TextDomain2 1', + 'Page 1.1' => 'TextDomain2 1.1', + 'Page 2' => 'TextDomain2 2', + 'Page 2.3' => 'TextDomain2 2.3', + 'Page 2.3.3' => 'TextDomain2 2.3.3', + 'Page 2.3.3.1' => 'TextDomain2 2.3.3.1', + ); + + $translator = new Translator(); + $translator->getPluginManager()->setService('default1', $loader1); + $translator->getPluginManager()->setService('default2', $loader2); + $translator->addTranslationFile('default1', null, 'ZendTest_1'); + $translator->addTranslationFile('default2', null, 'ZendTest_2'); + return $translator; + } } diff --git a/test/Helper/Navigation/BreadcrumbsTest.php b/test/Helper/Navigation/BreadcrumbsTest.php index 74fa5eef..46e74966 100644 --- a/test/Helper/Navigation/BreadcrumbsTest.php +++ b/test/Helper/Navigation/BreadcrumbsTest.php @@ -171,6 +171,15 @@ public function testTranslationUsingZendTranslate() $this->assertEquals($expected, $this->_helper->render()); } + public function testTranslationUsingZendTranslateAndCustomTextDomain() + { + $this->_helper->setTranslator($this->_getTranslatorWithTextDomain()); + + $expected = $this->_getExpected('bc/textdomain.html'); + + $this->assertEquals($expected, $this->_helper->render($this->_nav3)); + } + public function testTranslationUsingZendTranslateAdapter() { $translator = $this->_getTranslator(); diff --git a/test/Helper/Navigation/MenuTest.php b/test/Helper/Navigation/MenuTest.php index 6c9a803c..2d79daeb 100644 --- a/test/Helper/Navigation/MenuTest.php +++ b/test/Helper/Navigation/MenuTest.php @@ -219,6 +219,15 @@ public function testTranslationUsingZendTranslate() $this->assertEquals($expected, $this->_helper->render()); } + public function testTranslationUsingZendTranslateWithTextDomain() + { + $translator = $this->_getTranslatorWithTextDomain(); + $this->_helper->setTranslator($translator); + + $expected = $this->_getExpected('menu/textdomain.html'); + $this->assertEquals($expected, $this->_helper->render($this->_nav3)); + } + public function testTranslationUsingZendTranslateAdapter() { $translator = $this->_getTranslator(); diff --git a/test/Helper/Navigation/_files/expected/bc/textdomain.html b/test/Helper/Navigation/_files/expected/bc/textdomain.html new file mode 100644 index 00000000..dbc58e77 --- /dev/null +++ b/test/Helper/Navigation/_files/expected/bc/textdomain.html @@ -0,0 +1 @@ +TextDomain1 2 > Page 2.3 > TextDomain1 2.3.3 > TextDomain2 2.3.3.1 \ No newline at end of file diff --git a/test/Helper/Navigation/_files/expected/menu/textdomain.html b/test/Helper/Navigation/_files/expected/menu/textdomain.html new file mode 100644 index 00000000..2cf01673 --- /dev/null +++ b/test/Helper/Navigation/_files/expected/menu/textdomain.html @@ -0,0 +1,48 @@ + \ No newline at end of file diff --git a/test/Helper/Navigation/_files/navigation.xml b/test/Helper/Navigation/_files/navigation.xml index 58c5c63f..82ff652a 100644 --- a/test/Helper/Navigation/_files/navigation.xml +++ b/test/Helper/Navigation/_files/navigation.xml @@ -209,4 +209,122 @@ + + + + + page1 + + + + + page1/page1_1 + ZendTest_1 + + + + + + + + page2 + ZendTest_1 + + + + + page2/page2_1 + + + + + page2/page2_2 + + + + + page2/page2_2/page2_2_1 + + + + + page2/page2_2/page2_2_2 + 1 + + + + + + + + page2/page2_3 + ZendTest_No + + + + + page2/page2_3/page2_3_1 + + + + + page2/page2_3/page2_3_2 + 0 + + + + + page2/page2_3/page2_3_2/1 + 1 + + + + + page2/page2_3/page2_3_2/2 + 1 + + + + + # + 1 + + + + + + + + + + page2/page2_3/page2_3_3 + admin_foo + ZendTest_1 + + + + + page2/page2_3/page2_3_3/1 + 1 + ZendTest_2 + + + + + page2/page2_3/page2_3_3/2 + guest_foo + 1 + + + + + + + + + + + + + From 7c93cabeeb71eab48934926054186b2c32e128e0 Mon Sep 17 00:00:00 2001 From: Daniele Princiotta Date: Sat, 17 Aug 2013 18:21:36 +0200 Subject: [PATCH 07/20] Fixed method names --- src/Helper/Navigation/AbstractHelper.php | 2 +- src/Helper/Navigation/Breadcrumbs.php | 2 +- src/Helper/Navigation/Menu.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Helper/Navigation/AbstractHelper.php b/src/Helper/Navigation/AbstractHelper.php index 41ae6d5b..16159e66 100644 --- a/src/Helper/Navigation/AbstractHelper.php +++ b/src/Helper/Navigation/AbstractHelper.php @@ -398,7 +398,7 @@ public function htmlify(AbstractPage $page) if (null !== ($translator = $this->getTranslator())) { if (null === ($textDomain = $page->getTextdomain())) { - $textDomain = $this->getTranslatorTextDomain(); + $textDomain = $this->getTranslatorTextdomain(); } if (is_string($label) && !empty($label)) { $label = $translator->translate($label, $textDomain); diff --git a/src/Helper/Navigation/Breadcrumbs.php b/src/Helper/Navigation/Breadcrumbs.php index 1ff435cd..55d8cee9 100644 --- a/src/Helper/Navigation/Breadcrumbs.php +++ b/src/Helper/Navigation/Breadcrumbs.php @@ -110,7 +110,7 @@ public function renderStraight($container = null) $html = $active->getLabel(); if (null !== ($translator = $this->getTranslator())) { if (null === ($textDomain = $active->getTextdomain())) { - $textDomain = $this->getTranslatorTextDomain(); + $textDomain = $this->getTranslatorTextdomain(); } $html = $translator->translate($html, $textDomain); } diff --git a/src/Helper/Navigation/Menu.php b/src/Helper/Navigation/Menu.php index 02ffbd3e..34e6208c 100644 --- a/src/Helper/Navigation/Menu.php +++ b/src/Helper/Navigation/Menu.php @@ -478,7 +478,7 @@ public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToList // translate label and title? if (null !== ($translator = $this->getTranslator())) { if (null === ($textDomain = $page->getTextdomain())) { - $textDomain = $this->getTranslatorTextDomain(); + $textDomain = $this->getTranslatorTextdomain(); } if (is_string($label) && !empty($label)) { $label = $translator->translate($label, $textDomain); From 77fce7b26cca82492a2d4a65a5353f6984c099b0 Mon Sep 17 00:00:00 2001 From: Daniele Princiotta Date: Sat, 17 Aug 2013 18:46:50 +0200 Subject: [PATCH 08/20] Aligned method naming to zf style --- src/Helper/Navigation/AbstractHelper.php | 4 ++-- src/Helper/Navigation/Breadcrumbs.php | 4 ++-- src/Helper/Navigation/Menu.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Helper/Navigation/AbstractHelper.php b/src/Helper/Navigation/AbstractHelper.php index 16159e66..7cb12cce 100644 --- a/src/Helper/Navigation/AbstractHelper.php +++ b/src/Helper/Navigation/AbstractHelper.php @@ -397,8 +397,8 @@ public function htmlify(AbstractPage $page) $title = $page->getTitle(); if (null !== ($translator = $this->getTranslator())) { - if (null === ($textDomain = $page->getTextdomain())) { - $textDomain = $this->getTranslatorTextdomain(); + if (null === ($textDomain = $page->getTextDomain())) { + $textDomain = $this->getTranslatorTextDomain(); } if (is_string($label) && !empty($label)) { $label = $translator->translate($label, $textDomain); diff --git a/src/Helper/Navigation/Breadcrumbs.php b/src/Helper/Navigation/Breadcrumbs.php index 55d8cee9..c259363c 100644 --- a/src/Helper/Navigation/Breadcrumbs.php +++ b/src/Helper/Navigation/Breadcrumbs.php @@ -109,8 +109,8 @@ public function renderStraight($container = null) } else { $html = $active->getLabel(); if (null !== ($translator = $this->getTranslator())) { - if (null === ($textDomain = $active->getTextdomain())) { - $textDomain = $this->getTranslatorTextdomain(); + if (null === ($textDomain = $active->getTextDomain())) { + $textDomain = $this->getTranslatorTextDomain(); } $html = $translator->translate($html, $textDomain); } diff --git a/src/Helper/Navigation/Menu.php b/src/Helper/Navigation/Menu.php index 34e6208c..32c3058b 100644 --- a/src/Helper/Navigation/Menu.php +++ b/src/Helper/Navigation/Menu.php @@ -477,8 +477,8 @@ public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToList // translate label and title? if (null !== ($translator = $this->getTranslator())) { - if (null === ($textDomain = $page->getTextdomain())) { - $textDomain = $this->getTranslatorTextdomain(); + if (null === ($textDomain = $page->getTextDomain())) { + $textDomain = $this->getTranslatorTextDomain(); } if (is_string($label) && !empty($label)) { $label = $translator->translate($label, $textDomain); From 62cd616cdf98019f88c1a30a5b0cfb4ca3f6cfdb Mon Sep 17 00:00:00 2001 From: tranba Date: Tue, 20 Aug 2013 00:41:12 +0700 Subject: [PATCH 09/20] Fix CS --- test/Helper/PartialLoopTest.php | 2 +- .../scripts/partialLoopShouldNotConvertToArrayRecursively.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Helper/PartialLoopTest.php b/test/Helper/PartialLoopTest.php index 59d2bf49..d4f0166d 100644 --- a/test/Helper/PartialLoopTest.php +++ b/test/Helper/PartialLoopTest.php @@ -479,4 +479,4 @@ public function toArray() { return $this->_info; } -} \ No newline at end of file +} diff --git a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml index ee8a0a9f..1bdfee84 100644 --- a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml +++ b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml @@ -2,4 +2,4 @@ No object model passed obj->current() . "\n"; -endif; \ No newline at end of file +endif; From 5f5bcc54cfb8af4c8f587ff68c92e311ba6619f1 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 19 Aug 2013 17:12:22 -0500 Subject: [PATCH 10/20] [zendframework/zf2#4969] CS fixes - trailing whitespace --- .../scripts/partialLoopShouldNotConvertToArrayRecursively.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml index 1bdfee84..d0ed0395 100644 --- a/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml +++ b/test/Helper/_files/modules/application/views/scripts/partialLoopShouldNotConvertToArrayRecursively.phtml @@ -1,5 +1,5 @@ obj)): ?> No object model passed -obj->current() . "\n"; endif; From e2afc561aa085fdba7e545db7434c0b6a11b8240 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 19 Aug 2013 17:21:27 -0500 Subject: [PATCH 11/20] [zendframework/zf2#4979] CS fixes - EOF ending --- test/Helper/Navigation/_files/expected/bc/textdomain.html | 2 +- test/Helper/Navigation/_files/expected/menu/textdomain.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Helper/Navigation/_files/expected/bc/textdomain.html b/test/Helper/Navigation/_files/expected/bc/textdomain.html index dbc58e77..22c5d802 100644 --- a/test/Helper/Navigation/_files/expected/bc/textdomain.html +++ b/test/Helper/Navigation/_files/expected/bc/textdomain.html @@ -1 +1 @@ -TextDomain1 2 > Page 2.3 > TextDomain1 2.3.3 > TextDomain2 2.3.3.1 \ No newline at end of file +TextDomain1 2 > Page 2.3 > TextDomain1 2.3.3 > TextDomain2 2.3.3.1 diff --git a/test/Helper/Navigation/_files/expected/menu/textdomain.html b/test/Helper/Navigation/_files/expected/menu/textdomain.html index 2cf01673..340a71af 100644 --- a/test/Helper/Navigation/_files/expected/menu/textdomain.html +++ b/test/Helper/Navigation/_files/expected/menu/textdomain.html @@ -45,4 +45,4 @@ - \ No newline at end of file + From 937440beeb38ce4c27dd8d7ccf7f04d18f3526b9 Mon Sep 17 00:00:00 2001 From: serpent7776 Date: Fri, 6 Sep 2013 16:50:14 +0200 Subject: [PATCH 12/20] Added unit tests Changed source to conform to Zend coding standards --- src/Helper/Navigation/Breadcrumbs.php | 5 ++++- test/Helper/Navigation/BreadcrumbsTest.php | 8 ++++++++ .../_files/expected/bc/partialwithseparator.html | 1 + .../Helper/Navigation/_files/mvc/views/bc_separator.phtml | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 test/Helper/Navigation/_files/expected/bc/partialwithseparator.html create mode 100644 test/Helper/Navigation/_files/mvc/views/bc_separator.phtml diff --git a/src/Helper/Navigation/Breadcrumbs.php b/src/Helper/Navigation/Breadcrumbs.php index 093a88e9..a39d8330 100644 --- a/src/Helper/Navigation/Breadcrumbs.php +++ b/src/Helper/Navigation/Breadcrumbs.php @@ -172,7 +172,10 @@ public function renderPartial($container = null, $partial = null) } // put breadcrumb pages in model - $model = array('pages' => array(), 'separator' => $this->getSeparator()); + $model = array( + 'pages' => array(), + 'separator' => $this->getSeparator() + ); $active = $this->findActive($container); if ($active) { $active = $active['page']; diff --git a/test/Helper/Navigation/BreadcrumbsTest.php b/test/Helper/Navigation/BreadcrumbsTest.php index 74fa5eef..051508d3 100644 --- a/test/Helper/Navigation/BreadcrumbsTest.php +++ b/test/Helper/Navigation/BreadcrumbsTest.php @@ -198,6 +198,14 @@ public function testRenderingPartial() $this->assertEquals($expected, $this->_helper->render()); } + public function testRenderingPartialWithSeparator() + { + $this->_helper->setPartial('bc_separator.phtml')->setSeparator(' / '); + + $expected = $this->_getExpected('bc/partialwithseparator.html'); + $this->assertEquals($expected, $this->_helper->render()); + } + public function testRenderingPartialBySpecifyingAnArrayAsPartial() { $this->_helper->setPartial(array('bc.phtml', 'application')); diff --git a/test/Helper/Navigation/_files/expected/bc/partialwithseparator.html b/test/Helper/Navigation/_files/expected/bc/partialwithseparator.html new file mode 100644 index 00000000..f0bb7880 --- /dev/null +++ b/test/Helper/Navigation/_files/expected/bc/partialwithseparator.html @@ -0,0 +1 @@ +Page 2 / Page 2.3 / Page 2.3.3 / Page 2.3.3.1 \ No newline at end of file diff --git a/test/Helper/Navigation/_files/mvc/views/bc_separator.phtml b/test/Helper/Navigation/_files/mvc/views/bc_separator.phtml new file mode 100644 index 00000000..c8a14d62 --- /dev/null +++ b/test/Helper/Navigation/_files/mvc/views/bc_separator.phtml @@ -0,0 +1,4 @@ +vars()->separator, array_map( + create_function('$a', 'return $a->getLabel();'), + $this->vars()->pages)); From e7cbcfd29d7da707877d53a4468bfeeb98fdca17 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 15 Sep 2013 06:49:58 +0700 Subject: [PATCH 13/20] no change on phar --- test/_templates/view.phar | Bin 7032 -> 7031 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/_templates/view.phar b/test/_templates/view.phar index 4bf1ff26199ab6729f8d76f0e3cb37d7e2ea2eac..a333028d85ef5ffc01708a6c09c7df5e37326d0d 100644 GIT binary patch delta 12 Tcmexi_T6kluEgd%2`**;C@Tcl delta 14 Vcmexv_QPyLt^}jP=3EIbW&kh_1or>{ From 5f4ac925e8e30025dffa0c54f0cd5cc39a7fe69f Mon Sep 17 00:00:00 2001 From: Artur Bodera Date: Mon, 23 Sep 2013 12:36:28 +0200 Subject: [PATCH 14/20] Fix fluid interface docblock @return references. --- .../Placeholder/Container/AbstractContainer.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Helper/Placeholder/Container/AbstractContainer.php b/src/Helper/Placeholder/Container/AbstractContainer.php index 62adaef7..24e76882 100644 --- a/src/Helper/Placeholder/Container/AbstractContainer.php +++ b/src/Helper/Placeholder/Container/AbstractContainer.php @@ -260,7 +260,7 @@ public function set($value) * Prepend a value to the top of the container * * @param mixed $value - * @return AbstractContainer + * @return self */ public function prepend($value) { @@ -275,7 +275,7 @@ public function prepend($value) * Append a value to the end of the container * * @param mixed $value - * @return AbstractContainer + * @return self */ public function append($value) { @@ -303,7 +303,7 @@ public function nextIndex() * optionally, if a number is passed, it will be the number of spaces * * @param string|int $indent - * @return AbstractContainer + * @return self */ public function setIndent($indent) { @@ -325,7 +325,7 @@ public function getIndent() * Set postfix for __toString() serialization * * @param string $postfix - * @return AbstractContainer + * @return self */ public function setPostfix($postfix) { @@ -347,7 +347,7 @@ public function getPostfix() * Set prefix for __toString() serialization * * @param string $prefix - * @return AbstractContainer + * @return self */ public function setPrefix($prefix) { @@ -371,7 +371,7 @@ public function getPrefix() * Used to implode elements in container * * @param string $separator - * @return AbstractContainer + * @return self */ public function setSeparator($separator) { From 5915128dd755b2b958f4b899d9e6958aab7da47e Mon Sep 17 00:00:00 2001 From: Maks3w Date: Thu, 3 Oct 2013 10:50:29 +0200 Subject: [PATCH 15/20] =?UTF-8?q?Removed=20all=20@category,=20@package,=20?= =?UTF-8?q?and=20@subpackage=20annotations=20=E2=80=A6=20-=20Continue=20ze?= =?UTF-8?q?ndframework/zf2#3508=20removing=20ZendTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/Helper/AbstractTest.php | 4 ---- test/Helper/BasePathTest.php | 4 ---- test/Helper/CycleTest.php | 4 ---- test/Helper/DeclareVarsTest.php | 4 ---- test/Helper/DoctypeTest.php | 4 ---- test/Helper/EscapeCssTest.php | 1 - test/Helper/EscapeHtmlAttrTest.php | 1 - test/Helper/EscapeHtmlTest.php | 1 - test/Helper/EscapeJsTest.php | 1 - test/Helper/EscapeUrlTest.php | 1 - test/Helper/FlashMessengerTest.php | 4 ---- test/Helper/GravatarTest.php | 4 ---- test/Helper/HeadLinkTest.php | 4 ---- test/Helper/HeadMetaTest.php | 4 ---- test/Helper/HeadScriptTest.php | 4 ---- test/Helper/HeadStyleTest.php | 4 ---- test/Helper/HeadTitleTest.php | 4 ---- test/Helper/HtmlFlashTest.php | 4 ---- test/Helper/HtmlListTest.php | 4 ---- test/Helper/HtmlObjectTest.php | 4 ---- test/Helper/HtmlPageTest.php | 4 ---- test/Helper/HtmlQuicktimeTest.php | 4 ---- test/Helper/IdentityTest.php | 4 ---- test/Helper/InlineScriptTest.php | 4 ---- test/Helper/JsonTest.php | 4 ---- test/Helper/LayoutTest.php | 4 ---- test/Helper/Navigation/AbstractTest.php | 4 ---- test/Helper/Navigation/BreadcrumbsTest.php | 4 ---- test/Helper/Navigation/LinksTest.php | 4 ---- test/Helper/Navigation/MenuTest.php | 4 ---- test/Helper/Navigation/NavigationTest.php | 4 ---- test/Helper/Navigation/SitemapTest.php | 4 ---- test/Helper/PaginationControlTest.php | 4 ---- test/Helper/PartialLoopTest.php | 4 ---- test/Helper/PartialTest.php | 4 ---- test/Helper/Placeholder/ContainerTest.php | 4 ---- test/Helper/Placeholder/RegistryTest.php | 4 ---- test/Helper/Placeholder/StandaloneContainerTest.php | 4 ---- test/Helper/PlaceholderTest.php | 4 ---- test/Helper/RenderChildModelTest.php | 4 ---- test/Helper/RenderToPlaceholderTest.php | 4 ---- test/Helper/ServerUrlTest.php | 4 ---- test/Helper/TestAsset/ArrayTranslator.php | 1 - test/Helper/TestAsset/AuthenticationAdapter.php | 6 ------ test/Helper/TestAsset/ConcreteHelper.php | 1 - test/Helper/TestAsset/IdentityObject.php | 6 ------ test/Helper/TestAsset/Stringified.php | 1 - test/Helper/TestAsset/ToArray.php | 1 - test/Helper/UrlIntegrationTest.php | 4 ---- test/Helper/UrlTest.php | 4 ---- test/HelperPluginManagerTest.php | 4 ---- test/Model/JsonModelTest.php | 6 ------ test/Model/TestAsset/Variable.php | 1 - test/Model/ViewModelTest.php | 6 ------ test/PhpRendererTest.php | 4 ---- test/Renderer/FeedRendererTest.php | 6 ------ test/Renderer/JsonRendererTest.php | 4 ---- test/Renderer/TestAsset/JsonModel.php | 6 ------ test/Resolver/AggregateResolverTest.php | 6 ------ test/Resolver/TemplateMapResolverTest.php | 6 ------ test/Strategy/FeedStrategyTest.php | 6 ------ test/Strategy/JsonStrategyTest.php | 6 ------ test/Strategy/PhpRendererStrategyTest.php | 6 ------ test/TemplatePathStackTest.php | 4 ---- test/TestAsset/Invokable.php | 1 - test/TestAsset/Renderer/VarExportRenderer.php | 6 ------ test/TestAsset/Uninvokable.php | 1 - test/TestAsset/VariableFunctor.php | 6 ------ test/VariablesTest.php | 4 ---- test/ViewEventTest.php | 1 - test/ViewTest.php | 1 - test/_stubs/FilterDir1/Foo.php | 6 ------ test/_stubs/HelperDir1/Stub1.php | 6 ------ test/_stubs/HelperDir1/StubEmpty.php | 1 - test/_stubs/HelperDir2/Datetime.php | 6 ------ test/_stubs/HelperDir2/Stub1.php | 6 ------ test/_stubs/HelperDir2/Stub2.php | 6 ------ 77 files changed, 299 deletions(-) diff --git a/test/Helper/AbstractTest.php b/test/Helper/AbstractTest.php index df81b2e8..baeffa65 100644 --- a/test/Helper/AbstractTest.php +++ b/test/Helper/AbstractTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use ZendTest\View\Helper\TestAsset\ConcreteHelper; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/BasePathTest.php b/test/Helper/BasePathTest.php index c089f6cb..b8d72737 100644 --- a/test/Helper/BasePathTest.php +++ b/test/Helper/BasePathTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use Zend\View\Helper\BasePath; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/CycleTest.php b/test/Helper/CycleTest.php index 57dd7bfa..9ad83635 100644 --- a/test/Helper/CycleTest.php +++ b/test/Helper/CycleTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -15,9 +14,6 @@ /** * Test class for Zend_View_Helper_Cycle. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/DeclareVarsTest.php b/test/Helper/DeclareVarsTest.php index 39ffc1ec..b6e59a3d 100644 --- a/test/Helper/DeclareVarsTest.php +++ b/test/Helper/DeclareVarsTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use Zend\View\Helper\DeclareVars; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/DoctypeTest.php b/test/Helper/DoctypeTest.php index 9aea8c54..e19e10aa 100644 --- a/test/Helper/DoctypeTest.php +++ b/test/Helper/DoctypeTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -15,9 +14,6 @@ /** * Test class for Zend_View_Helper_Doctype. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/EscapeCssTest.php b/test/Helper/EscapeCssTest.php index 592a8a32..f6d07074 100644 --- a/test/Helper/EscapeCssTest.php +++ b/test/Helper/EscapeCssTest.php @@ -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_View */ namespace ZendTest\View\Helper; diff --git a/test/Helper/EscapeHtmlAttrTest.php b/test/Helper/EscapeHtmlAttrTest.php index 896556be..2640a4c1 100644 --- a/test/Helper/EscapeHtmlAttrTest.php +++ b/test/Helper/EscapeHtmlAttrTest.php @@ -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_View */ namespace ZendTest\View\Helper; diff --git a/test/Helper/EscapeHtmlTest.php b/test/Helper/EscapeHtmlTest.php index d7358529..88f68165 100644 --- a/test/Helper/EscapeHtmlTest.php +++ b/test/Helper/EscapeHtmlTest.php @@ -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_View */ namespace ZendTest\View\Helper; diff --git a/test/Helper/EscapeJsTest.php b/test/Helper/EscapeJsTest.php index 7c5ddef1..ac15c867 100644 --- a/test/Helper/EscapeJsTest.php +++ b/test/Helper/EscapeJsTest.php @@ -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_View */ namespace ZendTest\View\Helper; diff --git a/test/Helper/EscapeUrlTest.php b/test/Helper/EscapeUrlTest.php index 8032f9e6..8c36cb76 100644 --- a/test/Helper/EscapeUrlTest.php +++ b/test/Helper/EscapeUrlTest.php @@ -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_View */ namespace ZendTest\View\Helper; diff --git a/test/Helper/FlashMessengerTest.php b/test/Helper/FlashMessengerTest.php index e742e3c8..1b3f6b86 100644 --- a/test/Helper/FlashMessengerTest.php +++ b/test/Helper/FlashMessengerTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -22,9 +21,6 @@ /** * Test class for Zend_View_Helper_Cycle. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/GravatarTest.php b/test/Helper/GravatarTest.php index d8fe09e9..783f8372 100644 --- a/test/Helper/GravatarTest.php +++ b/test/Helper/GravatarTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -15,9 +14,6 @@ use Zend\View\Helper\Gravatar; /** - * @category Zend - * @package Zendview - * @subpackage UnitTests * @group Zendview * @group Zendview_Helper */ diff --git a/test/Helper/HeadLinkTest.php b/test/Helper/HeadLinkTest.php index 0c82b8c6..81700198 100644 --- a/test/Helper/HeadLinkTest.php +++ b/test/Helper/HeadLinkTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -18,9 +17,6 @@ /** * Test class for Zend_View_Helper_HeadLink. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HeadMetaTest.php b/test/Helper/HeadMetaTest.php index b78eeda5..ac57248d 100644 --- a/test/Helper/HeadMetaTest.php +++ b/test/Helper/HeadMetaTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -18,9 +17,6 @@ /** * Test class for Zend_View_Helper_HeadMeta. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HeadScriptTest.php b/test/Helper/HeadScriptTest.php index c70cfa02..4bc41633 100644 --- a/test/Helper/HeadScriptTest.php +++ b/test/Helper/HeadScriptTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -17,9 +16,6 @@ /** * Test class for Zend_View_Helper_HeadScript. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HeadStyleTest.php b/test/Helper/HeadStyleTest.php index d707c1ae..956f7f4d 100644 --- a/test/Helper/HeadStyleTest.php +++ b/test/Helper/HeadStyleTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -17,9 +16,6 @@ /** * Test class for Zend_View_Helper_HeadStyle. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HeadTitleTest.php b/test/Helper/HeadTitleTest.php index a373f5a6..18e6440d 100644 --- a/test/Helper/HeadTitleTest.php +++ b/test/Helper/HeadTitleTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -17,9 +16,6 @@ /** * Test class for Zend_View_Helper_HeadTitle. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HtmlFlashTest.php b/test/Helper/HtmlFlashTest.php index fdbbafb9..e536ef6b 100644 --- a/test/Helper/HtmlFlashTest.php +++ b/test/Helper/HtmlFlashTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use Zend\View\Helper\HtmlFlash; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HtmlListTest.php b/test/Helper/HtmlListTest.php index 324c47fe..6d55e63a 100644 --- a/test/Helper/HtmlListTest.php +++ b/test/Helper/HtmlListTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use Zend\View\Renderer\PhpRenderer as View; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HtmlObjectTest.php b/test/Helper/HtmlObjectTest.php index 5a689bfa..d5a896f8 100644 --- a/test/Helper/HtmlObjectTest.php +++ b/test/Helper/HtmlObjectTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -15,9 +14,6 @@ use Zend\View\Helper\HtmlObject; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HtmlPageTest.php b/test/Helper/HtmlPageTest.php index ab083fe4..1cf2ccd6 100644 --- a/test/Helper/HtmlPageTest.php +++ b/test/Helper/HtmlPageTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use Zend\View\Helper\HtmlPage; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/HtmlQuicktimeTest.php b/test/Helper/HtmlQuicktimeTest.php index 42081c53..324ba858 100644 --- a/test/Helper/HtmlQuicktimeTest.php +++ b/test/Helper/HtmlQuicktimeTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use Zend\View\Helper\HtmlQuicktime; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/IdentityTest.php b/test/Helper/IdentityTest.php index 98edd566..42916967 100644 --- a/test/Helper/IdentityTest.php +++ b/test/Helper/IdentityTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -19,9 +18,6 @@ * * Tests Identity helper * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/InlineScriptTest.php b/test/Helper/InlineScriptTest.php index c33e6351..626ce48e 100644 --- a/test/Helper/InlineScriptTest.php +++ b/test/Helper/InlineScriptTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -17,9 +16,6 @@ /** * Test class for Zend_View_Helper_InlineScript. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/JsonTest.php b/test/Helper/JsonTest.php index e82c1da0..43752112 100644 --- a/test/Helper/JsonTest.php +++ b/test/Helper/JsonTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -18,9 +17,6 @@ /** * Test class for Zend_View_Helper_Json * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/LayoutTest.php b/test/Helper/LayoutTest.php index 636cd10e..4302b57f 100644 --- a/test/Helper/LayoutTest.php +++ b/test/Helper/LayoutTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -17,9 +16,6 @@ /** * Test class for Zend_View_Helper_Layout * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Navigation/AbstractTest.php b/test/Helper/Navigation/AbstractTest.php index ea224188..dba5be65 100644 --- a/test/Helper/Navigation/AbstractTest.php +++ b/test/Helper/Navigation/AbstractTest.php @@ -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_View */ namespace ZendTest\View\Helper\Navigation; @@ -25,9 +24,6 @@ /** * Base class for navigation view helper tests * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Navigation/BreadcrumbsTest.php b/test/Helper/Navigation/BreadcrumbsTest.php index 74fa5eef..9981419a 100644 --- a/test/Helper/Navigation/BreadcrumbsTest.php +++ b/test/Helper/Navigation/BreadcrumbsTest.php @@ -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_View */ namespace ZendTest\View\Helper\Navigation; @@ -16,9 +15,6 @@ /** * Tests Zend_View_Helper_Navigation_Breadcrumbs * - * @category Zend_Tests - * @package Zend_View - * @subpackage Helper * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Navigation/LinksTest.php b/test/Helper/Navigation/LinksTest.php index 9ebe6afd..aad52191 100644 --- a/test/Helper/Navigation/LinksTest.php +++ b/test/Helper/Navigation/LinksTest.php @@ -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_View */ namespace ZendTest\View\Helper\Navigation; @@ -22,9 +21,6 @@ /** * Tests Zend_View_Helper_Navigation_Links * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Navigation/MenuTest.php b/test/Helper/Navigation/MenuTest.php index 6c9a803c..366e7c80 100644 --- a/test/Helper/Navigation/MenuTest.php +++ b/test/Helper/Navigation/MenuTest.php @@ -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_View */ namespace ZendTest\View\Helper\Navigation; @@ -13,9 +12,6 @@ /** * Tests Zend_View_Helper_Navigation_Menu * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Navigation/NavigationTest.php b/test/Helper/Navigation/NavigationTest.php index 480ac7b4..c9257643 100644 --- a/test/Helper/Navigation/NavigationTest.php +++ b/test/Helper/Navigation/NavigationTest.php @@ -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_View */ namespace ZendTest\View\Helper\Navigation; @@ -20,9 +19,6 @@ /** * Tests Zend_View_Helper_Navigation * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Navigation/SitemapTest.php b/test/Helper/Navigation/SitemapTest.php index cd91949d..62bcc90e 100644 --- a/test/Helper/Navigation/SitemapTest.php +++ b/test/Helper/Navigation/SitemapTest.php @@ -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_View */ namespace ZendTest\View\Helper\Navigation; @@ -16,9 +15,6 @@ /** * Tests Zend_View_Helper_Navigation_Sitemap * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/PaginationControlTest.php b/test/Helper/PaginationControlTest.php index c15245ad..3a0565de 100644 --- a/test/Helper/PaginationControlTest.php +++ b/test/Helper/PaginationControlTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -16,9 +15,6 @@ use Zend\View\Resolver; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/PartialLoopTest.php b/test/Helper/PartialLoopTest.php index e70eff07..4f2f20f3 100644 --- a/test/Helper/PartialLoopTest.php +++ b/test/Helper/PartialLoopTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -19,9 +18,6 @@ /** * Test class for Zend_View_Helper_PartialLoop. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/PartialTest.php b/test/Helper/PartialTest.php index 88cc78ba..a662fb43 100644 --- a/test/Helper/PartialTest.php +++ b/test/Helper/PartialTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -18,9 +17,6 @@ /** * Test class for Partial view helper. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Placeholder/ContainerTest.php b/test/Helper/Placeholder/ContainerTest.php index 462d5a0c..1a119653 100644 --- a/test/Helper/Placeholder/ContainerTest.php +++ b/test/Helper/Placeholder/ContainerTest.php @@ -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_View */ namespace ZendTest\View\Helper\Placeholder; @@ -14,9 +13,6 @@ /** * Test class for Zend_View_Helper_Placeholder_Container. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Placeholder/RegistryTest.php b/test/Helper/Placeholder/RegistryTest.php index b296aa03..34081ea7 100644 --- a/test/Helper/Placeholder/RegistryTest.php +++ b/test/Helper/Placeholder/RegistryTest.php @@ -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_View */ namespace ZendTest\View\Helper\Placeholder; @@ -17,9 +16,6 @@ /** * Test class for Zend_View_Helper_Placeholder_Registry. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/Placeholder/StandaloneContainerTest.php b/test/Helper/Placeholder/StandaloneContainerTest.php index 1a52857d..5cde0b0e 100644 --- a/test/Helper/Placeholder/StandaloneContainerTest.php +++ b/test/Helper/Placeholder/StandaloneContainerTest.php @@ -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_View */ namespace ZendTest\View\Helper\Placeholder; @@ -16,9 +15,6 @@ /** * Test class for Zend_View_Helper_Placeholder_StandaloneContainer. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/PlaceholderTest.php b/test/Helper/PlaceholderTest.php index 2c701cc6..ad6c381d 100644 --- a/test/Helper/PlaceholderTest.php +++ b/test/Helper/PlaceholderTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -17,9 +16,6 @@ /** * Test class for Zend_View_Helper_Placeholder. * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/RenderChildModelTest.php b/test/Helper/RenderChildModelTest.php index 49df9928..b066ef07 100644 --- a/test/Helper/RenderChildModelTest.php +++ b/test/Helper/RenderChildModelTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -16,9 +15,6 @@ use Zend\View\Resolver\TemplateMapResolver; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/RenderToPlaceholderTest.php b/test/Helper/RenderToPlaceholderTest.php index 6bef038d..51f4a29f 100644 --- a/test/Helper/RenderToPlaceholderTest.php +++ b/test/Helper/RenderToPlaceholderTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -14,9 +13,6 @@ use Zend\View\Helper\Placeholder as PlaceholderHelper; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/ServerUrlTest.php b/test/Helper/ServerUrlTest.php index 65ec9454..e0008ab5 100644 --- a/test/Helper/ServerUrlTest.php +++ b/test/Helper/ServerUrlTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -15,9 +14,6 @@ /** * Tests Zend_View_Helper_ServerUrl * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/TestAsset/ArrayTranslator.php b/test/Helper/TestAsset/ArrayTranslator.php index f76631c6..5b553362 100644 --- a/test/Helper/TestAsset/ArrayTranslator.php +++ b/test/Helper/TestAsset/ArrayTranslator.php @@ -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_View */ namespace ZendTest\View\Helper\TestAsset; diff --git a/test/Helper/TestAsset/AuthenticationAdapter.php b/test/Helper/TestAsset/AuthenticationAdapter.php index 20a778ec..ed9e98de 100644 --- a/test/Helper/TestAsset/AuthenticationAdapter.php +++ b/test/Helper/TestAsset/AuthenticationAdapter.php @@ -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_View */ namespace ZendTest\View\Helper\TestAsset; @@ -13,11 +12,6 @@ use Zend\Authentication\Adapter\AdapterInterface; use Zend\Authentication\Result; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTests - */ class AuthenticationAdapter implements AdapterInterface { protected $identity; diff --git a/test/Helper/TestAsset/ConcreteHelper.php b/test/Helper/TestAsset/ConcreteHelper.php index aeb4ba09..8cfd9368 100644 --- a/test/Helper/TestAsset/ConcreteHelper.php +++ b/test/Helper/TestAsset/ConcreteHelper.php @@ -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_Validator */ namespace ZendTest\View\Helper\TestAsset; diff --git a/test/Helper/TestAsset/IdentityObject.php b/test/Helper/TestAsset/IdentityObject.php index 8b1d3305..88a5ad2f 100644 --- a/test/Helper/TestAsset/IdentityObject.php +++ b/test/Helper/TestAsset/IdentityObject.php @@ -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_View */ namespace ZendTest\View\Helper\TestAsset; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTests - */ class IdentityObject { /** diff --git a/test/Helper/TestAsset/Stringified.php b/test/Helper/TestAsset/Stringified.php index a37f915c..8c85cd85 100644 --- a/test/Helper/TestAsset/Stringified.php +++ b/test/Helper/TestAsset/Stringified.php @@ -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_View */ namespace ZendTest\View\Helper\TestAsset; diff --git a/test/Helper/TestAsset/ToArray.php b/test/Helper/TestAsset/ToArray.php index 3ebe6580..dcc42ff0 100644 --- a/test/Helper/TestAsset/ToArray.php +++ b/test/Helper/TestAsset/ToArray.php @@ -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_View */ namespace ZendTest\View\Helper\TestAsset; diff --git a/test/Helper/UrlIntegrationTest.php b/test/Helper/UrlIntegrationTest.php index 8690131f..0ca34b10 100644 --- a/test/Helper/UrlIntegrationTest.php +++ b/test/Helper/UrlIntegrationTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -18,9 +17,6 @@ /** * url() helper test -- tests integration with MVC * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/Helper/UrlTest.php b/test/Helper/UrlTest.php index d8542e43..d578c83e 100644 --- a/test/Helper/UrlTest.php +++ b/test/Helper/UrlTest.php @@ -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_View */ namespace ZendTest\View\Helper; @@ -21,9 +20,6 @@ * * Tests formText helper, including some common functionality of all form helpers * - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View * @group Zend_View_Helper */ diff --git a/test/HelperPluginManagerTest.php b/test/HelperPluginManagerTest.php index 4717cef2..477e8343 100644 --- a/test/HelperPluginManagerTest.php +++ b/test/HelperPluginManagerTest.php @@ -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_View */ namespace ZendTest\View; @@ -17,9 +16,6 @@ use Zend\View\Renderer\PhpRenderer; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View */ class HelperPluginManagerTest extends \PHPUnit_Framework_TestCase diff --git a/test/Model/JsonModelTest.php b/test/Model/JsonModelTest.php index 6731f057..c9ccfc04 100644 --- a/test/Model/JsonModelTest.php +++ b/test/Model/JsonModelTest.php @@ -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_View */ namespace ZendTest\View\Model; @@ -14,11 +13,6 @@ use Zend\View\Model\JsonModel; use Zend\Json\Json; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class JsonModelTest extends TestCase { public function testAllowsEmptyConstructor() diff --git a/test/Model/TestAsset/Variable.php b/test/Model/TestAsset/Variable.php index 5df8655e..59ce552e 100644 --- a/test/Model/TestAsset/Variable.php +++ b/test/Model/TestAsset/Variable.php @@ -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_View */ namespace ZendTest\View\Model\TestAsset; diff --git a/test/Model/ViewModelTest.php b/test/Model/ViewModelTest.php index 45835e52..b0da97db 100644 --- a/test/Model/ViewModelTest.php +++ b/test/Model/ViewModelTest.php @@ -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_View */ namespace ZendTest\View\Model; @@ -17,11 +16,6 @@ use Zend\View\Variables as ViewVariables; use ZendTest\View\Model\TestAsset\Variable; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class ViewModelTest extends TestCase { public function testImplementsModelInterface() diff --git a/test/PhpRendererTest.php b/test/PhpRendererTest.php index 0e66125b..e7a16347 100644 --- a/test/PhpRendererTest.php +++ b/test/PhpRendererTest.php @@ -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_View */ namespace ZendTest\View; @@ -18,9 +17,6 @@ use Zend\Filter\FilterChain; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View */ class PhpRendererTest extends \PHPUnit_Framework_TestCase diff --git a/test/Renderer/FeedRendererTest.php b/test/Renderer/FeedRendererTest.php index 2296846b..92d4431b 100644 --- a/test/Renderer/FeedRendererTest.php +++ b/test/Renderer/FeedRendererTest.php @@ -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_View */ namespace ZendTest\View\Renderer; @@ -16,11 +15,6 @@ use Zend\View\Model\ViewModel; use Zend\View\Renderer\FeedRenderer; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class FeedRendererTest extends TestCase { public function setUp() diff --git a/test/Renderer/JsonRendererTest.php b/test/Renderer/JsonRendererTest.php index b0a34259..78a2c432 100644 --- a/test/Renderer/JsonRendererTest.php +++ b/test/Renderer/JsonRendererTest.php @@ -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_View */ namespace ZendTest\View\Renderer; @@ -18,9 +17,6 @@ use Zend\View\Model\ViewModel; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View */ class JsonRendererTest extends TestCase diff --git a/test/Renderer/TestAsset/JsonModel.php b/test/Renderer/TestAsset/JsonModel.php index 9df9eb5a..8f5a8d4b 100644 --- a/test/Renderer/TestAsset/JsonModel.php +++ b/test/Renderer/TestAsset/JsonModel.php @@ -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_View */ namespace ZendTest\View\Renderer\TestAsset; use JsonSerializable; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class JsonModel implements JsonSerializable { public $value = false; diff --git a/test/Resolver/AggregateResolverTest.php b/test/Resolver/AggregateResolverTest.php index 82770fc9..b503f3be 100644 --- a/test/Resolver/AggregateResolverTest.php +++ b/test/Resolver/AggregateResolverTest.php @@ -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_View */ namespace ZendTest\View\Resolver; @@ -13,11 +12,6 @@ use PHPUnit_Framework_TestCase as TestCase; use Zend\View\Resolver; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class AggregateResolverTest extends TestCase { public function testAggregateIsEmptyByDefault() diff --git a/test/Resolver/TemplateMapResolverTest.php b/test/Resolver/TemplateMapResolverTest.php index 25876587..c095eac7 100644 --- a/test/Resolver/TemplateMapResolverTest.php +++ b/test/Resolver/TemplateMapResolverTest.php @@ -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_View */ namespace ZendTest\View\Resolver; @@ -14,11 +13,6 @@ use PHPUnit_Framework_TestCase as TestCase; use Zend\View\Resolver\TemplateMapResolver; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class TemplateMapResolverTest extends TestCase { public function testMapIsEmptyByDefault() diff --git a/test/Strategy/FeedStrategyTest.php b/test/Strategy/FeedStrategyTest.php index 0838bd68..b438b838 100644 --- a/test/Strategy/FeedStrategyTest.php +++ b/test/Strategy/FeedStrategyTest.php @@ -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_View */ namespace ZendTest\View\Strategy; @@ -22,11 +21,6 @@ use Zend\View\Strategy\FeedStrategy; use Zend\View\ViewEvent; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class FeedStrategyTest extends TestCase { public function setUp() diff --git a/test/Strategy/JsonStrategyTest.php b/test/Strategy/JsonStrategyTest.php index 1ac73601..ce30f241 100644 --- a/test/Strategy/JsonStrategyTest.php +++ b/test/Strategy/JsonStrategyTest.php @@ -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_View */ namespace ZendTest\View\Strategy; @@ -22,11 +21,6 @@ use Zend\View\ViewEvent; use Zend\Stdlib\Parameters; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class JsonStrategyTest extends TestCase { public function setUp() diff --git a/test/Strategy/PhpRendererStrategyTest.php b/test/Strategy/PhpRendererStrategyTest.php index 50ad67ee..ab0f5654 100644 --- a/test/Strategy/PhpRendererStrategyTest.php +++ b/test/Strategy/PhpRendererStrategyTest.php @@ -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_View */ namespace ZendTest\View\Strategy; @@ -18,11 +17,6 @@ use Zend\View\Strategy\PhpRendererStrategy; use Zend\View\ViewEvent; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class PhpRendererStrategyTest extends TestCase { public function setUp() diff --git a/test/TemplatePathStackTest.php b/test/TemplatePathStackTest.php index 0f427e22..21359f86 100644 --- a/test/TemplatePathStackTest.php +++ b/test/TemplatePathStackTest.php @@ -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_View */ namespace ZendTest\View; @@ -13,9 +12,6 @@ use Zend\View\Resolver\TemplatePathStack; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View */ class TemplatePathStackTest extends \PHPUnit_Framework_TestCase diff --git a/test/TestAsset/Invokable.php b/test/TestAsset/Invokable.php index 936586cf..677c8a00 100644 --- a/test/TestAsset/Invokable.php +++ b/test/TestAsset/Invokable.php @@ -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_View */ namespace ZendTest\View\TestAsset; diff --git a/test/TestAsset/Renderer/VarExportRenderer.php b/test/TestAsset/Renderer/VarExportRenderer.php index 6e8459aa..39766045 100644 --- a/test/TestAsset/Renderer/VarExportRenderer.php +++ b/test/TestAsset/Renderer/VarExportRenderer.php @@ -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_View */ namespace ZendTest\View\TestAsset\Renderer; @@ -14,11 +13,6 @@ use Zend\View\Renderer\RendererInterface as Renderer; use Zend\View\Resolver\ResolverInterface as Resolver; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class VarExportRenderer implements Renderer { public function getEngine() diff --git a/test/TestAsset/Uninvokable.php b/test/TestAsset/Uninvokable.php index 9d2b0ee9..81c947b0 100644 --- a/test/TestAsset/Uninvokable.php +++ b/test/TestAsset/Uninvokable.php @@ -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_View */ namespace ZendTest\View\TestAsset; diff --git a/test/TestAsset/VariableFunctor.php b/test/TestAsset/VariableFunctor.php index a1869f86..4314aeb5 100644 --- a/test/TestAsset/VariableFunctor.php +++ b/test/TestAsset/VariableFunctor.php @@ -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_View */ namespace ZendTest\View\TestAsset; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTest - */ class VariableFunctor { public $value; diff --git a/test/VariablesTest.php b/test/VariablesTest.php index e2c0afae..19f04d68 100644 --- a/test/VariablesTest.php +++ b/test/VariablesTest.php @@ -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_View */ namespace ZendTest\View; @@ -14,9 +13,6 @@ use Zend\Config\Config; /** - * @category Zend - * @package Zend_View - * @subpackage UnitTests * @group Zend_View */ class VariablesTest extends \PHPUnit_Framework_TestCase diff --git a/test/ViewEventTest.php b/test/ViewEventTest.php index fbfbdc9c..8ead3185 100644 --- a/test/ViewEventTest.php +++ b/test/ViewEventTest.php @@ -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_View */ namespace ZendTest\View; diff --git a/test/ViewTest.php b/test/ViewTest.php index 5ddf398f..a57c047c 100644 --- a/test/ViewTest.php +++ b/test/ViewTest.php @@ -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_View */ namespace ZendTest\View; diff --git a/test/_stubs/FilterDir1/Foo.php b/test/_stubs/FilterDir1/Foo.php index 6578894b..99a90a82 100644 --- a/test/_stubs/FilterDir1/Foo.php +++ b/test/_stubs/FilterDir1/Foo.php @@ -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_View */ namespace ZendTest\View\Filter; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTests - */ class Foo { public function filter($buffer) diff --git a/test/_stubs/HelperDir1/Stub1.php b/test/_stubs/HelperDir1/Stub1.php index 249566cf..a3a5fc06 100644 --- a/test/_stubs/HelperDir1/Stub1.php +++ b/test/_stubs/HelperDir1/Stub1.php @@ -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_View */ namespace Foo\View\Helper; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTests - */ class Stub1 { public function direct() diff --git a/test/_stubs/HelperDir1/StubEmpty.php b/test/_stubs/HelperDir1/StubEmpty.php index c4071a2b..8dea03ec 100644 --- a/test/_stubs/HelperDir1/StubEmpty.php +++ b/test/_stubs/HelperDir1/StubEmpty.php @@ -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_View */ namespace ZendTest\View\_stubs\HelperDir1; diff --git a/test/_stubs/HelperDir2/Datetime.php b/test/_stubs/HelperDir2/Datetime.php index 3e3e16a7..eff9e906 100644 --- a/test/_stubs/HelperDir2/Datetime.php +++ b/test/_stubs/HelperDir2/Datetime.php @@ -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_View */ namespace ZendTest\View\_stubs\HelperDir2; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTests - */ class Datetime { public function datetime() diff --git a/test/_stubs/HelperDir2/Stub1.php b/test/_stubs/HelperDir2/Stub1.php index 7d6f63f5..ace36eef 100644 --- a/test/_stubs/HelperDir2/Stub1.php +++ b/test/_stubs/HelperDir2/Stub1.php @@ -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_View */ namespace ZendTest\View\_stubs\HelperDir2; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTests - */ class Stub1 { public function direct() diff --git a/test/_stubs/HelperDir2/Stub2.php b/test/_stubs/HelperDir2/Stub2.php index 8c077dbf..718aea82 100644 --- a/test/_stubs/HelperDir2/Stub2.php +++ b/test/_stubs/HelperDir2/Stub2.php @@ -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_View */ namespace Zend\View\Helper; -/** - * @category Zend - * @package Zend_View - * @subpackage UnitTests - */ class Stub2 { public $view; From f2e927e5a44024126ecdb2f21728a7663e1b255c Mon Sep 17 00:00:00 2001 From: Lucas CORBEAUX Date: Fri, 18 Oct 2013 09:28:34 +0200 Subject: [PATCH 16/20] Testing for include failure and empty buffer instead of file existence. Slightly changed exception message and hide warnings in tests. --- src/Renderer/PhpRenderer.php | 16 ++++++++-------- test/PhpRendererTest.php | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Renderer/PhpRenderer.php b/src/Renderer/PhpRenderer.php index 8272e924..a380cd6f 100644 --- a/src/Renderer/PhpRenderer.php +++ b/src/Renderer/PhpRenderer.php @@ -502,21 +502,21 @@ public function render($nameOrModel, $values = null) $this->__template )); } - if (!is_readable($this->__file) || is_dir($this->__file)) { - throw new Exception\UnexpectedValueException(sprintf( - '%s: Unable to open template "%s"; File does not exists, is not readable or is a directory', - __METHOD__, - $this->__file - )); - } try { ob_start(); - include $this->__file; + $includeReturn = include $this->__file; $this->__content = ob_get_clean(); } catch (\Exception $ex) { ob_end_clean(); throw $ex; } + if ($includeReturn === false && empty($this->__content)) { + throw new Exception\UnexpectedValueException(sprintf( + '%s: Unable to render template "%s"; file include failed', + __METHOD__, + $this->__file + )); + } } $this->setVars(array_pop($this->__varsCache)); diff --git a/test/PhpRendererTest.php b/test/PhpRendererTest.php index 520bae12..a760d66c 100644 --- a/test/PhpRendererTest.php +++ b/test/PhpRendererTest.php @@ -354,24 +354,24 @@ public function testRendererRaisesExceptionIfResolverCannotResolveTemplate() public function testRendererRaisesExceptionIfResolvedTemplateDoesNotExists() { - $this->setExpectedException('Zend\View\Exception\UnexpectedValueException', 'File does not exists'); + $this->setExpectedException('Zend\View\Exception\UnexpectedValueException', 'file include failed'); $resolver = new TemplateMapResolver(array( 'not-exists' => '/does/not/exists', )); $this->renderer->setResolver($resolver); - $this->renderer->render('not-exists'); + @$this->renderer->render('not-exists'); } public function testRendererRaisesExceptionIfResolvedTemplateIsDirectory() { - $this->setExpectedException('Zend\View\Exception\UnexpectedValueException', 'File does not exists'); + $this->setExpectedException('Zend\View\Exception\UnexpectedValueException', 'file include failed'); $resolver = new TemplateMapResolver(array( 'is-directory' => '.', )); $this->renderer->setResolver($resolver); - $this->renderer->render('is-directory'); + @$this->renderer->render('is-directory'); } /** From 102c7ca9fe9e88f947174e30d4262fcf750f0338 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 22 Oct 2013 16:07:10 -0500 Subject: [PATCH 17/20] [zendframework/zf2#5080] CS fixes - EOF marker --- .../Navigation/_files/expected/bc/partialwithseparator.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Helper/Navigation/_files/expected/bc/partialwithseparator.html b/test/Helper/Navigation/_files/expected/bc/partialwithseparator.html index f0bb7880..6b2b4c38 100644 --- a/test/Helper/Navigation/_files/expected/bc/partialwithseparator.html +++ b/test/Helper/Navigation/_files/expected/bc/partialwithseparator.html @@ -1 +1 @@ -Page 2 / Page 2.3 / Page 2.3.3 / Page 2.3.3.1 \ No newline at end of file +Page 2 / Page 2.3 / Page 2.3.3 / Page 2.3.3.1 From 29f5ac438923e509477702b8a478ca0747c94c76 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 22 Oct 2013 16:50:16 -0500 Subject: [PATCH 18/20] Fix failing test - For some reason, an EOL is being found in the "expected" file, or injected as part of the `_getExpected()` routine. The code is performing as expected, however, so added a `trim()` to ensure the expectation is correct. --- test/Helper/Navigation/BreadcrumbsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Helper/Navigation/BreadcrumbsTest.php b/test/Helper/Navigation/BreadcrumbsTest.php index 5f73bf89..8e405ef9 100644 --- a/test/Helper/Navigation/BreadcrumbsTest.php +++ b/test/Helper/Navigation/BreadcrumbsTest.php @@ -208,7 +208,7 @@ public function testRenderingPartialWithSeparator() { $this->_helper->setPartial('bc_separator.phtml')->setSeparator(' / '); - $expected = $this->_getExpected('bc/partialwithseparator.html'); + $expected = trim($this->_getExpected('bc/partialwithseparator.html')); $this->assertEquals($expected, $this->_helper->render()); } From 7525d612083068ab397c4185337529b58e95ae90 Mon Sep 17 00:00:00 2001 From: Lucas CORBEAUX Date: Thu, 24 Oct 2013 21:44:52 +0200 Subject: [PATCH 19/20] Fix a code standard issue in the UnexpectedValueException, change the testing strategy to avoid the use of the @ operator. --- src/Exception/UnexpectedValueException.php | 3 +- test/PhpRendererTest.php | 35 ++++++++++++++-------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php index 3968d8d8..9b9ec908 100644 --- a/src/Exception/UnexpectedValueException.php +++ b/src/Exception/UnexpectedValueException.php @@ -12,8 +12,7 @@ /** * Unexpected value exception */ -class UnexpectedValueException - extends \UnexpectedValueException +class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface { } diff --git a/test/PhpRendererTest.php b/test/PhpRendererTest.php index a760d66c..78612dd0 100644 --- a/test/PhpRendererTest.php +++ b/test/PhpRendererTest.php @@ -352,26 +352,37 @@ public function testRendererRaisesExceptionIfResolverCannotResolveTemplate() $test = $this->renderer->render('should-not-find-this'); } - public function testRendererRaisesExceptionIfResolvedTemplateDoesNotExists() + public function invalidTemplateFiles() { - $this->setExpectedException('Zend\View\Exception\UnexpectedValueException', 'file include failed'); - $resolver = new TemplateMapResolver(array( - 'not-exists' => '/does/not/exists', - )); - - $this->renderer->setResolver($resolver); - @$this->renderer->render('not-exists'); + return array( + array('/does/not/exists'), + array('.') + ); } - public function testRendererRaisesExceptionIfResolvedTemplateIsDirectory() + /** + * @dataProvider invalidTemplateFiles + */ + public function testRendererRaisesExceptionIfResolvedTemplateIsInvalid($template) { - $this->setExpectedException('Zend\View\Exception\UnexpectedValueException', 'file include failed'); $resolver = new TemplateMapResolver(array( - 'is-directory' => '.', + 'invalid' => $template, )); + set_error_handler(function ($errno, $errstr) { return true; }, E_WARNING); + $this->renderer->setResolver($resolver); - @$this->renderer->render('is-directory'); + + try { + $this->renderer->render('invalid'); + $caught = false; + } catch(\Exception $e) { + $caught = $e; + } + + restore_error_handler(); + $this->assertInstanceOf('Zend\View\Exception\UnexpectedValueException', $caught); + $this->assertContains('file include failed', $caught->getMessage()); } /** From 31f87bea9e80e721f379e7b2b23088e8a2e77d8e Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 24 Oct 2013 16:10:13 -0500 Subject: [PATCH 20/20] [zendframework/zf2#5266] implements - "implements" stays on same line as declaration, interfaces on one line per --- src/Exception/UnexpectedValueException.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php index 9b9ec908..2b2bd692 100644 --- a/src/Exception/UnexpectedValueException.php +++ b/src/Exception/UnexpectedValueException.php @@ -12,7 +12,7 @@ /** * Unexpected value exception */ -class UnexpectedValueException extends \UnexpectedValueException - implements ExceptionInterface +class UnexpectedValueException extends \UnexpectedValueException implements + ExceptionInterface { }