Merge pull request #2 from apimatic/add-php-7-1-to-7-4-to-travis

Updated travis files with new PHP versions.

.gitignore

@@ -1,8 +1,8 @@
 /README.html
 /*.tgz
 /dist/
-/vendor/
+/vendor*/
 .buildpath
 .project
 .settings
-/composer.lock
+/composer*.lock

.travis.yml

@@ -1,11 +1,12 @@
 language: php
 sudo: false
 php:
-  - 5.4
-  - 5.5
   - 5.6
-  - 7
-  - hhvm
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - composer install --no-interaction --prefer-source --dev

composer.json

@@ -24,7 +24,7 @@
         "issues": "https://github.com/apimatic/jsonmapper/issues"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.2.*",
-        "squizlabs/php_codesniffer": "~1.5"
+        "phpunit/phpunit": "^5 || ^6 || ^7",
+        "squizlabs/php_codesniffer": "^3"
     }
 }

src/JsonMapper.php

@@ -324,11 +324,11 @@ public function mapClass($json, $type)
      * 
      * @param object|null      $json JSON object structure from json_decode()
      * @param \ReflectionClass $rc   Class to get instance of. This method
-     *                                will try to first match the discriminator
-     *                                field with the discriminator value of
-     *                                the current class or its child class.
-     *                                If no matches is found, then the current
-     *                                class's instance is returned.
+     *                               will try to first match the discriminator
+     *                               field with the discriminator value of
+     *                               the current class or its child class.
+     *                               If no matches is found, then the current
+     *                               class's instance is returned.
      *                                
      * @return object|null           Object instance if match is found.
      */
@@ -408,7 +408,7 @@ protected function getChildClasses($rc)
      */
     protected function getFullNamespace($type, $strNs)
     {
-        if ($type !== '' && $type{0} != '\\') {
+        if (\is_string($type) && $type !== '' && $type[0] != '\\') {
             //create a full qualified namespace
             if ($strNs != '') {
                 $type = '\\' . $strNs . '\\' . $type;

tests/JsonMapperTest.php

@@ -35,7 +35,7 @@
  * @license  OSL-3.0 http://opensource.org/licenses/osl-3.0
  * @link     http://www.netresearch.de/
  */
-class JsonMapperTest extends \PHPUnit_Framework_TestCase
+class JsonMapperTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for "@var string"

tests/namespacetest/NamespaceTest.php

@@ -8,7 +8,7 @@
 
 use apimatic\jsonmapper\JsonMapper;
 
-class NamespaceTest extends \PHPUnit_Framework_TestCase
+class NamespaceTest extends \PHPUnit\Framework\TestCase
 {
     public function testMapArrayNamespace()
     {

tests/phpunit.xml

@@ -3,9 +3,8 @@
          colors="true"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestSize="true"
          beStrictAboutTestsThatDoNotTestAnything="true"
-         checkForUnintentionallyCoveredCode="true"
+         beStrictAboutCoversAnnotation="true"
 >
     <filter>
         <whitelist>