Merge branch 'hotfix/ZF2-178' of https://github.com/Maks3w/zf2 into h…

…otfix/zf2-178
zendframework · May 20, 2012 · 6483052 · 6483052
commit 6483052
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 201 deletions.
diff --git a/test/Helper/Navigation/SitemapTest.php b/test/Helper/Navigation/SitemapTest.php
@@ -20,7 +20,7 @@
  */
 
 namespace ZendTest\View\Helper\Navigation;
-use Zend\Controller\Request;
+
 use Zend\View;
 
 /**

diff --git a/test/Helper/_files/modules/application/controllers/ActionBarController.php b/test/Helper/_files/modules/application/controllers/ActionBarController.php
diff --git a/test/Helper/_files/modules/application/controllers/ActionFooController.php b/test/Helper/_files/modules/application/controllers/ActionFooController.php
diff --git a/test/Helper/_files/modules/foo/controllers/BazController.php b/test/Helper/_files/modules/foo/controllers/BazController.php
diff --git a/test/Helper/_files/modules/foo/controllers/FooController.php b/test/Helper/_files/modules/foo/controllers/FooController.php
diff --git a/test/Helper/_files/modules/foo/views/scripts/baz/bar-one.phtml b/test/Helper/_files/modules/foo/views/scripts/baz/bar-one.phtml
diff --git a/test/Helper/_files/modules/foo/views/scripts/baz/bar-three.phtml b/test/Helper/_files/modules/foo/views/scripts/baz/bar-three.phtml
diff --git a/test/Helper/_files/modules/foo/views/scripts/baz/bar-two.phtml b/test/Helper/_files/modules/foo/views/scripts/baz/bar-two.phtml
diff --git a/test/Helper/_files/modules/foo/views/scripts/foo/bar.phtml b/test/Helper/_files/modules/foo/views/scripts/foo/bar.phtml
diff --git a/test/Helper/_files/modules/foo/views/scripts/foo/nest.phtml b/test/Helper/_files/modules/foo/views/scripts/foo/nest.phtml
diff --git a/test/Helper/_files/modules/foo/views/scripts/foo/nested.phtml b/test/Helper/_files/modules/foo/views/scripts/foo/nested.phtml
diff --git a/test/Helper/_files/modules/foo/views/scripts/partialLoop.phtml b/test/Helper/_files/modules/foo/views/scripts/partialLoop.phtml
diff --git a/test/Helper/_files/modules/foo/views/scripts/partialTwo.phtml b/test/Helper/_files/modules/foo/views/scripts/partialTwo.phtml