w-takumi / yahoo-shopping-jp-php

yahooLogin/callback.php

Spacing +8 added lines, -8 removed lines

@@ -11,13 +11,13 @@ 
 var_dump($_GET);
 
 // アプリケーションID, シークレッvト
-$redirect_uri = strtok('https://'.$_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"],'?');
+$redirect_uri = strtok('https://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"], '?');
 echo $redirect_uri."<br>";
 
 // クレデンシャルインスタンス生成
-$cred = new ClientCredential( YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST );
+$cred = new ClientCredential(YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST);
 // YConnectクライアントインスタンス生成
-$client = new YConnectClient( $cred );
+$client = new YConnectClient($cred);
 
 // デバッグ用ログ出力
 $client->enableDebugMode();
@@ -36,13 +36,13 @@ 
 
     echo "<h1>Access Token Request</h1>";
     // アクセストークン, リフレッシュトークン, IDトークンを取得
-    echo "ACCESS TOKEN : " . $client->getAccessToken() . "<br/><br/>";
-    echo "REFRESH TOKEN: " . $client->getRefreshToken() . "<br/><br/>";
-    echo "EXPIRATION   : " . $client->getAccessTokenExpiration() . "<br/><br/>";
+    echo "ACCESS TOKEN : ".$client->getAccessToken()."<br/><br/>";
+    echo "REFRESH TOKEN: ".$client->getRefreshToken()."<br/><br/>";
+    echo "EXPIRATION   : ".$client->getAccessTokenExpiration()."<br/><br/>";
 
     file_put_contents(ACCESS_TOKEN_FILE, $client->getAccessToken());
     file_put_contents(REFRESH_TOKEN_FILE, $client->getRefreshToken());
 
-} catch ( \Exception $e ) {
-    echo "<pre>" . print_r( $e, true ) . "</pre>";
+} catch (\Exception $e) {
+    echo "<pre>".print_r($e, true)."</pre>";
 }
\ No newline at end of file

yahooLogin/defines.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 //yahooシッピーノアプリID（webnotakumiで取得）
-define('YAHOO_APP_ID_TEST', 'dj0zaiZpPUZFNTFuUUQ3Q2piSSZzPWNvbnN1bWVyc2VjcmV0Jng9MWY-');//test
-define('YAHOO_SECRET_TEST', 'a71d10c84a7826c7f98aae379f4d33607dff4a87');//test
+define('YAHOO_APP_ID_TEST', 'dj0zaiZpPUZFNTFuUUQ3Q2piSSZzPWNvbnN1bWVyc2VjcmV0Jng9MWY-'); //test
+define('YAHOO_SECRET_TEST', 'a71d10c84a7826c7f98aae379f4d33607dff4a87'); //test
 
 define('ACCESS_TOKEN_FILE', '../access_token.txt');
 define('REFRESH_TOKEN_FILE', '../refresh_token.txt');

yahooLogin/login.php

Spacing +9 added lines, -9 removed lines

@@ -11,37 +11,37 @@ 
 use YConnect\YConnectClient;
 
 //ログインボタン表示する場合
-if(0){
+if (0) {
 
     $contents = file_get_contents('login_view.php');
 
     $param['client_id'] = YAHOO_APP_ID_TEST;
-    $param['redirect_uri'] = str_replace('login.php','callback.php','https://'.$_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]);
+    $param['redirect_uri'] = str_replace('login.php', 'callback.php', 'https://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]);
     //state リクエストとコールバック間の検証用のランダムな文字列
     $param['state'] = substr(str_shuffle('1234567890abcdefghijklmnopqrstuvwxyz'), 0, 10).'_'.time().'_'.substr(str_shuffle('1234567890abcdefghijklmnopqrstuvwxyz'), 0, 10);
     //nonce リプレイアタック対策のランダムな文字列
     $param['nonce'] = substr(str_shuffle('1234567890abcdefghijklmnopqrstuvwxyz'), 0, 10).'_'.time().'_'.substr(str_shuffle('1234567890abcdefghijklmnopqrstuvwxyz'), 0, 10);
     //viewに変数を埋め込む
-    foreach($param as $key => $val){
+    foreach ($param as $key => $val) {
         $contents = str_replace('{$'.$key.'}', $val, $contents);
     }
 
     echo $contents;
 
-}else{
+} else {
     //js使用しない場合
 
     // クレデンシャルインスタンス生成
-    $cred = new ClientCredential(YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST );
+    $cred = new ClientCredential(YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST);
     // YConnectクライアントインスタンス生成
-    $client = new YConnectClient( $cred );
+    $client = new YConnectClient($cred);
 
     // デバッグ用ログ出力
     $client->enableDebugMode();
 
         try {
 
-            $param['redirect_uri'] = str_replace('login.php','callback.php','https://'.$_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]);
+            $param['redirect_uri'] = str_replace('login.php', 'callback.php', 'https://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]);
             //state リクエストとコールバック間の検証用のランダムな文字列
             $param['state'] = substr(str_shuffle('1234567890abcdefghijklmnopqrstuvwxyz'), 0, 10).'_'.time().'_'.substr(str_shuffle('1234567890abcdefghijklmnopqrstuvwxyz'), 0, 10);
             //nonce リプレイアタック対策のランダムな文字列
@@ -70,7 +70,7 @@ 
                 $param['prompt']
             );
 
-        } catch ( \Exception $e ) {
-            echo "<pre>" . print_r( $e, true ) . "</pre>";
+        } catch (\Exception $e) {
+            echo "<pre>".print_r($e, true)."</pre>";
         }
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     echo $contents;
 
-}else{
+} else{
     //js使用しない場合
 
     // クレデンシャルインスタンス生成

yahooLogin/refresh_token.php

Spacing +10 added lines, -10 removed lines

@@ -10,9 +10,9 @@ 
 
 
 // クレデンシャルインスタンス生成
-$cred = new ClientCredential(YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST );
+$cred = new ClientCredential(YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST);
 // YConnectクライアントインスタンス生成
-$client = new YConnectClient( $cred );
+$client = new YConnectClient($cred);
 
 // デバッグ用ログ出力
 $client->enableDebugMode();
@@ -22,24 +22,24 @@ 
     $refresh_token = file_get_contents(REFRESH_TOKEN_FILE);
 
     // Tokenエンドポイントにリクエストしてアクセストークンを更新
-    $client->refreshAccessToken( $refresh_token );
+    $client->refreshAccessToken($refresh_token);
     echo "<h1>Refresh Access Token Request</h1>";
-    echo "ACCESS TOKEN : " . $client->getAccessToken() . "<br/><br/>";
-    echo "EXPIRATION   : " . $client->getAccessTokenExpiration();
+    echo "ACCESS TOKEN : ".$client->getAccessToken()."<br/><br/>";
+    echo "EXPIRATION   : ".$client->getAccessTokenExpiration();
 
     file_put_contents(ACCESS_TOKEN_FILE, $client->getAccessToken());
 
 
-} catch ( TokenException $te ) {
+} catch (TokenException $te) {
 
     // リフレッシュトークンが有効期限切れであるかチェック
-    if( $te->invalidGrant() ) {
+    if ($te->invalidGrant()) {
         // はじめのAuthorizationエンドポイントリクエストからやり直してください
         echo "<h1>Refresh Token has Expired</h1>";
     }
 
-    echo "<pre>" . print_r( $te, true ) . "</pre>";
+    echo "<pre>".print_r($te, true)."</pre>";
 
-} catch ( \Exception $e ) {
-    echo "<pre>" . print_r( $e, true ) . "</pre>";
+} catch (\Exception $e) {
+    echo "<pre>".print_r($e, true)."</pre>";
 }

yahooLogin/getUserInfo.php

Spacing +5 added lines, -5 removed lines

@@ -10,9 +10,9 @@ 
 echo "ユーザ情報取得<br>";
 
 // クレデンシャルインスタンス生成
-$cred = new ClientCredential( YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST );
+$cred = new ClientCredential(YAHOO_APP_ID_TEST, YAHOO_SECRET_TEST);
 // YConnectクライアントインスタンス生成
-$client = new YConnectClient( $cred );
+$client = new YConnectClient($cred);
 
 // デバッグ用ログ出力
 $client->enableDebugMode();
@@ -26,8 +26,8 @@ 
     echo "<h1>UserInfo Request</h1>";
     echo "UserInfo: <br/>";
     // UserInfo情報を取得
-    echo "<pre>" . print_r( $client->getUserInfo(), true ) . "</pre>";
+    echo "<pre>".print_r($client->getUserInfo(), true)."</pre>";
 
-} catch ( \Exception $e ) {
-    echo "<pre>" . print_r( $e, true ) . "</pre>";
+} catch (\Exception $e) {
+    echo "<pre>".print_r($e, true)."</pre>";
 }

YahooClientTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 use Shippinno\YahooShoppingJp\Api\SearchItems;
 use Shippinno\YahooShoppingJp\Api\SearchOrders;

Indentation +7 added lines, -7 removed lines

@@ -11,17 +11,17 @@ 
 use Shippinno\YahooShoppingJp\Enum\CancelReason;
 
 define('YAHOO_APP_ID',
-  'dj0zaiZpPUZFNTFuUUQ3Q2piSSZzPWNvbnN1bWVyc2VjcmV0Jng9MWY-');
+    'dj0zaiZpPUZFNTFuUUQ3Q2piSSZzPWNvbnN1bWVyc2VjcmV0Jng9MWY-');
 define('YAHOO_SECRET',
-  'a71d10c84a7826c7f98aae379f4d33607dff4a87');
+    'a71d10c84a7826c7f98aae379f4d33607dff4a87');
 $accessToken  = 'dw_bcoYMsYi_ahYU5.6vkn.vTk6Y6nF74YIw82P4dLoHjR8eRrEGMbKS9YYB1f6F95sgm3Z4d0FSWfrNYCb0EdxE02CFVz..4daPOZKt9Ud3dZ1ewLt7.TYDbkbjywzinO1qnH1Z4QdPaenDtNK.JVILPbTpJHIgmdatCFHX7ea_hFPfRl04Z7xuXaCE9NcH6ICdAYMaC2NE6N4Dg6hnY3sTJpwVGPCEc10GBcVLB7j2CTflK4rN0Vmmj2mdxCZqrE3jYh0AqtsfOpSqhXoHIBsepx5P7YiGtTclX_Uh0LpzDkTlpZJ7Si66zl4LOEkFASJHtU86bRosDPu3ISGDlf1ar61fJvf9q9Z94dXGJaIKRXpO2xFERGEOEH0FWUSzWeouJR0DZlnsAjvt2lT1wKBJH9IceNutTFdBe8ypIlkjlIRjyBc2jjVA6nz4.4E1DIRwTydYmZmbqnWqdp8oEuwX2Cd9QCGOjC9CWI2uHhCAx_bGm6GlPhNO.agutvX6zSzl.UdsU9JrDexi8XEg1FQ9s.EqownBSa8Uoh9dSUiMz8h4E8MyKM65d9e9csOzWTDqOkWeVGpIE5w60T8DmoI06nTCmgrACEk4jQaftj72fvX7uz.zTU4yUFYfUGi290XfPaIPMm.u33iI';
 $refreshToken = '';
 $seller_id    = 'snbx-nxpqe5hm3';
 
 
 $client = new Client(
-  $accessToken,
-  $refreshToken);
+    $accessToken,
+    $refreshToken);
 //  file_get_contents(__DIR__ . '/access_token.txt'),
 //  file_get_contents(__DIR__ . '/refresh_token.txt')
 //);
@@ -31,9 +31,9 @@ 
 $client->setApi($factory->api());
 $request = $factory->request();
 $request->setSellerId($seller_id)
-  ->setIsPointFix(false)
-  ->setOrderStatus(OrderStatus::PROCESSED())
-  ->setOrderId('snbx-nxpqe5hm3-10000045');
+    ->setIsPointFix(false)
+    ->setOrderStatus(OrderStatus::PROCESSED())
+    ->setOrderId('snbx-nxpqe5hm3-10000045');
 
 $response = $client->execute($request);
 

Unused Use Statements -4 removed lines

@@ -2,13 +2,9 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
-use Shippinno\YahooShoppingJp\Api\SearchItems;
-use Shippinno\YahooShoppingJp\Api\SearchOrders;
 use Shippinno\YahooShoppingJp\Client;
-use Shippinno\YahooShoppingJp\Api\OrderCount;
 use Shippinno\YahooShoppingJp\Factory\UpdateOrderStatusFactory;
 use Shippinno\YahooShoppingJp\Enum\OrderStatus;
-use Shippinno\YahooShoppingJp\Enum\CancelReason;
 
 define('YAHOO_APP_ID',
   'dj0zaiZpPUZFNTFuUUQ3Q2piSSZzPWNvbnN1bWVyc2VjcmV0Jng9MWY-');

src/YahooShoppingJp/Api/GetOrderInfoApi.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function distillResponse(array $response): array
     {
-        if(! isset($response['Result']['OrderInfo'])) {
+        if (!isset($response['Result']['OrderInfo'])) {
             throw new DistillationException;
         }
 

src/YahooShoppingJp/Api/UpdateOrderShippingStatusApi.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function distillResponse(array $response): array
     {
-        if(! isset($response['Result']['Status'])
+        if (!isset($response['Result']['Status'])
         || $response['Result']['Status'] !== 'OK') {
             throw new DistillationException;
         }

tests/unit/YahooShoppingJp/Request/GetItemStockInfoRequestTest.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $this->assertSame($request, $request->setSellerId('VALID_SELLER_ID'));
 
         for ($i = 1; $i <= 1001; $i++) {
-            $request->addItemCode('AN_ITEM_CODE_' . $i);
+            $request->addItemCode('AN_ITEM_CODE_'.$i);
         }
 
         $request->getParams();