Merge branch 'martinssipenko-v2'

Author: martin-helmich

.travis.yml

@@ -1,11 +1,16 @@
 language: php
 sudo: false
 php:
+  - 7.3
+  - 7.2
   - 7.1
-  - 7.0
 install:
-  - composer install --prefer-dist
+  - composer install --optimize-autoloader --prefer-dist --no-interaction
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script:
   - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-after_success:
-  - vendor/bin/test-reporter
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

composer.json

@@ -9,13 +9,15 @@
         }
     ],
     "require": {
-        "flow/jsonpath": "^0.3.1",
-        "phpunit/phpunit": ">=6.0",
-        "justinrainbow/json-schema": "^5.0",
-        "php": ">=7.0"
+        "php": ">=7.0",
+        "flow/jsonpath": "^0.4.0",
+        "justinrainbow/json-schema": "^5.0"
+    },
+    "conflict": {
+        "phpunit/phpunit": "<6.0 || >= 8.0"
     },
     "require-dev": {
-        "codeclimate/php-test-reporter": "dev-master"
+        "phpunit/phpunit": "^6.0 | ^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -27,5 +29,8 @@
             "vendor/phpunit/phpunit/src/Framework/Assert/Functions.php",
             "src/Functions.php"
         ]
+    },
+    "config": {
+        "sort-packages": true
     }
 }

phpunit.xml

@@ -6,7 +6,6 @@
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
-        mapTestClassNameToCoveredClassName="false"
         timeoutForSmallTests="1"
         timeoutForMediumTests="10"
         timeoutForLargeTests="60">
@@ -21,11 +20,11 @@
     <logging>
         <log type="coverage-html" target="build/coverage" lowUpperBound="35"
              highLowerBound="70"/>
-        <log type="junit" target="build/phpunit" logIncompleteSkipped="false"/>
+        <log type="junit" target="build/phpunit"/>
     </logging>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>