Merge pull request #244 from GrahamCampbell/patch-1

Fix PHP 8.0 support
This commit is contained in:
Jaap van Otterdijk
2020-07-09 14:42:26 +02:00
committed by GitHub
2 changed files with 30 additions and 30 deletions
+4 -4
View File
@@ -15,13 +15,13 @@
], ],
"require": { "require": {
"php": "^7.2 || ^8.0", "php": "^7.2 || ^8.0",
"phpdocumentor/type-resolver": "^1.0", "phpdocumentor/type-resolver": "^1.3",
"webmozart/assert": "^1", "webmozart/assert": "^1.9.1",
"phpdocumentor/reflection-common": "^2.0", "phpdocumentor/reflection-common": "^2.2",
"ext-filter": "*" "ext-filter": "*"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "1.3.*" "mockery/mockery": "~1.3.2"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
Generated
+26 -26
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5d0d3ec49d1159ef26291092b2c55192", "content-hash": "8a52bc233d90a2f83a3d5ac697d9ccdc",
"packages": [ "packages": [
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
@@ -164,20 +164,20 @@
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
"version": "1.9.0", "version": "1.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/webmozart/assert.git", "url": "https://github.com/webmozart/assert.git",
"reference": "9dc4f203e36f2b486149058bade43c851dd97451" "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451", "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
"reference": "9dc4f203e36f2b486149058bade43c851dd97451", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.3 || ^7.0", "php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8" "symfony/polyfill-ctype": "^1.8"
}, },
"conflict": { "conflict": {
@@ -209,26 +209,26 @@
"check", "check",
"validate" "validate"
], ],
"time": "2020-06-16T10:16:42+00:00" "time": "2020-07-08T17:02:28+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "hamcrest/hamcrest-php", "name": "hamcrest/hamcrest-php",
"version": "v2.0.0", "version": "v2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/hamcrest/hamcrest-php.git", "url": "https://github.com/hamcrest/hamcrest-php.git",
"reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad" "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad", "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
"reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad", "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3|^7.0" "php": "^5.3|^7.0|^8.0"
}, },
"replace": { "replace": {
"cordoval/hamcrest-php": "*", "cordoval/hamcrest-php": "*",
@@ -236,14 +236,13 @@
"kodova/hamcrest-php": "*" "kodova/hamcrest-php": "*"
}, },
"require-dev": { "require-dev": {
"phpunit/php-file-iterator": "1.3.3", "phpunit/php-file-iterator": "^1.4 || ^2.0",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
"satooshi/php-coveralls": "^1.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0-dev" "dev-master": "2.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -253,35 +252,35 @@
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"BSD" "BSD-3-Clause"
], ],
"description": "This is the PHP port of Hamcrest Matchers", "description": "This is the PHP port of Hamcrest Matchers",
"keywords": [ "keywords": [
"test" "test"
], ],
"time": "2016-01-20T08:20:44+00:00" "time": "2020-07-09T08:09:16+00:00"
}, },
{ {
"name": "mockery/mockery", "name": "mockery/mockery",
"version": "1.3.1", "version": "1.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mockery/mockery.git", "url": "https://github.com/mockery/mockery.git",
"reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be" "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "url": "https://api.github.com/repos/mockery/mockery/zipball/9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283",
"reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"hamcrest/hamcrest-php": "~2.0", "hamcrest/hamcrest-php": "^2.0.1",
"lib-pcre": ">=7.0", "lib-pcre": ">=7.0",
"php": ">=5.6.0" "php": ">=5.6.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0|~9.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -324,7 +323,7 @@
"test double", "test double",
"testing" "testing"
], ],
"time": "2019-12-26T09:49:15+00:00" "time": "2020-07-09T08:23:05+00:00"
} }
], ],
"aliases": [], "aliases": [],
@@ -336,5 +335,6 @@
"php": "^7.2 || ^8.0", "php": "^7.2 || ^8.0",
"ext-filter": "*" "ext-filter": "*"
}, },
"platform-dev": [] "platform-dev": [],
"plugin-api-version": "1.1.0"
} }