Use array support class instead of helpers due to depreciation

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -5,6 +5,7 @@
 use RuntimeException;
 use Adldap\AdldapInterface;
 use Illuminate\Auth\Events\Login;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
@@ -90,7 +91,7 @@ protected function makeUserProvider(Hasher $hasher, array $config)
         if (is_a($provider, DatabaseUserProvider::class, $allowString = true)) {
             // We will try to retrieve their model from the config file,
             // otherwise we will try to use the providers config array.
-            $model = Config::get('ldap_auth.model') ?? array_get($config, 'model');
+            $model = Config::get('ldap_auth.model') ?? Arr::get($config, 'model');
 
             if (! $model) {
                 throw new RuntimeException(

src/Commands/Console/Import.php

@@ -6,6 +6,7 @@
 use RuntimeException;
 use Adldap\Models\User;
 use UnexpectedValueException;
+use Illuminate\Support\Arr;
 use Illuminate\Console\Command;
 use Adldap\Laravel\Events\Imported;
 use Illuminate\Support\Facades\Bus;
@@ -334,7 +335,7 @@ protected function determineModel()
     {
         // Retrieve all of the configured authentication providers that
         // use the LDAP driver and have a configured model.
-        $providers = array_where(Config::get('auth.providers'), function ($value, $key) {
+        $providers = Arr::where(Config::get('auth.providers'), function ($value, $key) {
             return $value['driver'] == 'ldap' && array_key_exists('model', $value);
         });
 

src/Commands/SyncPassword.php

@@ -3,6 +3,7 @@
 namespace Adldap\Laravel\Commands;
 
 use Illuminate\Support\Str;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Database\Eloquent\Model;
@@ -109,7 +110,7 @@ protected function hasPasswordColumn() : bool
      */
     protected function password()
     {
-        return array_get($this->credentials, 'password');
+        return Arr::get($this->credentials, 'password');
     }
 
     /**

src/Resolvers/UserResolver.php

@@ -6,6 +6,7 @@
 use Adldap\Models\User;
 use Adldap\Query\Builder;
 use Adldap\AdldapInterface;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
@@ -140,20 +141,8 @@ public function query() : Builder
 
         $query->select($selects);
 
-        $scopes = Config::get('ldap_auth.scopes', []);
-
-        if (is_array($scopes)) {
-            foreach ($scopes as $scope) {
-                // Here we will use Laravel's IoC container to construct our scope.
-                // This allows us to utilize any Laravel dependencies in
-                // the scopes constructor that may be needed.
-
-                /** @var \Adldap\Laravel\Scopes\ScopeInterface $scope */
-                $scope = app($scope);
-
-                // With the scope constructed, we can apply it to our query.
-                $scope->apply($query);
-            }
+        foreach ($this->getQueryScopes() as $scope) {
+            app($scope)->apply($query);
         }
 
         return $query;
@@ -200,7 +189,7 @@ public function getDatabaseIdColumn() : string
      */
     protected function getPasswordFromCredentials($credentials)
     {
-        return array_get($credentials, 'password');
+        return Arr::get($credentials, 'password');
     }
 
     /**
@@ -234,4 +223,14 @@ protected function getLdapAuthConnectionName()
     {
         return Config::get('ldap_auth.connection', 'default');
     }
+
+    /**
+     * Returns the configured query scopes.
+     *
+     * @return array
+     */
+    protected function getQueryScopes()
+    {
+        return Config::get('ldap_auth.scopes', []);
+    }
 }