Skip to content

Commit

Permalink
[BUGFIX] Allow Windows to run Phive Phars (#900)
Browse files Browse the repository at this point in the history
The Windows CLI is not smart enough to inspect an 'executable' file (e.g. to
look for a 'shebang') to determine what program is required to run it.  It
requires the file to have a file extension which is associated with the required
program.  Thus the Phar files have been renamed to have the `.phar` extension.
  • Loading branch information
JakeQZ authored Jun 15, 2020
1 parent 57dc0a8 commit 14a725f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
([#880](https://github.com/MyIntervals/emogrifier/pull/880))

### Fixed
- Allow Windows CLI to run development tools installed through Phive
([#900](https://github.com/MyIntervals/emogrifier/pull/900))
- Switch to a maintained package for parallel PHP linting
([#884](https://github.com/MyIntervals/emogrifier/pull/884))
- Add `.0` version suffixes to PHP version requirements
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@
},
"scripts": {
"php:version": "php -v | grep -Po 'PHP\\s++\\K(?:\\d++\\.)*+\\d++(?:-\\w++)?+'",
"php:fix": "\"./tools/php-cs-fixer\" --config=config/php-cs-fixer.php fix config/ src/ tests/",
"php:fix": "\"./tools/php-cs-fixer.phar\" --config=config/php-cs-fixer.php fix config/ src/ tests/",
"ci:php:lint": "\"vendor/bin/parallel-lint\" config src tests",
"ci:php:sniff": "\"vendor/bin/phpcs\" config src tests",
"ci:php:fixer": "\"./tools/php-cs-fixer\" --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff-format=udiff config/ src/ tests/",
"ci:php:md": "\"./tools/phpmd\" src text config/phpmd.xml",
"ci:php:fixer": "\"./tools/php-cs-fixer.phar\" --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff-format=udiff config/ src/ tests/",
"ci:php:md": "\"./tools/phpmd.phar\" src text config/phpmd.xml",
"ci:php:psalm": "\"vendor/bin/psalm\" --show-info=false",
"ci:tests:unit": "\"./tools/phpunit\"",
"ci:tests:sof": "\"./tools/phpunit\" --stop-on-failure",
"ci:tests:unit": "\"./tools/phpunit.phar\"",
"ci:tests:sof": "\"./tools/phpunit.phar\" --stop-on-failure",
"ci:tests": [
"@ci:tests:unit"
],
Expand Down
6 changes: 3 additions & 3 deletions phive.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="php-cs-fixer" version="^2.16" installed="2.16.3" location="./tools/php-cs-fixer" copy="true"/>
<phar name="phpmd" version="^2.8" installed="2.8.2" location="./tools/phpmd" copy="true"/>
<phar name="phpunit" version="^7.5" installed="7.5.20" location="./tools/phpunit" copy="true"/>
<phar name="php-cs-fixer" version="^2.16" installed="2.16.3" location="./tools/php-cs-fixer.phar" copy="true"/>
<phar name="phpmd" version="^2.8" installed="2.8.2" location="./tools/phpmd.phar" copy="true"/>
<phar name="phpunit" version="^7.5" installed="7.5.20" location="./tools/phpunit.phar" copy="true"/>
</phive>
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 14a725f

Please sign in to comment.