Require codeigniter 4.5 ad interim

CodeIgniter · Feb 25, 2024 · 19ba680 · 19ba680
1 parent 0087056
commit 19ba680
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -11,13 +11,27 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-require_once __DIR__ . '/vendor/codeigniter4/framework/system/Test/bootstrap.php';
+use Composer\InstalledVersions;
 
-$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/vendor/codeigniter4/framework/system/Helpers'));
+foreach (['codeigniter4/codeigniter4', 'codeigniter4/framework'] as $framework) {
+    if (InstalledVersions::isInstalled($framework)) {
+        require_once __DIR__ . '/vendor/' . $framework . '/system/Test/bootstrap.php';
 
-/** @var SplFileInfo $helper */
-foreach ($iterator as $helper) {
-    if ($helper->isFile()) {
-        require_once $helper->getRealPath();
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(
+                __DIR__ . '/vendor/' . $framework . '/system/Helpers'
+            )
+        );
+
+        /** @var SplFileInfo $helper */
+        foreach ($iterator as $helper) {
+            if ($helper->isFile()) {
+                require_once $helper->getRealPath();
+            }
+        }
+
+        return;
     }
 }
+
+throw new RuntimeException('There is no CodeIgniter4 framework installed.');
diff --git a/composer.json b/composer.json
@@ -23,7 +23,8 @@
     },
     "require": {
         "php": "^8.1",
-        "codeigniter4/framework": "^4.4",
+        "composer-runtime-api": "^2.2",
+        "codeigniter4/codeigniter4": "4.5.x-dev",
         "phpstan/phpstan": "^1.10"
     },
     "require-dev": {
@@ -39,6 +40,12 @@
         "phpunit/phpunit": "^10.2",
         "rector/rector": "^1.0.0"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/codeigniter4/codeigniter4"
+        }
+    ],
     "conflict": {
         "codeigniter/framework": "*"
     },

diff --git a/tests/Type/data/services.php b/tests/Type/data/services.php
@@ -12,7 +12,7 @@
  */
 
 use CodeIgniter\Autoloader\Autoloader;
-use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Autoloader\FileLocatorInterface;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\CLI\Commands;
 use CodeIgniter\Debug\Exceptions;
@@ -52,7 +52,7 @@
 
 // from CodeIgniter\Config\BaseService
 assertType(Autoloader::class, single_service('autoloader'));
-assertType(FileLocator::class, service('locator'));
+assertType(FileLocatorInterface::class, service('locator'));
 assertType('null', service('__callStatic'));
 assertType('null', service('serviceExists'));
 assertType('null', service('reset'));