Merge pull request #8 from gemal/master

Bug fixes and updates

.travis.yml

@@ -1,17 +1,14 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
-  - 7.0
-
-matrix:
-  allow_failures:
-    - php: 7.0
+  - 7.1
+  - 7.2
 
 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:
-  - phpunit
+  - if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then vendor/bin/phpunit; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != '7.1' ]]; then phpunit; fi

README.md

@@ -97,7 +97,7 @@ You can set the account number you wish to use by calling;
 
 You can then also retrieve the currently set account number with:
 
-	$Reporter->getAccountNumber();
+	$Reporter->getAccountNum();
 
 ### Vendor Number
 

src/Reporter.php

@@ -261,7 +261,8 @@ public function performRequest($endpoint, $jsonRequest)
                     'headers' => [
                         'User-Agent' => 'Java/1.8.0_92',
                         'Accept' => 'text/xml, text/plain'
-                    ]
+                    ],
+                    'decode_content' => false
                 ]
             );
 

tests/ReporterTest.php

@@ -138,7 +138,7 @@ public function testProcessResponseReturnsCorrectArray()
     {
         $action = 'Sales.getVendors';
 
-        $WorkingResponse = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $WorkingResponse = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $WorkingResponse->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Vendors><Vendor>1234567</Vendor><Vendor>9876543</Vendor></Vendors>');
 
@@ -157,7 +157,7 @@ public function testProcessResponseReturnsCorrectArray()
             )
         );
 
-        $BlankResponse = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $BlankResponse = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $BlankResponse->method('getBody')
             ->willReturn('');
 
@@ -174,7 +174,7 @@ public function testProcessResponseThrowsExceptionIfInvalidAction()
     {
         $this->setExpectedException('InvalidArgumentException');
 
-        $BlankResponse = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $BlankResponse = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $BlankResponse->method('getBody')
             ->willReturn('');
 
@@ -187,13 +187,13 @@ public function testProcessResponseThrowsExceptionIfInvalidAction()
 
     public function testPerformRequestCanCheckStatusAndReturnCorrectly()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Vendors><Vendor>1234567</Vendor><Vendor>9876543</Vendor></Vendors>');
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -231,13 +231,13 @@ public function testPerformRequestCanCheckStatusAndReturnCorrectly()
 
     public function testPerformRequestWhenResponseHasFailed()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('');
         $Response->method('getStatusCode')
             ->willReturn(404);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -270,13 +270,13 @@ public function testPerformRequestWhenResponseHasFailed()
 
     public function testGetSalesAccountsReturnsCorrectArray()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Accounts><Account><Name>John Smith</Name><Number>1234567</Number></Account></Accounts>');
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -299,13 +299,13 @@ public function testGetSalesAccountsReturnsCorrectArray()
 
     public function testGetSalesAccountsReturnsBlankArrayOnFail()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('');
         $Response->method('getStatusCode')
             ->willReturn(404);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -323,13 +323,13 @@ public function testGetSalesAccountsReturnsBlankArrayOnFail()
 
     public function testGetSalesVendorsReturnsCorrectArray()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Vendors><Vendor>1234567</Vendor><Vendor>9876543</Vendor></Vendors>');
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -350,13 +350,13 @@ public function testGetSalesVendorsReturnsCorrectArray()
 
     public function testGetSalesVendorsReturnsBlankArrayOnFail()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('');
         $Response->method('getStatusCode')
             ->willReturn(404);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -374,13 +374,13 @@ public function testGetSalesVendorsReturnsBlankArrayOnFail()
 
     public function testGetFinanceAccountsReturnsCorrectArray()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Accounts><Account><Name>John Smith</Name><Number>1234567</Number></Account></Accounts>');
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -403,13 +403,13 @@ public function testGetFinanceAccountsReturnsCorrectArray()
 
     public function testGetFinanceAccountsReturnsBlankArrayOnFail()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('');
         $Response->method('getStatusCode')
             ->willReturn(404);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -427,13 +427,13 @@ public function testGetFinanceAccountsReturnsBlankArrayOnFail()
 
     public function testGetFinanceVendorsReturnsCorrectArray()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><VendorsAndRegions><Vendor><Number>1234567</Number><Region><Code>AE</Code><Reports><Report>Financial</Report></Reports></Region><Region><Code>AU</Code><Reports><Report>Financial</Report><Report>Sale</Report></Reports></Region></Vendor></VendorsAndRegions>');
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -470,13 +470,13 @@ public function testGetFinanceVendorsReturnsCorrectArray()
 
     public function testGetFinanceVendorsReturnsBlankArrayOnFail()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('');
         $Response->method('getStatusCode')
             ->willReturn(404);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -494,15 +494,15 @@ public function testGetFinanceVendorsReturnsBlankArrayOnFail()
 
     public function testGetSalesReportReturnsCorrectReport()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn(
                 new TestSalesReportContent
             );
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -536,15 +536,15 @@ public function testGetSalesReportReturnsCorrectReport()
 
     public function testGetSalesReportReturnsBlankArrayWhenNoReport()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn(
                 new TestSalesReportNoContent
             );
         $Response->method('getStatusCode')
             ->willReturn(404);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -562,15 +562,15 @@ public function testGetSalesReportReturnsBlankArrayWhenNoReport()
 
     public function testGetFinanceReportReturnsCorrectReport()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn(
                 new TestFinanceReportContent
             );
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -606,15 +606,15 @@ public function testGetFinanceReportReturnsCorrectReport()
 
     public function testGetFinanceReportReturnsBlankArrayWhenNoReport()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn(
                 new TestFinanceReportNoContent
             );
         $Response->method('getStatusCode')
             ->willReturn(404);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response
@@ -632,13 +632,13 @@ public function testGetFinanceReportReturnsBlankArrayWhenNoReport()
 
     public function testGetLastResultReturnsCorrectValue()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Vendors><Vendor>1234567</Vendor><Vendor>9876543</Vendor></Vendors>');
         $Response->method('getStatusCode')
             ->willReturn(200);
 
-        $GuzzleMock = $this->getMock('GuzzleHttp\ClientInterface');
+        $GuzzleMock = $this->getMockBuilder('GuzzleHttp\ClientInterface')->getMock();
         $GuzzleMock->method('request')
             ->willReturn(
                 $Response

tests/Responses/FinanceGetAccountsTest.php

@@ -7,7 +7,7 @@ class FinanceGetAccountsTest extends \PHPUnit_Framework_TestCase
 {
     public function testProcessReturnsCorrectValueForSingleFinanceAccount()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Accounts><Account><Name>John Smith</Name><Number>1234567</Number></Account></Accounts>');
 
@@ -28,7 +28,7 @@ public function testProcessReturnsCorrectValueForSingleFinanceAccount()
 
     public function testProcessReturnsCorrectValueForMultipleFinanceAccount()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Accounts><Account><Name>John Smith</Name><Number>1234567</Number></Account><Account><Name>Jane Doe</Name><Number>9876543</Number></Account></Accounts>');
 
@@ -53,7 +53,7 @@ public function testProcessReturnsCorrectValueForMultipleFinanceAccount()
 
     public function testProcessReturnsEmptyArrayForInvalidXML()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Accounts><Account><Name>John Smith 1234567</Number></Account><Account><Name>Jane Doe</Name><Number>9876543</Number></Accounts>');
 
@@ -69,7 +69,7 @@ public function testProcessReturnsEmptyArrayForInvalidXML()
 
     public function testProcessReturnsEmptyArrayForEmptyContents()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn('');
 

tests/Responses/FinanceGetReportTest.php

@@ -7,7 +7,7 @@ class FinanceGetReportTest extends \PHPUnit_Framework_TestCase
 {
     public function testProcessReturnsReportInArrayFormat()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn(
                 new TestFinanceReportContent
@@ -43,7 +43,7 @@ public function testProcessReturnsReportInArrayFormat()
 
     public function testProcessReturnsEmptyArrayWhenContentsEmpty()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn(
                 new TestFinanceReportNoContent
@@ -61,7 +61,7 @@ public function testProcessReturnsEmptyArrayWhenContentsEmpty()
 
     public function testProcessReturnsEmptyArrayIfFileIsNotGZipped()
     {
-        $Response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $Response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
         $Response->method('getBody')
             ->willReturn(
                 new TestFinanceReportNoEncoding