Skip to content

Commit c68947c

Browse files
authored
Merge pull request #23 from Dealerdirect/fixes-1
php 7.2 compatibility and small fixes
2 parents 9be0a8c + d7bab17 commit c68947c

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

README.md

+9-12
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
[![License][license-shield]](LICENSE.md)
77

88
[![Travis][travis-shield]][travis]
9-
[![Dependency Status][versioneye-shield]][versioneye]
109
[![Latest Version on Packagist][packagist-version-shield]][packagist-version]
1110
[![Packagist][packagist-shield]][packagist]
1211

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

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

101100
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
@@ -105,8 +104,8 @@ releases signature matches the public key of Dealerdirect.
105104

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

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

183182
The MIT License (MIT)
184183

185-
Copyright (c) 2016-2017 Dealerdirect B.V.
184+
Copyright (c) 2016-2018 Dealerdirect B.V.
186185

187186
Permission is hereby granted, free of charge, to any person obtaining a copy
188187
of this software and associated documentation files (the "Software"), to deal
@@ -215,7 +214,7 @@ THE SOFTWARE.
215214
[grumphp]: https://github.com/phpro/grumphp
216215
[json-lint]: https://github.com/Seldaek/jsonlint
217216
[license-shield]: https://img.shields.io/github/license/dealerdirect/php-qa-tools.svg
218-
[maintenance-shield]: https://img.shields.io/maintenance/yes/2017.svg
217+
[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
219218
[mockery]: https://github.com/padraic/mockery
220219
[packagist-shield]: https://img.shields.io/packagist/dt/dealerdirect/qa-tools.svg
221220
[packagist-version-shield]: https://img.shields.io/packagist/v/dealerdirect/qa-tools.svg
@@ -229,7 +228,7 @@ THE SOFTWARE.
229228
[phpcompatibility]: https://github.com/wimg/PHPCompatibility
230229
[phpcov]: https://github.com/sebastianbergmann/phpcov
231230
[phpcpd]: https://github.com/sebastianbergmann/phpcpd
232-
[phpcs-composer-installer]: https://github.com/DealerDirect/phpcodesniffer-composer-installer
231+
[phpcs-composer-installer]: https://github.com/Dealerdirect/phpcodesniffer-composer-installer
233232
[phpcs-fixer]: http://cs.sensiolabs.org
234233
[phpcs]: https://github.com/squizlabs/PHP_CodeSniffer
235234
[phpdoc]: https://www.phpdoc.org
@@ -243,9 +242,7 @@ THE SOFTWARE.
243242
[sami]: https://github.com/FriendsOfPHP/sami
244243
[security-checker]: https://security.sensiolabs.org
245244
[tombstone-analyzer]: https://github.com/scheb/tombstone-analyzer
246-
[travis-shield]: https://img.shields.io/travis/DealerDirect/php-qa-tools.svg
247-
[travis]: https://travis-ci.org/DealerDirect/php-qa-tools
245+
[travis-shield]: https://img.shields.io/travis/Dealerdirect/php-qa-tools.svg
246+
[travis]: https://travis-ci.org/Dealerdirect/php-qa-tools
248247
[vacancies]: https://www.dealerdirect.com/en/vacancies
249-
[versioneye-shield]: https://www.versioneye.com/user/projects/580939a4d65a77002f5eab70/badge.svg
250-
[versioneye]: https://www.versioneye.com/user/projects/580939a4d65a77002f5eab70
251248
[versions-check]: https://github.com/Soullivaneuh/composer-versions-check

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"require": {
2626
"php": ">=5.6,<8.0-dev",
27-
"brianium/paratest": ">=0.14.0,<1.0.0",
27+
"brianium/paratest": ">=0.14|^1.0",
2828
"codeception/codeception": "^2.3",
2929
"dealerdirect/phpcodesniffer-composer-installer": "^0.4",
3030
"deployer/deployer": "^4.3",
@@ -37,7 +37,7 @@
3737
"phpmd/phpmd": "^2.6.0",
3838
"phpmetrics/phpmetrics": "^2.3.2",
3939
"phpro/grumphp": ">=0.11.0,<1.0.0,!=0.11.4",
40-
"phpunit/phpunit": "^5.7",
40+
"phpunit/phpunit": "^5.7|^6.5",
4141
"robmorgan/phinx": "^0.9",
4242
"scheb/tombstone-analyzer": "^0.3",
4343
"sebastian/phpcpd": "^3.0",

0 commit comments

Comments
 (0)