T14602 setcookies

CHANGELOG-4.0.md

@@ -7,6 +7,7 @@
 ## Changed
 - Changed `Phalcon\Mvc\Router\Annotations` to use `converters` instead of `conversors` [#14532](https://github.com/phalcon/cphalcon/issues/14532)
 - Changed `Phalcon\Di::setRaw` to `Phalcon\Di::setService` to align more with the use of the method [#14555](https://github.com/phalcon/cphalcon/issues/14555)
+- Changed `Phalcon\Http\CookieInterface` to `Phalcon\Http\Cookie\CookieInterface` to avoid confusion [#14602](https://github.com/phalcon/cphalcon/issues/14602)
 
 ## Fixed
 - Fixed `PhalconMvc\Model` to ignore internal setters if properties have the same name as the setter [#14538](https://github.com/phalcon/cphalcon/issues/14538)
@@ -37,6 +38,7 @@
   - `Phalcon/Translate/TranslateFactory`
   - `Phalcon/Validation/ValidatorFactory`
 - Fixed `Phalcon\Mvc\Model::cloneResultMap` to cast integers when fields are `TYPE_BIGINTEGER`, `TYPE_INTEGER`, `TYPE_MEDIUMINTEGER`, `TYPE_SMALLINTEGER`, `TYPE_TINYINTEGER` [#14584](https://github.com/phalcon/cphalcon/issues/14584)
+- Fixed `Phalcon\Http\Response::setCookies` to use the correct interface [#14602](https://github.com/phalcon/cphalcon/issues/14602)
 
 # [4.0.0-rc.r3](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0-rc.3) (2019-11-16)
 ## Added

phalcon/Http/Cookie.zep

@@ -16,6 +16,7 @@ use Phalcon\Crypt\CryptInterface;
 use Phalcon\Crypt\Mismatch;
 use Phalcon\Filter\FilterInterface;
 use Phalcon\Http\Response\Exception;
+use Phalcon\Http\Cookie\CookieInterface;
 use Phalcon\Http\Cookie\Exception as CookieException;
 use Phalcon\Session\ManagerInterface as SessionManagerInterface;
 

phalcon/Http/CookieInterface.zep → phalcon/Http/Cookie/CookieInterface.zep

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Http;
+namespace Phalcon\Http\Cookie;
 
 /**
  * Interface for Phalcon\Http\Cookie

phalcon/Http/Response/Cookies.zep

@@ -12,8 +12,8 @@ namespace Phalcon\Http\Response;
 
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Http\CookieInterface;
 use Phalcon\Http\Cookie\Exception;
+use Phalcon\Http\Cookie\CookieInterface;
 
 /**
  * Phalcon\Http\Response\Cookies

phalcon/Http/Response/CookiesInterface.zep

@@ -10,7 +10,7 @@
 
 namespace Phalcon\Http\Response;
 
-use Phalcon\Http\CookieInterface;
+use Phalcon\Http\Cookie\CookieInterface;
 
 /**
  * Phalcon\Http\Response\CookiesInterface

tests/unit/Http/Response/CookiesCest.php

@@ -4,7 +4,7 @@
 
 use Phalcon\Di;
 use Phalcon\Http\Cookie;
-use Phalcon\Http\CookieInterface;
+use Phalcon\Http\Cookie\CookieInterface;
 use Phalcon\Http\Response;
 use Phalcon\Http\Response\Cookies;
 use Phalcon\Session\Adapter\Stream as SessionFiles;

tests/unit/Http/Response/GetReasonPhraseCest.php

@@ -31,7 +31,7 @@ public function httpResponseGetReasonPhrase(UnitTester $I)
         $oResponse = new Response('<h1>Test</h1>', 200, $sPhrase);
 
         $I->assertSame(
-            $sPhrase, 
+            $sPhrase,
             $oResponse->getReasonPhrase()
         );
     }

tests/unit/Http/Response/GetSetCookiesCest.php

@@ -13,11 +13,15 @@
 namespace Phalcon\Test\Unit\Http\Response;
 
 use Phalcon\Http\Response;
-use Phalcon\Http\Cookie;
+use Phalcon\Http\Response\Cookies;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
 use UnitTester;
+use function var_dump;
 
 class GetSetCookiesCest
 {
+    use DiTrait;
+
     /**
      * Tests Phalcon\Http\Response :: getCookies() / setCookies()
      *
@@ -28,13 +32,17 @@ public function httpResponseGetSetCookies(UnitTester $I)
     {
         $I->wantToTest('Http\Response - getCookies() / setCookies');
 
-        $oCookie = new Cookie('firstname','jeremy');
-
+        $this->setNewFactoryDefault();
+
+        $oCookies = new Cookies();
+        $oCookies->setDI($this->container);
+        $oCookies->set('firstname', 'jeremy');
+
         $oResponse = new Response();
-        $oResponse->setCookies($oCookie);
+        $oResponse->setCookies($oCookies);
 
         $I->assertSame(
-            $oCookie, 
+            $oCookies,
             $oResponse->getCookies()
         );
     }