Skip to content

refactor(setup): improved installation and setup classes #3932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thorsten merged 6 commits into from
Feb 2, 2026
+3,158 −1,099
Merged

refactor(setup): improved installation and setup classes #3932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e97224
refactor(setup): improved installation and setup classes
thorsten Feb 2, 2026
963077e
fix: corrected review notes
thorsten Feb 2, 2026
aa7fed1
fix: corrected corrupted .htaccess file
thorsten Feb 2, 2026
e699a04
fix: corrected review notes
thorsten Feb 2, 2026
482b783
fix: corrected review notes
thorsten Feb 2, 2026
d7aa857
fix: corrected review notes
thorsten Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions phpmyfaq/src/phpMyFAQ/Instance/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
use phpMyFAQ\Configuration;
use phpMyFAQ\Core\Exception;
use phpMyFAQ\Instance\Database\DriverInterface;
use phpMyFAQ\Setup\Installation\SchemaInstaller;
use phpMyFAQ\Setup\Migration\QueryBuilder\DialectFactory;

/**
* Class Database
Expand Down Expand Up @@ -87,25 +89,23 @@ private function __construct(
/**
* Database factory.
*
* Returns a SchemaInstaller that uses the dialect-agnostic DatabaseSchema.
*
* @param Configuration $configuration phpMyFAQ configuration container
* @param string $type Database management system type
* @throws Exception
*/
public static function factory(Configuration $configuration, string $type): ?DriverInterface
{
if (str_starts_with($type, 'pdo_')) {
$class = 'phpMyFAQ\Instance\Database\Pdo' . ucfirst(substr($type, 4));
} else {
$class = 'phpMyFAQ\Instance\Database\\' . ucfirst($type);
try {
$dialect = DialectFactory::createForType(strtolower($type));
} catch (\InvalidArgumentException) {
throw new Exception('Invalid Database Type: ' . $type);
}

if (class_exists($class)) {
self::$driver = new $class($configuration);

return self::$driver;
}
self::$driver = new SchemaInstaller($configuration, $dialect);

throw new Exception('Invalid Database Type: ' . $type);
return self::$driver;
}

/**
Expand Down
8 changes: 0 additions & 8 deletions phpmyfaq/src/phpMyFAQ/Session/SessionWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,4 @@ public function remove(string $key): mixed
{
return $this->session->remove($key);
}

/**
* Get the underlying Symfony Session instance
*/
public function getSession(): Session
{
return $this->session;
}
}
Loading