minor improvements and documentation fixes

src/Grant/AbstractGrant.php

@@ -11,7 +11,7 @@
 
 namespace League\OAuth2\Server\Grant;
 
-use League\Event\EmitterInterface;
+use League\Event\EmitterAwareTrait;
 use League\Event\Event;
 use League\OAuth2\Server\Entities\AccessTokenEntity;
 use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface;
@@ -29,6 +29,8 @@ use Psr\Http\Message\ServerRequestInterface;
  */
 abstract class AbstractGrant implements GrantTypeInterface
 {
+    use EmitterAwareTrait;
+
     const SCOPE_DELIMITER_STRING = ' ';
 
     /**
@@ -60,11 +62,6 @@ abstract class AbstractGrant implements GrantTypeInterface
      */
     protected $accessTokenRepository;
 
-    /**
-     * @var \League\Event\Emitter
-     */
-    protected $emitter;
-
     /**
      * @var ScopeRepositoryInterface
      */
@@ -120,14 +117,6 @@ abstract class AbstractGrant implements GrantTypeInterface
         $this->pathToPublicKey = $pathToPublicKey;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function setEmitter(EmitterInterface $emitter)
-    {
-        $this->emitter = $emitter;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -179,7 +168,7 @@ abstract class AbstractGrant implements GrantTypeInterface
         );
 
         if (!$client instanceof ClientEntityInterface) {
-            $this->emitter->emit(new Event('client.authentication.failed', $request));
+            $this->getEmitter()->emit(new Event('client.authentication.failed', $request));
 
             throw OAuthServerException::invalidClient();
         }