fix users naming

sinbadxiii · Sep 24, 2021 · de36406 · de36406
1 parent e08bbce
commit de36406
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/Auth.php b/src/Auth.php
@@ -83,8 +83,8 @@ protected function resolve($name)
 
     public function createProvider($configGuard = null)
     {
-        $driver = sprintf("\\%s\\Providers\\%s%sProvider",
-            __NAMESPACE__, ucfirst($configGuard->provider),
+        $driver = sprintf("\\%s\\Providers\\%sProvider",
+            __NAMESPACE__,
             ucfirst($this->config->providers->{$configGuard->provider}->driver)
         );
 

diff --git a/src/Providers/Users/File/Parser.php → src/Providers/File/Parser.php b/src/Providers/Users/File/Parser.php → src/Providers/File/Parser.php
diff --git a/src/Providers/UsersFileProvider.php → src/Providers/FileProvider.php b/src/Providers/UsersFileProvider.php → src/Providers/FileProvider.php
@@ -4,15 +4,14 @@
 
 use Sinbadxiii\PhalconAuth\Contracts\AuthenticatableInterface;
 use Sinbadxiii\PhalconAuth\Providers\Users\File\Parser;
-use Sinbadxiii\PhalconAuth\Providers\Users\UsersProviderInterface;
 use Sinbadxiii\PhalconAuth\Users\User;
 use Sinbadxiii\PhalconAuth\Users\UsersCollection;
 
 /**
  * Class UsersFileProvider
  * @package Sinbadxiii\PhalconAuth\Providers
  */
-class UsersFileProvider implements UsersProviderInterface
+class FileProvider implements ProviderInterface
 {
     protected UsersCollection $collection;
     private $config;

diff --git a/src/Providers/UsersModelProvider.php → src/Providers/ModelProvider.php b/src/Providers/UsersModelProvider.php → src/Providers/ModelProvider.php
@@ -3,12 +3,11 @@
 namespace Sinbadxiii\PhalconAuth\Providers;
 
 use Sinbadxiii\PhalconAuth\Contracts\AuthenticatableInterface;
-use Sinbadxiii\PhalconAuth\Providers\Users\UsersProviderInterface;
 use Sinbadxiii\PhalconAuth\RememberToken\RememberTokenModel;
 use Phalcon\Di;
 use Phalcon\Security\Random;
 
-class UsersModelProvider implements UsersProviderInterface
+class ModelProvider implements ProviderInterface
 {
     protected $model;
 

diff --git a/...roviders/Users/UsersProviderInterface.php → src/Providers/ProviderInterface.php b/...roviders/Users/UsersProviderInterface.php → src/Providers/ProviderInterface.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sinbadxiii\PhalconAuth\Providers\Users;
+namespace Sinbadxiii\PhalconAuth\Providers;
 
 use Sinbadxiii\PhalconAuth\Contracts\AuthenticatableInterface;
 
-interface UsersProviderInterface
+interface ProviderInterface
 {
     public function retrieveByCredentials(array $credentials);
     public function retrieveById($id);