Skip to content

Commit e3407fa

Browse files
committed
Fix dev dependency loading in travis
1 parent 36a06cf commit e3407fa

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

.travis/before_script.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ composer config repositories.travis_to_test git https://github.com/$TRAVIS_REPO_
2929
composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_BRANCH}\#{$TRAVIS_COMMIT}
3030

3131
# Install dev dependencies of module
32-
cat ./composer.json
3332
php ../.travis/merge-dev.php vendor/$COMPOSER_PACKAGE_NAME/composer.json ./composer.json | tee composer.json
3433
composer update
3534

.travis/merge-dev.php

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66
*/
77
declare(strict_types=1);
88

9-
$fromFile = $argv[1];
10-
$toFile = $argv[2];
9+
$sourceFile = $argv[1];
10+
$targetFile = $argv[2];
1111

12-
$fromJson = json_decode(file_get_contents($fromFile), true);
13-
$toJson = json_decode(file_get_contents($toFile), true);
14-
var_dump($fromJson, $toJson, json_last_error_msg());
12+
$sourceJson = json_decode(file_get_contents($sourceFile), true);
13+
$targetUnsafeJson = file_get_contents($targetFile);
14+
// Remove unnecessary PSR-0 section, it causes JSON syntax errors due to empty key
15+
$targetUnsafeJson = \preg_replace('#"psr-0": {.*?},#s', '', $targetUnsafeJson);
16+
$targetJson = json_decode($targetUnsafeJson, true);
1517

16-
foreach ($fromJson['autoload-dev']['psr-4'] ?? [] as $key => $value) {
17-
$pathPrefix = dirname($fromFile) . DIRECTORY_SEPARATOR;
18-
$fromJson['autoload-dev']['psr-4'][$key] = $pathPrefix . $value;
18+
foreach ($sourceJson['autoload-dev']['psr-4'] ?? [] as $key => $value) {
19+
$pathPrefix = dirname($sourceFile) . DIRECTORY_SEPARATOR;
20+
$sourceJson['autoload-dev']['psr-4'][$key] = $pathPrefix . $value;
1921
}
2022

21-
$toJson['require-dev'] = array_replace_recursive($toJson['require-dev'] ?? [], $fromJson['require-dev']);
22-
$toJson['autoload-dev'] = array_merge_recursive($toJson['autoload-dev'] ?? [], $fromJson['autoload-dev']);
23+
$targetJson['require-dev'] = array_replace_recursive($targetJson['require-dev'] ?? [], $sourceJson['require-dev']);
24+
$targetJson['autoload-dev'] = array_merge_recursive($targetJson['autoload-dev'] ?? [], $sourceJson['autoload-dev']);
2325

24-
echo json_encode($toJson, JSON_PRETTY_PRINT);
26+
echo json_encode($targetJson, JSON_PRETTY_PRINT);

0 commit comments

Comments
 (0)