Skip to content
This repository was archived by the owner on Jul 8, 2023. It is now read-only.

Commit 6da7252

Browse files
committed
Attempting to remove Composer magic.
1 parent 4da20cc commit 6da7252

File tree

8 files changed

+1253
-215
lines changed

8 files changed

+1253
-215
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
/.composer/
21
/build/
32
/coverage/
43
/doc/*.html
54
/test/bin/php-cs-fixer
65
/vendor/
76
/web/
8-
/composer.lock
97
/README.html

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ matrix:
4343
before_install:
4444
- phpenv config-rm xdebug.ini || true
4545
- composer config --global github-oauth.github.com $GITHUB_TOKEN
46-
install: scripts/composer-install --prefer-dist --no-progress --no-interaction
46+
install: composer install --prefer-dist --no-progress --no-interaction
4747
before_script:
4848
- if [[ "$HHVMPHP7" ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
4949
script: scripts/travis
@@ -70,6 +70,5 @@ env:
7070
cache:
7171
directories:
7272
- $HOME/.composer
73-
- .composer
7473

7574
sudo: false

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ lint: test/bin/php-cs-fixer
1313
test/bin/php-cs-fixer fix --using-cache no
1414

1515
install:
16-
PHONY_MAKEFILE_INSTALL=1 scripts/composer-install
16+
composer install
1717

1818
edge-cases: install
1919
php --version

composer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"errors/exceptions": "^0.1",
2020
"hamcrest/hamcrest-php": "^2",
2121
"icecave/semver": "^3",
22-
"phpunit/phpunit": "^4|^5"
22+
"phpunit/phpunit": "^4"
2323
},
2424
"autoload": {
2525
"psr-4": {
@@ -37,5 +37,10 @@
3737
"test/src/ClassA.php",
3838
"test/src/TestClass.php"
3939
]
40+
},
41+
"config": {
42+
"platform": {
43+
"php": "5.3.99999"
44+
}
4045
}
4146
}

0 commit comments

Comments
 (0)