Merge pull request #49 from rogervila/phpunit9

mtrajano · web-flow · commit 20823090a4b9 · 2020-10-03T19:39:21.000-04:00
PHPUnit 9 Support
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
 .phpunit.result.cache
+composer.lock
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     "require-dev": {
         "php": ">=7.0",
         "orchestra/testbench": "~4.0",
-        "phpunit/phpunit": "8.3.*",
+        "phpunit/phpunit": "^8.0|^9.0",
         "laravel/passport": "^8.0"
     },
     "autoload": {
@@ -38,6 +38,6 @@
         }
     },
     "require": {
-        "phpdocumentor/reflection-docblock": "^4.3"
+        "phpdocumentor/reflection-docblock": "^4.3|^5.2"
     }
 }
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"require-dev": {`
`12`	`12`	`"php": ">=7.0",`
`13`	`13`	`"orchestra/testbench": "~4.0",`
`14`		`- "phpunit/phpunit": "8.3.*",`
	`14`	`+ "phpunit/phpunit": "^8.0\|^9.0",`
`15`	`15`	`"laravel/passport": "^8.0"`
`16`	`16`	`},`
`17`	`17`	`"autoload": {`
`@@ -38,6 +38,6 @@`
`38`	`38`	`}`
`39`	`39`	`},`
`40`	`40`	`"require": {`
`41`		`- "phpdocumentor/reflection-docblock": "^4.3"`
	`41`	`+ "phpdocumentor/reflection-docblock": "^4.3\|^5.2"`
`42`	`42`	`}`
`43`	`43`	`}`