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

Commit

Permalink
Merge branch 'zf2phpunit35' of http://github.com/billkarwin/zf2 into …
Browse files Browse the repository at this point in the history 
…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
  • Loading branch information
@weierophinney
weierophinney committed Nov 2, 2010
4 parents d9e9932 + 1f23947 + 63c4a7e + eac899d commit d01f94f
Show file tree
Hide file tree
Showing 6 changed files with 168 additions and 0 deletions.
28 changes: 28 additions & 0 deletions test/ContainerTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,39 @@
<?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_Session
* @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\Session;

use Zend\Session\Container,
Zend\Session\Manager,
Zend\Session;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @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 ContainerTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
Expand Down
28 changes: 28 additions & 0 deletions test/SessionConfigurationTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +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_Session
* @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\Session;

use Zend\Session\Configuration\SessionConfiguration;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @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 SessionConfigurationTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
Expand Down
28 changes: 28 additions & 0 deletions test/SessionManagerTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,39 @@
<?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_Session
* @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\Session;

use Zend\Session\SessionManager,
Zend\Session,
Zend\Registry;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @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 SessionManagerTest extends \PHPUnit_Framework_TestCase
{
public $error;
Expand Down
28 changes: 28 additions & 0 deletions test/SessionStorageTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,38 @@
<?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_Session
* @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\Session;

use Zend\Session\Storage\SessionStorage,
Zend\Session\Storage\ArrayStorage;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @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 SessionStorageTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
Expand Down
28 changes: 28 additions & 0 deletions test/StandardConfigurationTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +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_Session
* @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\Session;

use Zend\Session\Configuration\StandardConfiguration;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @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 StandardConfigurationTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
Expand Down
28 changes: 28 additions & 0 deletions test/StorageTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +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_Session
* @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\Session;

use Zend\Session\Storage\ArrayStorage;

/**
* @category Zend
* @package Zend_Session
* @subpackage UnitTests
* @group Zend_Session
* @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 StorageTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
Expand Down

0 comments on commit d01f94f

Please sign in to comment.