From 0c71aeee465e7620e81334f4c869b2856f31df0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Kr=C3=A4mer?= Date: Mon, 13 Feb 2017 01:00:27 +0100 Subject: [PATCH] Changing the namespace for the cookie implementation --- src/Http/{Client => }/Cookie/Cookie.php | 2 +- src/Http/{Client => }/Cookie/CookieCollection.php | 2 +- src/Http/{Client => }/Cookie/CookieCryptTrait.php | 2 +- src/Http/{Client => }/Cookie/CookieInterface.php | 2 +- src/Http/{Client => }/Cookie/RequestCookies.php | 2 +- src/Http/{Client => }/Cookie/ResponseCookies.php | 2 +- tests/TestCase/Http/{Client => }/Cookie/CookieTest.php | 4 ++-- .../Http/{Client => }/Cookie/RequestCookiesTest.php | 6 +++--- .../Http/{Client => }/Cookie/ResponseCookiesTest.php | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) rename src/Http/{Client => }/Cookie/Cookie.php (99%) rename src/Http/{Client => }/Cookie/CookieCollection.php (97%) rename src/Http/{Client => }/Cookie/CookieCryptTrait.php (99%) rename src/Http/{Client => }/Cookie/CookieInterface.php (95%) rename src/Http/{Client => }/Cookie/RequestCookies.php (98%) rename src/Http/{Client => }/Cookie/ResponseCookies.php (96%) rename tests/TestCase/Http/{Client => }/Cookie/CookieTest.php (97%) rename tests/TestCase/Http/{Client => }/Cookie/RequestCookiesTest.php (92%) rename tests/TestCase/Http/{Client => }/Cookie/ResponseCookiesTest.php (83%) diff --git a/src/Http/Client/Cookie/Cookie.php b/src/Http/Cookie/Cookie.php similarity index 99% rename from src/Http/Client/Cookie/Cookie.php rename to src/Http/Cookie/Cookie.php index e00512a0714..72b959530f2 100644 --- a/src/Http/Client/Cookie/Cookie.php +++ b/src/Http/Cookie/Cookie.php @@ -11,7 +11,7 @@ * @since 3.5.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Http\Client\Cookie; +namespace Cake\Http\Cookie; use Cake\Utility\Hash; use Cake\Utility\Security; diff --git a/src/Http/Client/Cookie/CookieCollection.php b/src/Http/Cookie/CookieCollection.php similarity index 97% rename from src/Http/Client/Cookie/CookieCollection.php rename to src/Http/Cookie/CookieCollection.php index 92dc74f4b59..1890584ae35 100644 --- a/src/Http/Client/Cookie/CookieCollection.php +++ b/src/Http/Cookie/CookieCollection.php @@ -11,7 +11,7 @@ * @since 3.5.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Http\Client\Cookie; +namespace Cake\Http\Cookie; class CookieCollection { diff --git a/src/Http/Client/Cookie/CookieCryptTrait.php b/src/Http/Cookie/CookieCryptTrait.php similarity index 99% rename from src/Http/Client/Cookie/CookieCryptTrait.php rename to src/Http/Cookie/CookieCryptTrait.php index 358a7b64854..1394319f69b 100644 --- a/src/Http/Client/Cookie/CookieCryptTrait.php +++ b/src/Http/Cookie/CookieCryptTrait.php @@ -12,7 +12,7 @@ * @since 3.1.6 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Http\Client\Cookie; +namespace Cake\Http\Cookie; use Cake\Utility\Security; use RuntimeException; diff --git a/src/Http/Client/Cookie/CookieInterface.php b/src/Http/Cookie/CookieInterface.php similarity index 95% rename from src/Http/Client/Cookie/CookieInterface.php rename to src/Http/Cookie/CookieInterface.php index ef34fffb292..e226b7ddbc7 100644 --- a/src/Http/Client/Cookie/CookieInterface.php +++ b/src/Http/Cookie/CookieInterface.php @@ -11,7 +11,7 @@ * @since 3.5.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Http\Client\Cookie; +namespace Cake\Http\Cookie; interface CookieInterface { diff --git a/src/Http/Client/Cookie/RequestCookies.php b/src/Http/Cookie/RequestCookies.php similarity index 98% rename from src/Http/Client/Cookie/RequestCookies.php rename to src/Http/Cookie/RequestCookies.php index d74f31b3b9b..85280edb0fc 100644 --- a/src/Http/Client/Cookie/RequestCookies.php +++ b/src/Http/Cookie/RequestCookies.php @@ -11,7 +11,7 @@ * @since 3.5.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Http\Client\Cookie; +namespace Cake\Http\Cookie; use InvalidArgumentException; use Iterator; diff --git a/src/Http/Client/Cookie/ResponseCookies.php b/src/Http/Cookie/ResponseCookies.php similarity index 96% rename from src/Http/Client/Cookie/ResponseCookies.php rename to src/Http/Cookie/ResponseCookies.php index f068021597e..1ce84dcf3f4 100644 --- a/src/Http/Client/Cookie/ResponseCookies.php +++ b/src/Http/Cookie/ResponseCookies.php @@ -11,7 +11,7 @@ * @since 3.5.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Http\Client\Cookie; +namespace Cake\Http\Cookie; use Psr\Http\Message\ResponseInterface; diff --git a/tests/TestCase/Http/Client/Cookie/CookieTest.php b/tests/TestCase/Http/Cookie/CookieTest.php similarity index 97% rename from tests/TestCase/Http/Client/Cookie/CookieTest.php rename to tests/TestCase/Http/Cookie/CookieTest.php index 4fbb00892a3..07faaf53d16 100644 --- a/tests/TestCase/Http/Client/Cookie/CookieTest.php +++ b/tests/TestCase/Http/Cookie/CookieTest.php @@ -10,10 +10,10 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Http\Client; +namespace Cake\Test\TestCase\Http\Cookie; use Cake\Chronos\Chronos; -use Cake\Http\Client\Cookie\Cookie; +use Cake\Http\Cookie\Cookie; use Cake\TestSuite\TestCase; /** diff --git a/tests/TestCase/Http/Client/Cookie/RequestCookiesTest.php b/tests/TestCase/Http/Cookie/RequestCookiesTest.php similarity index 92% rename from tests/TestCase/Http/Client/Cookie/RequestCookiesTest.php rename to tests/TestCase/Http/Cookie/RequestCookiesTest.php index 0b366e469c3..40e6cd47b3b 100644 --- a/tests/TestCase/Http/Client/Cookie/RequestCookiesTest.php +++ b/tests/TestCase/Http/Cookie/RequestCookiesTest.php @@ -10,10 +10,10 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Http\Client; +namespace Cake\Test\TestCase\Http\Cookie; -use Cake\Http\Client\Cookie\Cookie; -use Cake\Http\Client\Cookie\RequestCookies; +use Cake\Http\Cookie\Cookie; +use Cake\Http\Cookie\RequestCookies; use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; diff --git a/tests/TestCase/Http/Client/Cookie/ResponseCookiesTest.php b/tests/TestCase/Http/Cookie/ResponseCookiesTest.php similarity index 83% rename from tests/TestCase/Http/Client/Cookie/ResponseCookiesTest.php rename to tests/TestCase/Http/Cookie/ResponseCookiesTest.php index e1def370295..bd76cdde9de 100644 --- a/tests/TestCase/Http/Client/Cookie/ResponseCookiesTest.php +++ b/tests/TestCase/Http/Cookie/ResponseCookiesTest.php @@ -10,10 +10,10 @@ * @since 3.0.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ -namespace Cake\Test\TestCase\Http\Client; +namespace Cake\Test\TestCase\Http\Cookie; -use Cake\Http\Client\Cookie\Cookie; -use Cake\Http\Client\Cookie\ResponseCookies; +use Cake\Http\Cookie\Cookie; +use Cake\Http\Cookie\ResponseCookies; use Cake\TestSuite\TestCase; /**