Bump php to 7.3. Bump phpunit to 9.6. Remove yoast assertion helpers

AydinHassan · AydinHassan · commit 9ca163fbb365 · 2023-02-05T15:01:08.000+01:00
diff --git a/composer.json b/composer.json
@@ -12,16 +12,15 @@
         }
     ],
     "require" : {
-        "php" : ">=7.2",
+        "php" : ">=7.3",
         "ext-pdo_sqlite": "*",
         "php-school/php-workshop": "dev-master",
         "ext-sockets": "*"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12.52",
         "squizlabs/php_codesniffer": "^3.5",
-        "phpunit/phpunit": "^8.5",
-        "yoast/phpunit-polyfills": "^1.0"
+        "phpunit/phpunit": "^9.6"
     },
     "autoload" : {
         "psr-4" : {
diff --git a/composer.lock b/composer.lock
diff --git a/test/Exercise/ArrayWeGoTest.php b/test/Exercise/ArrayWeGoTest.php
@@ -10,11 +10,9 @@
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
 class ArrayWeGoTest extends TestCase
 {
-    use AssertionRenames;
 
     /**
      * @var Generator
diff --git a/test/Exercise/ConcernedAboutSeparationTest.php b/test/Exercise/ConcernedAboutSeparationTest.php
@@ -11,12 +11,9 @@
 use PhpSchool\PhpWorkshop\Result\Success;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
 class ConcernedAboutSeparationTest extends TestCase
 {
-    use AssertionRenames;
-
     /**
      * @var Filesystem
      */
diff --git a/test/Exercise/ExceptionalCodingTest.php b/test/Exercise/ExceptionalCodingTest.php
@@ -10,12 +10,9 @@
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
 class ExceptionalCodingTest extends TestCase
 {
-    use AssertionRenames;
-
     /**
      * @var Generator
      */
diff --git a/test/Exercise/FilteredLsTest.php b/test/Exercise/FilteredLsTest.php
@@ -3,15 +3,12 @@
 namespace PhpSchool\LearnYouPhpTest\Exercise;
 
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
-use PhpSchool\PhpWorkshop\Solution\SolutionInterface;
 use PHPUnit\Framework\TestCase;
 use PhpSchool\LearnYouPhp\Exercise\FilteredLs;
 use Symfony\Component\Filesystem\Filesystem;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
 class FilteredLsTest extends TestCase
 {
-    use AssertionRenames;
 
     /**
      * @var Filesystem
diff --git a/test/Exercise/MyFirstIoTest.php b/test/Exercise/MyFirstIoTest.php
@@ -11,11 +11,9 @@
 use PHPUnit\Framework\TestCase;
 use PhpSchool\LearnYouPhp\Exercise\MyFirstIo;
 use Symfony\Component\Filesystem\Filesystem;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
 class MyFirstIoTest extends TestCase
 {
-    use AssertionRenames;
 
     /**
      * @var Generator
diff --git a/test/Exercise/TimeServerTest.php b/test/Exercise/TimeServerTest.php
@@ -4,7 +4,6 @@
 
 use Colors\Color;
 use PhpSchool\LearnYouPhp\Exercise\TimeServer;
-use PhpSchool\LearnYouPhp\TcpSocketFactory;
 use PhpSchool\PhpWorkshop\Check\CheckRepository;
 use PhpSchool\PhpWorkshop\Event\EventDispatcher;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
@@ -20,11 +19,9 @@
 use PhpSchool\PhpWorkshop\ResultAggregator;
 use PhpSchool\Terminal\Terminal;
 use PHPUnit\Framework\TestCase;
-use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
 class TimeServerTest extends TestCase
 {
-    use AssertionRenames;
 
     /**
      * @var TimeServer
