Merge pull request #15 from IanSimpson/logger-fixes2

Allow overriding logger from subclasses of OAuthController
IanSimpson · Oct 15, 2018 · 09d5344 · 09d5344
2 parents 0d2d7ab + d5b3141
commit 09d5344
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -6,6 +6,5 @@ Director:
   rules:
     'oauth': 'IanSimpson\OauthServerController'
 Injector:
-  Logger:
-    class: 'Logger'
+  OAuthLogger:
     factory: 'IanSimpson\LogFactory'
diff --git a/code/OAuth.php b/code/OAuth.php
@@ -33,7 +33,7 @@ class OauthServerController extends \Controller
     /**
      * @var LoggerInterface
      */
-    private $logger;
+    protected $logger;
 
     /**
      * @var Authenticator classes on which to show an athentication greeting message.
@@ -102,7 +102,7 @@ public function __construct()
             new \DateInterval('PT1H') // new access tokens will expire after 1 hour
         );
 
-        $this->logger = Injector::inst()->get('Logger');
+        $this->logger = Injector::inst()->get('OAuthLogger');
 
         parent::__construct();
     }

diff --git a/tests/OauthServerControllerTest.php b/tests/OauthServerControllerTest.php
@@ -51,7 +51,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        Injector::inst()->registerService($this->logger, 'Logger');
+        Injector::inst()->registerService($this->logger, 'OAuthLogger');
     }
 
     public function tearDown()