Merge pull request magento#1520 from magento-helix/MAGETWO-75517

[Helix] Fixes
manuelson · Sep 28, 2017 · 2fccb81 · 2fccb81
2 parents fa2439c + 509aa5f
commit 2fccb81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
@@ -141,12 +141,10 @@ public function testStartActionCustomerToQuote()
     /**
      * Test return action with configurable product.
      *
-     * #magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php skipped due to MAGETWO-75517
+     * @magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php
      */
     public function testReturnAction()
     {
-
-        $this->markTestSkipped('Test skipped due to MAGETWO-75517');
         $quote = $this->_objectManager->create(Quote::class);
         $quote->load('test_cart_with_configurable', 'reserved_order_id');
 

diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express_configurable.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express_configurable.php
@@ -27,9 +27,9 @@
 
 $requestInfo = new \Magento\Framework\DataObject(
     [
-        'product' => 1,
-        'selected_configurable_option' => 1,
-        'qty' => 100,
+        'product' => 2,
+        'selected_configurable_option' => 2,
+        'qty' => 1,
         'super_attribute' => [
             $attribute->getId() => $option->getId()
         ]

diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime.php
@@ -79,6 +79,9 @@ public function isEmptyDate($date)
      * @param int $time
      * @return string The given time in given format
      *
+     * @deprecated
+     * @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
+     *
      * @codeCoverageIgnore
      */
     public function gmDate($format, $time)
@@ -92,6 +95,9 @@ public function gmDate($format, $time)
      * @param string $timeStr
      * @return int
      *
+     * @deprecated
+     * @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
+     *
      * @codeCoverageIgnore
      */
     public function strToTime($timeStr)