Upgrade travis and more (pionl#11)

* Added confirmation request to import settings.

* Parameter "confirmation_request" writing has been changed.

* Fixed incorrect namespace for confirmation request.

* Added support for contact purpose.

* Editing releases in readme.md.
Fix bad names in Purposes holder.

* New line in the end of file ConfirmationRequest.php.

* Updated travis.yml by composer minimum PHP version requirement.

* Upgrade PHPUnit to 7.5

* Clean from old PHPDoc and fix no assertions.

* Missing client property in Api class.

* Upgrade Guzzle to 7.2.

* File .editorconfig. New line at end of files.

* Support last tested guzzle and greater.

.editorconfig

@@ -0,0 +1,9 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+[*]
+charset = utf-8
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 php:
-  - '5.6'
-  - '7.0'
-  - '7.1'
+  - '7.3'
+  - '7.4'
 
-before_script: composer install --dev
+before_script: composer install
 
-script: ./vendor/phpunit/phpunit/phpunit --configuration phpunit.xml
+script: ./vendor/phpunit/phpunit/phpunit --configuration phpunit.xml

composer.json

@@ -25,10 +25,10 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=7.3",
-        "guzzlehttp/guzzle": "^6.2"
+        "guzzlehttp/guzzle": ">=6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^7.5",
         "vlucas/phpdotenv": "^2.4"
     }
 }

phpunit.xml

@@ -6,20 +6,10 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="Application Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-        <exclude>
-            <directory>vendor/</directory>
-            <directory>tests/</directory>
-        </exclude>
-    </filter>
 </phpunit>

src/Api.php

@@ -24,6 +24,9 @@ class Api
      */
     private $apiUrl;
 
+    /** @var \GuzzleHttp\Client */
+    private $client;
+
     /**
      * Api constructor.
      *

src/Exceptions/JsonDataInvalidException.php

@@ -35,4 +35,4 @@ public static function throwIfInValid($arrayOrObject, $key, $functionCheck)
 
         return $value;
     }
-}
+}

src/Exceptions/JsonDataMissingException.php

@@ -40,4 +40,4 @@ public static function throwIfSet($arrayOrObject, $key)
         return $arrayOrObject->{$key};
     }
 
-}
+}

src/Exceptions/PropertyRequiredException.php

@@ -25,4 +25,4 @@ public function __construct($propertyName, $customMessage = null, $code = 500, E
         parent::__construct($message, $code, $previous);
     }
 
-}
+}

src/Exceptions/RequestException.php

@@ -45,4 +45,4 @@ public function request()
     {
         return $this->request;
     }
-}
+}

src/Helpers/global_helpers.php

@@ -32,4 +32,4 @@ function value($value, $onNullValue) {
     }
 
     return $value;
-}
+}

src/Models/AbstractHolder.php

@@ -36,4 +36,4 @@ public function jsonSerialize()
     {
         return $this->toArray();
     }
-}
+}

src/Models/AbstractMapHolder.php

@@ -31,4 +31,4 @@ protected function insertEntry($entry)
 
         return true;
     }
-}
+}

src/Models/Model.php

@@ -50,4 +50,4 @@ public function jsonSerialize()
             return !is_null($val);
         });
     }
-}
+}

tests/ApiClientTest.php

@@ -48,4 +48,4 @@ public function testCustomBaseUri()
         // Check if the URL is same
         $this->assertEquals('test', $baseUri);
     }
-}
+}

tests/Mock/HolderMock.php

@@ -10,4 +10,4 @@ public function add($item)
         $this->items[] = $item;
         return $this;
     }
-}
+}

tests/Mock/ModelMock.php

@@ -22,4 +22,4 @@ public function toArray()
         ];
     }
 
-}
+}

tests/Mock/RequestMock.php

@@ -15,4 +15,4 @@ protected function options()
         return ['test'];
     }
 
-}
+}

tests/Models/ModelTest.php

@@ -42,8 +42,7 @@ public function testFromJSON()
             'array' => []
         ]);
 
-        $this->assertObjectNotHasAttribute('unsupported', $model, 'A key should not be imported if not found in default 
-        toArray data');
+        $this->assertObjectNotHasAttribute('unsupported', $model, 'A key should not be imported if not found in default toArray data');
         $this->assertTrue($model->boolean);
         $this->assertNull($model->null);
         $this->assertEquals([], $model->array);
@@ -60,4 +59,4 @@ public function testFromJSONParseNull()
         ]);
         $this->assertNull($model->array);
     }
-}
+}

tests/Request/AbstractRequestTest.php

@@ -56,8 +56,7 @@ public function testResponseStatusCodeWithResponseError()
             'The exception should use json message if Guzzle returns simple error');
         $this->assertEquals(500, $exception->getCode(), 'Exception must have same code as status code');
         $this->assertEquals(500, $exception->response()->statusCode());
-        $this->assertNotNull($exception->request(), 'Non 200 status code should have request - 
-        passed from guzzle exception');
+        $this->assertNotNull($exception->request(), 'Non 200 status code should have request - passed from guzzle exception');
     }
 
     /**
@@ -90,8 +89,7 @@ public function testResponseStatusCode()
         $this->assertEquals('Client error', $exception->getMessage(), 'The exception should use the Guzzles message');
         $this->assertEquals(500, $exception->getCode(), 'Exception must have same code as status code');
         $this->assertEquals(500, $exception->response()->statusCode());
-        $this->assertNotNull($exception->request(), 'Non 200 status code should have request - 
-        passed from guzzle exception');
+        $this->assertNotNull($exception->request(), 'Non 200 status code should have request - passed from guzzle exception');
     }
 
     /**
@@ -111,8 +109,7 @@ public function testResponseStatusCodeWithJson()
         $this->assertEquals('Client error: An error', $exception->getMessage(), 'The guzzle message is simple, append message');
         $this->assertEquals(500, $exception->getCode(), 'Exception must have same code as status code');
         $this->assertEquals(500, $exception->response()->statusCode());
-        $this->assertNotNull($exception->request(), 'Non 200 status code should have request - 
-        passed from guzzle exception');
+        $this->assertNotNull($exception->request(), 'Non 200 status code should have request - passed from guzzle exception');
     }
 
-}
+}

tests/Request/Credentials/CredentialsLiveTest.php

@@ -44,4 +44,4 @@ public function testSend401()
             $this->assertNull($response->accountId(), 'Default value of accountId should be null');
         }
     }
-}
+}

tests/Request/Credentials/CredentialsTest.php

@@ -45,4 +45,4 @@ public function testSend()
 
         $this->assertEquals(2, $response->accountId());
     }
-}
+}

tests/Request/CustomFields/Create/RequestLiveTest.php

@@ -46,4 +46,4 @@ public function testSend()
         $this->assertEquals('text', $customField->type);
         $this->assertEquals('test', $customField->name);
     }
-}
+}

tests/Request/CustomFields/Create/RequestTest.php

@@ -61,4 +61,4 @@ public function testConstructCustomField()
         $this->assertNotNull($request->customField());
         $this->assertEquals('test', $request->customField()->name, 'Custom field is not same as passed');
     }
-}
+}

tests/Request/CustomFields/CustomFieldTest.php

@@ -112,4 +112,4 @@ public function testCreateValueEmpty()
         $this->assertEquals(11, $importField->id);
         $this->assertNull($importField->value);
     }
-}
+}

tests/Request/CustomFields/CustomFieldsTest.php

@@ -101,4 +101,4 @@ public function testExists()
         $this->assertInstanceOf(CustomField::class, $customField);
         $this->assertEquals(1, $customField->id);
     }
-}
+}

tests/Request/CustomFields/Exists/RequestLiveTest.php

@@ -35,4 +35,4 @@ public function testSend()
 
         $this->assertTrue(is_object($customField), 'Not found');
     }
-}
+}

tests/Request/CustomFields/Exists/RequestTest.php

@@ -101,12 +101,11 @@ public function testNotExistsWithoutResults()
                 "limit": 2
             },
             "data": [
-                
             ]
         }';
 
         $customField = $this->request()->exists();
 
         $this->assertFalse($customField, 'The exists should return false if not found');
     }
-}
+}

tests/Request/CustomFields/Search/RequestLiveTest.php

@@ -50,4 +50,4 @@ public function testSend()
             $this->assertNotNull($customField->id);
         }
     }
-}
+}

tests/Request/CustomFields/Search/RequestTest.php

@@ -205,4 +205,4 @@ public function testQueryFilterByTypeFail()
     //endregion
 
 
-}
+}

tests/Request/Import/ContactListTest.php

@@ -52,4 +52,4 @@ public function testJsonSerialize()
             'status' => ContactList::CONFIRMED
         ], $this->list->jsonSerialize());
     }
-}
+}

tests/Request/Import/ContactTest.php

@@ -193,4 +193,4 @@ public function testJson()
             $json
         );
     }
-}
+}

tests/Request/Import/CustomFieldTest.php

@@ -59,4 +59,4 @@ public function testAddOption()
         $this->field->addOption(2);
         $this->assertEquals([1, 2], $this->field->options);
     }
-}
+}

tests/Request/Import/ImportLiveTest.php

@@ -34,6 +34,7 @@ public function testBasic() {
     public function testContactImport()
     {
         // Uncomment if you want to try
+        $this->assertNull(null);
         return;
 
         $contactFull = new Contact('[email protected]');
@@ -50,4 +51,4 @@ public function testContactImport()
         $this->assertEquals(201, $response->statusCode());
     }
 
-}
+}

tests/Request/Import/ImportTest.php

@@ -141,4 +141,4 @@ public function testChunkModeError()
         $this->import->send();
     }
 
-}
+}

tests/Request/Import/PurposeTest.php

@@ -57,4 +57,4 @@ public function testDateTimeFormat()
             $this->assertContains('Invalid date and time format', $exception->getMessage());
         }
     }
-}
+}

tests/TestCase/ApiStubTestCase.php

@@ -45,9 +45,9 @@ protected function setUp()
      * Creates a tests for send request that will check if correct parameters are send to clients request method
      *
      * @param AbstractRequest                                 $request
-     * @param string|null|\PHPUnit_Framework_Constraint|mixed $endpointName
-     * @param string|null|\PHPUnit_Framework_Constraint|mixed $httpMethod
-     * @param string|null|\PHPUnit_Framework_Constraint|mixed $options
+     * @param string|null|mixed $endpointName
+     * @param string|null|mixed $httpMethod
+     * @param string|null|mixed $options
      *
      * @return \SmartEmailing\v3\Request\Response
      */
@@ -61,8 +61,8 @@ protected function createEndpointTest($request, $endpointName, $httpMethod = 'GE
     /**
      * Builds the response/client mocks and setups for a clients request call
      *
-     * @param string|null|\PHPUnit_Framework_Constraint|mixed $endpointName
-     * @param string|null|\PHPUnit_Framework_Constraint|mixed $httpMethod
+     * @param string|null|mixed $endpointName
+     * @param string|null|mixed $httpMethod
      * @param array                                           $options
      */
     protected function stubClientResponse($endpointName, $httpMethod = 'GET', $options = [])
@@ -89,9 +89,7 @@ protected function stubClientResponse($endpointName, $httpMethod = 'GET', $optio
     /**
      * Builds the correct constraint value based on input value
      *
-     * @param string|null|\PHPUnit_Framework_Constraint|mixed $desiredValue
-     *
-     * @return \PHPUnit_Framework_Constraint_IsAnything|\PHPUnit_Framework_Constraint_IsEqual
+     * @param string|null|mixed $desiredValue
      */
     protected function valueConstraint($desiredValue)
     {
@@ -156,7 +154,7 @@ public function createSendErrorResponse($request, $responseText, $responseMessag
             // Run the request
             $request->send();
 
-            $this->fail('The send request should raise an exception when Guzzle raises RequestException 
+            $this->fail('The send request should raise an exception when Guzzle raises RequestException
             (non 200 status code) or API returns 200 status code with error status in json');
             return null;
         } catch (RequestException $exception) {
@@ -211,4 +209,4 @@ protected function assertResponse($response, $responseClass, $responseStatus, $r
         $this->assertEquals($meta, $response->meta());
     }
 
-}
+}

tests/TestCase/BaseTestCase.php

@@ -81,4 +81,4 @@ function env($key, $default = null)
         }
         return $value;
     }
-}
+}