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

Commit 64c7b8d

Browse files
weierophinneyweierophinney
committed
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
5 parents 1318bf4 + edaa760 + c4c0c95 + 4cc2cd6 + 1353fef commit 64c7b8d

File tree

5 files changed

+127
-12
lines changed

5 files changed

+127
-12
lines changed

‎test/FilterChainTest.php‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
<?php
22
/**
3+
* Zend Framework
4+
*
5+
* LICENSE
6+
*
7+
* This source file is subject to the new BSD license that is bundled
8+
* with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://framework.zend.com/license/new-bsd
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to license@zend.com so we can send you a copy immediately.
14+
*
315
* @category Zend
416
* @package Zend_Stdlib
5-
* @subpackage Test
6-
* @copyright Copyright (c) 2010-2010 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
17+
* @subpackage UnitTests
18+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @license http://framework.zend.com/license/new-bsd New BSD License
20+
* @version $Id:$
821
*/
922

1023
namespace ZendTest\Stdlib;
@@ -14,9 +27,10 @@
1427
/**
1528
* @category Zend
1629
* @package Zend_Stdlib
17-
* @subpackage Test
18-
* @copyright Copyright (c) 2010-2010 Zend Technologies USA Inc. (http://www.zend.com)
19-
* @license New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
30+
* @subpackage UnitTests
31+
* @group Zend_Stdlib
32+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @license http://framework.zend.com/license/new-bsd New BSD License
2034
*/
2135
class FilterChainTest extends \PHPUnit_Framework_TestCase
2236
{

‎test/SignalHandlerTest.php‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
<?php
22
/**
3+
* Zend Framework
4+
*
5+
* LICENSE
6+
*
7+
* This source file is subject to the new BSD license that is bundled
8+
* with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://framework.zend.com/license/new-bsd
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to license@zend.com so we can send you a copy immediately.
14+
*
315
* @category Zend
416
* @package Zend_Stdlib
5-
* @subpackage Test
6-
* @copyright Copyright (c) 2010 - Present Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
17+
* @subpackage UnitTests
18+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @license http://framework.zend.com/license/new-bsd New BSD License
20+
* @version $Id:$
821
*/
922

1023
namespace ZendTest\SignalSlot;
@@ -14,9 +27,10 @@
1427
/**
1528
* @category Zend
1629
* @package Zend_Stdlib
17-
* @subpackage Test
18-
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
19-
* @license New BSD {@link http://www.opensource.org/licenses/bsd-license.php}
30+
* @subpackage UnitTests
31+
* @group Zend_Stdlib
32+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @license http://framework.zend.com/license/new-bsd New BSD License
2034
*/
2135
class SignalHandlerTest extends \PHPUnit_Framework_TestCase
2236
{

‎test/SplPriorityQueueTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,37 @@
11
<?php
2+
/**
3+
* Zend Framework
4+
*
5+
* LICENSE
6+
*
7+
* This source file is subject to the new BSD license that is bundled
8+
* with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://framework.zend.com/license/new-bsd
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to license@zend.com so we can send you a copy immediately.
14+
*
15+
* @category Zend
16+
* @package Zend_Stdlib
17+
* @subpackage UnitTests
18+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @license http://framework.zend.com/license/new-bsd New BSD License
20+
* @version $Id:$
21+
*/
22+
223
namespace ZendTest\Stdlib;
324

425
use Zend\Stdlib\SplPriorityQueue;
526

27+
/**
28+
* @category Zend
29+
* @package Zend_Stdlib
30+
* @subpackage UnitTests
31+
* @group Zend_Stdlib
32+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @license http://framework.zend.com/license/new-bsd New BSD License
34+
*/
635
class SplPriorityQueueTest extends \PHPUnit_Framework_TestCase
736
{
837
public function setUp()

‎test/SplQueueTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,37 @@
11
<?php
2+
/**
3+
* Zend Framework
4+
*
5+
* LICENSE
6+
*
7+
* This source file is subject to the new BSD license that is bundled
8+
* with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://framework.zend.com/license/new-bsd
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to license@zend.com so we can send you a copy immediately.
14+
*
15+
* @category Zend
16+
* @package Zend_Stdlib
17+
* @subpackage UnitTests
18+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @license http://framework.zend.com/license/new-bsd New BSD License
20+
* @version $Id:$
21+
*/
22+
223
namespace ZendTest\Stdlib;
324

425
use Zend\Stdlib\SplQueue;
526

27+
/**
28+
* @category Zend
29+
* @package Zend_Stdlib
30+
* @subpackage UnitTests
31+
* @group Zend_Stdlib
32+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @license http://framework.zend.com/license/new-bsd New BSD License
34+
*/
635
class SplQueueTest extends \PHPUnit_Framework_TestCase
736
{
837
public function setUp()

‎test/SplStackTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,37 @@
11
<?php
2+
/**
3+
* Zend Framework
4+
*
5+
* LICENSE
6+
*
7+
* This source file is subject to the new BSD license that is bundled
8+
* with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://framework.zend.com/license/new-bsd
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to license@zend.com so we can send you a copy immediately.
14+
*
15+
* @category Zend
16+
* @package Zend_Stdlib
17+
* @subpackage UnitTests
18+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @license http://framework.zend.com/license/new-bsd New BSD License
20+
* @version $Id:$
21+
*/
22+
223
namespace ZendTest\Stdlib;
324

425
use Zend\Stdlib\SplStack;
526

27+
/**
28+
* @category Zend
29+
* @package Zend_Stdlib
30+
* @subpackage UnitTests
31+
* @group Zend_Stdlib
32+
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
33+
* @license http://framework.zend.com/license/new-bsd New BSD License
34+
*/
635
class SplStackTest extends \PHPUnit_Framework_TestCase
736
{
837
public function setUp()

0 commit comments

Comments
 (0)