Merge pull request #283 from tarlepp/tests/phpunit-9.0.0

tests/phpunit-9.0.0
tarlepp · Feb 9, 2020 · 426297a · 426297a
2 parents 65c789e + fe7bb49
commit 426297a
Show file tree

Hide file tree

Showing 29 changed files with 680 additions and 511 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/symfony-flex-backend.iml b/.idea/symfony-flex-backend.iml
diff --git a/Dockerfile_dev b/Dockerfile_dev
@@ -17,7 +17,7 @@ RUN docker-php-ext-install -j$(nproc) bcmath \
     && docker-php-ext-install intl \
     && docker-php-ext-install opcache \
     && docker-php-ext-install zip \
-    && pecl install xdebug-2.9.0 \
+    && pecl install xdebug-2.9.2 \
     && docker-php-ext-enable xdebug
 
 # Install APCu and APC backward compatibility

diff --git a/composer.json b/composer.json
@@ -102,16 +102,16 @@
 	"autoload-dev": {
 		"psr-4": {
 			"App\\Tests\\": "tests/",
-			"PHPUnit\\": "tools/phpunit/vendor/phpunit/phpunit/src/",
-			"PHPUnit\\Framework\\MockObject\\": "tools/phpunit/vendor/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility",
-			"SebastianBergmann\\FinderFacade\\": "tools/phpunit/vendor/sebastian/finder-facade/src",
-			"Symfony\\Component\\BrowserKit\\": "tools/phpunit/vendor/symfony/browser-kit",
-			"Symfony\\Component\\DomCrawler\\": "tools/phpunit/vendor/symfony/dom-crawler",
-			"Symfony\\Bridge\\PhpUnit\\": "tools/phpunit/vendor/symfony/phpunit-bridge",
-			"TheSeer\\fDOM\\": "tools/phpunit/vendor/theseer/fdomdocument/src",
+			"PHPUnit\\": "tools/01_phpunit/vendor/phpunit/phpunit/src/",
+			"PHPUnit\\Framework\\MockObject\\": "tools/01_phpunit/vendor/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility",
+			"SebastianBergmann\\FinderFacade\\": "tools/01_phpunit/vendor/sebastian/finder-facade/src",
+			"Symfony\\Component\\BrowserKit\\": "tools/01_phpunit/vendor/symfony/browser-kit",
+			"Symfony\\Component\\DomCrawler\\": "tools/01_phpunit/vendor/symfony/dom-crawler",
+			"Symfony\\Bridge\\PhpUnit\\": "tools/01_phpunit/vendor/symfony/phpunit-bridge",
+			"TheSeer\\fDOM\\": "tools/01_phpunit/vendor/theseer/fdomdocument/src",
 			"Liuggio\\Fastest\\": [
-				"tools/phpunit/vendor/liuggio/fastest/src",
-				"tools/phpunit/vendor/liuggio/fastest/adapters"
+				"tools/01_phpunit/vendor/liuggio/fastest/src",
+				"tools/01_phpunit/vendor/liuggio/fastest/adapters"
 			]
 		}
 	},

diff --git a/composer.lock b/composer.lock
diff --git a/tools/ecs/.gitignore → tools/01_phpunit/.gitignore b/tools/ecs/.gitignore → tools/01_phpunit/.gitignore
diff --git a/tools/phpunit/composer.json → tools/01_phpunit/composer.json b/tools/phpunit/composer.json → tools/01_phpunit/composer.json
@@ -2,10 +2,10 @@
 	"require": {},
 	"require-dev": {
 		"liuggio/fastest": "1.6.1",
-		"phpunit/phpunit": "8.5.2",
-		"phpunit/phpcov": "6.0.1",
+		"phpunit/phpcov": "7.0.0",
+		"phpunit/phpunit": "9.0.0",
 		"roave/security-advisories": "dev-master",
-		"sebastian/finder-facade": "1.2.3",
+		"sebastian/finder-facade": "2.0.0",
 		"symfony/browser-kit": "4.4.4",
 		"symfony/phpunit-bridge": "4.4.4",
 		"theseer/fdomdocument": "1.6.6"