Skip to content

Commit 631a38a

Browse files
committed
Debug Travis
1 parent e3407fa commit 631a38a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.travis/before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ 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-
php ../.travis/merge-dev.php vendor/$COMPOSER_PACKAGE_NAME/composer.json ./composer.json | tee composer.json
32+
php ../.travis/merge-dev.php vendor/$COMPOSER_PACKAGE_NAME/composer.json composer.json | tee composer.json
3333
composer update
3434

3535
# prepare for test suite

.travis/merge-dev.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
* This is used to install the module within a Magento 2 installation, but with its dev dependencies
66
*/
77
declare(strict_types=1);
8+
ob_start();
89

910
$sourceFile = $argv[1];
1011
$targetFile = $argv[2];
1112

1213
$sourceJson = json_decode(file_get_contents($sourceFile), true);
1314
$targetUnsafeJson = file_get_contents($targetFile);
15+
var_dump($targetFile, $targetUnsafeJson);
1416
// Remove unnecessary PSR-0 section, it causes JSON syntax errors due to empty key
1517
$targetUnsafeJson = \preg_replace('#"psr-0": {.*?},#s', '', $targetUnsafeJson);
1618
$targetJson = json_decode($targetUnsafeJson, true);
1719

20+
var_dump($sourceJson, $targetUnsafeJson, $targetJson, json_last_error_msg());
21+
1822
foreach ($sourceJson['autoload-dev']['psr-4'] ?? [] as $key => $value) {
1923
$pathPrefix = dirname($sourceFile) . DIRECTORY_SEPARATOR;
2024
$sourceJson['autoload-dev']['psr-4'][$key] = $pathPrefix . $value;
@@ -23,4 +27,6 @@
2327
$targetJson['require-dev'] = array_replace_recursive($targetJson['require-dev'] ?? [], $sourceJson['require-dev']);
2428
$targetJson['autoload-dev'] = array_merge_recursive($targetJson['autoload-dev'] ?? [], $sourceJson['autoload-dev']);
2529

30+
fwrite(STDERR, ob_get_clean());
31+
2632
echo json_encode($targetJson, JSON_PRETTY_PRINT);

0 commit comments

Comments
 (0)