Skip to content

Commit 2fccb81

Browse files
authored
Merge pull request magento#1520 from magento-helix/MAGETWO-75517
[Helix] Fixes
2 parents fa2439c + 509aa5f commit 2fccb81

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,10 @@ public function testStartActionCustomerToQuote()
141141
/**
142142
* Test return action with configurable product.
143143
*
144-
* #magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php skipped due to MAGETWO-75517
144+
* @magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php
145145
*/
146146
public function testReturnAction()
147147
{
148-
149-
$this->markTestSkipped('Test skipped due to MAGETWO-75517');
150148
$quote = $this->_objectManager->create(Quote::class);
151149
$quote->load('test_cart_with_configurable', 'reserved_order_id');
152150

dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express_configurable.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
$requestInfo = new \Magento\Framework\DataObject(
2929
[
30-
'product' => 1,
31-
'selected_configurable_option' => 1,
32-
'qty' => 100,
30+
'product' => 2,
31+
'selected_configurable_option' => 2,
32+
'qty' => 1,
3333
'super_attribute' => [
3434
$attribute->getId() => $option->getId()
3535
]

lib/internal/Magento/Framework/Stdlib/DateTime.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ public function isEmptyDate($date)
7979
* @param int $time
8080
* @return string The given time in given format
8181
*
82+
* @deprecated
83+
* @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
84+
*
8285
* @codeCoverageIgnore
8386
*/
8487
public function gmDate($format, $time)
@@ -92,6 +95,9 @@ public function gmDate($format, $time)
9295
* @param string $timeStr
9396
* @return int
9497
*
98+
* @deprecated
99+
* @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
100+
*
95101
* @codeCoverageIgnore
96102
*/
97103
public function strToTime($timeStr)

0 commit comments

Comments
 (0)