Remove workaround for PHP-DI#791

package-health · Apr 10, 2022 · 913e0ad · 913e0ad
1 parent cecfa55
commit 913e0ad
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 108 deletions.
diff --git a/bin/console.php b/bin/console.php
@@ -29,10 +29,7 @@
 $containerBuilder = new ContainerBuilder();
 
 if (isset($_ENV['PHP_ENV']) && $_ENV['PHP_ENV'] === 'production') {
-  // workaround for https://github.com/PHP-DI/PHP-DI/issues/791
-  if (PHP_VERSION_ID < 80100) {
-    $containerBuilder->enableCompilation(__DIR__ . '/../var/cache');
-  }
+  $containerBuilder->enableCompilation(__DIR__ . '/../var/cache');
 }
 
 // Set up settings

diff --git a/composer.json b/composer.json
@@ -31,6 +31,9 @@
   "prefer-stable": true,
   "require": {
     "php": ">=8.1",
+    "ext-filter": "*",
+    "ext-json": "*",
+    "ext-pcntl": "*",
     "ext-pdo": "*",
     "ext-posix": "*",
     "ext-redis": "*",
@@ -47,10 +50,11 @@
     "nyholm/dsn": "^2.0",
     "nyholm/psr7": "^1.5",
     "nyholm/psr7-server": "^1.0",
-    "php-di/php-di": "^6.3",
+    "php-di/php-di": "^6.4",
     "phpunit/php-timer": "^5.0",
     "psr/cache": "^1.0",
     "psr/container": "^1.0",
+    "psr/http-message": "^1.0",
     "psr/log": "^2.0",
     "ramsey/collection": "^1.2",
     "robmorgan/phinx": "^0.12.10",