remove php version header on sandbox environment (#7)

mhdcodes · web-flow · commit 2b3213e7a319 · 2021-05-08T14:53:06.000+01:00
diff --git a/phpunit.xml.bak b/phpunit.xml.bak
diff --git a/src/Contracts/Environment.php b/src/Contracts/Environment.php
@@ -4,6 +4,11 @@
 
 interface Environment
 {
+    /**
+     * @return string
+     */
+    public function name();
+
     /**
      * @return string
      */
diff --git a/src/Environment/ProductionEnvironment.php b/src/Environment/ProductionEnvironment.php
@@ -13,4 +13,12 @@ public function baseUrl()
     {
         return 'https://api.paypal.com';
     }
+
+    /**
+     * @return string
+     */
+    public function name()
+    {
+        return 'production';
+    }
 }
diff --git a/src/Environment/SandboxEnvironment.php b/src/Environment/SandboxEnvironment.php
@@ -13,4 +13,12 @@ public function baseUrl()
     {
         return 'https://api.sandbox.paypal.com';
     }
+
+    /**
+     * @return string
+     */
+    public function name()
+    {
+        return 'sandbox';
+    }
 }
diff --git a/src/Http/PayPalClient.php b/src/Http/PayPalClient.php
@@ -101,9 +101,19 @@ public function injectGzipHeaders(Request $request)
      */
     public function injectSdkHeaders(Request $request)
     {
-        return $request->withHeader('sdk_name', 'Checkout SDK')
-                    ->withHeader('sdk_version', '1.0.0')
-                    ->withHeader('sdk_tech_stack', 'PHP '.PHP_VERSION);
+        $r = $request->withHeader('sdk_name', 'Checkout SDK')
+                    ->withHeader('sdk_version', '1.0.0');
+
+        /*
+         * Only inject this header on production
+         *
+         * @see https://github.com/phpjuice/paypal-checkout-sdk/issues/6
+         */
+        if ('production' == $this->environment->name()) {
+            $r = $r->withHeader('sdk_tech_stack', 'PHP '.PHP_VERSION);
+        }
+
+        return $r;
     }
 
     /**
diff --git a/tests/Http/AccessTokenRequestTest.php b/tests/Http/AccessTokenRequestTest.php
@@ -24,37 +24,55 @@ protected function setUp(): void
         $this->environment = new ProductionEnvironment('client_id', 'client_secret');
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectUri()
     {
         $request = new AccessTokenRequest($this->environment);
         $this->assertEquals('/v1/oauth2/token', $request->getUri());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectMethod()
     {
         $request = new AccessTokenRequest($this->environment);
         $this->assertEquals('POST', $request->getMethod());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectHeaders()
     {
         $request = new AccessTokenRequest($this->environment);
         $this->assertEquals('application/x-www-form-urlencoded', $request->getHeaderLine('Content-Type'));
     }
 
+    /**
+     * @test
+     */
     public function testHasBasicAuthHeaders()
     {
         $request = new AccessTokenRequest($this->environment);
         $this->assertEquals('Basic '.$this->environment->basicAuthorizationString(), $request->getHeaderLine('Authorization'));
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectDataWithGetBody()
     {
         $request = new AccessTokenRequest($this->environment);
         $expected = http_build_query(['grant_type' => 'client_credentials']);
         $this->assertEquals($expected, (string) $request->getBody());
     }
 
+    /**
+     * @test
+     */
     public function testExecuteRequest()
     {
         $mockResponse = json_encode([
diff --git a/tests/Http/AccessTokenTest.php b/tests/Http/AccessTokenTest.php
@@ -7,13 +7,19 @@
 
 class AccessTokenTest extends TestCase
 {
+    /**
+     * @test
+     */
     public function testCreateAccessToken()
     {
         $accessToken = new AccessToken('A21AAFSO5otrlVigoJUQ1p', 'Bearer', 32400);
         $this->assertEquals('A21AAFSO5otrlVigoJUQ1p', $accessToken->getToken());
         $this->assertEquals('Bearer', $accessToken->getTokenType());
     }
 
+    /**
+     * @test
+     */
     public function testTokenIsExpired()
     {
         $accessToken = new AccessToken('A21AAFSO5otrlVigoJUQ1p', 'Bearer', 32400);
@@ -22,6 +28,9 @@ public function testTokenIsExpired()
         $this->assertTrue($accessToken->isExpired());
     }
 
+    /**
+     * @test
+     */
     public function testTokenAuthorizationString()
     {
         $accessToken = new AccessToken('Token', 'Bearer', 32400);
diff --git a/tests/Http/OrderAuthorizeRequestTest.php b/tests/Http/OrderAuthorizeRequestTest.php
@@ -12,25 +12,37 @@
 
 class OrderAuthorizeRequestTest extends TestCase
 {
+    /**
+     * @test
+     */
     public function testHasCorrectUri()
     {
         $request = new OrderAuthorizeRequest('1KC5501443316171H');
         $this->assertEquals('/v2/checkout/orders/1KC5501443316171H/authorize', $request->getUri());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectMethod()
     {
         $request = new OrderAuthorizeRequest('1KC5501443316171H');
         $this->assertEquals('POST', $request->getMethod());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectHeaders()
     {
         $request = new OrderAuthorizeRequest('1KC5501443316171H');
         $this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));
         $this->assertEquals('return=representation', $request->getHeaderLine('Prefer'));
     }
 
+    /**
+     * @test
+     */
     public function testExecuteRequest()
     {
         $mockResponse = json_encode([
diff --git a/tests/Http/OrderCaptureRequestTest.php b/tests/Http/OrderCaptureRequestTest.php
@@ -12,25 +12,37 @@
 
 class OrderCaptureRequestTest extends TestCase
 {
+    /**
+     * @test
+     */
     public function testHasCorrectUri()
     {
         $request = new OrderCaptureRequest('1KC5501443316171H');
         $this->assertEquals('/v2/checkout/orders/1KC5501443316171H/capture', $request->getUri());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectMethod()
     {
         $request = new OrderCaptureRequest('1KC5501443316171H');
         $this->assertEquals('POST', $request->getMethod());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectHeaders()
     {
         $request = new OrderCaptureRequest('1KC5501443316171H');
         $this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));
         $this->assertEquals('return=representation', $request->getHeaderLine('Prefer'));
     }
 
+    /**
+     * @test
+     */
     public function testExecuteRequest()
     {
         $mockResponse = Utils::jsonEncode([
diff --git a/tests/Http/OrderCreateRequestTest.php b/tests/Http/OrderCreateRequestTest.php
@@ -16,25 +16,37 @@
 
 class OrderCreateRequestTest extends TestCase
 {
+    /**
+     * @test
+     */
     public function testHasCorrectUri()
     {
         $request = new OrderCreateRequest();
         $this->assertEquals('/v2/checkout/orders', $request->getUri());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectMethod()
     {
         $request = new OrderCreateRequest();
         $this->assertEquals('POST', $request->getMethod());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectHeaders()
     {
         $request = new OrderCreateRequest();
         $this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));
         $this->assertEquals('return=representation', $request->getHeaderLine('Prefer'));
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectDataWithGetBody()
     {
         $purchase_unit = new PurchaseUnit('USD', 100.00);
@@ -52,6 +64,9 @@ public function testHasCorrectDataWithGetBody()
         $this->assertEquals($order->toArray(), Utils::jsonDecode($request->getBody(), true));
     }
 
+    /**
+     * @test
+     */
     public function testExecuteRequest()
     {
         $mockResponse = Utils::jsonEncode([
diff --git a/tests/Http/OrderShowRequestTest.php b/tests/Http/OrderShowRequestTest.php
@@ -12,25 +12,37 @@
 
 class OrderShowRequestTest extends TestCase
 {
+    /**
+     * @test
+     */
     public function testHasCorrectUri()
     {
         $request = new OrderShowRequest('1KC5501443316171H');
         $this->assertEquals('/v2/checkout/orders/1KC5501443316171H', $request->getUri());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectMethod()
     {
         $request = new OrderShowRequest('1KC5501443316171H');
         $this->assertEquals('GET', $request->getMethod());
     }
 
+    /**
+     * @test
+     */
     public function testHasCorrectHeaders()
     {
         $request = new OrderShowRequest('1KC5501443316171H');
         $this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));
         $this->assertEquals('return=representation', $request->getHeaderLine('Prefer'));
     }
 
+    /**
+     * @test
+     */
     public function testExecuteRequest()
     {
         $mockResponse = Utils::jsonEncode([
diff --git a/tests/Http/PayPalClientTest.php b/tests/Http/PayPalClientTest.php

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,12 @@ public function baseUrl()`
`13`	`13`	`{`
`14`	`14`	`return 'https://api.paypal.com';`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ /**`
	`18`	`+ * @return string`
	`19`	`+ */`
	`20`	`+ public function name()`
	`21`	`+ {`
	`22`	`+ return 'production';`
	`23`	`+ }`
`16`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,37 +24,55 @@ protected function setUp(): void`
`24`	`24`	`$this->environment = new ProductionEnvironment('client_id', 'client_secret');`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ /**`
	`28`	`+ * @test`
	`29`	`+ */`
`27`	`30`	`public function testHasCorrectUri()`
`28`	`31`	`{`
`29`	`32`	`$request = new AccessTokenRequest($this->environment);`
`30`	`33`	`$this->assertEquals('/v1/oauth2/token', $request->getUri());`
`31`	`34`	`}`
`32`	`35`
	`36`	`+ /**`
	`37`	`+ * @test`
	`38`	`+ */`
`33`	`39`	`public function testHasCorrectMethod()`
`34`	`40`	`{`
`35`	`41`	`$request = new AccessTokenRequest($this->environment);`
`36`	`42`	`$this->assertEquals('POST', $request->getMethod());`
`37`	`43`	`}`
`38`	`44`
	`45`	`+ /**`
	`46`	`+ * @test`
	`47`	`+ */`
`39`	`48`	`public function testHasCorrectHeaders()`
`40`	`49`	`{`
`41`	`50`	`$request = new AccessTokenRequest($this->environment);`
`42`	`51`	`$this->assertEquals('application/x-www-form-urlencoded', $request->getHeaderLine('Content-Type'));`
`43`	`52`	`}`
`44`	`53`
	`54`	`+ /**`
	`55`	`+ * @test`
	`56`	`+ */`
`45`	`57`	`public function testHasBasicAuthHeaders()`
`46`	`58`	`{`
`47`	`59`	`$request = new AccessTokenRequest($this->environment);`
`48`	`60`	`$this->assertEquals('Basic '.$this->environment->basicAuthorizationString(), $request->getHeaderLine('Authorization'));`
`49`	`61`	`}`
`50`	`62`
	`63`	`+ /**`
	`64`	`+ * @test`
	`65`	`+ */`
`51`	`66`	`public function testHasCorrectDataWithGetBody()`
`52`	`67`	`{`
`53`	`68`	`$request = new AccessTokenRequest($this->environment);`
`54`	`69`	`$expected = http_build_query(['grant_type' => 'client_credentials']);`
`55`	`70`	`$this->assertEquals($expected, (string) $request->getBody());`
`56`	`71`	`}`
`57`	`72`
	`73`	`+ /**`
	`74`	`+ * @test`
	`75`	`+ */`
`58`	`76`	`public function testExecuteRequest()`
`59`	`77`	`{`
`60`	`78`	`$mockResponse = json_encode([`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,19 @@`
`7`	`7`
`8`	`8`	`class AccessTokenTest extends TestCase`
`9`	`9`	`{`
	`10`	`+ /**`
	`11`	`+ * @test`
	`12`	`+ */`
`10`	`13`	`public function testCreateAccessToken()`
`11`	`14`	`{`
`12`	`15`	`$accessToken = new AccessToken('A21AAFSO5otrlVigoJUQ1p', 'Bearer', 32400);`
`13`	`16`	`$this->assertEquals('A21AAFSO5otrlVigoJUQ1p', $accessToken->getToken());`
`14`	`17`	`$this->assertEquals('Bearer', $accessToken->getTokenType());`
`15`	`18`	`}`
`16`	`19`
	`20`	`+ /**`
	`21`	`+ * @test`
	`22`	`+ */`
`17`	`23`	`public function testTokenIsExpired()`
`18`	`24`	`{`
`19`	`25`	`$accessToken = new AccessToken('A21AAFSO5otrlVigoJUQ1p', 'Bearer', 32400);`
`@@ -22,6 +28,9 @@ public function testTokenIsExpired()`
`22`	`28`	`$this->assertTrue($accessToken->isExpired());`
`23`	`29`	`}`
`24`	`30`
	`31`	`+ /**`
	`32`	`+ * @test`
	`33`	`+ */`
`25`	`34`	`public function testTokenAuthorizationString()`
`26`	`35`	`{`
`27`	`36`	`$accessToken = new AccessToken('Token', 'Bearer', 32400);`
Original file line number	Diff line number	Diff line change
`@@ -12,25 +12,37 @@`
`12`	`12`
`13`	`13`	`class OrderAuthorizeRequestTest extends TestCase`
`14`	`14`	`{`
	`15`	`+ /**`
	`16`	`+ * @test`
	`17`	`+ */`
`15`	`18`	`public function testHasCorrectUri()`
`16`	`19`	`{`
`17`	`20`	`$request = new OrderAuthorizeRequest('1KC5501443316171H');`
`18`	`21`	`$this->assertEquals('/v2/checkout/orders/1KC5501443316171H/authorize', $request->getUri());`
`19`	`22`	`}`
`20`	`23`
	`24`	`+ /**`
	`25`	`+ * @test`
	`26`	`+ */`
`21`	`27`	`public function testHasCorrectMethod()`
`22`	`28`	`{`
`23`	`29`	`$request = new OrderAuthorizeRequest('1KC5501443316171H');`
`24`	`30`	`$this->assertEquals('POST', $request->getMethod());`
`25`	`31`	`}`
`26`	`32`
	`33`	`+ /**`
	`34`	`+ * @test`
	`35`	`+ */`
`27`	`36`	`public function testHasCorrectHeaders()`
`28`	`37`	`{`
`29`	`38`	`$request = new OrderAuthorizeRequest('1KC5501443316171H');`
`30`	`39`	`$this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));`
`31`	`40`	`$this->assertEquals('return=representation', $request->getHeaderLine('Prefer'));`
`32`	`41`	`}`
`33`	`42`
	`43`	`+ /**`
	`44`	`+ * @test`
	`45`	`+ */`
`34`	`46`	`public function testExecuteRequest()`
`35`	`47`	`{`
`36`	`48`	`$mockResponse = json_encode([`
Original file line number	Diff line number	Diff line change
`@@ -16,25 +16,37 @@`
`16`	`16`
`17`	`17`	`class OrderCreateRequestTest extends TestCase`
`18`	`18`	`{`
	`19`	`+ /**`
	`20`	`+ * @test`
	`21`	`+ */`
`19`	`22`	`public function testHasCorrectUri()`
`20`	`23`	`{`
`21`	`24`	`$request = new OrderCreateRequest();`
`22`	`25`	`$this->assertEquals('/v2/checkout/orders', $request->getUri());`
`23`	`26`	`}`
`24`	`27`
	`28`	`+ /**`
	`29`	`+ * @test`
	`30`	`+ */`
`25`	`31`	`public function testHasCorrectMethod()`
`26`	`32`	`{`
`27`	`33`	`$request = new OrderCreateRequest();`
`28`	`34`	`$this->assertEquals('POST', $request->getMethod());`
`29`	`35`	`}`
`30`	`36`
	`37`	`+ /**`
	`38`	`+ * @test`
	`39`	`+ */`
`31`	`40`	`public function testHasCorrectHeaders()`
`32`	`41`	`{`
`33`	`42`	`$request = new OrderCreateRequest();`
`34`	`43`	`$this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));`
`35`	`44`	`$this->assertEquals('return=representation', $request->getHeaderLine('Prefer'));`
`36`	`45`	`}`
`37`	`46`
	`47`	`+ /**`
	`48`	`+ * @test`
	`49`	`+ */`
`38`	`50`	`public function testHasCorrectDataWithGetBody()`
`39`	`51`	`{`
`40`	`52`	`$purchase_unit = new PurchaseUnit('USD', 100.00);`
`@@ -52,6 +64,9 @@ public function testHasCorrectDataWithGetBody()`
`52`	`64`	`$this->assertEquals($order->toArray(), Utils::jsonDecode($request->getBody(), true));`
`53`	`65`	`}`
`54`	`66`
	`67`	`+ /**`
	`68`	`+ * @test`
	`69`	`+ */`
`55`	`70`	`public function testExecuteRequest()`
`56`	`71`	`{`
`57`	`72`	`$mockResponse = Utils::jsonEncode([`