Merge pull request #13 from TomHAnderson/hotfix/entity-namespaces

Hotfix/entity namespaces
API-Skeletons · Apr 27, 2015 · 54573dc · 54573dc
2 parents 656f788 + d76c302
commit 54573dc
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 109 deletions.
diff --git a/src/Entity/AccessToken.php b/src/Entity/AccessToken.php
@@ -2,8 +2,8 @@
 
 namespace ZF\OAuth2\Doctrine\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Zend\Stdlib\ArraySerializableInterface;
+use Doctrine\Common\Collections\ArrayCollection;
 
 /**
  * AccessToken
@@ -26,7 +26,7 @@ class AccessToken implements ArraySerializableInterface
     private $id;
 
     /**
-     * @var \ZF\OAuth2\Doctrine\Entity\Client
+     * @var Client
      */
     private $client;
 
@@ -36,6 +36,7 @@ class AccessToken implements ArraySerializableInterface
     private $scope;
 
     /**
+     * UserInterface
      * @var object
      */
     private $user;
@@ -45,7 +46,7 @@ class AccessToken implements ArraySerializableInterface
      */
     public function __construct()
     {
-        $this->scope = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->scope = new ArrayCollection();
     }
 
     public function getArrayCopy()
@@ -156,10 +157,10 @@ public function getId()
     /**
      * Set client
      *
-     * @param \ZF\OAuth2\Doctrine\Entity\Client $client
+     * @param Client $client
      * @return AccessToken
      */
-    public function setClient(\ZF\OAuth2\Doctrine\Entity\Client $client)
+    public function setClient(Client $client)
     {
         $this->client = $client;
 
@@ -169,7 +170,7 @@ public function setClient(\ZF\OAuth2\Doctrine\Entity\Client $client)
     /**
      * Get client
      *
-     * @return \ZF\OAuth2\Doctrine\Entity\Client
+     * @return Client
      */
     public function getClient()
     {
@@ -179,10 +180,10 @@ public function getClient()
     /**
      * Add scope
      *
-     * @param \ZF\OAuth2\Doctrine\Entity\Scope $scope
+     * @param Scope $scope
      * @return AccessToken
      */
-    public function addScope(\ZF\OAuth2\Doctrine\Entity\Scope $scope)
+    public function addScope(Scope $scope)
     {
         $this->scope[] = $scope;
 
@@ -192,9 +193,9 @@ public function addScope(\ZF\OAuth2\Doctrine\Entity\Scope $scope)
     /**
      * Remove scope
      *
-     * @param \ZF\OAuth2\Doctrine\Entity\Scope $scope
+     * @param Scope $scope
      */
-    public function removeScope(\ZF\OAuth2\Doctrine\Entity\Scope $scope)
+    public function removeScope(Scope $scope)
     {
         $this->scope->removeElement($scope);
     }
@@ -215,7 +216,7 @@ public function getScope()
      * @param $user
      * @return AuthorizationCode
      */
-    public function setUser($user)
+    public function setUser(UserInterface $user)
     {
         $this->user = $user;
 

diff --git a/src/Entity/AuthorizationCode.php b/src/Entity/AuthorizationCode.php
@@ -2,7 +2,7 @@
 
 namespace ZF\OAuth2\Doctrine\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
 
 /**
  * AuthorizationCode
@@ -35,7 +35,7 @@ class AuthorizationCode
     private $id;
 
     /**
-     * @var \ZF\OAuth2\Doctrine\Entity\Client
+     * @var Client
      */
     private $client;
 
@@ -45,6 +45,7 @@ class AuthorizationCode
     private $scope;
 
     /**
+     * UserInterface
      * @var object
      */
     private $user;
@@ -54,7 +55,7 @@ class AuthorizationCode
      */
     public function __construct()
     {
-        $this->scope = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->scope = new ArrayCollection();
     }
 
     public function getArrayCopy()
@@ -217,10 +218,10 @@ public function getId()
     /**
      * Set client
      *
-     * @param \ZF\OAuth2\Doctrine\Entity\Client $client
+     * @param Client $client
      * @return AuthorizationCode
      */
-    public function setClient(\ZF\OAuth2\Doctrine\Entity\Client $client)
+    public function setClient(Client $client)
     {
         $this->client = $client;
 
@@ -230,7 +231,7 @@ public function setClient(\ZF\OAuth2\Doctrine\Entity\Client $client)
     /**
      * Get client
      *
-     * @return \ZF\OAuth2\Doctrine\Entity\Client
+     * @return Client
      */
     public function getClient()
     {
@@ -240,10 +241,10 @@ public function getClient()
     /**
      * Add scope
      *
-     * @param \ZF\OAuth2\Doctrine\Entity\Scope $scope
+     * @param Scope $scope
      * @return AuthorizationCode
      */
-    public function addScope(\ZF\OAuth2\Doctrine\Entity\Scope $scope)
+    public function addScope(Scope $scope)
     {
         $this->scope[] = $scope;
 
@@ -253,9 +254,9 @@ public function addScope(\ZF\OAuth2\Doctrine\Entity\Scope $scope)
     /**
      * Remove scope
      *
-     * @param \ZF\OAuth2\Doctrine\Entity\Scope $scope
+     * @param Scope $scope
      */
-    public function removeScope(\ZF\OAuth2\Doctrine\Entity\Scope $scope)
+    public function removeScope(Scope $scope)
     {
         $this->scope->removeElement($scope);
     }
@@ -276,7 +277,7 @@ public function getScope()
      * @param $user
      * @return AuthorizationCode
      */
-    public function setUser($user)
+    public function setUser(UserInterface $user)
     {
         $this->user = $user;