Skip to content

Commit 04004a4

Browse files
committed
Facepalm
1 parent 43471f3 commit 04004a4

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
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 `pwd`/vendor/$COMPOSER_PACKAGE_NAME/composer.json `pwd`/composer.json | tee composer.json
32+
php ../.travis/merge-dev.php vendor/$COMPOSER_PACKAGE_NAME/composer.json composer.json
3333
composer update
3434

3535
# prepare for test suite

.travis/merge-dev.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
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();
98

109
$sourceFile = $argv[1];
1110
$targetFile = $argv[2];
@@ -28,6 +27,4 @@
2827
$targetJson['require-dev'] = array_replace_recursive($targetJson['require-dev'] ?? [], $sourceJson['require-dev']);
2928
$targetJson['autoload-dev'] = array_merge_recursive($targetJson['autoload-dev'] ?? [], $sourceJson['autoload-dev']);
3029

31-
fwrite(STDERR, ob_get_clean());
32-
33-
echo json_encode($targetJson, JSON_PRETTY_PRINT);
30+
file_put_contents($targetFile, json_encode($targetJson, JSON_PRETTY_PRINT));

0 commit comments

Comments
 (0)