use chillerlan\Traits\DotEnv;

cli/common.php

@@ -13,8 +13,8 @@
 require_once __DIR__.'/functions.php';
 
 use chillerlan\Database\{Connection, Options, Drivers\PDO\PDOMySQLDriver, Query\Dialects\MySQLQueryBuilder};
-use Dotenv\Dotenv;
 use chillerlan\SimpleCache\{Cache, Drivers\MemoryCacheDriver};
+use chillerlan\Traits\DotEnv;
 
 if(!is_cli()){
 	throw new \Exception('no way, buddy.');
@@ -23,15 +23,15 @@
 date_default_timezone_set('UTC');
 mb_internal_encoding('UTF-8');
 
-(new Dotenv(__DIR__.'/../config', '.env'))->load();
+$env = (new DotEnv(__DIR__.'/../config', '.env'))->load();
 
 $db = new Connection(new Options([
 	'driver'       => PDOMySQLDriver::class,
 	'querybuilder' => MySQLQueryBuilder::class,
-	'host'     => getenv('DB_HOST'),
-	'port'     => getenv('DB_PORT'),
-	'database' => getenv('DB_DATABASE'),
-	'username' => getenv('DB_USERNAME'),
-	'password' => getenv('DB_PASSWORD'),
+	'host'     => $env->get('DB_HOST'),
+	'port'     => $env->get('DB_PORT'),
+	'database' => $env->get('DB_DATABASE'),
+	'username' => $env->get('DB_USERNAME'),
+	'password' => $env->get('DB_PASSWORD'),
 ]), new Cache(new MemoryCacheDriver));
 

composer.json

@@ -17,10 +17,10 @@
 		"php": ">=7.0.7",
 		"chillerlan/database": "dev-master",
 		"chillerlan/php-curl": "dev-master",
-		"vlucas/phpdotenv": "2.*"
+		"chillerlan/php-traits": "1.0.*"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "6.3.*"
+		"phpunit/phpunit": "6.4.*"
 	},
 	"autoload": {
 		"files": [

public/itemsearch.php

@@ -12,23 +12,23 @@
 
 use chillerlan\Database\{Connection, Options, Drivers\Native\MySQLiDriver, Query\Dialects\MySQLQueryBuilder};
 use chillerlan\SimpleCache\{Cache, Drivers\MemoryCacheDriver};
-use Dotenv\Dotenv;
+use chillerlan\Traits\DotEnv;
 
 date_default_timezone_set('UTC');
 mb_internal_encoding('UTF-8');
 
-(new Dotenv(__DIR__.'/../config', '.env'))->load();
+$env = (new DotEnv(__DIR__.'/../config', '.env'))->load();
 
 $cache = new Cache(new MemoryCacheDriver); // dummy, use redis or memcached instead
 
 $db = new Connection(new Options([
 	'driver'       => MySQLiDriver::class,
 	'querybuilder' => MySQLQueryBuilder::class,
-	'host'     => getenv('DB_HOST'),
-	'port'     => getenv('DB_PORT'),
-	'database' => getenv('DB_DATABASE'),
-	'username' => getenv('DB_USERNAME'),
-	'password' => getenv('DB_PASSWORD'),
+	'host'     => $env->get('DB_HOST'),
+	'port'     => $env->get('DB_PORT'),
+	'database' => $env->get('DB_DATABASE'),
+	'username' => $env->get('DB_USERNAME'),
+	'password' => $env->get('DB_PASSWORD'),
 ]), $cache);