Finished renaming of classes to remove the OAuth prefix

Document/AccessToken.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace FOS\OAuthServerBundle\Document;
+
+use FOS\OAuthServerBundle\Model\AccessToken as BaseAccessToken;
+
+class AccessToken extends BaseAccessToken
+{
+}

Document/AccessTokenManager.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace FOS\OAuthServerBundle\Document;
+
+use FOS\OAuthServerBundle\Model\AccessTokenManagerInterface;
+
+class AccessTokenManager extends TokenManager implements AccessTokenManagerInterface
+{
+}
+

Document/OAuth2AuthCode.php → Document/AuthCode.php

@@ -5,12 +5,12 @@
 
 namespace FOS\OAuthServerBundle\Document;
 
-use FOS\OAuthServerBundle\Model\OAuth2AuthCode as BaseOAuth2AuthCode;
+use FOS\OAuthServerBundle\Model\AuthCode as BaseAuthCode;
 
 /**
  * @author Richard Fullmer <[email protected]>
  */
-class OAuth2AuthCode extends BaseOAuth2AuthCode
+class AuthCode extends BaseAuthCode
 {
 
 }

Document/OAuth2AuthCodeManager.php → Document/AuthCodeManager.php

@@ -2,11 +2,11 @@
 
 namespace FOS\OAuthServerBundle\Document;
 
-use FOS\OAuthServerBundle\Model\OAuth2AuthCodeManager as BaseOAuth2AuthCodeManager;
-use FOS\OAuthServerBundle\Model\OAuth2AuthCodeInterface;
+use FOS\OAuthServerBundle\Model\AuthCodeManager as BaseAuthCodeManager;
+use FOS\OAuthServerBundle\Model\AuthCodeInterface;
 use Doctrine\ODM\MongoDB\DocumentManager;
 
-class OAuth2AuthCodeManager extends BaseOAuth2AuthCodeManager
+class AuthCodeManager extends BaseAuthCodeManager
 {
     protected $dm;
 
@@ -34,14 +34,14 @@ function getClass()
      */
     function findAuthCodeBy(array $criteria)
     {
-        return $this->dm->findOneBy($criteria);
+        return $this->repository->findOneBy($criteria);
     }
 
     /**
-     * @param OAuth2AuthCodeInterface $authCode
-     * @param bool $andFlush
+     * @param AuthCodeInterface $authCode
+     * @param boolean $andFlush
      */
-    function updateAuthCode(OAuth2AuthCodeInterface $authCode, $andFlush = true)
+    function updateAuthCode(AuthCodeInterface $authCode, $andFlush = true)
     {
         $this->dm->persist($authCode);
 
@@ -50,7 +50,7 @@ function updateAuthCode(OAuth2AuthCodeInterface $authCode, $andFlush = true)
         }
     }
 
-    function deleteAuthCode(OAuth2AuthCodeInterface $authCode)
+    function deleteAuthCode(AuthCodeInterface $authCode)
     {
         $this->dm->remove($authCode);
         $this->dm->flush();

Document/Client.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace FOS\OAuthServerBundle\Document;
+
+use FOS\OAuthServerBundle\Model\Client as BaseClient;
+
+class Client extends BaseClient
+{
+}
+

Document/OAuth2ClientManager.php → Document/ClientManager.php

@@ -2,11 +2,11 @@
 
 namespace FOS\OAuthServerBundle\Document;
 
-use FOS\OAuthServerBundle\Model\OAuth2ClientManager as BaseOAuth2ClientManager;
+use FOS\OAuthServerBundle\Model\ClientManager as BaseClientManager;
 use Doctrine\ODM\MongoDB\DocumentManager;
-use FOS\OAuthServerBundle\Model\OAuth2ClientInterface;
+use FOS\OAuthServerBundle\Model\ClientInterface;
 
-class OAuth2ClientManager extends BaseOAuth2ClientManager
+class ClientManager extends BaseClientManager
 {
     protected $dm;
 
@@ -31,16 +31,16 @@ public function findClientBy(array $criteria)
         return $this->repository->findOneBy($criteria);
     }
 
-    public function updateClient(OAuth2ClientInterface $client, $andFlush = true)
+    public function updateClient(ClientInterface $client, $andFlush = true)
     {
         $this->dm->persist($client);
-        
+
         if ($andFlush) {
             $this->dm->flush();
         }
     }
 
-    public function deleteClient(OAuth2ClientInterface $client)
+    public function deleteClient(ClientInterface $client)
     {
         $this->dm->remove($client);
         $this->dm->flush();

Document/OAuth2TokenManager.php → Document/TokenManager.php

@@ -2,11 +2,11 @@
 
 namespace FOS\OAuthServerBundle\Document;
 
-use FOS\OAuthServerBundle\Model\OAuth2TokenManager as BaseOAuth2TokenManager;
+use FOS\OAuthServerBundle\Model\TokenManager as BaseTokenManager;
 use Doctrine\ODM\MongoDB\DocumentManager;
-use FOS\OAuthServerBundle\Model\OAuth2TokenInterface;
+use FOS\OAuthServerBundle\Model\TokenInterface;
 
-class OAuth2TokenManager extends BaseOAuth2TokenManager
+class TokenManager extends BaseTokenManager
 {
     protected $dm;
 
@@ -31,7 +31,7 @@ public function findTokenBy(array $criteria)
         return $this->repository->findOneBy($criteria);
     }
 
-    public function updateToken(OAuth2TokenInterface $token, $andFlush = true)
+    public function updateToken(TokenInterface $token, $andFlush = true)
     {
         $this->dm->persist($token);
 
@@ -40,7 +40,7 @@ public function updateToken(OAuth2TokenInterface $token, $andFlush = true)
         }
     }
 
-    public function deleteToken(OAuth2TokenInterface $token)
+    public function deleteToken(TokenInterface $token)
     {
         $this->dm->remove($token);
         $this->dm->flush();

Entity/AccessTokenManager.php

@@ -11,9 +11,8 @@
 
 namespace FOS\OAuthServerBundle\Entity;
 
-use FOS\OAuthServerBundle\Entity\OAuthTokenManager;
-use FOS\OAuthServerBundle\Model\OAuthAccessTokenManagerInterface;
+use FOS\OAuthServerBundle\Model\AccessTokenManagerInterface;
 
-class OAuthAccessTokenManager extends OAuthTokenManager implements OAuthAccessTokenManagerInterface
+class OAuthAccessTokenManager extends TokenManager implements AccessTokenManagerInterface
 {
 }

Entity/AuthCode.php

@@ -11,8 +11,8 @@
 
 namespace FOS\OAuthServerBundle\Entity;
 
-use FOS\OAuthServerBundle\Model\OAuthAuthCode as BaseOAuthAuthCode;
+use FOS\OAuthServerBundle\Model\AuthCode as BaseAuthCode;
 
-class OAuthAuthCode extends BaseOAuthAuthCode
+class AuthCode extends BaseAuthCode
 {
 }

Entity/AuthCodeManager.php

@@ -12,8 +12,6 @@
 namespace FOS\OAuthServerBundle\Entity;
 
 use Doctrine\ORM\EntityManager;
-
-use FOS\OAuthServerBundle\Entity\TokenManager;
 use FOS\OAuthServerBundle\Model\AuthCodeManager as BaseAuthCodeManager;
 use FOS\OAuthServerBundle\Model\AuthCodeInterface;
 

Entity/ClientManager.php

@@ -11,7 +11,7 @@
 
 namespace FOS\OAuthServerBundle\Entity;
 
-se Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManager;
 use FOS\OAuthServerBundle\Model\ClientManager as BaseClientManager;
 use FOS\OAuthServerBundle\Model\ClientInterface;
 

FOSOAuthServerBundle.php

@@ -11,7 +11,7 @@
 
 namespace FOS\OAuthServerBundle;
 
-use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuth2Factory;
+use FOS\OAuthServerBundle\DependencyInjection\Security\Factory\OAuthFactory;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -24,7 +24,7 @@ public function build(ContainerBuilder $container)
 
         $extension = $container->getExtension('security');
         if (method_exists($extension, 'addSecurityListenerFactory')) {
-            $extension->addSecurityListenerFactory(new OAuth2Factory);
+            $extension->addSecurityListenerFactory(new OAuthFactory);
         }
     }
 }

Model/AccessToken.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace FOS\OAuthServerBundle\Model;
+
+class AccessToken extends Token implements AccessTokenInterface
+{
+}

Model/OAuth2AccessTokenInterface.php → Model/AccessTokenInterface.php

@@ -13,6 +13,6 @@
 
 use OAuth2\Model\IOAuth2AccessToken;
 
-interface OAuthAccessTokenInterface extends OAuthTokenInterface, IOAuth2AccessToken
+interface AccessTokenInterface extends TokenInterface, IOAuth2AccessToken
 {
 }

Model/AccessTokenManagerInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace FOS\OAuthServerBundle\Model;
+
+interface AccessTokenManagerInterface extends TokenManagerInterface
+{
+}
+

Model/OAuth2AuthCode.php → Model/AuthCode.php

@@ -8,7 +8,7 @@
 /**
  * @author Richard Fullmer <[email protected]>
  */
-class OAuth2AuthCode extends OAuth2Token implements OAuth2AuthCodeInterface
+class AuthCode extends Token implements AuthCodeInterface
 {
     protected $redirectUri;
 

Model/OAuth2AuthCodeInterface.php → Model/AuthCodeInterface.php

@@ -10,6 +10,6 @@
 /**
  * @author Richard Fullmer <[email protected]>
  */
-interface OAuth2AuthCodeInterface extends OAuth2TokenInterface, IOAuth2AuthCode
+interface AuthCodeInterface extends TokenInterface, IOAuth2AuthCode
 {
 }

Model/OAuth2AuthCodeManager.php → Model/AuthCodeManager.php

@@ -2,7 +2,7 @@
 
 namespace FOS\OAuthServerBundle\Model;
 
-abstract class OAuth2AuthCodeManager implements OAuth2AuthCodeManagerInterface
+abstract class AuthCodeManager implements AuthCodeManagerInterface
 {
     public function createAuthCode()
     {

Model/AuthCodeManagerInterface.php

@@ -0,0 +1,44 @@
+<?php
+/*
+ *
+ */
+
+namespace FOS\OAuthServerBundle\Model;
+
+/**
+ * @author Richard Fullmer <[email protected]>
+ */
+interface AuthCodeManagerInterface
+{
+    /**
+     * @return \FOS\OAuthServerBundle\Model\AuthCodeInterface
+     */
+    function createAuthCode();
+
+    /**
+     * @return string
+     */
+    function getClass();
+
+    /**
+     * @param array $criteria
+     */
+    function findAuthCodeBy(array $criteria);
+
+    /**
+     * @param string $token
+     *
+     * @return \FOS\OAuthServerBundle\Model\AuthCodeInterface
+     */
+    function findAuthCodeByToken($token);
+
+    /**
+     * @param \FOS\OAuthServerBundle\Model\AuthCodeInterface $authCode
+     */
+    function updateAuthCode(AuthCodeInterface $authCode);
+
+    /**
+     * @param \FOS\OAuthServerBundle\Model\AuthCodeInterface $authCode
+     */
+    function deleteAuthCode(AuthCodeInterface $authCode);
+}

Model/OAuth2Client.php → Model/Client.php

@@ -5,7 +5,7 @@
 use OAuth2\OAuth2;
 use FOS\OAuthServerBundle\Util\Random;
 
-class OAuth2Client implements OAuth2ClientInterface
+class Client implements ClientInterface
 {
     protected $id;
 

Model/OAuth2ClientInterface.php → Model/ClientInterface.php

@@ -4,7 +4,7 @@
 
 use OAuth2\Model\IOAuth2Client;
 
-interface OAuth2ClientInterface extends IOAuth2Client
+interface ClientInterface extends IOAuth2Client
 {
     function getId();
 

Model/OAuth2ClientManager.php → Model/ClientManager.php

@@ -2,7 +2,7 @@
 
 namespace FOS\OAuthServerBundle\Model;
 
-abstract class OAuth2ClientManager implements OAuth2ClientManagerInterface
+abstract class ClientManager implements ClientManagerInterface
 {
     public function createClient()
     {

Model/ClientManagerInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace FOS\OAuthServerBundle\Model;
+
+interface ClientManagerInterface
+{
+    function createClient();
+
+    function getClass();
+
+    function findClientBy(array $criteria);
+
+    function findClientByPublicId($publicId);
+
+    function updateClient(ClientInterface $client, $andFlush = true);
+
+    function deleteClient(ClientInterface $client);
+}
+