Fix ping to check each connection, not only first one

.php_cs.dist → .php_cs.php

@@ -20,9 +20,12 @@
         'phpdoc_order' => true,
         'psr4' => true,
         'strict_param' => true,
+        'native_function_invocation' => false,
     ))
+    ->setCacheFile(getenv('TRAVIS') ? getenv('HOME') . '/php-cs-fixer/.php-cs-fixer' : __DIR__.'/var/.php_cs.cache')
     ->setFinder(
         PhpCsFixer\Finder::create()
+            ->name('/\.php$/')
             ->in(__DIR__)
     )
-;
+;

.travis.yml

@@ -1,5 +1,3 @@
-sudo: required
-
 git:
     depth: 10
 
@@ -8,61 +6,60 @@ language: php
 matrix:
   include:
     - php: 7.1
-      env: SYMFONY_VERSION=3.0.* PHPSTAN=true
-    - php: 7.1
-      env: SYMFONY_VERSION=3.0.* PHP_CS_FIXER=true
-    - php: 7.0
-      env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true
-    - php: 7.0
-      env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
+      sudo: false
+      env: SYMFONY_VERSION=3.4.* PHPSTAN=true
     - php: 7.1
-      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
+      sudo: false
+      env: SYMFONY_VERSION=3.4.* PHP_CS_FIXER=true
     - php: 7.1
+      sudo: false
       env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true
-    - php: 7.2
-      services: docker
-      env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
-      services: docker
-      env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
-    - php: 7.1
-      services: docker
-      env: SYMFONY_VERSION=3.2.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+      sudo: false
+      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
+    - php: 7.2
+      sudo: false
+      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
     - php: 7.1
       services: docker
-      env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+      sudo: required
+      env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
+      sudo: required
       services: docker
       env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
+      sudo: required
       services: docker
-      env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
+      env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
   allow_failures:
-    - env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
+    - env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
 
 cache:
     directories:
         - $HOME/.composer/cache
+        - $HOME/php-cs-fixer
 
 before_install:
     - echo "extension = mongodb.so" >> $HOME/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+    - echo "extension = redis.so" >> $HOME/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 install:
     - rm $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini;
     - echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-    - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+    - php ./bin/fix-symfony-version.php "$SYMFONY_VERSION"
     - composer install
     - if [ "$PREPARE_CONTAINER" = true ]; then docker --version; fi
     - if [ "$PREPARE_CONTAINER" = true ]; then docker-compose --version; fi
     - if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi
 
 script:
-    - if [ "$PHPSTAN" = true ]; then composer require "phpstan/phpstan:^0.8" ; php -d memory_limit=512M bin/phpstan analyse -l 1 -c phpstan.neon pkg/gps pkg/amqp-ext pkg/async-event-dispatcher pkg/dbal pkg/enqueue pkg/enqueue-bundle pkg/fs pkg/gearman pkg/job-queue pkg/null pkg/pheanstalk pkg/redis pkg/simple-client pkg/sqs pkg/stomp pkg/test pkg/rdkafka; fi
-    - if [ "$PHP_CS_FIXER" = true ]; then IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS; fi
-    - if [ "$PHP_CS_FIXER" = true ]; then ./bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no --path-mode=intersection -- "${COMMIT_SCA_FILES[@]}"; fi
+    - PKG_PHP_CHANGED_FILES=`./bin/git-find-changed-php-files.sh "${TRAVIS_COMMIT_RANGE}"`
+    - if [ "$PHP_CS_FIXER" = true ] && [ ! -z "${PKG_PHP_CHANGED_FILES}" ]; then ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection  -- ${PKG_PHP_CHANGED_FILES[@]} ; fi
+    - if [ "$PHPSTAN" = true ] && [ ! -z "${PKG_PHP_CHANGED_FILES}" ]; then docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon -- ${PKG_PHP_CHANGED_FILES[@]} ; fi
     - if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
-    - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/run-fun-test.sh --exclude-group=rdkafka; fi
-    - if [ "RDKAFKA_TESTS" = true ]; then bin/run-fun-test.sh --group=rdkafka; fi
+    - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/test.sh --exclude-group=rdkafka; fi
+    - if [ "RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
 
 notifications:
   webhooks:

CONTRIBUTING.md

@@ -0,0 +1,8 @@
+Contributing
+------------
+
+Enqueue is an open source, community-driven project.
+
+If you'd like to contribute, please read the following documents:
+
+* [Contribution](docs/contribution.md)

README.md

@@ -1,31 +1,48 @@
+<p align="center"><img width="700" src="https://github.com/php-enqueue/logos/blob/master/Enqueue%20logo.png" alt="Enqueue logo" /></p>
+
+<p align="center">
+  <a href="https://gitter.im/php-enqueue/Lobby"><img src="https://badges.gitter.im/php-enqueue/Lobby.svg" alt="Enqueue Chat"></a>
+  <a href="https://travis-ci.org/php-enqueue/enqueue-dev"><img src="https://travis-ci.org/php-enqueue/enqueue-dev.png?branch=master" alt="Build Status"></a>
+  <a href="https://packagist.org/packages/enqueue/enqueue/stats"><img src="https://poser.pugx.org/enqueue/enqueue/d/total.png?branch=master" alt="Total Downloads"></a>
+  <a href="https://packagist.org/packages/enqueue/enqueue"><img src="https://poser.pugx.org/enqueue/enqueue/version.png" alt="Latest Stable Version"></a>
+  <a href="./LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License"></a>
+</p>
+
+<h2 align="center">Supporting Enqueue</h2>
+
+Enqueue is an MIT-licensed open source project with its ongoing development made possible entirely by the support of community and our customers. If you'd like to join them, please consider:
+
+- [Become a sponsor](https://www.patreon.com/makasim)
+- [Become our client](http://forma-pro.com/)
+
+---
+
+## Introduction
+
 **Enqueue** is production ready, battle-tested messaging solution for PHP. Provides a common way for programs to create, send, read messages. 
 
 This is a main development repository. It provides a friendly environment for productive development and testing of all Enqueue related features&packages.
 
-[![Gitter](https://badges.gitter.im/php-enqueue/Lobby.svg)](https://gitter.im/php-enqueue/Lobby)
-[![Build Status](https://travis-ci.org/php-enqueue/enqueue-dev.png?branch=master)](https://travis-ci.org/php-enqueue/enqueue-dev)
-[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
-
 Features:
 
 * [Feature rich](docs/quick_tour.md).
 
 * Adopts [queue interoperable](https://github.com/queue-interop/queue-interop) interfaces (inspired by [Java JMS](https://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html)).
 * Battle-tested. Used in production.
 * Supported  transports 
-    * [AMQP(s)](docs/transport/amqp.md) based on [PHP AMQP extension](https://github.com/pdezwart/php-amqp). 
+    * [AMQP(s)](docs/transport/amqp.md) based on [PHP AMQP extension](https://github.com/pdezwart/php-amqp)
 [![Build Status](https://travis-ci.org/php-enqueue/amqp-ext.png?branch=master)](https://travis-ci.org/php-enqueue/amqp-ext)
 [![Total Downloads](https://poser.pugx.org/enqueue/amqp-ext/d/total.png)](https://packagist.org/packages/enqueue/amqp-ext/stats)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/amqp-ext/version.png)](https://packagist.org/packages/enqueue/amqp-ext)
-    * [AMQP](docs/transport/amqp_bunny.md) based on [bunny](https://github.com/jakubkulhan/bunny). 
+    * [AMQP](docs/transport/amqp_bunny.md) based on [bunny](https://github.com/jakubkulhan/bunny)
 [![Build Status](https://travis-ci.org/php-enqueue/amqp-bunny.png?branch=master)](https://travis-ci.org/php-enqueue/amqp-bunny)
 [![Total Downloads](https://poser.pugx.org/enqueue/amqp-bunny/d/total.png)](https://packagist.org/packages/enqueue/amqp-bunny/stats)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/amqp-bunny/version.png)](https://packagist.org/packages/enqueue/amqp-bunny)
-    * [AMQP(s)](docs/transport/amqp_lib.md) based on [php-amqplib](https://github.com/php-amqplib/php-amqplib). 
+    * [AMQP(s)](docs/transport/amqp_lib.md) based on [php-amqplib](https://github.com/php-amqplib/php-amqplib)
 [![Build Status](https://travis-ci.org/php-enqueue/amqp-lib.png?branch=master)](https://travis-ci.org/php-enqueue/amqp-lib)
 [![Total Downloads](https://poser.pugx.org/enqueue/amqp-lib/d/total.png)](https://packagist.org/packages/enqueue/amqp-lib/stats)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/amqp-lib/version.png)](https://packagist.org/packages/enqueue/amqp-lib)
-    * [Beanstalk](docs/transport/pheanstalk.md).
+    * [Beanstalk](docs/transport/pheanstalk.md)
 [![Build Status](https://travis-ci.org/php-enqueue/pheanstalk.png?branch=master)](https://travis-ci.org/php-enqueue/pheanstalk)
 [![Total Downloads](https://poser.pugx.org/enqueue/pheanstalk/d/total.png)](https://packagist.org/packages/enqueue/pheanstalk/stats)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/pheanstalk/version.png)](https://packagist.org/packages/enqueue/pheanstalk)
@@ -65,7 +82,11 @@ Features:
 [![Build Status](https://travis-ci.org/php-enqueue/mongodb.png?branch=master)](https://travis-ci.org/php-enqueue/mongodb)
 [![Total Downloads](https://poser.pugx.org/enqueue/mongodb/d/total.png)](https://packagist.org/packages/enqueue/mongodb/stats)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/mongodb/version.png)](https://packagist.org/packages/enqueue/mongodb)
-    * [Null](docs/transport/null.md).
+    * [WAMP](docs/transport/wamp.md)
+[![Build Status](https://travis-ci.org/php-enqueue/wamp.png?branch=master)](https://travis-ci.org/php-enqueue/wamp)
+[![Total Downloads](https://poser.pugx.org/enqueue/wamp/d/total.png)](https://packagist.org/packages/enqueue/wamp/stats)
+[![Latest Stable Version](https://poser.pugx.org/enqueue/wamp/version.png)](https://packagist.org/packages/enqueue/wamp)
+    * [Null](docs/transport/null.md)
 [![Build Status](https://travis-ci.org/php-enqueue/null.png?branch=master)](https://travis-ci.org/php-enqueue/null)
 [![Total Downloads](https://poser.pugx.org/enqueue/null/d/total.png)](https://packagist.org/packages/enqueue/null/stats)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/null/version.png)](https://packagist.org/packages/enqueue/null)
@@ -77,6 +98,7 @@ Features:
 * [Yii2. Amqp driver](docs/yii/amqp_driver.md)
 * [Message bus](docs/quick_tour.md#client) support.
 * [RPC over MQ](docs/quick_tour.md#remote-procedure-call-rpc) support.
+* [Monitoring](docs/monitoring.md)
 * Temporary queues support.
 * Well designed, decoupled and reusable components.
 * Carefully tested (unit & functional).

bin/build-rabbitmq-image.sh

@@ -3,6 +3,7 @@
 set -e
 set -x
 
-(cd docker && docker build --rm --force-rm --no-cache --pull --squash --tag "enqueue/rabbitmq:latest" -f Dockerfile.rabbitmq .)
+(cd docker && docker build --rm --force-rm --no-cache --pull --squash --tag "enqueue/rabbitmq-local-build" -f Dockerfile."$1"-rabbitmq .)
 (cd docker && docker login --username="$DOCKER_USER" --password="$DOCKER_PASSWORD")
-(cd docker && docker push "enqueue/rabbitmq:latest")
+(cd docker && docker tag enqueue/rabbitmq-local-build enqueue/rabbitmq:"$1")
+(cd docker && docker push "enqueue/rabbitmq:$1")

bin/fix-symfony-version.php

@@ -0,0 +1,14 @@
+<?php
+
+if (empty($argv[1])) {
+    throw new \LogicException('The new symfony version must be provided');
+}
+
+$newVersion = $argv[1];
+
+$composer = file_get_contents(__DIR__.'/../composer.json');
+
+$updatedComposer = preg_replace('/"symfony\/(.*)": ".*"/', '"symfony/$1": "'.$newVersion.'"', $composer).PHP_EOL;
+echo $updatedComposer.PHP_EOL;
+
+file_put_contents(__DIR__.'/../composer.json', $updatedComposer);

bin/git-find-changed-php-files.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if (( "$#" != 1 ))
+then
+    echo "Git range must be provided"
+    exit 1
+fi
+
+
+IFS='
+'
+ALL_CHANGED_FILES=$(git diff --name-only --diff-filter=ACMRTUXB "$1");
+PKG_PHP_CHANGED_FILES=$(echo "$ALL_CHANGED_FILES" | grep -E "^pkg\/" | grep -E ".*?\.php$");
+
+echo "$PKG_PHP_CHANGED_FILES";

bin/pre-commit

@@ -68,7 +68,9 @@ function getFilesToFix()
         return (bool) preg_match('/\.(php|twig|translations\/*.yml)$/', $file);
     });
 
-    echo sprintf('Found %s staged files', count($stagedFiles)).PHP_EOL;
+    $stagedFiles = array_filter($stagedFiles, function ($file) {
+        return (bool) preg_match('/^pkg\//', $file);
+    });
 
     return $stagedFiles;
 }
@@ -77,18 +79,18 @@ function runPhpLint()
 {
     global $phpBin, $projectRootDir;
 
-    $filesWithErrors = array();
+    $output = [];
     foreach (getFilesToFix() as $file) {
-        $output = '';
+        $commandOutput = null;
         $returnCode = null;
-        exec(sprintf('%s -l %s 2>/dev/null', $phpBin, $projectRootDir.'/'.$file), $output, $returnCode);
+        exec(sprintf('%s -l %s', $phpBin, $projectRootDir.'/'.$file), $commandOutput, $returnCode);
 
         if ($returnCode) {
-            $filesWithErrors[] = $file;
+            $output[] = $commandOutput;
         }
     }
 
-    return $filesWithErrors;
+    return $output;
 }
 
 function runPhpCsFixer()
@@ -101,56 +103,71 @@ function runPhpCsFixer()
     }
 
     $filesWithErrors = array();
-    foreach (getFilesToFix() as $file) {
-        $output = '';
-        $returnCode = null;
+    $output = '';
+    $returnCode = null;
+
+    exec(sprintf(
+        '%s %s fix --config=.php_cs.php --dry-run --no-interaction --path-mode=intersection  -- %s',
+        $phpBin,
+        $phpCsFixerBin,
+        implode(' ', getFilesToFix())
+    ), $output, $returnCode);
 
+    if ($returnCode) {
         exec(sprintf(
-            '%s %s fix %s --dry-run',
+            '%s %s fix --config=.php_cs.php --no-interaction -v --path-mode=intersection  -- %s',
             $phpBin,
             $phpCsFixerBin,
-            $projectRootDir.'/'.$file
-        ), $output, $returnCode);
+            implode(' ', getFilesToFix())
+        ), $output);
+    }
 
-        if ($returnCode) {
-            $output = '';
+    return $returnCode;
+}
 
-            exec(sprintf(
-                '%s %s fix %s',
-                $phpBin,
-                $phpCsFixerBin,
-                $projectRootDir.'/'.$file
-            ), $output);
+function runPhpstan()
+{
+    $output = '';
+    $returnCode = null;
 
-            $filesWithErrors[] = $file;
-        }
-    }
+    exec(sprintf(
+        'docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon %s',
+        implode(' ', getFilesToFix())
+    ), $output, $returnCode);
 
-    return $filesWithErrors;
+    return $returnCode ? $output : false;
 }
 
+echo sprintf('Found %s staged files', count(getFilesToFix())).PHP_EOL;
+
 $phpSyntaxErrors = runPhpLint();
 if ($phpSyntaxErrors) {
     echo "Php syntax errors were found in next files:" . PHP_EOL;
-
-    foreach ($phpSyntaxErrors as $error) {
-        echo $error . PHP_EOL;
+    foreach ($phpSyntaxErrors as $phpSyntaxErrors) {
+        echo array_walk_recursive($phpSyntaxErrors, function($item) {
+            echo $item.PHP_EOL;
+        }) . PHP_EOL;
     }
 
     exit(1);
 }
 
-$phpCSFixerErrors = runPhpCsFixer();
-if ($phpCSFixerErrors) {
+$phpCSFixed = runPhpCsFixer();
+if ($phpCSFixed) {
     echo "Incorrect coding standards were detected and fixed." . PHP_EOL;
     echo "Please stash changes and run commit again." . PHP_EOL;
-    echo "List of changed files:" . PHP_EOL;
 
-    foreach ($phpCSFixerErrors as $error) {
-        echo $error . PHP_EOL;
-    }
+    exit(1);
+}
+
+$phpStanErrors = runPhpstan();
+if ($phpStanErrors) {
+    echo array_walk_recursive($phpStanErrors, function($item) {
+        echo $item.PHP_EOL;
+    }) . PHP_EOL;
+    echo PHP_EOL;
 
     exit(1);
 }
 
-exit(0);
+exit(0);