bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Revert node.config.php into Config table

Browse source
This commit is contained in:
Philipp Holzer 2023-02-05 00:15:01 +01:00
commit 513ef03421
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
27 changed files with 425 additions and 829 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Database/Database.php
View file

@ -36,6 +36,7 @@ use PDO;
use PDOException;
use PDOStatement;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
/**
* This class is for the low level database stuff that does driver specific things.
@ -54,15 +55,15 @@ class Database
/**
* @var IManageConfigValues
*/
protected $config;
protected $config = null;
/**
* @var Profiler
*/
protected $profiler;
protected $profiler = null;
/**
* @var LoggerInterface
*/
protected $logger;
protected $logger = null;
protected $server_info = '';
/** @var PDO|mysqli */
protected $connection;
@ -80,18 +81,36 @@ class Database
/** @var ViewDefinition */
protected $viewDefinition;
public function __construct(IManageConfigValues $config, Profiler $profiler, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition, LoggerInterface $logger)
public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
{
// We are storing these values for being able to perform a reconnect
$this->config = $config;
$this->profiler = $profiler;
$this->dbaDefinition = $dbaDefinition;
$this->viewDefinition = $viewDefinition;
$this->logger = $logger;
// Use dummy values - necessary for the first factory call of the logger itself
$this->logger = new NullLogger();
$this->profiler = new Profiler($config);
$this->connect();
}
/**
* @param IManageConfigValues $config
* @param Profiler $profiler
* @param LoggerInterface $logger
*
* @return void
*
* @todo Make this method obsolet - use a clean pattern instead ...
*/
public function setDependency(IManageConfigValues $config, Profiler $profiler, LoggerInterface $logger)
{
$this->logger = $logger;
$this->profiler = $profiler;
$this->config = $config;
}
/**
* Tries to connect to database
*