diff --git a/composer.json b/composer.json index 78acd41..1717f85 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,6 @@ "illuminate/contracts": ">=5.1", "illuminate/support": ">=5.1", "illuminate/validation": ">=5.1", - "foxxmd/php-utilities": "dev-master", "orchestra/testbench": "~3.1" }, "require-dev": { diff --git a/src/AgileDataServiceProvider.php b/src/AgileDataServiceProvider.php index 58bfc14..7e6a326 100644 --- a/src/AgileDataServiceProvider.php +++ b/src/AgileDataServiceProvider.php @@ -3,7 +3,7 @@ namespace atk4\LaravelAD; use atk4\data\Persistence; -use FoxxMD\Utilities\ArrayUtil; +use Illuminate\Support\Arr; use Illuminate\Support\ServiceProvider; class AgileDataServiceProvider extends ServiceProvider @@ -37,6 +37,9 @@ protected function registerPersistence() switch ($connectionDetails['driver']) { case 'mysql': $dsn .= "host={$connectionDetails['host']};dbname={$connectionDetails['database']}"; + if (!empty($connectionDetails['port'])) { + $dsn .= ';port='.$connectionDetails['port']; + } break; case 'sqlite': $dsn .= "{$connectionDetails['database']}"; @@ -45,7 +48,7 @@ protected function registerPersistence() throw new \Exception('Driver must mysql or sqlite'); } - return Persistence::connect($dsn, ArrayUtil::get($connectionDetails['username']), ArrayUtil::get($connectionDetails['password'])); + return Persistence::connect($dsn, Arr::get($connectionDetails, 'username'), Arr::get($connectionDetails, 'password')); }); $this->app->alias('agiledata', Persistence::class);