Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PHP5.6 #220

Merged
merged 8 commits into from
May 10, 2020
Merged

PHP5.6 #220

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a048d2c
Bump version to PHP5.6 add compatibility testing and test for 5.6-7.4…
dshanske Apr 25, 2020
588fb0f
Add phpunit script to composer to ensure it is running the dev versio…
dshanske Apr 25, 2020
a33647a
Update README to note slight change in instructions due scripting
dshanske Apr 25, 2020
fda3521
Try to fix lock issue
dshanske Apr 25, 2020
45f8aa4
Set composer platform to PHP5.6 so that dependencies will require tha…
dshanske Apr 25, 2020
11f4ae5
Now that composer.lock is based on 5.6, remove the entry forcing it t…
dshanske Apr 28, 2020
2af4891
Fix README
dshanske Apr 30, 2020
de985dc
Update composer lock to latest versions, make travis always update fo…
Zegnat May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
dist: trusty
language: php
php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4
- nightly
env:
- COMPOSER_REQUIRE=""
Expand Down
13 changes: 7 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,13 @@ Pull requests very welcome, please try to maintain stylistic, structural and nam

1. Fork the repo to your github account
2. Clone a copy to your computer (simply installing php-mf2 using composer only works for using it, not developing it)
3. Install the dev dependencies with `./composer.phar install`
4. Run PHPUnit with `./vendor/bin/phpunit`
5. Make your changes
6. Add PHPUnit tests for your changes, either in an existing test file if suitable, or a new one
7. Make sure your tests pass (`./vendor/bin/phpunit`), using 5.4+
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
3. Install the dev dependencies with `composer install`.
4. Run PHPUnit with `composer phpunit`
5. Check PHP Compatibility with the current minimum version supported (`composer phpcs`)
6. Make your changes
7. Add PHPUnit tests for your changes, either in an existing test file if suitable, or a new one
8. Make sure your tests pass (`composer phpunit`)
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
9. Bask in the warm feeling of having contributed to a piece of free software
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be "10."

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd also suggest switching 6 and 7 to encourage TDD.

  1. Add PHPUnit tests to cover what you want to change, either in an existing test file if suitable, or a new one
  2. Make your changes


### Testing
Expand Down
19 changes: 16 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,26 @@
],
"bin": ["bin/fetch-mf2", "bin/parse-mf2"],
"require": {
"php": ">=5.4.0"
"php": ">=5.6.0"
},
"config": {
"platform": {
}
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
"phpdocumentor/phpdocumentor": "v2.8.4",
"mf2/tests": "@dev"
"mf2/tests": "@dev",
"squizlabs/php_codesniffer": "^2.6 || ^3.1.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.6",
"phpcompatibility/php-compatibility": "^9.3"
},
"scripts": {
"install-codestandards": [
"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
],
"phpcs": "./vendor/bin/phpcs -p",
"phpunit": "./vendor/bin/phpunit"
},
"autoload": {
"files": ["Mf2/Parser.php"]
},
Expand Down
Loading