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

Commit

Permalink
Browse files Browse the repository at this point in the history
Conflicts:
	tests/ZendTest/Code/Generator/AbstractGeneratorTest.php
	tests/ZendTest/Code/Generator/ClassGeneratorTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/AuthorTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/LicenseTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/ParamTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/ReturnTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/TagTest.php
	tests/ZendTest/Code/Generator/DocBlockGeneratorTest.php
	tests/ZendTest/Code/Generator/FileGeneratorTest.php
	tests/ZendTest/Code/Generator/MethodGeneratorTest.php
	tests/ZendTest/Code/Generator/ParameterGeneratorTest.php
	tests/ZendTest/Code/Generator/PropertyGeneratorTest.php
	tests/ZendTest/Code/Generator/PropertyValueGeneratorTest.php
	tests/ZendTest/Code/Generator/ValueGeneratorTest.php
  • Loading branch information
Maks3w committed Oct 3, 2013
149 parents 8053499 + c3d9295 + 4c82c64 + 593b71b + 8cc68f1 + 1642118 + 89a44d0 + 5c10b75 + db7d808 + 4ee93be + 9ecbeb2 + d240054 + 78d3205 + 8903b2d + 464835b + c59b54d + 14ad3a0 + f4ac37b + 0ec8036 + 8839d0e + 07564e2 + a65cb66 + ecb09fb + 6de3f68 + cb8f354 + d7ffaed + 1819a00 + e2ca906 + f897f74 + 0568c55 + d7f0623 + 8b4896f + 2f83acc + a44d7dd + 6bce797 + 6ad2b62 + 1e41fbd + a0078e6 + 9db875b + 2879406 + 9acc850 + eddeb7d + 5a77057 + 33c15ff + 9f13ebf + a2ad2a5 + c0ba21c + 94e82a8 + 459f1f9 + e0c8424 + 5ef6a39 + 58fd018 + 65e3b0b + d21655a + 1d20fd1 + fe81bc5 + 96fadae + 072c64d + d3c9780 + 9c15ae8 + 66a4342 + 85c9491 + 8ec8384 + 004366f + 55a086d + ac7c7af + f02a226 + 00c4ac3 + 3f52720 + 5508474 + 49ed2f6 + d562686 + 67b42b2 + bdb1dae + 9809630 + 7304e37 + 752a5af + 8181c8f + 53bdac2 + c2f9414 + f6341e9 + 57cde95 + c750616 + 293054e + 7432649 + 63f13f6 + 927c00d + 44e0d4b + bc03833 + 1fd7c61 + de0cb77 + 66e902f + 24354dc + 9f886a2 + 845333c + 96e9a1e + 52fbeb6 + 7f76d90 + fec4cec + 24efdcc + 219c9ad + 3025666 + 17d48b4 + 00f4506 + 0800032 + fc89677 + e89d79b + f329014 + a1bfde3 + 7dec05c + 734f9f2 + 2756031 + 408f714 + fd53447 + f1f6e0d + e193ac7 + dad06c3 + 03ab3c8 + d0b9eec + e47995d + 411b935 + ddc8029 + a6c1451 + e823524 + eb63995 + 2de2423 + a95575b + 03a862c + e195cc6 + f4ac757 + a53de82 + 42763a8 + 6b14b45 + 2c344a8 + ff8337b + 18b53cb + e669f19 + 592011d + 076244a + df3d273 + df0ceea + 52b821e + b5e6fa9 + be5e28e + fa8e439 + 07914f0 + 12778bc + 67c0313 + 467d976 commit 615fcf5
Show file tree
Hide file tree
Showing 86 changed files with 0 additions and 120 deletions.
4 changes: 0 additions & 4 deletions test/Client/CommonHttpTests.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -32,9 +31,6 @@
* You can also set the proper constant in your test configuration file to
* point to the right place.
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/CurlTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -26,9 +25,6 @@
* You can also set the proper constand in your test configuration file to
* point to the right place.
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/ProxyAdapterTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -20,9 +19,6 @@
*
* See TestConfiguration.php.dist for more information.
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/SocketKeepaliveTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -23,9 +22,6 @@
* You can also set the proper constand in your test configuration file to
* point to the right place.
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/SocketPersistentTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -23,9 +22,6 @@
* You can also set the proper constand in your test configuration file to
* point to the right place.
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/SocketTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -26,9 +25,6 @@
* You can also set the proper constant in your test configuration file to
* point to the right place.
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/StaticClientTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -17,9 +16,6 @@
/**
* This are the test for the prototype of Zend\Http\Client
*
* @category Zend
* @package Zend\Http\Client
* @subpackage UnitTests
* @group Zend\Http
* @group Zend\Http\Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/StaticTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -22,9 +21,6 @@
* executed once, and do not need to be tested with different servers /
* client setups.
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/TestAdapterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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_Http
*/

namespace ZendTest\Http\Client;

/**
* Exercises Zend_Http_Client_Adapter_Test
*
* @category Zend
* @package Zend_Http_Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Client/UseCaseTest.php
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_Http
*/

namespace ZendTest\Http\Client;
Expand All @@ -19,9 +18,6 @@
/**
* This are the test for the prototype of Zend\Http\Client
*
* @category Zend
* @package Zend\Http\Client
* @subpackage UnitTests
* @group Zend_Http
* @group Zend_Http_Client
*/
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/fwrite.php
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_Http
*/

namespace Zend\Http\Client\Adapter;
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testCookies.php
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_Http
*/

echo serialize($_COOKIE);
1 change: 0 additions & 1 deletion test/Client/_files/testExceptionOnReadTimeout.php
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_Http
*/

/**
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testGetData.php
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_Http
*/

echo serialize($_GET);
1 change: 0 additions & 1 deletion test/Client/_files/testHttpAuth.php
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_Http
*/

$user = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : null;
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testMultibyteChunkedResponseZF6218.php
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_Http
*/

header("Content-type: text/plain; charset=UTF-8");
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testPatchData.php
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_Http
*/

$putdata = fopen("php://input", "r");
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testPostData.php
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_Http
*/

echo serialize($_POST);
1 change: 0 additions & 1 deletion test/Client/_files/testRawGetData.php
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_Http
*/

echo serialize($_GET);
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testRawPostData.php
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_Http
*/

readfile('php://input');
1 change: 0 additions & 1 deletion test/Client/_files/testRedirections.php
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_Http
*/

if (! isset($_GET['redirection'])) {
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testRelativeRedirections.php
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_Http
*/

if (! isset($_GET['redirect'])) $_GET['redirect'] = null;
Expand Down
1 change: 0 additions & 1 deletion test/Client/_files/testResetParameters.php
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_Http
*/

echo serialize($_GET) . "\n" . serialize($_POST);
1 change: 0 additions & 1 deletion test/Client/_files/testStreamRequest.php
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_Http
*/

readfile('php://input');
1 change: 0 additions & 1 deletion test/Client/_files/testUploads.php
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_Http
*/

if (! empty($_FILES)) {
Expand Down
1 change: 0 additions & 1 deletion test/ClientTest.php
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_Http
*/

namespace ZendTest\Http;
Expand Down
1 change: 0 additions & 1 deletion test/CookiesTest.php
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_Http
*/

namespace ZendTest\Http;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AcceptCharsetTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AcceptEncodingTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AcceptLanguageTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AcceptRangesTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AcceptTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AgeTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AllowTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AuthenticationInfoTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/AuthorizationTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
1 change: 0 additions & 1 deletion test/Header/CacheControlTest.php
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_Http
*/

namespace ZendTest\Http\Header;
Expand Down
Loading

0 comments on commit 615fcf5

Please sign in to comment.