Skip to content

Commit 9406a87

Browse files
* Have Composer in tools/composer and managed through composer self-update
* Install Psalm using Phive as `tools/psalm` * Install PHP-CS-Fixer using Phive as `tools/php-cs-fixer`
1 parent be22833 commit 9406a87

File tree

8 files changed

+29
-6
lines changed

8 files changed

+29
-6
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/tools export-ignore
2+
/tools/* binary
3+
4+
*.php diff=php

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ php:
99
- 7.4
1010

1111
install:
12-
- travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader --prefer-stable
12+
- travis_retry ./tools/composer update --no-interaction --no-ansi --no-progress --no-suggest
1313

1414
script:
1515
- ./vendor/bin/phpunit --coverage-clover=coverage.xml

build.xml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project name="diff" default="setup">
3-
<target name="setup" depends="clean,composer"/>
3+
<target name="setup" depends="clean,install-dependencies"/>
44

55
<target name="clean" description="Cleanup build artifacts">
66
<delete dir="${basedir}/vendor"/>
77
<delete file="${basedir}/composer.lock"/>
88
</target>
99

10-
<target name="composer" depends="clean" description="Install dependencies with Composer">
11-
<exec executable="composer" taskname="composer">
10+
<target name="install-dependencies" depends="clean" description="Install dependencies with Composer">
11+
<exec executable="${basedir}/tools/composer" taskname="composer">
1212
<arg value="update"/>
1313
<arg value="--no-interaction"/>
1414
<arg value="--no-progress"/>
1515
<arg value="--no-ansi"/>
1616
<arg value="--no-suggest"/>
17-
<arg value="--optimize-autoloader"/>
18-
<arg value="--prefer-stable"/>
17+
</exec>
18+
</target>
19+
20+
<target name="update-tools">
21+
<exec executable="phive" taskname="phive">
22+
<arg value="--no-progress"/>
23+
<arg value="update"/>
24+
</exec>
25+
26+
<exec executable="${basedir}/tools/composer" taskname="composer">
27+
<arg value="self-update"/>
1928
</exec>
2029
</target>
2130
</project>

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"email": "[email protected]"
1515
}
1616
],
17+
"prefer-stable": true,
18+
"config": {
19+
"optimize-autoloader": true,
20+
"sort-packages": true
21+
},
1722
"require": {
1823
"php": "^7.1"
1924
},

phive.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phive xmlns="https://phar.io/phive">
3+
<phar name="php-cs-fixer" version="^2.16" installed="2.16.1" ___location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="psalm" version="^3.8" installed="3.8.3" ___location="./tools/psalm" copy="true"/>
5+
</phive>

tools/composer

1.85 MB
Binary file not shown.

tools/php-cs-fixer

1.73 MB
Binary file not shown.

tools/psalm

7.84 MB
Binary file not shown.

0 commit comments

Comments
 (0)