Skip to content

Commit a9d2b3c

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-99567' into 2.1.18-develop-pr75
2 parents d19d8dd + d2d479f commit a9d2b3c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionProviderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public function testGetProductsIfOneOfChildIsDisabledPerStore()
9898
*/
9999
public function testGetProductsIfOneOfChildIsOutOfStock()
100100
{
101+
$this->markTestSkipped('Test skipped due to MAGETWO-99629');
101102
$configurableProduct = $this->productRepository->get('configurable', false, null, true);
102103
$lowestPriceChildrenProducts = $this->createLowestPriceOptionsProvider()->getProducts($configurableProduct);
103104
$this->assertCount(1, $lowestPriceChildrenProducts);

lib/internal/Magento/Framework/App/Router/ActionList.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Framework\App\Router;
87

98
use Magento\Framework\Module\Dir\Reader as ModuleReader;
109

10+
/**
11+
* Class to retrieve action class.
12+
*/
1113
class ActionList
1214
{
1315
/**
@@ -74,6 +76,7 @@ public function get($module, $area, $namespace, $action)
7476
if ($area) {
7577
$area = '\\' . $area;
7678
}
79+
$namespace = strtolower($namespace);
7780
if (strpos($namespace, self::NOT_ALLOWED_IN_NAMESPACE_PATH) !== false) {
7881
return null;
7982
}

0 commit comments

Comments
 (0)