Skip to content

Commit 3336c45

Browse files
author
Joan He
committed
MAGETWO-89260: Fix Travis build issues
- fix static test failure
1 parent 40eaa4a commit 3336c45

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

app/code/Magento/Backend/Block/Menu.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
387387
$itemName = substr($menuId, strrpos($menuId, '::') + 2);
388388
$itemClass = str_replace('_', '-', strtolower($itemName));
389389

390-
if (
391-
is_array($colBrakes)
390+
if (is_array($colBrakes)
392391
&& count($colBrakes)
393392
&& $colBrakes[$itemPosition]['colbrake']
394393
&& $itemPosition != 1

setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public function generate($products, $fixtureMap)
171171
],
172172
];
173173
$websiteIdsFixtures = $fixtureMap['website_ids'](1, 0);
174-
if ((is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) || !is_null($websiteIdsFixtures)) {
174+
if ((is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) || $websiteIdsFixtures != null) {
175175
// Get website id from fixture in case when one site is assigned per product
176176
$customTableMap['catalog_product_website'] = [
177177
'fields' => [

0 commit comments

Comments
 (0)