Skip to content

Commit ddb82b0

Browse files
committed
Additional Travis CI builds fixes: fix mistake in .travis.yml which broke everything, fix trouble caused integration tests failures on PHP 5.5/5.6, speed up composer install by bot preferring source, eliminate notice due to empty config value passed to @magentoConfigFixture
1 parent 4596640 commit ddb82b0

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ before_script:
5050
# Change memory_limit for travis
5151
- echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
5252
- phpenv rehash;
53-
- composer install --no-interaction --prefer-source --dev
54-
- cd ..
53+
- composer install --no-interaction --dev
5554
script:
5655
# Unit tests
5756
- sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"

app/code/Magento/Directory/Helper/Data.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ public function getRegionJson()
182182
];
183183
}
184184
$json = $this->_coreHelper->jsonEncode($regions);
185-
185+
if ($json === false) {
186+
$json = 'false';
187+
}
186188
$this->_configCacheType->save($json, $cacheKey);
187189
}
188190
$this->_regionJson = $json;

dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ protected function _assignConfigData(\PHPUnit_Framework_TestCase $test)
102102
if (preg_match('/^.+?(?=_store\s)/', $configPathAndValue, $matches)) {
103103
/* Store-scoped config value */
104104
$storeCode = $matches[0] != 'current' ? $matches[0] : null;
105-
list(, $configPath, $requiredValue) = preg_split('/\s+/', $configPathAndValue, 3);
105+
$parts = preg_split('/\s+/', $configPathAndValue, 3);
106+
list(, $configPath, $requiredValue) = $parts + ['', '', ''];
106107
$originalValue = $this->_getConfigValue($configPath, $storeCode);
107108
$this->_storeConfigValues[$storeCode][$configPath] = $originalValue;
108109
$this->_setConfigValue($configPath, $requiredValue, $storeCode);

0 commit comments

Comments
 (0)