Skip to content

Commit b4eb24a

Browse files
committed
Merge pull request #286 from magento-extensibility/ext-s51
[Extensibility] Sprint 51 Bug Fixes
2 parents 9800042 + bdabd26 commit b4eb24a

File tree

6 files changed

+359
-306
lines changed

6 files changed

+359
-306
lines changed

app/code/Magento/Sales/Helper/Guest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ private function setGuestViewCookie($cookieValue)
225225
{
226226
$metadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
227227
->setPath(self::COOKIE_PATH)
228-
->setDuration(self::COOKIE_LIFETIME)
229228
->setHttpOnly(true);
230229
$this->cookieManager->setPublicCookie(self::COOKIE_NAME, $cookieValue, $metadata);
231230
}

app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ public function testLoadValidOrderNotEmptyPost()
138138
->method('setPath')
139139
->with(Guest::COOKIE_PATH)
140140
->will($this->returnSelf());
141-
$metaDataMock->expects($this->once())
142-
->method('setDuration')
143-
->with(Guest::COOKIE_LIFETIME)
144-
->will($this->returnSelf());
145141
$metaDataMock->expects($this->once())
146142
->method('setHttpOnly')
147143
->with(true)
@@ -188,10 +184,6 @@ public function testLoadValidOrderStoredCookie()
188184
->method('setPath')
189185
->with(Guest::COOKIE_PATH)
190186
->will($this->returnSelf());
191-
$metaDataMock->expects($this->once())
192-
->method('setDuration')
193-
->with(Guest::COOKIE_LIFETIME)
194-
->will($this->returnSelf());
195187
$metaDataMock->expects($this->once())
196188
->method('setHttpOnly')
197189
->with(true)

composer.json

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,27 @@
99
],
1010
"require": {
1111
"php": "~5.5.0|~5.6.0",
12-
"zendframework/zend-stdlib": "2.3.1",
13-
"zendframework/zend-code": "2.3.1",
14-
"zendframework/zend-server": "2.3.1",
15-
"zendframework/zend-soap": "2.3.1",
16-
"zendframework/zend-uri": "2.3.1",
17-
"zendframework/zend-validator": "2.3.1",
18-
"zendframework/zend-console": "2.3.1",
19-
"zendframework/zend-modulemanager": "2.3.1",
20-
"zendframework/zend-mvc": "2.3.1",
21-
"zendframework/zend-text": "2.3.1",
22-
"zendframework/zend-eventmanager": "2.3.1",
23-
"zendframework/zend-view": "2.3.1",
24-
"zendframework/zend-servicemanager": "2.3.1",
25-
"zendframework/zend-json": "2.3.1",
26-
"zendframework/zend-config": "2.3.1",
27-
"zendframework/zend-form": "2.3.1",
28-
"zendframework/zend-di": "2.3.1",
29-
"zendframework/zend-serializer": "2.3.1",
30-
"zendframework/zend-log": "2.3.1",
31-
"zendframework/zend-http": "2.3.1",
12+
"zendframework/zend-stdlib": "2.4.0",
13+
"zendframework/zend-code": "2.4.0",
14+
"zendframework/zend-server": "2.4.0",
15+
"zendframework/zend-soap": "2.4.0",
16+
"zendframework/zend-uri": "2.4.0",
17+
"zendframework/zend-validator": "2.4.0",
18+
"zendframework/zend-console": "2.4.0",
19+
"zendframework/zend-modulemanager": "2.4.0",
20+
"zendframework/zend-mvc": "2.4.0",
21+
"zendframework/zend-text": "2.4.0",
22+
"zendframework/zend-i18n": "2.4.0",
23+
"zendframework/zend-eventmanager": "2.4.0",
24+
"zendframework/zend-view": "2.4.0",
25+
"zendframework/zend-servicemanager": "2.4.0",
26+
"zendframework/zend-json": "2.4.0",
27+
"zendframework/zend-config": "2.4.0",
28+
"zendframework/zend-form": "2.4.0",
29+
"zendframework/zend-di": "2.4.0",
30+
"zendframework/zend-serializer": "2.4.0",
31+
"zendframework/zend-log": "2.4.0",
32+
"zendframework/zend-http": "2.4.0",
3233
"magento/zendframework1": "1.12.10",
3334
"composer/composer": "1.0.0-alpha9",
3435
"monolog/monolog": "1.11.0",

0 commit comments

Comments
 (0)