Dev

WebFiori/Framework/App.php

@@ -431,7 +431,7 @@
          *
          * @since 2.1
          */
-        define('WF_VERSION', '3.0.0-RC.2');
+        define('WF_VERSION', 'v3.0.0-RC.3');
         /**
          * A constant that tells the type of framework version.
          *
@@ -447,7 +447,7 @@
          *
          * @since 2.1
          */
-        define('WF_RELEASE_DATE', '2026-05-04');
+        define('WF_RELEASE_DATE', '2026-05-11');
     }
     /**
      * Initiate main components of the application.
@@ -613,7 +613,7 @@
      *
      * @return bool
      */
     private static function canAcceptArgs(ReflectionClass $refClass, array $args): bool {
         if (empty($args)) {
             return true;
         }
@@ -835,7 +835,7 @@
         //Its used to construct the folder at which index file will exist at
         $DS = DIRECTORY_SEPARATOR;
         $vendorPath = $DS.'vendor'.$DS.'webFiori'.$DS.'framework'.$DS.'WebFiori'.$DS.'Framework';
         $rootPath = substr(__DIR__, 0, strlen(__DIR__) - strlen($vendorPath));
 
         return $rootPath;
     }
@@ -870,7 +870,7 @@
         }
 
         if (!$isLoaded) {
             throw new Exception('Unable to locate the autoloader class.');
         }
     }
 
@@ -878,7 +878,7 @@
      * @throws FileException
      */
     private function initMiddleware() {
-        App::autoRegister('middleware', function(AbstractMiddleware $inst)
+        App::autoRegister('Middleware', function(AbstractMiddleware $inst)
         {
             MiddlewareManager::register($inst);
         });
@@ -957,9 +957,9 @@
      */
     private function setHandlers() {
         Handler::registerHandler(new CLIErrHandler());
         // Handler::registerHandler(new APICallErrHandler());
         // Handler::registerHandler(new HTTPErrHandler());
         // Handler::unregisterHandler(Handler::getHandler('Default'));
         Handler::setConfig(HandlerConfig::createDevelopmentConfig());
     }
 }

WebFiori/Framework/Cli/CLITestCase.php

@@ -12,6 +12,7 @@
 
 use WebFiori\Cli\Command;
 use WebFiori\Cli\CommandTestCase;
+use WebFiori\Database\ConnectionPool;
 use WebFiori\File\File;
 use WebFiori\Framework\App;
 
@@ -25,6 +26,10 @@ protected function setUp(): void {
         parent::setUp();
         $this->setRunner(App::getRunner());
     }
+    protected function tearDown(): void {
+        ConnectionPool::reset();
+        parent::tearDown();
+    }
     /**
      * Register multiple commands and simulate the process of executing the app
      * as if in production environment.

WebFiori/Framework/Cli/Commands/DryRunMigrationsCommand.php

@@ -47,12 +47,12 @@ public function exec(): int {
             // Discover migrations
             $migrationsPath = APP_PATH.'Database'.DS.'Migrations';
             $namespace = APP_DIR.'\\Database\\Migrations';
-            $count = $this->runner->discoverFromPath($migrationsPath, $namespace);
+            $count = $this->runner->discoverFromPath($migrationsPath, $namespace, true);
 
             // Discover seeders
             $seedersPath = APP_PATH.'Database'.DS.'Seeders';
             $seedersNs = APP_DIR.'\\Database\\Seeders';
-            $count += $this->runner->discoverFromPath($seedersPath, $seedersNs);
+            $count += $this->runner->discoverFromPath($seedersPath, $seedersNs, true);
 
             if ($count === 0) {
                 $this->info('No migrations/seeders found.');
@@ -66,6 +66,10 @@ public function exec(): int {
             $this->println('Message: ' . $e->getMessage());
             $this->println('File: ' . $e->getFile() . ':' . $e->getLine());
             return 1;
+        } finally {
+            if ($this->runner !== null) {
+                $this->runner->close();
+            }
         }
     }
 

WebFiori/Framework/Cli/Commands/FreshMigrationsCommand.php

@@ -47,11 +47,11 @@ public function exec(): int {
             // Discover migrations
             $migrationsPath = APP_PATH.'Database'.DS.'Migrations';
             $namespace = APP_DIR.'\\Database\\Migrations';
-            $migrationsCount = $this->runner->discoverFromPath($migrationsPath, $namespace);
+            $migrationsCount = $this->runner->discoverFromPath($migrationsPath, $namespace, true);
 
             $seedersPath = APP_PATH.'Database'.DS.'Seeders';
             $seedersNamespace = APP_DIR.'\\Database\\Seeders';
-            $seedersCount = $this->runner->discoverFromPath($seedersPath, $seedersNamespace);
+            $seedersCount = $this->runner->discoverFromPath($seedersPath, $seedersNamespace, true);
 
             $count = $migrationsCount + $seedersCount;
 
@@ -86,6 +86,10 @@ public function exec(): int {
             $this->println('Message: ' . $e->getMessage());
             $this->println('File: ' . $e->getFile() . ':' . $e->getLine());
             return 1;
+        } finally {
+            if ($this->runner !== null) {
+                $this->runner->close();
+            }
         }
     }
 

WebFiori/Framework/Cli/Commands/MigrationsStatusCommand.php

@@ -47,7 +47,7 @@ public function exec(): int {
             // Discover migrations
             $migrationsPath = APP_PATH.'Database'.DS.'Migrations';
             $namespace = APP_DIR.'\\Database\\Migrations';
-            $count = $this->runner->discoverFromPath($migrationsPath, $namespace);
+            $count = $this->runner->discoverFromPath($migrationsPath, $namespace, true);
 
             if ($count === 0) {
                 $this->info('No migrations found.');
@@ -61,6 +61,10 @@ public function exec(): int {
             $this->println('Message: ' . $e->getMessage());
             $this->println('File: ' . $e->getFile() . ':' . $e->getLine());
             return 1;
+        } finally {
+            if ($this->runner !== null) {
+                $this->runner->close();
+            }
         }
     }
 

WebFiori/Framework/Cli/Commands/RollbackMigrationsCommand.php

@@ -49,7 +49,7 @@ public function exec(): int {
             // Discover migrations
             $migrationsPath = APP_PATH.'Database'.DS.'Migrations';
             $namespace = APP_DIR.'\\Database\\Migrations';
-            $this->runner->discoverFromPath($migrationsPath, $namespace);
+            $this->runner->discoverFromPath($migrationsPath, $namespace, true);
 
             return $this->rollback();
 
@@ -58,6 +58,10 @@ public function exec(): int {
             $this->println('Message: ' . $e->getMessage());
             $this->println('File: ' . $e->getFile() . ':' . $e->getLine());
             return 1;
+        } finally {
+            if ($this->runner !== null) {
+                $this->runner->close();
+            }
         }
     }
 

WebFiori/Framework/Cli/Commands/RunMigrationsCommandNew.php

@@ -47,11 +47,11 @@
             // Discover migrations
             $migrationsPath = APP_PATH.'Database'.DS.'Migrations';
             $namespace = APP_DIR.'\\Database\\Migrations';
-            $count = $this->runner->discoverFromPath($migrationsPath, $namespace);
+            $count = $this->runner->discoverFromPath($migrationsPath, $namespace, true);
 
             $seedersPath = APP_PATH.'Database'.DS.'Seeders';
             $seedersNamespace = APP_DIR.'\\Database\\Seeders';
-            $count += $this->runner->discoverFromPath($seedersPath, $seedersNamespace);
+            $count += $this->runner->discoverFromPath($seedersPath, $seedersNamespace, true);
 
             if ($count === 0) {
                 $this->info('No migrations found.');
@@ -62,7 +62,7 @@
 
         } catch (Throwable $e) {
             $msg = $e->getMessage();
             if ((str_contains($msg, ".schema_changes' doesn't exist") && $e->getCode() == 1146)) {
                 $this->warning('Table "schema_changes" does not exist. No migrations executed.');
                 $this->info('Run "migrations:ini" to create the table.');
                 return 1;
@@ -71,6 +71,10 @@
             $this->println('Message: ' . $e->getMessage());
             $this->println('File: ' . $e->getFile() . ':' . $e->getLine());
             return 1;
+        } finally {
+            if ($this->runner !== null) {
+                $this->runner->close();
+            }
         }
     }
 

WebFiori/Framework/Router/RouterUri.php

@@ -12,6 +12,7 @@
 
 use Closure;
 use InvalidArgumentException;
+use WebFiori\Framework\Middleware\AbstractMiddleware;
 use WebFiori\Framework\Middleware\MiddlewareManager;
 use WebFiori\Http\RequestUri;
 use WebFiori\Http\Uri;
@@ -191,10 +192,32 @@ public function addMiddleware(string $name) {
         if ($mw === null) {
             $group = MiddlewareManager::getGroup($name);
 
-            foreach ($group as $mw) {
-                $this->assignedMiddlewareList[] = $mw;
+            if (!empty($group)) {
+                foreach ($group as $mw) {
+                    $this->assignedMiddlewareList[] = $mw;
+                }
+
+                return;
+            }
+
+            // Try resolving as class name
+            if (class_exists($name) && is_subclass_of($name, AbstractMiddleware::class)) {
+                $inst = new $name();
+                MiddlewareManager::register($inst);
+                $this->assignedMiddlewareList[] = $inst;
+
+                return;
+            }
+
+            // If it looks like a class reference (contains backslash) but isn't valid, throw
+            if (str_contains($name, '\\')) {
+                throw new \InvalidArgumentException(
+                    "Middleware '$name' is not registered, does not match any group, "
+                    . "and is not a valid middleware class."
+                );
             }
 
+            // Otherwise treat as a group/name that may be registered later (silent)
             return;
         }
         $this->assignedMiddlewareList[] = $mw;

composer.json

@@ -28,7 +28,7 @@
         "webfiori/jsonx": "v4.0.*",
         "webfiori/ui": "v4.0.*",
         "webfiori/collections": "v2.0.*",
-        "webfiori/database": "v2.0.*",
+        "webfiori/database": "v2.1.*",
         "webfiori/cli": "v2.1.*",
         "webfiori/mailer": "v2.1.*",
         "webfiori/err": "v2.0.*"

tests/WebFiori/Framework/Tests/Cli/DryRunMigrationsCommandTest.php

@@ -194,12 +194,26 @@ public function down(Database \$db): void {
 
     private function cleanupMigrations(): void {
         $dir = APP_PATH.'Database'.DS.'Migrations';
+        $this->cleanPhpFiles($dir);
+        $seedersDir = APP_PATH.'Database'.DS.'Seeders';
+        $this->cleanPhpFiles($seedersDir);
+    }
+
+    private function cleanPhpFiles(string $dir): void {
+        if (!is_dir($dir)) {
+            return;
+        }
+
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
 
-        if (is_dir($dir)) {
-            foreach (glob($dir.DS.'*.php') as $file) {
-                if (basename($file) !== '.gitkeep') {
-                    unlink($file);
-                }
+        foreach ($iterator as $item) {
+            if ($item->isFile() && $item->getExtension() === 'php') {
+                unlink($item->getRealPath());
+            } elseif ($item->isDir() && count(scandir($item->getRealPath())) === 2) {
+                rmdir($item->getRealPath());
             }
         }
     }

tests/WebFiori/Framework/Tests/Cli/FreshMigrationsCommandTest.php

@@ -182,12 +182,26 @@ public function down(Database \$db): void {
 
     private function cleanupMigrations(): void {
         $dir = APP_PATH.'Database'.DS.'Migrations';
+        $this->cleanPhpFiles($dir);
+        $seedersDir = APP_PATH.'Database'.DS.'Seeders';
+        $this->cleanPhpFiles($seedersDir);
+    }
+
+    private function cleanPhpFiles(string $dir): void {
+        if (!is_dir($dir)) {
+            return;
+        }
+
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
 
-        if (is_dir($dir)) {
-            foreach (glob($dir.DS.'*.php') as $file) {
-                if (basename($file) !== '.gitkeep') {
-                    unlink($file);
-                }
+        foreach ($iterator as $item) {
+            if ($item->isFile() && $item->getExtension() === 'php') {
+                unlink($item->getRealPath());
+            } elseif ($item->isDir() && count(scandir($item->getRealPath())) === 2) {
+                rmdir($item->getRealPath());
             }
         }
     }

tests/WebFiori/Framework/Tests/Cli/MigrationsStatusCommandTest.php

@@ -181,12 +181,24 @@ public function down(Database \$db): void {
 
     private function cleanupMigrations(): void {
         $dir = APP_PATH.'Database'.DS.'Migrations';
+        $this->cleanPhpFiles($dir);
+    }
+
+    private function cleanPhpFiles(string $dir): void {
+        if (!is_dir($dir)) {
+            return;
+        }
+
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
 
-        if (is_dir($dir)) {
-            foreach (glob($dir.DS.'*.php') as $file) {
-                if (basename($file) !== '.gitkeep') {
-                    unlink($file);
-                }
+        foreach ($iterator as $item) {
+            if ($item->isFile() && $item->getExtension() === 'php') {
+                unlink($item->getRealPath());
+            } elseif ($item->isDir() && count(scandir($item->getRealPath())) === 2) {
+                rmdir($item->getRealPath());
             }
         }
     }