Skip to content

Commit 2b24c64

Browse files
committed
Debug Travis
1 parent 296b031 commit 2b24c64

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.travis/before_script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ 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 $(realpath vendor/$COMPOSER_PACKAGE_NAME/composer.json) $(realpath composer.json) | tee composer.json
32+
ls -l
33+
php ../.travis/merge-dev.php vendor/$COMPOSER_PACKAGE_NAME/composer.json composer.json | tee composer.json
3334
composer update
3435

3536
# prepare for test suite

.travis/merge-dev.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
$sourceFile = $argv[1];
1111
$targetFile = $argv[2];
1212

13-
$sourceJson = json_decode(file_get_contents($sourceFile), true);
1413
$targetUnsafeJson = file_get_contents($targetFile);
15-
var_dump($targetFile, $targetUnsafeJson);
16-
// Remove unnecessary PSR-0 section, it causes JSON syntax errors due to empty key
14+
var_dump(getcwd(), $sourceFile, $targetFile, $targetUnsafeJson);
1715
$targetUnsafeJson = \preg_replace('#"psr-0": {.*?},#s', '', $targetUnsafeJson);
16+
17+
$sourceJson = json_decode(file_get_contents($sourceFile), true);
18+
// Remove unnecessary PSR-0 section, it causes JSON syntax errors due to empty key
1819
$targetJson = json_decode($targetUnsafeJson, true);
1920

2021
var_dump($sourceJson, $targetUnsafeJson, $targetJson, json_last_error_msg());

0 commit comments

Comments
 (0)