修正命名空间错误

fenghaikun · fenghaikun · commit 30229fbf33a2 · 2017-07-18T14:04:00.000+08:00
diff --git a/src/AbstractDTO.php b/src/AbstractDTO.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK;
+namespace Sixdec\SDK;
 
 /**
  * @author hehui<hehui@eelly.net>
diff --git a/src/Logger/Api/ApiLogger.php b/src/Logger/Api/ApiLogger.php
@@ -10,10 +10,10 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Logger\Api;
+namespace Sixdec\SDK\Logger\Api;
 
-use sixdec\SDK\EellyClient;
-use sixdec\SDK\Logger\Service\ApiLoggerInterface;
+use Sixdec\SDK\SixdecClient;
+use Sixdec\SDK\Logger\Service\ApiLoggerInterface;
 
 /**
  * @author hehui<hehui@eelly.net>
@@ -27,6 +27,6 @@ class ApiLogger implements ApiLoggerInterface
      */
     public function log(string $traceId, array $request = [], array $response = [], array $extras = []): void
     {
-        EellyClient::request('logger/apiLogger', __FUNCTION__, $traceId, $request, $response, $extras);
+        SixdecClient::request('logger/apiLogger', __FUNCTION__, $traceId, $request, $response, $extras);
     }
 }
diff --git a/src/Logger/Service/ApiLoggerInterface.php b/src/Logger/Service/ApiLoggerInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Logger\Service;
+namespace Sixdec\SDK\Logger\Service;
 
 /**
  * @author hehui<hehui@eelly.net>
diff --git a/src/Member/Api/Index.php b/src/Member/Api/Index.php
@@ -10,12 +10,12 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Member\Api;
+namespace Sixdec\SDK\Member\Api;
 
-use sixdec\SDK\EellyClient;
-use sixdec\SDK\Member\Service\Index\DTO\FastDFSDTO;
-use sixdec\SDK\Member\Service\Index\DTO\TimeDTO;
-use sixdec\SDK\Member\Service\IndexInterface;
+use Sixdec\SDK\SixdecClient;
+use Sixdec\SDK\Member\Service\Index\DTO\FastDFSDTO;
+use Sixdec\SDK\Member\Service\Index\DTO\TimeDTO;
+use Sixdec\SDK\Member\Service\IndexInterface;
 use Psr\Http\Message\UploadedFileInterface;
 
 class Index implements IndexInterface
@@ -27,7 +27,7 @@ class Index implements IndexInterface
      */
     public function cacheTime(string $name): TimeDTO
     {
-        return EellyClient::request('member/index', __FUNCTION__, $name);
+        return SixdecClient::request('member/index', __FUNCTION__, $name);
     }
 
     /**
@@ -37,7 +37,7 @@ public function cacheTime(string $name): TimeDTO
      */
     public function uploadFileToFastDFS(string $name, UploadedFileInterface $file): ?FastDFSDTO
     {
-        return EellyClient::request('member/index', __FUNCTION__, $name, $file);
+        return SixdecClient::request('member/index', __FUNCTION__, $name, $file);
     }
 
     /**
@@ -47,7 +47,7 @@ public function uploadFileToFastDFS(string $name, UploadedFileInterface $file):
      */
     public function returnInt(): int
     {
-        return EellyClient::request('member/index', __FUNCTION__);
+        return SixdecClient::request('member/index', __FUNCTION__);
     }
 
     /**
@@ -57,7 +57,7 @@ public function returnInt(): int
      */
     public function returnString(): string
     {
-        return EellyClient::request('member/index', __FUNCTION__);
+        return SixdecClient::request('member/index', __FUNCTION__);
     }
 
     /**
@@ -67,7 +67,7 @@ public function returnString(): string
      */
     public function returnArray(): array
     {
-        return EellyClient::request('member/index', __FUNCTION__);
+        return SixdecClient::request('member/index', __FUNCTION__);
     }
 
     /**
@@ -77,7 +77,7 @@ public function returnArray(): array
      */
     public function returnBool(): bool
     {
-        return EellyClient::request('member/index', __FUNCTION__);
+        return SixdecClient::request('member/index', __FUNCTION__);
     }
 
     /**
@@ -87,7 +87,7 @@ public function returnBool(): bool
      */
     public function returnfloat(): float
     {
-        return EellyClient::request('member/index', __FUNCTION__);
+        return SixdecClient::request('member/index', __FUNCTION__);
     }
 
     /**
@@ -97,6 +97,6 @@ public function returnfloat(): float
      */
     public function returnNull(): void
     {
-        EellyClient::request('member/index', __FUNCTION__);
+        SixdecClient::request('member/index', __FUNCTION__);
     }
 }
diff --git a/src/Member/Service/Index/DTO/FastDFSDTO.php b/src/Member/Service/Index/DTO/FastDFSDTO.php
@@ -10,9 +10,9 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Member\Service\Index\DTO;
+namespace Sixdec\SDK\Member\Service\Index\DTO;
 
-use sixdec\SDK\AbstractDTO;
+use Sixdec\SDK\AbstractDTO;
 
 class FastDFSDTO extends AbstractDTO
 {
diff --git a/src/Member/Service/Index/DTO/TimeDTO.php b/src/Member/Service/Index/DTO/TimeDTO.php
@@ -10,9 +10,9 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Member\Service\Index\DTO;
+namespace Sixdec\SDK\Member\Service\Index\DTO;
 
-use sixdec\SDK\AbstractDTO;
+use Sixdec\SDK\AbstractDTO;
 
 /**
  * @author hehui<hehui@eelly.net>
diff --git a/src/Member/Service/Index/DTO/UploadFileDTO.php b/src/Member/Service/Index/DTO/UploadFileDTO.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Member\Service\Index\DTO;
+namespace Sixdec\SDK\Member\Service\Index\DTO;
 
 use GuzzleHttp\Psr7\UploadedFile;
 
diff --git a/src/Member/Service/IndexInterface.php b/src/Member/Service/IndexInterface.php
@@ -10,10 +10,10 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Member\Service;
+namespace Sixdec\SDK\Member\Service;
 
-use sixdec\SDK\Member\Service\Index\DTO\FastDFSDTO;
-use sixdec\SDK\Member\Service\Index\DTO\TimeDTO;
+use Sixdec\SDK\Member\Service\Index\DTO\FastDFSDTO;
+use Sixdec\SDK\Member\Service\Index\DTO\TimeDTO;
 use Psr\Http\Message\UploadedFileInterface;
 
 interface IndexInterface
diff --git a/src/Oauth/Service/AuthorizationServerInterface.php b/src/Oauth/Service/AuthorizationServerInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Oauth\Service;
+namespace Sixdec\SDK\Oauth\Service;
 
 /**
  * @author hehui<hehui@eelly.net>
diff --git a/src/Oauth/Service/ResourceServerInterface.php b/src/Oauth/Service/ResourceServerInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Oauth\Service;
+namespace Sixdec\SDK\Oauth\Service;
 
 /**
  * @author hehui<hehui@eelly.net>
diff --git a/src/SixdecClient.php b/src/SixdecClient.php
@@ -10,13 +10,13 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK;
+namespace Sixdec\SDK;
 
 use Eelly\OAuth2\Client\Provider\EellyProvider;
 use GuzzleHttp\Psr7\MultipartStream;
 use Psr\Http\Message\UploadedFileInterface;
 
-class EellyClient
+class SixdecClient
 {
     private const URI = [
         'logger' => 'http://api.eelly.dev/',
@@ -37,7 +37,7 @@ class EellyClient
     private $provider;
 
     /**
-     * @var EellyClient
+     * @var SixdecClient
      */
     private static $self;
 
diff --git a/tests/src/EellyClientTest.php b/tests/src/EellyClientTest.php
@@ -10,22 +10,22 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Test;
+namespace Sixdec\SDK\Test;
 
-use sixdec\SDK\EellyClient;
-use sixdec\SDK\Member\Service\Index\DTO\TimeDTO;
+use Sixdec\SDK\SixdecClient;
+use Sixdec\SDK\Member\Service\Index\DTO\TimeDTO;
 use League\OAuth2\Client\Token\AccessToken;
 use PHPUnit\Framework\TestCase;
 
-class EellyClientTest extends TestCase
+class SixdecClientTest extends TestCase
 {
     /**
      * @var string
      */
     private $testFile;
 
     /**
-     * @var EellyClient
+     * @var SixdecClient
      */
     private $eellyClient;
 
@@ -40,12 +40,12 @@ public function setUp(): void
             'urlAccessToken'          => 'http://api.eelly.dev/oauth/authorizationServer/accessToken',
             'urlResourceOwnerDetails' => 'http://api.eelly.dev/',
         ];
-        $this->eellyClient = EellyClient::init($options);
+        $this->eellyClient = SixdecClient::init($options);
     }
 
     public function testInit(): void
     {
-        $this->assertInstanceOf(EellyClient::class, $this->eellyClient);
+        $this->assertInstanceOf(SixdecClient::class, $this->eellyClient);
     }
 
     public function testGetAccessToken(): void
@@ -56,9 +56,9 @@ public function testGetAccessToken(): void
 
     public function testRequest(): void
     {
-        $return = EellyClient::request('member/index', 'cacheTime', 'mytest');
+        $return = SixdecClient::request('member/index', 'cacheTime', 'mytest');
         $this->assertInstanceOf(TimeDTO::class, $return);
         $this->eellyClient->setTraceId('5944e409b481de6f9472b0b5');
-        $return = EellyClient::request('member/index', 'cacheTime', 'mytest');
+        $return = SixdecClient::request('member/index', 'cacheTime', 'mytest');
     }
 }
diff --git a/tests/src/Logger/Api/ApiLoggerTest.php b/tests/src/Logger/Api/ApiLoggerTest.php
@@ -10,9 +10,9 @@
  * file that was distributed with this source code.
  */
 
-namespace sixdec\SDK\Logger\Api;
+namespace Sixdec\SDK\Logger\Api;
 
-use sixdec\SDK\EellyClient;
+use Sixdec\SDK\SixdecClient;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -37,7 +37,7 @@ public function setUp(): void
             'urlAccessToken'          => 'http://api.eelly.dev/oauth/authorizationServer/accessToken',
             'urlResourceOwnerDetails' => 'http://api.eelly.dev/',
         ];
-        EellyClient::init($options);
+        SixdecClient::init($options);
         $this->logger = new ApiLogger();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@`
`10`	`10`	`* file that was distributed with this source code.`
`11`	`11`	`*/`
`12`	`12`
`13`		`-namespace sixdec\SDK\Logger\Api;`
	`13`	`+namespace Sixdec\SDK\Logger\Api;`
`14`	`14`
`15`		`-use sixdec\SDK\EellyClient;`
`16`		`-use sixdec\SDK\Logger\Service\ApiLoggerInterface;`
	`15`	`+use Sixdec\SDK\SixdecClient;`
	`16`	`+use Sixdec\SDK\Logger\Service\ApiLoggerInterface;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @author hehui<[email protected]>`
`@@ -27,6 +27,6 @@ class ApiLogger implements ApiLoggerInterface`
`27`	`27`	`*/`
`28`	`28`	`public function log(string $traceId, array $request = [], array $response = [], array $extras = []): void`
`29`	`29`	`{`
`30`		`- EellyClient::request('logger/apiLogger', __FUNCTION__, $traceId, $request, $response, $extras);`
	`30`	`+ SixdecClient::request('logger/apiLogger', __FUNCTION__, $traceId, $request, $response, $extras);`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@`
`10`	`10`	`* file that was distributed with this source code.`
`11`	`11`	`*/`
`12`	`12`
`13`		`-namespace sixdec\SDK\Member\Api;`
	`13`	`+namespace Sixdec\SDK\Member\Api;`
`14`	`14`
`15`		`-use sixdec\SDK\EellyClient;`
`16`		`-use sixdec\SDK\Member\Service\Index\DTO\FastDFSDTO;`
`17`		`-use sixdec\SDK\Member\Service\Index\DTO\TimeDTO;`
`18`		`-use sixdec\SDK\Member\Service\IndexInterface;`
	`15`	`+use Sixdec\SDK\SixdecClient;`
	`16`	`+use Sixdec\SDK\Member\Service\Index\DTO\FastDFSDTO;`
	`17`	`+use Sixdec\SDK\Member\Service\Index\DTO\TimeDTO;`
	`18`	`+use Sixdec\SDK\Member\Service\IndexInterface;`
`19`	`19`	`use Psr\Http\Message\UploadedFileInterface;`
`20`	`20`
`21`	`21`	`class Index implements IndexInterface`
`@@ -27,7 +27,7 @@ class Index implements IndexInterface`
`27`	`27`	`*/`
`28`	`28`	`public function cacheTime(string $name): TimeDTO`
`29`	`29`	`{`
`30`		`- return EellyClient::request('member/index', __FUNCTION__, $name);`
	`30`	`+ return SixdecClient::request('member/index', __FUNCTION__, $name);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
`@@ -37,7 +37,7 @@ public function cacheTime(string $name): TimeDTO`
`37`	`37`	`*/`
`38`	`38`	`public function uploadFileToFastDFS(string $name, UploadedFileInterface $file): ?FastDFSDTO`
`39`	`39`	`{`
`40`		`- return EellyClient::request('member/index', __FUNCTION__, $name, $file);`
	`40`	`+ return SixdecClient::request('member/index', __FUNCTION__, $name, $file);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`@@ -47,7 +47,7 @@ public function uploadFileToFastDFS(string $name, UploadedFileInterface $file):`
`47`	`47`	`*/`
`48`	`48`	`public function returnInt(): int`
`49`	`49`	`{`
`50`		`- return EellyClient::request('member/index', __FUNCTION__);`
	`50`	`+ return SixdecClient::request('member/index', __FUNCTION__);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`@@ -57,7 +57,7 @@ public function returnInt(): int`
`57`	`57`	`*/`
`58`	`58`	`public function returnString(): string`
`59`	`59`	`{`
`60`		`- return EellyClient::request('member/index', __FUNCTION__);`
	`60`	`+ return SixdecClient::request('member/index', __FUNCTION__);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`@@ -67,7 +67,7 @@ public function returnString(): string`
`67`	`67`	`*/`
`68`	`68`	`public function returnArray(): array`
`69`	`69`	`{`
`70`		`- return EellyClient::request('member/index', __FUNCTION__);`
	`70`	`+ return SixdecClient::request('member/index', __FUNCTION__);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`@@ -77,7 +77,7 @@ public function returnArray(): array`
`77`	`77`	`*/`
`78`	`78`	`public function returnBool(): bool`
`79`	`79`	`{`
`80`		`- return EellyClient::request('member/index', __FUNCTION__);`
	`80`	`+ return SixdecClient::request('member/index', __FUNCTION__);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
`@@ -87,7 +87,7 @@ public function returnBool(): bool`
`87`	`87`	`*/`
`88`	`88`	`public function returnfloat(): float`
`89`	`89`	`{`
`90`		`- return EellyClient::request('member/index', __FUNCTION__);`
	`90`	`+ return SixdecClient::request('member/index', __FUNCTION__);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`@@ -97,6 +97,6 @@ public function returnfloat(): float`
`97`	`97`	`*/`
`98`	`98`	`public function returnNull(): void`
`99`	`99`	`{`
`100`		`- EellyClient::request('member/index', __FUNCTION__);`
	`100`	`+ SixdecClient::request('member/index', __FUNCTION__);`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`* file that was distributed with this source code.`
`11`	`11`	`*/`
`12`	`12`
`13`		`-namespace sixdec\SDK\Member\Service\Index\DTO;`
	`13`	`+namespace Sixdec\SDK\Member\Service\Index\DTO;`
`14`	`14`
`15`		`-use sixdec\SDK\AbstractDTO;`
	`15`	`+use Sixdec\SDK\AbstractDTO;`
`16`	`16`
`17`	`17`	`class FastDFSDTO extends AbstractDTO`
`18`	`18`	`{`