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

Commit

Permalink
Merge branch 'master', remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@EpeeCheeze
EpeeCheeze committed Oct 3, 2013
149 parents fefc773 + 83cbc8a + 1b9fd60 + 8a8b989 + 10da323 + e6aba5a + b71d0a2 + 2aa926c + 8405746 + bf1a8de + f16339d + ed1dbc8 + dbf56da + bdb277e + 364ced3 + 9fccdf3 + 40f5963 + 9d7ddea + e1e4aa8 + 870703b + 958decf + e49a08e + a051e7e + b9f6e35 + 2bbef72 + aea30ce + faec0a2 + 098e166 + 51d6372 + 8757ace + 42477b6 + 32cf329 + 0ebadc5 + 188fa4d + a41bbf0 + a29bbbc + 941280d + d691226 + e547023 + d91c234 + 006ef75 + 69d1518 + 7dc0d1a + a995715 + e780008 + e810876 + 9e4090a + 269bf01 + 3a1f2fd + 0cab32d + 704cc7f + e20c9e6 + a0dfc1a + 76b3e1c + fd429e8 + 187ea79 + 2b43ea6 + e3b1be1 + 19f0ef6 + 33bf9c0 + 3729984 + a5ce396 + 698dbe0 + 0efca0b + 08b2a78 + ddaa846 + 7fe4493 + 0da7331 + 7226b1d + 851904c + a2eb795 + f658a03 + de83270 + 806df8a + 4e7ff23 + 409b768 + 1b97191 + d2649e3 + f0162d1 + 6f01416 + a2b3753 + 1786961 + d157fcb + 4444c37 + 192d20c + 811122b + 3a2cf9b + eb2029b + 7a6edab + 8d8a05d + c1ddf21 + 0090b4d + ef80e35 + 59b30de + 4656098 + 377b920 + ccba82c + 5d2770e + 41714a1 + 8adef43 + a78628f + b35fa7a + 3953c79 + aa28e42 + 38f9a49 + 47ed633 + 0a6bf6e + b61d89d + a1fbb6f + 238512b + f40a328 + 62dc143 + 328df3b + e12fe2d + e34a942 + 04e956d + a19a8c2 + ac4b6c0 + d28282e + bd5af3d + b976cb5 + 4feb67b + 7164be7 + 40174df + e4918ae + 1d9f9a2 + c77ae57 + 223b881 + c2f4e25 + e08b166 + e58e548 + 85e6bbd + 0ac2052 + c7ba6af + f443c57 + 1380626 + 5316b6e + a6136d4 + d233be3 + c100a2a + c6a0e2c + e7eef3c + 812f35d + 604cdcd + 5472285 + 6e2f420 + 76c4d1c + c60cca9 + 53d9070 commit a67cdeb
Show file tree
Hide file tree
Showing 79 changed files with 25 additions and 308 deletions.
22 changes: 17 additions & 5 deletions src/Helper/Placeholder/Container/AbstractContainer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ public function set($value)
* Prepend a value to the top of the container
*
* @param mixed $value
* @return void
* @return self
*/
public function prepend($value)
{
Expand All @@ -271,6 +271,18 @@ public function prepend($value)
return $this;
}

/**
* Append a value to the end of the container
*
* @param mixed $value
* @return self
*/
public function append($value)
{
parent::append($value);
return $this;
}

/**
* Next Index as defined by the PHP manual
*
Expand All @@ -291,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)
{
Expand All @@ -313,7 +325,7 @@ public function getIndent()
* Set postfix for __toString() serialization
*
* @param string $postfix
* @return AbstractContainer
* @return self
*/
public function setPostfix($postfix)
{
Expand All @@ -335,7 +347,7 @@ public function getPostfix()
* Set prefix for __toString() serialization
*
* @param string $prefix
* @return AbstractContainer
* @return self
*/
public function setPrefix($prefix)
{
Expand All @@ -359,7 +371,7 @@ public function getPrefix()
* Used to implode elements in container
*
* @param string $separator
* @return AbstractContainer
* @return self
*/
public function setSeparator($separator)
{
Expand Down
4 changes: 2 additions & 2 deletions src/HelperPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ class HelperPluginManager extends AbstractPluginManager
// basepath and url are not very useful without their factories, however the doctype
// helper works fine as an invokable. The factory for doctype simply checks for the
// config value from the merged config.
'doctype' => 'Zend\View\Helper\Doctype', // overridden by a factory in ViewHelperManagerFactory
'basepath' => 'Zend\View\Helper\BasePath',
'url' => 'Zend\View\Helper\Url',
'cycle' => 'Zend\View\Helper\Cycle',
'declarevars' => 'Zend\View\Helper\DeclareVars',
'doctype' => 'Zend\View\Helper\Doctype', // overridden by a factory in ViewHelperManagerFactory
'escapehtml' => 'Zend\View\Helper\EscapeHtml',
'escapehtmlattr' => 'Zend\View\Helper\EscapeHtmlAttr',
'escapejs' => 'Zend\View\Helper\EscapeJs',
Expand All @@ -73,6 +72,7 @@ class HelperPluginManager extends AbstractPluginManager
'renderchildmodel' => 'Zend\View\Helper\RenderChildModel',
'rendertoplaceholder' => 'Zend\View\Helper\RenderToPlaceholder',
'serverurl' => 'Zend\View\Helper\ServerUrl',
'url' => 'Zend\View\Helper\Url',
'viewmodel' => 'Zend\View\Helper\ViewModel',
);

Expand Down
4 changes: 0 additions & 4 deletions test/Helper/AbstractTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -14,9 +13,6 @@
use ZendTest\View\Helper\TestAsset\ConcreteHelper;

/**
* @category Zend
* @package Zend_View
* @subpackage UnitTests
* @group Zend_View
* @group Zend_View_Helper
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/BasePathTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -14,9 +13,6 @@
use Zend\View\Helper\BasePath;

/**
* @category Zend
* @package Zend_View
* @subpackage UnitTests
* @group Zend_View
* @group Zend_View_Helper
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/CycleTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/DeclareVarsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -14,9 +13,6 @@
use Zend\View\Helper\DeclareVars;

/**
* @category Zend
* @package Zend_View
* @subpackage UnitTests
* @group Zend_View
* @group Zend_View_Helper
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/DoctypeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
1 change: 0 additions & 1 deletion test/Helper/EscapeCssTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand Down
1 change: 0 additions & 1 deletion test/Helper/EscapeHtmlAttrTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand Down
1 change: 0 additions & 1 deletion test/Helper/EscapeHtmlTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand Down
1 change: 0 additions & 1 deletion test/Helper/EscapeJsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand Down
1 change: 0 additions & 1 deletion test/Helper/EscapeUrlTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/FlashMessengerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/GravatarTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -15,9 +14,6 @@
use Zend\View\Helper\Gravatar;

/**
* @category Zend
* @package Zendview
* @subpackage UnitTests
* @group Zendview
* @group Zendview_Helper
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HeadLinkTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HeadMetaTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HeadScriptTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HeadStyleTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HeadTitleTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HtmlFlashTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -14,9 +13,6 @@
use Zend\View\Helper\HtmlFlash;

/**
* @category Zend
* @package Zend_View
* @subpackage UnitTests
* @group Zend_View
* @group Zend_View_Helper
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HtmlListTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -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
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Helper/HtmlObjectTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_View
*/

namespace ZendTest\View\Helper;
Expand All @@ -15,9 +14,6 @@
use Zend\View\Helper\HtmlObject;

/**
* @category Zend
* @package Zend_View
* @subpackage UnitTests
* @group Zend_View
* @group Zend_View_Helper
*/
Expand Down
Loading

0 comments on commit a67cdeb

Please sign in to comment.