两个项目同时存在，修改命名空间

Author: windhoney

Bootstrap.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server;
+namespace wind\oauth2;
 
 use yii\web\GroupUrlRule;
 
@@ -10,26 +10,26 @@ class Bootstrap implements \yii\base\BootstrapInterface
      * @var array Model's map
      */
     private $_modelMap = [
-        'OauthClients'               => 'filsh\yii2\oauth2server\models\OauthClients',
-        'OauthAccessTokens'          => 'filsh\yii2\oauth2server\models\OauthAccessTokens',
-        'OauthAuthorizationCodes'    => 'filsh\yii2\oauth2server\models\OauthAuthorizationCodes',
-        'OauthRefreshTokens'         => 'filsh\yii2\oauth2server\models\OauthRefreshTokens',
-        'OauthScopes'                => 'filsh\yii2\oauth2server\models\OauthScopes',
+        'OauthClients'               => 'wind\oauth2\models\OauthClients',
+        'OauthAccessTokens'          => 'wind\oauth2\models\OauthAccessTokens',
+        'OauthAuthorizationCodes'    => 'wind\oauth2\models\OauthAuthorizationCodes',
+        'OauthRefreshTokens'         => 'wind\oauth2\models\OauthRefreshTokens',
+        'OauthScopes'                => 'wind\oauth2\models\OauthScopes',
     ];
 
     /**
      * @var array Storage's map
      */
     private $_storageMap = [
-        'access_token'          => 'filsh\yii2\oauth2server\storage\Pdo',
-        'authorization_code'    => 'filsh\yii2\oauth2server\storage\Pdo',
-        'client_credentials'    => 'filsh\yii2\oauth2server\storage\Pdo',
-        'client'                => 'filsh\yii2\oauth2server\storage\Pdo',
-        'refresh_token'         => 'filsh\yii2\oauth2server\storage\Pdo',
-        'user_credentials'      => 'filsh\yii2\oauth2server\storage\Pdo',
-        'public_key'            => 'filsh\yii2\oauth2server\storage\Pdo',
-        'jwt_bearer'            => 'filsh\yii2\oauth2server\storage\Pdo',
-        'scope'                 => 'filsh\yii2\oauth2server\storage\Pdo',
+        'access_token'          => 'wind\oauth2\storage\Pdo',
+        'authorization_code'    => 'wind\oauth2\storage\Pdo',
+        'client_credentials'    => 'wind\oauth2\storage\Pdo',
+        'client'                => 'wind\oauth2\storage\Pdo',
+        'refresh_token'         => 'wind\oauth2\storage\Pdo',
+        'user_credentials'      => 'wind\oauth2\storage\Pdo',
+        'public_key'            => 'wind\oauth2\storage\Pdo',
+        'jwt_bearer'            => 'wind\oauth2\storage\Pdo',
+        'scope'                 => 'wind\oauth2\storage\Pdo',
     ];
 
     /**
@@ -60,7 +60,7 @@ public function bootstrap($app)
                 }
 
                 if ($app instanceof \yii\console\Application) {
-                    $module->controllerNamespace = 'filsh\yii2\oauth2server\commands';
+                    $module->controllerNamespace = 'wind\oauth2\commands';
                 }
             }
         }

Module.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server;
+namespace wind\oauth2;
 
 use \Yii;
 use yii\i18n\PhpMessageSource;
@@ -11,7 +11,7 @@
  *
  * ```php
  * 'oauth2' => [
- *     'class' => 'filsh\yii2\oauth2server\Module',
+ *     'class' => 'wind\oauth2\Module',
  *     'tokenParamName' => 'accessToken',
  *     'tokenAccessLifetime' => 3600 * 24,
  *     'storageMap' => [
@@ -70,7 +70,7 @@ public function init()
     /**
      * Gets Oauth2 Server
      *
-     * @return \filsh\yii2\oauth2server\Server
+     * @return \wind\oauth2\Server
      * @throws \yii\base\InvalidConfigException
      */
     public function getServer()

README.md

@@ -1,109 +1,2 @@
 yii2-oauth2-server
-==================
-
-A wrapper for implementing an OAuth2 Server(https://github.com/bshaffer/oauth2-server-php)
-
-Installation
-------------
-
-The preferred way to install this extension is through [composer](http://getcomposer.org/download/).
-
-Either run
-
-```
-php composer.phar require --prefer-dist filsh/yii2-oauth2-server "*"
-```
-
-or add
-
-```json
-"filsh/yii2-oauth2-server": "*"
-```
-
-to the require section of your composer.json.
-
-To use this extension,  simply add the following code in your application configuration:
-
-```php
-'oauth2' => [
-    'class' => 'filsh\yii2\oauth2server\Module',
-    'options' => [
-        'token_param_name' => 'accessToken',
-        'access_lifetime' => 3600 * 24
-    ],
-    'storageMap' => [
-        'user_credentials' => 'common\models\User'
-    ],
-    'grantTypes' => [
-        'client_credentials' => [
-            'class' => 'OAuth2\GrantType\ClientCredentials',
-            'allow_public_clients' => false
-        ],
-        'user_credentials' => [
-            'class' => 'OAuth2\GrantType\UserCredentials'
-        ],
-        'refresh_token' => [
-            'class' => 'OAuth2\GrantType\RefreshToken',
-            'always_issue_new_refresh_token' => true
-        ]
-    ],
-]
-```
-
-```common\models\User``` - user model implementing an interface ```\OAuth2\Storage\UserCredentialsInterface```, so the oauth2 credentials data stored in user table
-
-The next step your shold run migration
-
-```php
-yii migrate --migrationPath=@vendor/filsh/yii2-oauth2-server/migrations
-```
-
-this migration create the oauth2 database scheme and insert test user credentials ```testclient:testpass``` for ```http://fake/```
-
-add url rule to urlManager
-
-```php
-'urlManager' => [
-    'rules' => [
-        'POST oauth2/<action:\w+>' => 'oauth2/default/<action>',
-        ...
-    ]
-]
-```
-
-Usage
------
-
-To use this extension,  simply add the behaviors for your base controller:
-
-```php
-use yii\helpers\ArrayHelper;
-use yii\filters\auth\HttpBearerAuth;
-use yii\filters\auth\QueryParamAuth;
-use filsh\yii2\oauth2server\filters\ErrorToExceptionFilter;
-use filsh\yii2\oauth2server\filters\auth\CompositeAuth;
-
-class Controller extends \yii\rest\Controller
-{
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return ArrayHelper::merge(parent::behaviors(), [
-            'authenticator' => [
-                'class' => CompositeAuth::className(),
-                'authMethods' => [
-                    ['class' => HttpBearerAuth::className()],
-                    ['class' => QueryParamAuth::className(), 'tokenParam' => 'accessToken'],
-                ]
-            ],
-            'exceptionFilter' => [
-                'class' => ErrorToExceptionFilter::className()
-            ],
-        ]);
-    }
-}
-```
-
-For more, see https://github.com/bshaffer/oauth2-server-php
+==================

Request.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server;
+namespace wind\oauth2;
 
 class Request extends \OAuth2\Request
 {

Response.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server;
+namespace wind\oauth2;
 
 class Response extends \OAuth2\Response
 {

Server.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace filsh\yii2\oauth2server;
+namespace wind\oauth2;
 
 class Server extends \OAuth2\Server
 {
     use traits\ClassNamespace;
 
     /**
-     * @var \filsh\yii2\oauth2server\Module
+     * @var \wind\oauth2\Module
      */
     protected $module;
 

controllers/DefaultController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace filsh\yii2\oauth2server\controllers;
+namespace wind\oauth2\controllers;
 
 use Yii;
 use yii\helpers\ArrayHelper;
-use filsh\yii2\oauth2server\filters\ErrorToExceptionFilter;
+use wind\oauth2\filters\ErrorToExceptionFilter;
 
 class DefaultController extends \yii\rest\Controller
 {

controllers/RestController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace filsh\yii2\oauth2server\controllers;
+namespace wind\oauth2\controllers;
 
 use Yii;
 use yii\helpers\ArrayHelper;
-use filsh\yii2\oauth2server\filters\ErrorToExceptionFilter;
+use wind\oauth2\filters\ErrorToExceptionFilter;
 
 class RestController extends \yii\rest\Controller
 {

exceptions/HttpException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\exceptions;
+namespace wind\oauth2\exceptions;
 
 class HttpException extends \yii\web\HttpException
 {

filters/ErrorToExceptionFilter.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace filsh\yii2\oauth2server\filters;
+namespace wind\oauth2\filters;
 
 use Yii;
 use yii\base\Controller;
-use filsh\yii2\oauth2server\Module;
-use filsh\yii2\oauth2server\exceptions\HttpException;
+use wind\oauth2\Module;
+use wind\oauth2\exceptions\HttpException;
 
 class ErrorToExceptionFilter extends \yii\base\Behavior
 {

filters/auth/CompositeAuth.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\filters\auth;
+namespace wind\oauth2\filters\auth;
 
 use \Yii;
 

grants/UserAuthCredentials.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\grants;
+namespace wind\oauth2\grants;
 
 use \OAuth2\Storage\ClientCredentialsInterface;
 use \OAuth2\Storage\UserCredentialsInterface;

models/OauthAccessTokens.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\models;
+namespace wind\oauth2\models;
 
 use Yii;
 

models/OauthAuthorizationCodes.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\models;
+namespace wind\oauth2\models;
 
 use Yii;
 

models/OauthClients.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\models;
+namespace wind\oauth2\models;
 
 use Yii;
 

models/OauthRefreshTokens.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\models;
+namespace wind\oauth2\models;
 
 use Yii;
 

models/OauthScopes.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\models;
+namespace wind\oauth2\models;
 
 use Yii;
 

storage/Pdo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\storage;
+namespace wind\oauth2\storage;
 
 class Pdo extends \OAuth2\Storage\Pdo
 {

traits/ClassNamespace.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace filsh\yii2\oauth2server\traits;
+namespace wind\oauth2\traits;
 
 trait ClassNamespace
 {