Merge branch 'fix-abandoned-packages'

Author: ezimuel

.travis.yml

@@ -17,13 +17,13 @@ matrix:
   fast_finish: true
   include:
     - php: 7.1
-      env: ES_VERSION="7.5.1"
+      env: ES_VERSION="7.5.2"
     - php: 7.2
-      env: ES_VERSION="7.5.1"
+      env: ES_VERSION="7.5.2"
     - php: 7.3
-      env: ES_VERSION="7.5.1"
+      env: ES_VERSION="7.5.2"
     - php: 7.4
-      env: ES_VERSION="7.5.1"
+      env: ES_VERSION="7.5.2"
     - php: 7.4
       env: ES_VERSION="8.0.0-SNAPSHOT"
   allow_failures:
@@ -38,7 +38,8 @@ before_install:
   - ./travis/run_es_docker.sh
 
 install:
-  - composer install --prefer-dist
+  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN} >/dev/null 2>&1; fi;
+  - composer install --prefer-dist --no-interaction >/dev/null 2>&1
 
 before_script:
   - if [ $TRAVIS_PHP_VERSION = '7.4' ]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; fi
@@ -47,10 +48,7 @@ before_script:
 
 script:
   - if [ $TRAVIS_PHP_VERSION != '7.4' ]; then composer run-script phpcs; fi
-  - 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
-  - if [ $TRAVIS_PHP_VERSION = '7.4' ]; then composer run-script phpstan; fi
+  - composer run-script phpstan
   - vendor/bin/phpunit $PHPUNIT_FLAGS
   - vendor/bin/phpunit -c phpunit-integration.xml --group sync $PHPUNIT_FLAGS
 

composer.json

@@ -12,17 +12,28 @@
         "name": "Enrico Zimuel"
     }
   ],
+  "repositories": [
+    {
+        "type": "vcs",
+        "url": "https://github.com/ezimuel/RingPHP"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/ezimuel/streams"
+    }
+  ],
   "require": {
     "php": "^7.1",
     "ext-json": ">=1.3.7",
-    "guzzlehttp/ringphp": "~1.0",
+    "guzzlehttp/ringphp": "dev-fork-elasticsearch",
+    "guzzlehttp/streams": "@dev",
     "psr/log": "~1.0"
   },
   "require-dev": {
     "cpliakas/git-wrapper": "~2.0",
     "doctrine/inflector": "^1.3",
     "mockery/mockery": "^1.2",
-    "phpstan/phpstan-shim": "^0.11",
+    "phpstan/phpstan": "^0.12",
     "phpunit/phpunit": "^7.5",
     "squizlabs/php_codesniffer": "^3.4",
     "symfony/finder": "~4.0",
@@ -56,10 +67,10 @@
       "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"
+      "@php vendor/bin/phpstan 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"
+      "@php vendor/bin/phpstan analyse -c phpstan-src.neon src --level 2 --no-progress"
     ]
   }
 }

phpstan-src-71.neon

@@ -7,3 +7,6 @@ parameters:
         -
             message: '#is not subtype of Throwable#'
             path: %currentWorkingDirectory%/src/Elasticsearch/ClientBuilder.php
+        -
+            message: '#Unsafe usage of new static()#'
+            path: %currentWorkingDirectory%/src/Elasticsearch/ClientBuilder.php

phpstan-src.neon

@@ -143,11 +143,8 @@ public function resultOrFuture(FutureArrayInterface $result, array $options = []
             do {
                 $result = $result->wait();
             } while ($result instanceof FutureArrayInterface);
-
-            return $result;
-        } elseif ($async === true || $async === 'lazy') {
-            return $result;
         }
+        return $result;
     }
 
     public function shouldRetry(array $request): bool