Merge pull request #2 from open-source-contributions/test_enhancement

Enhance tests for assertions and string casting

Author: zhooravell

.travis.yml

@@ -4,13 +4,14 @@ php:
     - 7.1
     - 7.2
     - 7.3
+    - 7.4
 
 before_script:
     - travis_retry composer self-update
-    - travis_retry composer install --no-interaction --prefer-source --dev
+    - travis_retry composer install --no-interaction --prefer-source
 
 script:
     - vendor/bin/phpunit --coverage-clover=coverage.xml
 
 after_success:
-    - bash <(curl -s https://codecov.io/bash)
+    - bash <(curl -s https://codecov.io/bash)

src/MonobankClient.php

@@ -90,7 +90,7 @@ private function request(string $method, string $endpoint, Token $token = null):
     {
         $headers = [
             'Accept' => 'application/json',
-            'User-Agent' => sprintf('%s MonobankPHPClient/%s', $this->client->getConfig('headers')['User-Agent'], MONOBANK_CLIENT_VERSION),
+            'User-Agent' => sprintf('%s MonobankPHPClient/%s', $this->client->getConfig('headers')['User-Agent'] ?? '', MONOBANK_CLIENT_VERSION),
         ];
 
         if (null !== $token) {

tests/GetClientInfoTest.php

@@ -51,9 +51,9 @@ public function testSuccess()
 
         $result = $client->getClientInfo();
 
-        $this->assertTrue(is_array($result));
-        $this->assertTrue(is_array($result['accounts']));
-        $this->assertTrue(1 == count($result['accounts']));
+        $this->assertIsArray($result);
+        $this->assertIsArray($result['accounts']);
+        $this->assertCount(1, $result['accounts']);
         $this->assertEquals('Mono cat', $result['name']);
     }
 
@@ -147,7 +147,7 @@ public function testCheckParams()
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/GetExchangeRatesTest.php

@@ -51,8 +51,8 @@ public function testSuccess()
 
         $result = $client->getExchangeRates();
 
-        $this->assertTrue(is_array($result));
-        $this->assertTrue(1 == count($result));
+        $this->assertIsArray($result);
+        $this->assertCount(1, $result);
         $this->assertEquals(840, $result[0]['currencyCodeA']);
         $this->assertEquals(980, $result[0]['currencyCodeB']);
         $this->assertEquals(1552392228, $result[0]['date']);
@@ -148,7 +148,7 @@ public function testCheckParams()
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/GetPersonalStatementTest.php

@@ -56,13 +56,13 @@ public function testSuccess()
         $client = new MonobankClient($httpClient, $token);
         $result = $client->getPersonalStatement(new PersonalStatementRequest(new DateTime(), new DateTime()));
 
-        $this->assertTrue(is_array($result));
-        $this->assertTrue(1 == count($result));
+        $this->assertIsArray($result);
+        $this->assertCount(1, $result);
         $this->assertEquals('ZuHWzqkKGVo=', $result[0]['id']);
         $this->assertEquals(1554466347, $result[0]['time']);
         $this->assertEquals('Покупка щастя', $result[0]['description']);
         $this->assertEquals(7997, $result[0]['mcc']);
-        $this->assertEquals(false, $result[0]['hold']);
+        $this->assertFalse($result[0]['hold']);
         $this->assertEquals(-95000, $result[0]['amount']);
         $this->assertEquals(-95000, $result[0]['operationAmount']);
         $this->assertEquals(980, $result[0]['currencyCode']);
@@ -215,7 +215,7 @@ public function testCheckParamsWithAccountID()
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/ValueObject/AccountIDTest.php

@@ -22,7 +22,7 @@ class AccountIDTest extends TestCase
      */
     public function testSuccess(string $id)
     {
-        $this->assertEquals($id, strval(new AccountID($id)));
+        $this->assertEquals($id, (string) (new AccountID($id)));
     }
 
     /**

tests/ValueObject/TokenTest.php

@@ -22,7 +22,7 @@ class TokenTest extends TestCase
      */
     public function testSuccess(string $token)
     {
-        $this->assertEquals($token, strval(new Token($token)));
+        $this->assertEquals($token, (string) (new Token($token)));
     }
 
     /**