✨ SettingsContainerInterface

Author: codemasher

composer.json

@@ -22,14 +22,16 @@
 	},
 	"require": {
 		"php": "^7.2",
-		"chillerlan/php-traits": "^2.0",
+		"chillerlan/php-settings-container": "^1.0",
 		"psr/simple-cache": "^1.0",
 		"psr/log": "^1.0"
 	},
 	"require-dev": {
+		"chillerlan/php-dotenv": "^1.0",
+		"chillerlan/php-traits": "^2.0",
 		"chillerlan/php-cache": "^2.0",
 		"chillerlan/php-log": "^2.0",
-		"phpunit/phpunit": "^7.3"
+		"phpunit/phpunit": "^7.4"
 	},
 	"autoload": {
 		"psr-4": {

src/DatabaseAbstract.php

@@ -15,9 +15,7 @@
 use chillerlan\Database\{
 	Drivers\DriverInterface, Query\QueryBuilder
 };
-use chillerlan\Traits\{
-	ImmutableSettingsInterface
-};
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\{
 	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger
 };
@@ -49,13 +47,13 @@ abstract class DatabaseAbstract implements LoggerAwareInterface{
 	/**
 	 * Database constructor.
 	 *
-	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $logger
 	 *
 	 * @throws \chillerlan\Database\DatabaseException
 	 */
-	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		$this->options = $options;
 		$this->cache   = $cache;
 

src/DatabaseOptions.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\Database;
 
-use chillerlan\Traits\ImmutableSettingsAbstract;
+use chillerlan\Settings\SettingsContainerAbstract;
 
 /**
  * @property string $driver
@@ -41,6 +41,6 @@
  * @property string $cachekey_hash_algo
  * @property string $storage_path
  */
-class DatabaseOptions extends ImmutableSettingsAbstract{
+class DatabaseOptions extends SettingsContainerAbstract{
 	use DatabaseOptionsTrait;
 }

src/Drivers/DriverAbstract.php

@@ -15,7 +15,7 @@
 use chillerlan\Database\{
 	Dialects\Dialect, Result
 };
-use chillerlan\Traits\ImmutableSettingsInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\{
 	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface
 };
@@ -60,11 +60,11 @@ abstract class DriverAbstract implements DriverInterface, LoggerAwareInterface{
 	/**
 	 * Constructor.
 	 *
-	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $logger
 	 */
-	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		$this->options = $options;
 		$this->cache   = $cache;
 		$this->logger  = $logger;

src/Drivers/DriverInterface.php

@@ -13,7 +13,7 @@
 namespace chillerlan\Database\Drivers;
 
 use chillerlan\Database\Dialects\Dialect;
-use chillerlan\Traits\ImmutableSettingsInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -22,11 +22,11 @@ interface DriverInterface{
 	/**
 	 * Constructor.
 	 *
-	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null  $cache
 	 * @param \Psr\Log\LoggerInterface|null         $logger
 	 */
-	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null);
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null);
 
 	/**
 	 * Establishes a database connection and returns the connection object

src/Drivers/MSSqlSrvPDO.php

@@ -13,7 +13,7 @@
 namespace chillerlan\Database\Drivers;
 
 use chillerlan\Database\Dialects\MSSQL;
-use chillerlan\Traits\ImmutableSettingsInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 use PDO;
 use Psr\{
 	Log\LoggerInterface, SimpleCache\CacheInterface
@@ -30,11 +30,11 @@ class MSSqlSrvPDO extends PDODriverAbstract{
 	/**
 	 * MSSqlSrvPDO constructor.
 	 *
-	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $log
 	 */
-	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $log = null){
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache = null, LoggerInterface $log = null){
 		unset($this->pdo_options[PDO::ATTR_EMULATE_PREPARES]);
 
 		// @todo

src/Dumper.php

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