File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ composer config repositories.travis_to_test git https://github.com/$TRAVIS_REPO_
2727# TODO make it work with tags as well:
2828
2929composer require ${COMPOSER_PACKAGE_NAME} :dev-${TRAVIS_BRANCH} \# {$TRAVIS_COMMIT }
30- php ../.travis/merge-dev.php vendor/$COMPOSER_PACKAGE_NAME /composer.json composer.json
30+ php ../.travis/merge-dev.php vendor/$COMPOSER_PACKAGE_NAME /composer.json composer.json | tee composer.json
3131
3232# prepare for test suite
3333case $TEST_SUITE in
Original file line number Diff line number Diff line change 11<?php
22/*
3- * Merge autoload-dev and require-dev from one composer.json into another one
3+ * Merge autoload-dev and require-dev from one composer.json
44 *
55 * This is used to install the module within a Magento 2 installation, but with its dev dependencies
66 */
2020$ toJson ['require-dev ' ] = array_replace_recursive ($ toJson ['require-dev ' ] ?? [], $ fromJson ['require-dev ' ]);
2121$ toJson ['autoload-dev ' ] = array_merge_recursive ($ toJson ['autoload-dev ' ] ?? [], $ fromJson ['autoload-dev ' ]);
2222
23- file_put_contents ( $ toFile , json_encode ($ toJson , JSON_PRETTY_PRINT ) );
23+ echo json_encode ($ toJson , JSON_PRETTY_PRINT );
You can’t perform that action at this time.
0 commit comments