Run with docker process factory

php-school · May 17, 2024 · 2da5ce2 · 2da5ce2
1 parent f435075
commit 2da5ce2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/.docker/runtime/docker-compose.yml b/.docker/runtime/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   runtime:
     image: php8appreciate-runtime

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "php-school/php-workshop": "dev-master"
+        "php-school/php-workshop": "dev-docker-fixes"
     },
     "require-dev": {
         "phpunit/phpunit": "^9",

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
@@ -9,4 +9,7 @@
     <directory>./test</directory>
     <exclude>./test/solutions</exclude>
   </testsuite>
+  <php>
+    <env name="process_factory" value="docker" force="true" />
+  </php>
 </phpunit>
diff --git a/src/Exercise/ThrowAnExpression.php b/src/Exercise/ThrowAnExpression.php
@@ -10,7 +10,6 @@
 use PhpParser\Node\Stmt\If_;
 use PhpParser\NodeFinder;
 use PhpParser\Parser;
-use PhpSchool\PhpWorkshop\Environment\CgiTestEnvironment;
 use PhpSchool\PhpWorkshop\Exercise\AbstractExercise;
 use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;

diff --git a/test/Exercise/ThrowAnExpressionTest.php b/test/Exercise/ThrowAnExpressionTest.php
@@ -34,7 +34,7 @@ public function testThrowingWrongException(): void
         self::assertInstanceOf(Success::class, $output->getResults()[1]);
 
         self::assertMatchesRegularExpression(
-            '/Fatal error:  Uncaught Exception: Access denied!/',
+            '/Fatal error: Uncaught Exception: Access denied!/',
             $output->getResults()[0]->getReason()
         );