DatabaseOptions -> ContainerInterface

Author: codemasher

src/DatabaseAbstract.php

@@ -16,7 +16,7 @@
 	Drivers\DriverInterface, Query\QueryBuilder
 };
 use chillerlan\{
-	Logger\LogTrait, Traits\ClassLoader
+	Logger\LogTrait, Traits\ClassLoader, Traits\ContainerInterface
 };
 use Psr\{
 	Log\LoggerAwareInterface, Log\LoggerInterface, SimpleCache\CacheInterface
@@ -48,11 +48,11 @@ abstract class DatabaseAbstract implements LoggerAwareInterface{
 	/**
 	 * Database constructor.
 	 *
-	 * @param \chillerlan\Database\DatabaseOptions $options
+	 * @param \chillerlan\Traits\ContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $logger
 	 */
-	public function __construct(DatabaseOptions $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		$this->options = $options;
 		$this->cache   = $cache;
 		$this->driver  = $this->loadClass($this->options->driver, DriverInterface::class, $this->options, $this->cache, $this->log);

src/Drivers/DriverAbstract.php

@@ -13,9 +13,10 @@
 namespace chillerlan\Database\Drivers;
 
 use chillerlan\Database\{
-	DatabaseOptions, Dialects\Dialect, Result
+	Dialects\Dialect, Result
 };
 use chillerlan\Logger\LogTrait;
+use chillerlan\Traits\ContainerInterface;
 use Psr\{
 	Log\LoggerAwareInterface, Log\LoggerInterface, SimpleCache\CacheInterface
 };
@@ -59,11 +60,11 @@ abstract class DriverAbstract implements DriverInterface, LoggerAwareInterface{
 	/**
 	 * Constructor.
 	 *
-	 * @param \chillerlan\Database\DatabaseOptions $options
+	 * @param \chillerlan\Traits\ContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $logger
 	 */
-	public function __construct(DatabaseOptions $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		$this->options = $options;
 		$this->cache   = $cache;
 		$this->log     = $logger;

src/Drivers/DriverInterface.php

@@ -15,6 +15,7 @@
 use chillerlan\Database\{
 	DatabaseOptions, Dialects\Dialect
 };
+use chillerlan\Traits\ContainerInterface;
 use Psr\{
 	Log\LoggerInterface, SimpleCache\CacheInterface
 };
@@ -24,11 +25,11 @@ interface DriverInterface{
 	/**
 	 * Constructor.
 	 *
-	 * @param \chillerlan\Database\DatabaseOptions $options
-	 * @param \Psr\SimpleCache\CacheInterface|null $cache
-	 * @param \Psr\Log\LoggerInterface|null        $logger
+	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \Psr\SimpleCache\CacheInterface|null  $cache
+	 * @param \Psr\Log\LoggerInterface|null         $logger
 	 */
-	public function __construct(DatabaseOptions $options, CacheInterface $cache = null, LoggerInterface $logger = null);
+	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null);
 
 	/**
 	 * Establishes a database connection and returns the connection object

src/Dumper.php

@@ -12,6 +12,7 @@
 
 namespace chillerlan\Database;
 
+use chillerlan\Traits\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -27,7 +28,7 @@ class Dumper extends DatabaseAbstract{
 	 */
 	protected $dialect;
 
-	public function __construct(DatabaseOptions $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		parent::__construct($options, $cache, $logger);
 
 		$this->dialect = $this->driver->getDialect();