Skip to content

Commit 87da7b3

Browse files
authored
Merge pull request #220 from dshanske/php56
PHP5.6
2 parents daf09fb + de985dc commit 87da7b3

File tree

5 files changed

+782
-2945
lines changed

5 files changed

+782
-2945
lines changed

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
dist: trusty
22
language: php
33
php:
4-
- 5.4
5-
- 5.5
64
- 5.6
75
- 7.0
86
- 7.1
97
- 7.2
108
- 7.3
9+
- 7.4
1110
- nightly
1211
env:
1312
- COMPOSER_REQUIRE=""
@@ -17,5 +16,5 @@ matrix:
1716
allow_failures:
1817
- php: nightly
1918
install:
19+
- composer update
2020
- $COMPOSER_REQUIRE
21-
before_script: composer install

README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,14 @@ Pull requests very welcome, please try to maintain stylistic, structural and nam
337337

338338
1. Fork the repo to your github account
339339
2. Clone a copy to your computer (simply installing php-mf2 using composer only works for using it, not developing it)
340-
3. Install the dev dependencies with `./composer.phar install`
341-
4. Run PHPUnit with `./vendor/bin/phpunit`
342-
5. Make your changes
340+
3. Install the dev dependencies with `composer install`.
341+
4. Run PHPUnit with `composer phpunit`
342+
5. Check PHP Compatibility with the current minimum version supported (`composer phpcs`)
343343
6. Add PHPUnit tests for your changes, either in an existing test file if suitable, or a new one
344-
7. Make sure your tests pass (`./vendor/bin/phpunit`), using 5.4+
345-
8. Go to your fork of the repo on github.com and make a pull request, preferably with a short summary, detailed description and references to issues/parsing specs as appropriate
346-
9. Bask in the warm feeling of having contributed to a piece of free software
344+
7. Make your changes
345+
8. Make sure your tests pass (`composer phpunit`)
346+
9. Go to your fork of the repo on github.com and make a pull request, preferably with a short summary, detailed description and references to issues/parsing specs as appropriate
347+
10. Bask in the warm feeling of having contributed to a piece of free software
347348

348349
### Testing
349350

composer.json

+16-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,26 @@
1111
],
1212
"bin": ["bin/fetch-mf2", "bin/parse-mf2"],
1313
"require": {
14-
"php": ">=5.4.0"
14+
"php": ">=5.6.0"
15+
},
16+
"config": {
17+
"platform": {
18+
}
1519
},
1620
"require-dev": {
1721
"phpunit/phpunit": "4.8.*",
18-
"phpdocumentor/phpdocumentor": "v2.8.4",
19-
"mf2/tests": "@dev"
22+
"mf2/tests": "@dev",
23+
"squizlabs/php_codesniffer": "^2.6 || ^3.1.0",
24+
"dealerdirect/phpcodesniffer-composer-installer": "^0.6",
25+
"phpcompatibility/php-compatibility": "^9.3"
2026
},
27+
"scripts": {
28+
"install-codestandards": [
29+
"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
30+
],
31+
"phpcs": "./vendor/bin/phpcs -p",
32+
"phpunit": "./vendor/bin/phpunit"
33+
},
2134
"autoload": {
2235
"files": ["Mf2/Parser.php"]
2336
},

0 commit comments

Comments
 (0)