Fix namespace extraction in ClassesInDirectories

- Fix extractNamespace() to properly skip non-T_NAMESPACE tokens
- Handle both T_NAME_QUALIFIED and T_STRING tokens for namespace parsing
- Filter ClassesInDirectories::list() to return only interfaces
- Update README and demo to use MediaQuerySqlModule

The bug was that extractNamespace() was processing non-array tokens like '(' from declare(strict_types=1), causing it to extract 'strict_types' instead of the actual namespace. Fixed by changing the condition to explicitly require T_NAMESPACE tokens.

Author: koriym

README.md

@@ -49,23 +49,36 @@ MediaQueryModule binds the execution of SQL to an interface by setting `DbQueryC
 
 ```php
 use Ray\AuraSqlModule\AuraSqlModule;
-use Ray\MediaQuery\DbQueryConfig;
-use Ray\MediaQuery\MediaQueryModule;
-use Ray\MediaQuery\Queries;
+use Ray\MediaQuery\MediaQuerySqlModule;
 
 protected function configure(): void
 {
-    $this->install(
-        new MediaQueryModule(
-            Queries::fromDir('/path/to/queryInterface'),
-            new DbQueryConfig('/path/to/sql')
-        ),
-    );
+    $this->install(new MediaQuerySqlModule(
+        interfaceDir: '/path/to/queryInterface',
+        sqlDir: '/path/to/sql'
+    ));
     $this->install(new AuraSqlModule('mysql:host=localhost;dbname=test', 'username', 'password'));
 }
 ```
 
-Note: MediaQueryModule requires AuraSqlModule to be installed.
+Note: MediaQuerySqlModule requires AuraSqlModule to be installed.
+
+For advanced use cases requiring explicit query class selection, create a custom module:
+
+```php
+use Ray\MediaQuery\MediaQueryBaseModule;
+use Ray\MediaQuery\MediaQueryDbModule;
+use Ray\MediaQuery\DbQueryConfig;
+use Ray\MediaQuery\Queries;
+
+class MyQueryModule extends AbstractModule {
+    protected function configure(): void {
+        $queries = Queries::fromClasses([UserInterface::class, OrderInterface::class]);
+        $this->install(new MediaQueryBaseModule($queries));
+        $this->install(new MediaQueryDbModule(new DbQueryConfig('/path/to/sql')));
+    }
+}
+```
 
 ### Request object injection
 

demo/run.php

@@ -11,26 +11,22 @@
 use Ray\AuraSqlModule\AuraSqlModule;
 use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
-use Ray\MediaQuery\DbQueryConfig;
-use Ray\MediaQuery\MediaQueryModule;
-use Ray\MediaQuery\Queries;
+use Ray\MediaQuery\MediaQuerySqlModule;
 
 $sqlDir = __DIR__ . '/sql';
+$interfaceDir = __DIR__ . '/src';
 $dsn = 'sqlite::memory:';
-$injector = new Injector(new class($sqlDir, $dsn) extends AbstractModule {
+$injector = new Injector(new class($interfaceDir, $sqlDir, $dsn) extends AbstractModule {
 
     public function __construct(
+        private string $interfaceDir,
         private string $sqlDir,
         private string $dsn
     ){}
 
     protected function configure()
     {
-        $queries = Queries::fromClasses([
-            UserAddInterface::class,
-            UserItemInterface::class
-        ]);
-        $this->install(new MediaQueryModule($queries, [new DbQueryConfig($this->sqlDir)]));
+        $this->install(new MediaQuerySqlModule($this->interfaceDir, $this->sqlDir));
         $this->install(new AuraSqlModule($this->dsn));
     }
 });

src/ClassesInDirectories.php

@@ -9,7 +9,6 @@
 use RecursiveIteratorIterator;
 use SplFileInfo;
 
-use function class_exists;
 use function count;
 use function file_get_contents;
 use function interface_exists;
@@ -44,7 +43,7 @@ public static function list(string ...$directories): Generator
 
                 $className = self::getClassFromFile($file->getRealPath());
 
-                if ($className === null || (! class_exists($className) && ! interface_exists($className))) {
+                if ($className === null || ! interface_exists($className)) {
                     continue;
                 }
 
@@ -82,14 +81,33 @@ private static function extractNamespace(array $tokens): string|null
     {
         /** @psalm-suppress MixedAssignment */
         foreach ($tokens as $index => $token) {
-            if (is_array($token) && $token[0] !== T_NAMESPACE) {
+            if (! is_array($token) || $token[0] !== T_NAMESPACE) {
                 continue;
             }
 
+            $namespace = '';
             for ($j = $index + 1, $count = count($tokens); $j < $count; $j++) {
+                // T_NAME_QUALIFIED for namespaces like Foo\Bar\Baz
                 if (isset($tokens[$j][0]) && $tokens[$j][0] === T_NAME_QUALIFIED) {
                     return $tokens[$j][1];
                 }
+
+                // T_STRING for simple namespaces like Demo or parts of namespace
+                if (is_array($tokens[$j]) && $tokens[$j][0] === T_STRING) {
+                    $namespace .= $tokens[$j][1];
+                    continue;
+                }
+
+                // Handle namespace separator
+                if ($tokens[$j] === '\\') {
+                    $namespace .= '\\';
+                    continue;
+                }
+
+                // Stop at semicolon or opening brace
+                if ($tokens[$j] === ';' || $tokens[$j] === '{') {
+                    return $namespace !== '' ? $namespace : null;
+                }
             }
         }