Merge branch 'zf2phpunit35' of http://github.com/billkarwin/zf2 into …

…merges/karwin-phpunit35 Conflicts: library/Zend/Filter/Encrypt/Openssl.php library/Zend/Service/Akismet/Akismet.php library/Zend/Service/Amazon/Amazon.php library/Zend/Service/Amazon/Exception.php library/Zend/Service/Amazon/Query.php library/Zend/Service/Audioscrobbler/Audioscrobbler.php library/Zend/Service/SlideShare/Exception.php tests/Zend/Layout/FunctionalTest.php tests/Zend/Markup/ParserIntegrityTest.php tests/Zend/Server/ReflectionTest.php tests/Zend/Service/Akismet/AkismetTest.php tests/Zend/Service/Audioscrobbler/AlbumDataTest.php tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php tests/Zend/Tag/ItemListTest.php tests/Zend/Tag/ItemTest.php tests/Zend/Text/MultiByteTest.php tests/Zend/Text/TableTest.php tests/Zend/Translate/Adapter/XmlTmTest.php tests/Zend/Validator/BarcodeTest.php tests/Zend/Validator/CallbackTest.php tests/Zend/Validator/File/FilesSizeTest.php tests/Zend/Validator/File/ImageSizeTest.php tests/Zend/Validator/File/SizeTest.php tests/Zend/Validator/File/UploadTest.php tests/Zend/Validator/File/WordCountTest.php tests/Zend/Validator/IbanTest.php tests/Zend/Validator/MessageTest.php tests/Zend/Validator/PostCodeTest.php tests/Zend/Validator/RegexTest.php tests/Zend/Validator/ValidateTest.php
zendframework · Nov 2, 2010 · 64c7b8d · 64c7b8d
5 parents 1318bf4 + edaa760 + c4c0c95 + 4cc2cd6 + 1353fef
commit 64c7b8d
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 12 deletions.
diff --git a/test/FilterChainTest.php b/test/FilterChainTest.php
@@ -1,10 +1,23 @@
 <?php
 /**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
  * @category   Zend
  * @package    Zend_Stdlib
- * @subpackage Test
- * @copyright  Copyright (c) 2010-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
  */
 
 namespace ZendTest\Stdlib;
@@ -14,9 +27,10 @@
 /**
  * @category   Zend
  * @package    Zend_Stdlib
- * @subpackage Test
- * @copyright  Copyright (c) 2010-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
+ * @subpackage UnitTests
+ * @group      Zend_Stdlib
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FilterChainTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/test/SignalHandlerTest.php b/test/SignalHandlerTest.php
@@ -1,10 +1,23 @@
 <?php
 /**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
  * @category   Zend
  * @package    Zend_Stdlib
- * @subpackage Test
- * @copyright  Copyright (c) 2010 - Present Zend Technologies USA Inc. (http://www.zend.com)
- * @license    New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
  */
 
 namespace ZendTest\SignalSlot;
@@ -14,9 +27,10 @@
 /**
  * @category   Zend
  * @package    Zend_Stdlib
- * @subpackage Test
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
+ * @subpackage UnitTests
+ * @group      Zend_Stdlib
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SignalHandlerTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/test/SplPriorityQueueTest.php b/test/SplPriorityQueueTest.php
@@ -1,8 +1,37 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Stdlib
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
 namespace ZendTest\Stdlib;
 
 use Zend\Stdlib\SplPriorityQueue;
 
+/**
+ * @category   Zend
+ * @package    Zend_Stdlib
+ * @subpackage UnitTests
+ * @group      Zend_Stdlib
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class SplPriorityQueueTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()

diff --git a/test/SplQueueTest.php b/test/SplQueueTest.php
@@ -1,8 +1,37 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Stdlib
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
 namespace ZendTest\Stdlib;
 
 use Zend\Stdlib\SplQueue;
 
+/**
+ * @category   Zend
+ * @package    Zend_Stdlib
+ * @subpackage UnitTests
+ * @group      Zend_Stdlib
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class SplQueueTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()

diff --git a/test/SplStackTest.php b/test/SplStackTest.php
@@ -1,8 +1,37 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Stdlib
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
 namespace ZendTest\Stdlib;
 
 use Zend\Stdlib\SplStack;
 
+/**
+ * @category   Zend
+ * @package    Zend_Stdlib
+ * @subpackage UnitTests
+ * @group      Zend_Stdlib
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class SplStackTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()