Author: codemasher

composer.json

@@ -23,14 +23,14 @@
 	"require": {
 		"php": "^7.2",
 		"chillerlan/php-settings-container": "^1.0",
+		"chillerlan/php-traits": "^3.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",
+		"chillerlan/php-cache": "dev-master",
+		"chillerlan/php-log": "^3.0",
 		"phpunit/phpunit": "^7.4"
 	},
 	"autoload": {

tests/DatabaseTest.php

@@ -22,13 +22,11 @@
 	DriverInterface, FirebirdPDO, MSSqlSrv, MSSqlSrvPDO, MySQLiDrv, MySQLPDO, PostgreSQL, PostgreSQLPDO, SQLitePDO
 };
 use chillerlan\Database\Query\QueryBuilder;
+use chillerlan\DotEnv\DotEnv;
 use chillerlan\Logger\{
 	Log, LogOptions, Output\LogOutputAbstract
 };
-use chillerlan\SimpleCache\{
-	Cache, Drivers\MemoryCacheDriver
-};
-use chillerlan\Traits\DotEnv;
+use chillerlan\SimpleCache\MemoryCache;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
 use ReflectionClass, ReflectionMethod;
@@ -81,7 +79,7 @@ class DatabaseTest extends TestCase{
 	protected $dialect;
 
 	/**
-	 * @var \chillerlan\Traits\DotEnv
+	 * @var \chillerlan\DotEnv\DotEnv
 	 */
 	protected $env;
 
@@ -174,15 +172,15 @@ protected function dbInstance(string $driver, string $env_prefix, bool $skip_on_
 
 		$this->options = new DatabaseOptions(array_merge([
 			'driver'   => $driver,
-			'host'     => $this->env->get($env_prefix.'_HOST'),
-			'port'     => $this->env->get($env_prefix.'_PORT'),
-			'socket'   => $this->env->get($env_prefix.'_SOCKET'),
-			'database' => $this->env->get($env_prefix.'_DATABASE'),
-			'username' => $this->env->get($env_prefix.'_USERNAME'),
-			'password' => $this->env->get($env_prefix.'_PASSWORD'),
+			'host'     => $this->env->{$env_prefix.'_HOST'},
+			'port'     => $this->env->{$env_prefix.'_PORT'},
+			'socket'   => $this->env->{$env_prefix.'_SOCKET'},
+			'database' => $this->env->{$env_prefix.'_DATABASE'},
+			'username' => $this->env->{$env_prefix.'_USERNAME'},
+			'password' => $this->env->{$env_prefix.'_PASSWORD'},
 		], $options));
 
-		$this->cache  = new Cache(new MemoryCacheDriver);
+		$this->cache  = new MemoryCache;
 		$this->db     = new Database($this->options, $cached ? $this->cache : null);
 		$this->db->setLogger($this->logger);