Skip to content

Commit 2b1fba5

Browse files
committed
MAGETWO-34390: Stabilization of replacing Zend_Locale with Native PHP Implementation
1 parent 61a8399 commit 2b1fba5

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

app/etc/di.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<preference for="Magento\Framework\View\Design\ThemeInterface" type="Magento\Theme\Model\Theme" />
2626
<preference for="Magento\Framework\View\Design\Theme\ResolverInterface" type="Magento\Theme\Model\Theme\Resolver" />
2727
<preference for="Magento\Framework\View\ConfigInterface" type="Magento\Framework\View\Config" />
28-
<preference for="Magento\Framework\App\View\Asset\Bundle\ConfigInterface" type="\Magento\Framework\App\View\Asset\Bundle\Config" />
2928
<preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\Lists" />
3029
<preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" />
3130
<type name="Magento\Store\Model\Store">

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Curl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Curl extends Adapter\Rest\CurlClient
2222
*/
2323
public function constructResourceUrl($resourcePath)
2424
{
25-
return rtrim(TESTS_BASE_URL, '/') . ltrim($resourcePath, '/');
25+
return rtrim(TESTS_BASE_URL, '/') . '/' . ltrim($resourcePath, '/');
2626
}
2727

2828
/**

dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ protected function formatTotalsData($data)
149149
*/
150150
protected function getQuoteItemTotalsData(\Magento\Quote\Model\Quote $quote)
151151
{
152-
$this->markTestSkipped('Temporary');
153152
$items = $quote->getAllItems();
154153
$item = array_shift($items);
155154

0 commit comments

Comments
 (0)