Fix problem with auth in extensions

laravel-doctrine · Sep 24, 2015 · d74d5c8 · d74d5c8
1 parent 0f546a7
commit d74d5c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 36 deletions.
diff --git a/src/Configuration/Manager.php b/src/Configuration/Manager.php
@@ -82,7 +82,7 @@ protected function createDriver($driver, array $settings = [])
         // will check for a custom driver creator, which allows developers to create
         // drivers using their own customized driver creator Closure to create it.
         if (isset($this->customCreators[$driver])) {
-            return $this->callCustomCreator($driver);
+            return $this->callCustomCreator($driver, $settings);
         } elseif (class_exists($class)) {
             return $this->container->make($class)->resolve($settings);
         }
@@ -94,12 +94,13 @@ protected function createDriver($driver, array $settings = [])
      * Call a custom driver creator.
      *
      * @param string $driver
+     * @param array  $settings
      *
      * @return mixed
      */
-    protected function callCustomCreator($driver)
+    protected function callCustomCreator($driver, array $settings = [])
     {
-        return $this->customCreators[$driver]($this->container);
+        return $this->customCreators[$driver]($settings, $this->container);
     }
 
     /**

diff --git a/src/DoctrineServiceProvider.php b/src/DoctrineServiceProvider.php
@@ -6,7 +6,6 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
-use Illuminate\Auth\AuthManager;
 use Illuminate\Support\ServiceProvider;
 use InvalidArgumentException;
 use LaravelDoctrine\ORM\Auth\DoctrineUserProvider;
@@ -31,21 +30,15 @@
 
 class DoctrineServiceProvider extends ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     * @var bool
-     */
-    //protected $defer = true;
-
     /**
      * Boot service provider.
      */
     public function boot()
     {
-        $this->app->make(ExtensionManager::class)->boot();
-
         $this->extendAuthManager();
 
+        $this->app->make(ExtensionManager::class)->boot();
+
         if (!$this->isLumen()) {
             $this->publishes([
                 $this->getConfigPath() => config_path('doctrine.php'),
@@ -253,30 +246,6 @@ protected function registerConsoleCommands()
         ]);
     }
 
-    /**
-     * Get the services provided by the provider.
-     * @return string[]
-     */
-    public function provides()
-    {
-        return [
-            'auth',
-            'em',
-            'registry',
-            'validation.presence',
-            AuthManager::class,
-            EntityManager::class,
-            DoctrineManager::class,
-            ConnectionManager::class,
-            CacheManager::class,
-            MetaDataManager::class,
-            ClassMetadataFactory::class,
-            EntityManagerInterface::class,
-            ExtensionManager::class,
-            ManagerRegistry::class
-        ];
-    }
-
     /**
      * @return bool
      */