No longer store auth guard. (#37)

* No longer store auth guard.

* Remove unused constructor.

* Remove unused constructor.

* Add getAuth() method.

Get auth manager with getter rather than directly.

* Fix phpdoc formatting.

* Minor formatting fix.

* Pass the current user to function

Implement current master branch's behavior.

* Fix code format and phpdoc return type

Use the contract that 'auth' is bound to instead of the default resolved manager.

* Directly return guard instead of auth

Author: garret-gunter

src/Blameable/BlameableExtension.php

@@ -6,25 +6,12 @@
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Gedmo\Blameable\BlameableListener;
-use Illuminate\Contracts\Auth\Guard;
 use LaravelDoctrine\Extensions\GedmoExtension;
 use LaravelDoctrine\Extensions\ResolveUserDecorator;
 
 class BlameableExtension extends GedmoExtension
 {
-    /**
-     * @var Guard
-     */
-    protected $auth;
-
-    /**
-     * @param Guard $auth
-     */
-    public function __construct(Guard $auth)
-    {
-        $this->auth = $auth;
-    }
-
+    
     /**
      * @param EventManager           $manager
      * @param EntityManagerInterface $em
@@ -34,7 +21,6 @@ public function addSubscribers(EventManager $manager, EntityManagerInterface $em
     {
         $subscriber = new ResolveUserDecorator(
             new BlameableListener(),
-            $this->auth,
             'setUserValue'
         );
 

src/Loggable/LoggableExtension.php

@@ -6,24 +6,11 @@
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Gedmo\Loggable\LoggableListener;
-use Illuminate\Contracts\Auth\Guard;
 use LaravelDoctrine\Extensions\GedmoExtension;
 use LaravelDoctrine\Extensions\ResolveUserDecorator;
 
 class LoggableExtension extends GedmoExtension
 {
-    /**
-     * @var Guard
-     */
-    protected $auth;
-
-    /**
-     * @param Guard $auth
-     */
-    public function __construct(Guard $auth)
-    {
-        $this->auth = $auth;
-    }
 
     /**
      * @param EventManager           $manager
@@ -34,7 +21,6 @@ public function addSubscribers(EventManager $manager, EntityManagerInterface $em
     {
         $subscriber = new ResolveUserDecorator(
             new LoggableListener,
-            $this->auth,
             'setUsername'
         );
 

src/ResolveUserDecorator.php

@@ -3,7 +3,6 @@
 namespace LaravelDoctrine\Extensions;
 
 use Doctrine\Common\EventSubscriber;
-use Illuminate\Contracts\Auth\Guard;
 
 class ResolveUserDecorator implements EventSubscriber
 {
@@ -17,21 +16,14 @@ class ResolveUserDecorator implements EventSubscriber
      */
     private $userSetterMethod;
 
-    /**
-     * @var Guard
-     */
-    private $auth;
-
     /**
      * @param EventSubscriber $wrapped
-     * @param Guard           $auth
      * @param string          $userSetterMethod
      */
-    public function __construct(EventSubscriber $wrapped, Guard $auth, $userSetterMethod)
+    public function __construct(EventSubscriber $wrapped, $userSetterMethod)
     {
         $this->wrapped          = $wrapped;
         $this->userSetterMethod = $userSetterMethod;
-        $this->auth             = $auth;
     }
 
     /**
@@ -67,8 +59,8 @@ public function setAnnotationReader($reader)
      */
     public function __call($method, $params)
     {
-        if ($this->auth->check()) {
-            call_user_func([$this->wrapped, $this->userSetterMethod], $this->auth->user());
+        if ($this->getGuard()->check()) {
+            call_user_func([$this->wrapped, $this->userSetterMethod], $this->getGuard()->user());
         }
 
         return call_user_func_array([$this->wrapped, $method], $params);
@@ -96,4 +88,14 @@ public function getEventSubscriberClass()
     {
         return get_class($this->wrapped);
     }
+    
+    /**
+    * Get current Auth manager.
+    *
+    * @return \Illuminate\Contracts\Auth\Guard
+    */
+    protected function getGuard()
+    {
+    	return app('auth')->guard();
+    }
 }