PHP-CS-Fixer @PHPUnit57Migration changes

tests/Stripe/AccountTest.php

@@ -16,7 +16,7 @@ public function testIsListable()
             '/v1/accounts'
         );
         $resources = Account::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\Account::class, $resources->data[0]);
     }
 
@@ -126,7 +126,7 @@ public function testPersons()
             '/v1/accounts/' . $account->id . '/persons'
         );
         $persons = $account->persons();
-        $this->assertTrue(is_array($persons->data));
+        $this->assertInternalType('array', $persons->data);
         $this->assertInstanceOf(\Stripe\Person::class, $persons->data[0]);
     }
 
@@ -159,7 +159,7 @@ public function testCanListCapabilities()
             '/v1/accounts/' . self::TEST_RESOURCE_ID . '/capabilities'
         );
         $resources = Account::allCapabilities(self::TEST_RESOURCE_ID);
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
     }
 
     public function testCanCreateExternalAccount()
@@ -213,7 +213,7 @@ public function testCanListExternalAccounts()
             '/v1/accounts/' . self::TEST_RESOURCE_ID . '/external_accounts'
         );
         $resources = Account::allExternalAccounts(self::TEST_RESOURCE_ID);
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
     }
 
     public function testCanCreateLoginLink()
@@ -281,7 +281,7 @@ public function testCanListPersons()
             '/v1/accounts/' . self::TEST_RESOURCE_ID . '/persons'
         );
         $resources = Account::allPersons(self::TEST_RESOURCE_ID);
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
     }
 
     public function testSerializeNewAdditionalOwners()
@@ -395,11 +395,10 @@ public function testSerializeUnsetAdditionalOwners()
         $this->assertSame($expected, $obj->serializeParameters());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testSerializeAdditionalOwnersDeletedItem()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $obj = Util\Util::convertToStripeObject([
             'object' => 'account',
             'legal_entity' => [

tests/Stripe/AlipayAccountTest.php

@@ -33,11 +33,10 @@ public function testHasCorrectUrlForCustomer()
         );
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyRetrievable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         AlipayAccount::retrieve(self::TEST_RESOURCE_ID);
     }
 
@@ -53,11 +52,10 @@ public function testIsSaveable()
         $this->assertSame(\Stripe\AlipayAccount::class, get_class($resource));
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyUpdatable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         AlipayAccount::update(self::TEST_RESOURCE_ID, [
             "metadata" => ["key" => "value"],
         ]);

tests/Stripe/ApiRequestorTest.php

@@ -79,12 +79,11 @@ public function testDefaultHeaders()
         $this->assertSame($headers['Authorization'], 'Bearer ' . $apiKey);
     }
 
-    /**
-     * @expectedException \Stripe\Exception\AuthenticationException
-     * @expectedExceptionMessageRegExp #No API key provided#
-     */
     public function testRaisesAuthenticationErrorWhenNoApiKey()
     {
+        $this->expectException(\Stripe\Exception\AuthenticationException::class);
+        $this->expectExceptionMessageRegExp('#No API key provided#');
+
         Stripe::setApiKey(null);
         Charge::create();
     }
@@ -112,7 +111,7 @@ public function testRaisesInvalidRequestErrorOn400()
             $this->fail("Did not raise error");
         } catch (Exception\InvalidRequestException $e) {
             $this->assertSame(400, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame('Missing id', $e->getMessage());
             $this->assertSame('id', $e->getStripeParam());
         } catch (\Exception $e) {
@@ -142,7 +141,7 @@ public function testRaisesIdempotencyErrorOn400AndTypeIdempotencyError()
             $this->fail("Did not raise error");
         } catch (Exception\IdempotencyException $e) {
             $this->assertSame(400, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame("Keys for idempotent requests can only be used with the same parameters they were first used with. Try using a key other than 'abc' if you meant to execute a different request.", $e->getMessage());
         } catch (\Exception $e) {
             $this->fail("Unexpected exception: " . get_class($e));
@@ -171,7 +170,7 @@ public function testRaisesAuthenticationErrorOn401()
             $this->fail("Did not raise error");
         } catch (Exception\AuthenticationException $e) {
             $this->assertSame(401, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame('You did not provide an API key.', $e->getMessage());
         } catch (\Exception $e) {
             $this->fail("Unexpected exception: " . get_class($e));
@@ -204,7 +203,7 @@ public function testRaisesCardErrorOn402()
             $this->fail("Did not raise error");
         } catch (Exception\CardException $e) {
             $this->assertSame(402, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame('Your card was declined.', $e->getMessage());
             $this->assertSame('card_declined', $e->getStripeCode());
             $this->assertSame('generic_decline', $e->getDeclineCode());
@@ -236,7 +235,7 @@ public function testRaisesPermissionErrorOn403()
             $this->fail("Did not raise error");
         } catch (Exception\PermissionException $e) {
             $this->assertSame(403, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame("The provided key 'sk_test_********************1234' does not have access to account 'foo' (or that account does not exist). Application access may have been revoked.", $e->getMessage());
         } catch (\Exception $e) {
             $this->fail("Unexpected exception: " . get_class($e));
@@ -266,7 +265,7 @@ public function testRaisesInvalidRequestErrorOn404()
             $this->fail("Did not raise error");
         } catch (Exception\InvalidRequestException $e) {
             $this->assertSame(404, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame('No such charge: foo', $e->getMessage());
             $this->assertSame('id', $e->getStripeParam());
         } catch (\Exception $e) {
@@ -295,7 +294,7 @@ public function testRaisesRateLimitErrorOn429()
             $this->fail("Did not raise error");
         } catch (Exception\RateLimitException $e) {
             $this->assertSame(429, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame('Too many requests', $e->getMessage());
         } catch (\Exception $e) {
             var_dump($e);
@@ -325,7 +324,7 @@ public function testRaisesRateLimitErrorOn400AndCodeRateLimit()
             $this->fail("Did not raise error");
         } catch (Exception\RateLimitException $e) {
             $this->assertSame(400, $e->getHttpStatus());
-            $this->assertTrue(is_array($e->getJsonBody()));
+            $this->assertInternalType('array', $e->getJsonBody());
             $this->assertSame('Too many requests', $e->getMessage());
         } catch (\Exception $e) {
             $this->fail("Unexpected exception: " . get_class($e));

tests/Stripe/ApplePayDomainTest.php

@@ -13,7 +13,7 @@ public function testIsListable()
             '/v1/apple_pay/domains'
         );
         $resources = ApplePayDomain::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\ApplePayDomain::class, $resources->data[0]);
     }
 

tests/Stripe/ApplicationFeeTest.php

@@ -14,7 +14,7 @@ public function testIsListable()
             '/v1/application_fees'
         );
         $resources = ApplicationFee::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\ApplicationFee::class, $resources->data[0]);
     }
 
@@ -65,7 +65,7 @@ public function testCanListRefunds()
             '/v1/application_fees/' . self::TEST_RESOURCE_ID . '/refunds'
         );
         $resources = ApplicationFee::allRefunds(self::TEST_RESOURCE_ID);
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\ApplicationFeeRefund::class, $resources->data[0]);
     }
 }

tests/Stripe/BalanceTransactionTest.php

@@ -13,7 +13,7 @@ public function testIsListable()
             '/v1/balance_transactions'
         );
         $resources = BalanceTransaction::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\BalanceTransaction::class, $resources->data[0]);
     }
 

tests/Stripe/BankAccountTest.php

@@ -42,11 +42,10 @@ public function testHasCorrectUrlForAccount()
         );
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyRetrievable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         BankAccount::retrieve(self::TEST_RESOURCE_ID);
     }
 
@@ -62,11 +61,10 @@ public function testIsSaveable()
         $this->assertSame(\Stripe\BankAccount::class, get_class($resource));
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyUpdatable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         BankAccount::update(self::TEST_RESOURCE_ID, [
             "metadata" => ["key" => "value"],
         ]);

tests/Stripe/BitcoinReceiverTest.php

@@ -46,7 +46,7 @@ public function testIsListable()
             '/v1/bitcoin/receivers'
         );
         $resources = BitcoinReceiver::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertSame(\Stripe\BitcoinReceiver::class, get_class($resources->data[0]));
     }
 

tests/Stripe/CapabilityTest.php

@@ -16,11 +16,10 @@ public function testHasCorrectUrl()
         );
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyRetrievable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         Capability::retrieve(self::TEST_RESOURCE_ID);
     }
 
@@ -36,11 +35,10 @@ public function testIsSaveable()
         $this->assertInstanceOf(\Stripe\Capability::class, $resource);
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyUpdatable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         Capability::update(self::TEST_RESOURCE_ID, ["requested" => true]);
     }
 }

tests/Stripe/CardTest.php

@@ -51,11 +51,10 @@ public function testHasCorrectUrlForRecipient()
         );
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyRetrievable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         Card::retrieve(self::TEST_RESOURCE_ID);
     }
 
@@ -71,11 +70,10 @@ public function testIsSaveable()
         $this->assertSame(\Stripe\Card::class, get_class($resource));
     }
 
-    /**
-     * @expectedException \Stripe\Exception\BadMethodCallException
-     */
     public function testIsNotDirectlyUpdatable()
     {
+        $this->expectException(\Stripe\Exception\BadMethodCallException::class);
+
         Card::update(self::TEST_RESOURCE_ID, [
             "metadata" => ["key" => "value"],
         ]);

tests/Stripe/ChargeTest.php

@@ -13,7 +13,7 @@ public function testIsListable()
             '/v1/charges'
         );
         $resources = Charge::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\Charge::class, $resources->data[0]);
     }
 

tests/Stripe/CollectionTest.php

@@ -19,12 +19,11 @@ public function setUpFixture()
         ]);
     }
 
-    /**
-     * @expectedException \Stripe\Exception\InvalidArgumentException
-     * @expectedExceptionMessageRegExp /You tried to access the \d index/
-     */
     public function testOffsetGetNumericIndex()
     {
+        $this->expectException(\Stripe\Exception\InvalidArgumentException::class);
+        $this->expectExceptionMessageRegExp('/You tried to access the \\d index/');
+
         $this->fixture[0];
     }
 
@@ -45,7 +44,7 @@ public function testCanList()
         );
 
         $resources = $this->fixture->all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
     }
 
     public function testCanRetrieve()

tests/Stripe/CountrySpecTest.php

@@ -13,7 +13,7 @@ public function testIsListable()
             '/v1/country_specs'
         );
         $resources = CountrySpec::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\CountrySpec::class, $resources->data[0]);
     }
 

tests/Stripe/CouponTest.php

@@ -13,7 +13,7 @@ public function testIsListable()
             '/v1/coupons'
         );
         $resources = Coupon::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\Coupon::class, $resources->data[0]);
     }
 

tests/Stripe/CreditNoteTest.php

@@ -13,7 +13,7 @@ public function testIsListable()
             '/v1/credit_notes'
         );
         $resources = CreditNote::all();
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
         $this->assertInstanceOf(\Stripe\CreditNote::class, $resources->data[0]);
     }
 
@@ -97,6 +97,6 @@ public function testCanListLines()
             '/v1/credit_notes/' . self::TEST_RESOURCE_ID . '/lines'
         );
         $resources = CreditNote::allLines(self::TEST_RESOURCE_ID);
-        $this->assertTrue(is_array($resources->data));
+        $this->assertInternalType('array', $resources->data);
     }
 }