Fix: Require and use phpunit/phpunit (#568)

FakerPHP · Dec 8, 2022 · 0eb47ba · 0eb47ba
1 parent c8461d9
commit 0eb47ba
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -45,11 +45,10 @@ jobs:
       - name: "Download dependencies"
         run: |
           composer update --no-interaction --no-progress --optimize-autoloader
-          vendor/bin/simple-phpunit install
 
       - name: "Collect code coverage with PHPUnit"
         run: |
-          vendor/bin/simple-phpunit --coverage-clover=.build/logs/clover.xml
+          vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml
 
       - name: "Send code coverage report to codecov.io"
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -51,4 +51,4 @@ jobs:
         run: "composer update --no-interaction --no-progress --optimize-autoloader"
 
       - name: "Run tests"
-        run: "./vendor/bin/simple-phpunit"
+        run: "./vendor/bin/phpunit"
diff --git a/Makefile b/Makefile
@@ -14,11 +14,11 @@ cs: vendor ## Fixes coding standard issues with php-cs-fixer
 
 .PHONY: coverage
 coverage: vendor ## Collects coverage with phpunit
-	vendor/bin/simple-phpunit --coverage-text --coverage-clover=.build/logs/clover.xml
+	vendor/bin/phpunit --coverage-text --coverage-clover=.build/logs/clover.xml
 
 .PHONY: test
 test: vendor ## Runs tests with phpunit
-	vendor/bin/simple-phpunit
+	vendor/bin/phpunit
 
 .PHONY: static
 static: vendor ## Runs static analyzers
@@ -37,4 +37,3 @@ clean:   ## Cleans up build and vendor files
 vendor: always
 	composer update --no-interaction
 	composer bin all install --no-interaction
-	vendor/bin/simple-phpunit install
diff --git a/composer.json b/composer.json
@@ -22,6 +22,7 @@
         "ext-intl": "*",
         "bamarni/composer-bin-plugin": "^1.4.1",
         "doctrine/persistence": "^1.3 || ^2.0",
+        "phpunit/phpunit": "^9.5.26",
         "symfony/phpunit-bridge": "^5.4.16"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,6 +9,9 @@
     columns="max"
     verbose="true"
 >
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=404"/>
     </php>