Merge pull request #286 from magento-extensibility/ext-s51

[Extensibility] Sprint 51 Bug Fixes
magento · May 12, 2015 · b4eb24a · b4eb24a
2 parents 9800042 + bdabd26
commit b4eb24a
Show file tree

Hide file tree

Showing 6 changed files with 359 additions and 306 deletions.
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
@@ -225,7 +225,6 @@ private function setGuestViewCookie($cookieValue)
     {
         $metadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
             ->setPath(self::COOKIE_PATH)
-            ->setDuration(self::COOKIE_LIFETIME)
             ->setHttpOnly(true);
         $this->cookieManager->setPublicCookie(self::COOKIE_NAME, $cookieValue, $metadata);
     }

diff --git a/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php b/app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php
@@ -138,10 +138,6 @@ public function testLoadValidOrderNotEmptyPost()
             ->method('setPath')
             ->with(Guest::COOKIE_PATH)
             ->will($this->returnSelf());
-        $metaDataMock->expects($this->once())
-            ->method('setDuration')
-            ->with(Guest::COOKIE_LIFETIME)
-            ->will($this->returnSelf());
         $metaDataMock->expects($this->once())
             ->method('setHttpOnly')
             ->with(true)
@@ -188,10 +184,6 @@ public function testLoadValidOrderStoredCookie()
             ->method('setPath')
             ->with(Guest::COOKIE_PATH)
             ->will($this->returnSelf());
-        $metaDataMock->expects($this->once())
-            ->method('setDuration')
-            ->with(Guest::COOKIE_LIFETIME)
-            ->will($this->returnSelf());
         $metaDataMock->expects($this->once())
             ->method('setHttpOnly')
             ->with(true)

diff --git a/composer.json b/composer.json
@@ -9,26 +9,27 @@
     ],
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "zendframework/zend-stdlib": "2.3.1",
-        "zendframework/zend-code": "2.3.1",
-        "zendframework/zend-server": "2.3.1",
-        "zendframework/zend-soap": "2.3.1",
-        "zendframework/zend-uri": "2.3.1",
-        "zendframework/zend-validator": "2.3.1",
-        "zendframework/zend-console": "2.3.1",
-        "zendframework/zend-modulemanager": "2.3.1",
-        "zendframework/zend-mvc": "2.3.1",
-        "zendframework/zend-text": "2.3.1",
-        "zendframework/zend-eventmanager": "2.3.1",
-        "zendframework/zend-view": "2.3.1",
-        "zendframework/zend-servicemanager": "2.3.1",
-        "zendframework/zend-json": "2.3.1",
-        "zendframework/zend-config": "2.3.1",
-        "zendframework/zend-form": "2.3.1",
-        "zendframework/zend-di": "2.3.1",
-        "zendframework/zend-serializer": "2.3.1",
-        "zendframework/zend-log": "2.3.1",
-        "zendframework/zend-http": "2.3.1",
+        "zendframework/zend-stdlib": "2.4.0",
+        "zendframework/zend-code": "2.4.0",
+        "zendframework/zend-server": "2.4.0",
+        "zendframework/zend-soap": "2.4.0",
+        "zendframework/zend-uri": "2.4.0",
+        "zendframework/zend-validator": "2.4.0",
+        "zendframework/zend-console": "2.4.0",
+        "zendframework/zend-modulemanager": "2.4.0",
+        "zendframework/zend-mvc": "2.4.0",
+        "zendframework/zend-text": "2.4.0",
+        "zendframework/zend-i18n": "2.4.0",
+        "zendframework/zend-eventmanager": "2.4.0",
+        "zendframework/zend-view": "2.4.0",
+        "zendframework/zend-servicemanager": "2.4.0",
+        "zendframework/zend-json": "2.4.0",
+        "zendframework/zend-config": "2.4.0",
+        "zendframework/zend-form": "2.4.0",
+        "zendframework/zend-di": "2.4.0",
+        "zendframework/zend-serializer": "2.4.0",
+        "zendframework/zend-log": "2.4.0",
+        "zendframework/zend-http": "2.4.0",
         "magento/zendframework1": "1.12.10",
         "composer/composer": "1.0.0-alpha9",
         "monolog/monolog": "1.11.0",