Merge pull request #897 from ezimuel/master

Code refactor + updated endpoints for 7.0.0

Author: ezimuel

.gitignore

@@ -21,7 +21,7 @@ Thumbs.db
 generator/*
 
 # Elasticsearch related
-util/elasticsearch
+util/elasticsearch/
 util/cache/
 util/output
 
@@ -30,3 +30,6 @@ util/output
 
 # PHPUnit
 /phpunit.xml
+
+# Code coverage
+build

.travis.yml

@@ -12,31 +12,17 @@ sudo: true
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
-      env: ES_VERSION="6.7.0"
-
     - php: 7.1
-      env: ES_VERSION="6.7.0"
+      env: ES_VERSION="7.0.0"
 
     - php: 7.2
-      env: ES_VERSION="6.7.0"
+      env: ES_VERSION="7.0.0"
 
     - php: 7.3
-      env: ES_VERSION="6.0.0"
-    - php: 7.3
-      env: ES_VERSION="6.1.0"
-    - php: 7.3
-      env: ES_VERSION="6.2.0"
-    - php: 7.3
-      env: ES_VERSION="6.3.0"
-    - php: 7.3
-      env: ES_VERSION="6.4.0"
-    - php: 7.3
-      env: ES_VERSION="6.5.0"
-    - php: 7.3
-      env: ES_VERSION="6.6.0"
+      env: ES_VERSION="7.0.0"
+  allow_failures:
     - php: 7.3
-      env: ES_VERSION="6.7.0"
+      env: ES_VERSION="7.1.0"
 
 env:
   global:
@@ -55,7 +41,9 @@ before_script:
 
 script:
   - if [ $TRAVIS_PHP_VERSION != '7.3' ]; then composer run-script phpcs; fi
-  - composer run-script phpstan
+  - if [ $TRAVIS_PHP_VERSION = '7.1' ]; then composer run-script phpstan7.1; fi
+  - if [ $TRAVIS_PHP_VERSION = '7.2' ]; then composer run-script phpstan7.1; fi
+  - if [ $TRAVIS_PHP_VERSION = '7.3' ]; then composer run-script phpstan; fi
   - vendor/bin/phpunit $PHPUNIT_FLAGS
   - vendor/bin/phpunit -c phpunit-integration.xml --group sync $PHPUNIT_FLAGS
 

composer.json

@@ -13,20 +13,20 @@
     }
   ],
   "require": {
-    "php": "^7.0",
+    "php": "^7.1",
     "ext-json": ">=1.3.7",
     "guzzlehttp/ringphp": "~1.0",
     "psr/log": "~1.0"
   },
   "require-dev": {
-    "cpliakas/git-wrapper": "^1.7 || ^2.1",
-    "doctrine/inflector": "^1.1",
+    "cpliakas/git-wrapper": "~2.0",
+    "doctrine/inflector": "^1.3",
     "mockery/mockery": "^1.2",
-    "phpstan/phpstan-shim": "^0.9 || ^0.11",
-    "phpunit/phpunit": "^5.7 || ^6.5",
+    "phpstan/phpstan-shim": "^0.11",
+    "phpunit/phpunit": "^7.5",
     "squizlabs/php_codesniffer": "^3.4",
-    "symfony/finder": "^2.8",
-    "symfony/yaml": "^2.8"
+    "symfony/finder": "~4.0",
+    "symfony/yaml": "~4.0"
   },
   "suggest": {
     "ext-curl": "*",
@@ -51,6 +51,9 @@
       "phpcs --standard=ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp src",
       "phpcs --standard=ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp tests"
     ],
+    "phpstan7.1": [
+      "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-src-71.neon src --level 2 --no-progress"
+    ],
     "phpstan": [
       "@php vendor/phpstan/phpstan-shim/phpstan.phar analyse -c phpstan-src.neon src --level 2 --no-progress"
     ]

phpstan-src-71.neon

@@ -0,0 +1,8 @@
+parameters:
+    ignoreErrors:
+
+        # nullable types are missing everywhere
+        # this should be removed and fixed in the code later
+        - '#Variable (.*) in isset\(\) always exists and is not nullable.#'
+        - '#Constant JSON_THROW_ON_ERROR not found#'
+        - '#class JsonException#'