Skip to content

php 7.2 compatibility and small fixes #23

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

Merged
merged 4 commits into from
Feb 7, 2018
Merged

php 7.2 compatibility and small fixes #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3d6883
allow newer phpunit version for php 7.2
Jan 30, 2018
57350e4
content fixes
Jan 30, 2018
790c73b
Versioneye removal
Jan 30, 2018
d7bab17
paratest upgrade
Jan 30, 2018
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
21 changes: 9 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
[![License][license-shield]](LICENSE.md)

[![Travis][travis-shield]][travis]
[![Dependency Status][versioneye-shield]][versioneye]
[![Latest Version on Packagist][packagist-version-shield]][packagist-version]
[![Packagist][packagist-shield]][packagist]

Expand Down Expand Up @@ -95,7 +94,7 @@ still use the one provided in a project.
The following script will install a system wide Composer for you, including the QA tools.

```bash
bash <(curl -S https://raw.githubusercontent.com/DealerDirect/php-qa-tools/master/bin/install.sh)
bash <(curl -S https://raw.githubusercontent.com/Dealerdirect/php-qa-tools/master/bin/install.sh)
```

That's it. This can be put in any instructions, such as a README or someone's blog, since the logic is in the shell
Expand All @@ -105,8 +104,8 @@ releases signature matches the public key of Dealerdirect.

```bash
gpg --keyserver hkp://keys.gnupg.net --recv-keys C4133165DF5EB4BAEABDADCACF1E7823C5339B59
curl -O https://raw.githubusercontent.com/DealerDirect/php-qa-tools/master/bin/install.sh
curl -O https://raw.githubusercontent.com/DealerDirect/php-qa-tools/master/bin/install.sh.sig
curl -O https://raw.githubusercontent.com/Dealerdirect/php-qa-tools/master/bin/install.sh
curl -O https://raw.githubusercontent.com/Dealerdirect/php-qa-tools/master/bin/install.sh.sig
gpg --verify install.sh.sig
bash install.sh
```
Expand All @@ -115,7 +114,7 @@ This is obviously a shell script, if you're really concerned about the argument
activities within, you can easily review it before you run it.

```bash
curl -O https://raw.githubusercontent.com/DealerDirect/php-qa-tools/master/bin/install.sh
curl -O https://raw.githubusercontent.com/Dealerdirect/php-qa-tools/master/bin/install.sh
less install.sh
bash instal.sh
```
Expand Down Expand Up @@ -182,7 +181,7 @@ Did not find a matching vacancy? Just [get in touch][get-in-touch]!

The MIT License (MIT)

Copyright (c) 2016-2017 Dealerdirect B.V.
Copyright (c) 2016-2018 Dealerdirect B.V.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -215,7 +214,7 @@ THE SOFTWARE.
[grumphp]: https://github.com/phpro/grumphp
[json-lint]: https://github.com/Seldaek/jsonlint
[license-shield]: https://img.shields.io/github/license/dealerdirect/php-qa-tools.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2017.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
[mockery]: https://github.com/padraic/mockery
[packagist-shield]: https://img.shields.io/packagist/dt/dealerdirect/qa-tools.svg
[packagist-version-shield]: https://img.shields.io/packagist/v/dealerdirect/qa-tools.svg
Expand All @@ -229,7 +228,7 @@ THE SOFTWARE.
[phpcompatibility]: https://github.com/wimg/PHPCompatibility
[phpcov]: https://github.com/sebastianbergmann/phpcov
[phpcpd]: https://github.com/sebastianbergmann/phpcpd
[phpcs-composer-installer]: https://github.com/DealerDirect/phpcodesniffer-composer-installer
[phpcs-composer-installer]: https://github.com/Dealerdirect/phpcodesniffer-composer-installer
[phpcs-fixer]: http://cs.sensiolabs.org
[phpcs]: https://github.com/squizlabs/PHP_CodeSniffer
[phpdoc]: https://www.phpdoc.org
Expand All @@ -243,9 +242,7 @@ THE SOFTWARE.
[sami]: https://github.com/FriendsOfPHP/sami
[security-checker]: https://security.sensiolabs.org
[tombstone-analyzer]: https://github.com/scheb/tombstone-analyzer
[travis-shield]: https://img.shields.io/travis/DealerDirect/php-qa-tools.svg
[travis]: https://travis-ci.org/DealerDirect/php-qa-tools
[travis-shield]: https://img.shields.io/travis/Dealerdirect/php-qa-tools.svg
[travis]: https://travis-ci.org/Dealerdirect/php-qa-tools
[vacancies]: https://www.dealerdirect.com/en/vacancies
[versioneye-shield]: https://www.versioneye.com/user/projects/580939a4d65a77002f5eab70/badge.svg
[versioneye]: https://www.versioneye.com/user/projects/580939a4d65a77002f5eab70
[versions-check]: https://github.com/Soullivaneuh/composer-versions-check
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"require": {
"php": ">=5.6,<8.0-dev",
"brianium/paratest": ">=0.14.0,<1.0.0",
"brianium/paratest": ">=0.14|^1.0",
"codeception/codeception": "^2.3",
"dealerdirect/phpcodesniffer-composer-installer": "^0.4",
"deployer/deployer": "^4.3",
Expand All @@ -37,7 +37,7 @@
"phpmd/phpmd": "^2.6.0",
"phpmetrics/phpmetrics": "^2.3.2",
"phpro/grumphp": ">=0.11.0,<1.0.0,!=0.11.4",
"phpunit/phpunit": "^5.7",
"phpunit/phpunit": "^5.7|^6.5",
"robmorgan/phinx": "^0.9",
"scheb/tombstone-analyzer": "^0.3",
"sebastian/phpcpd": "^3.0",
Expand Down