Merge pull request #1 from enricodias/dev

Fixes unexpected null result in php 5.6

.travis.yml

@@ -18,6 +18,9 @@ install:
 script:
   - php vendor/bin/phpunit
 
+after_success:
+  - php vendor/bin/ocular code-coverage:upload --format=php-clover tests/_reports/logs/clover.xml
+
 branches:
   only: 
     - master

composer.json

@@ -28,6 +28,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": ">5.7 <9"
+        "phpunit/phpunit": ">5.7 <9",
+        "scrutinizer/ocular": "^1.6"
     }
 }

phpunit.xml

@@ -31,4 +31,9 @@
             <directory suffix=".php">./tests</directory>
         </whitelist>
     </filter>
+    <logging>
+        <log type="coverage-clover" target="tests/_reports/logs/clover.xml"/>
+        <log type="coverage-html" target="tests/_reports/coverage" lowUpperBound="35" highLowerBound="70"/>
+        <log type="testdox-text" target="tests/_reports/testdox/executed.txt"/>
+    </logging>
 </phpunit>

src/SmsDev.php

@@ -219,7 +219,7 @@ private function makeRequest($request)
 
         $response = json_decode($response->getBody(), true);
 
-        if (json_last_error() != JSON_ERROR_NONE) return false;
+        if (json_last_error() != JSON_ERROR_NONE || is_array($response) === false) return false;
 
         $this->_result = $response;
 
@@ -231,6 +231,8 @@ private function makeRequest($request)
      * This method is needed to test API calls in unit tests.
      *
      * @return object GuzzleHttp\Client instance.
+     * 
+     * @codeCoverageIgnore
      */
     protected function getGuzzleClient()
     {

tests/ApiRequestsTest.php

@@ -159,4 +159,27 @@ public function testFilterByDate()
         $this->assertSame('01/01/2019', $query['date_from']);
         $this->assertArrayNotHasKey('date_to', $query);
     }
+
+    /**
+     * Test the timezone calculations in the date filters.
+     * 
+     * Example: 2020-01-02 01:00:00 should be day 2020-01-01 in America/Sao_Paulo
+     */
+    public function testTimezoneDate()
+    {
+        $SmsDev = $this->getServiceMock();
+
+        date_default_timezone_set('UTC');
+
+        $SmsDev->setDateFormat('Y-m-d H:i:s')
+            ->setFilter()
+                ->dateFrom('2020-01-02 01:00:00')
+            ->fetch();
+
+        $this->assertSame('/get', $this->_container[0]['request']->getUri()->getPath());
+
+        $query = $this->_container[0]['request']->getHeaders()['query'];
+
+        $this->assertSame('01/01/2020', $query['date_from']);
+    }
 }

tests/ApiResponseTest.php

@@ -72,7 +72,7 @@ public function testFilterByUnread()
 
         $parsedMessages = current($SmsDev->parsedMessages());
 
-        $this->assertSame('2018-01-19 11:35:14', $parsedMessages['date']);
+        $this->assertSame('2018-01-19 13:35:14', $parsedMessages['date']); // UTC conversion
         $this->assertSame('5511988887777',       $parsedMessages['number']);
         $this->assertSame('Resposta',            $parsedMessages['message']);
     }

tests/SmsDevMock.php

@@ -12,7 +12,7 @@ abstract class SmsDevMock extends TestCase
 
     public function getServiceMock($apiResponse = '')
     {
-        date_default_timezone_set('America/Sao_Paulo');
+        date_default_timezone_set('UTC');
 
         $this->_container = [];