Merge pull request #489 from php-enqueue/clean-up-queue-consumer

remove bc layer.

.travis.yml

@@ -51,8 +51,8 @@ script:
     - 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
     - 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:

bin/dev

@@ -20,9 +20,6 @@ while getopts "bustefcdp" OPTION; do
     f)
       ./bin/php-cs-fixer fix
       ;;
-    t)
-      ./bin/run-fun-test.sh "$2"
-      ;;
     c)
       docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list
       ;;

bin/test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -x
+set -e
+
+docker-compose run --workdir="/mqdev" --rm dev ./docker/bin/test.sh "$@"

docker-compose.yml

@@ -77,11 +77,10 @@ services:
       - "6379:6379"
 
   mysql:
-    image: mariadb:10
-    volumes:
-      - mysql-data:/var/lib/mysql
+    image: mysql:5.7
     environment:
       MYSQL_ROOT_PASSWORD: rootpass
+      MYSQL_DATABASE: mqdev
 
   generate-changelog:
     image: enqueue/generate-changelog:latest
@@ -120,6 +119,3 @@ services:
       HOSTNAME_EXTERNAL: 'localstack'
       SERVICES: 'sqs'
 
-volumes:
-  mysql-data:
-    driver: local

docker/bin/refresh-mysql-database.php

@@ -0,0 +1,16 @@
+<?php
+
+use Enqueue\Dbal\DbalConnectionFactory;
+
+require_once getcwd().'/vendor/autoload.php';
+
+$dsn = getenv('DOCTRINE_DSN');
+$database = trim(parse_url($dsn, PHP_URL_PATH), '/');
+
+$dbalContext = (new DbalConnectionFactory($dsn))->createContext();
+
+$dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase($database);
+$dbalContext->getDbalConnection()->exec('USE '.$database);
+$dbalContext->createDataBaseTable();
+
+echo 'MySQL Database is updated'.PHP_EOL;

bin/test → docker/bin/test.sh

@@ -39,8 +39,7 @@ waitForService kafka 9092 50
 waitForService mongo 27017 50
 waitForService localstack 4576 50
 
-php pkg/job-queue/Tests/Functional/app/console doctrine:database:create --if-not-exists
-php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force
+php docker/bin/refresh-mysql-database.php
 
 #php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference  enqueue
 bin/phpunit "$@"

docs/contribution.md

@@ -18,14 +18,14 @@ Once you did it you can work on a feature or bug fix.
 To run tests
 
 ```
-./bin/dev -t
+./bin/test.sh
 ```
 
 or for a package only:
 
 
 ```
-./bin/dev -t pkg/enqueue
+./bin/test.sh pkg/enqueue
 ```
 
 ## Commit 

pkg/dbal/Tests/DbalConnectionFactoryConfigTest.php

@@ -80,10 +80,12 @@ public static function provideConfigs()
         yield [
             'pdo_mysql:',
             [
-                'lazy' => true,
                 'connection' => [
                     'url' => 'pdo_mysql://root@localhost',
                 ],
+                'table_name' => 'enqueue',
+                'polling_interval' => 1000,
+                'lazy' => true,
             ],
         ];
 
@@ -114,10 +116,12 @@ public static function provideConfigs()
         yield [
             'pdo_mysql://user:pass@host:10001/db',
             [
-                'lazy' => true,
                 'connection' => [
                     'url' => 'pdo_mysql://user:pass@host:10001/db',
                 ],
+                'table_name' => 'enqueue',
+                'polling_interval' => 1000,
+                'lazy' => true,
             ],
         ];
 

pkg/dbal/composer.json

@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.1.3",
-        "queue-interop/queue-interop": "^0.7@dev",
+        "queue-interop/queue-interop": "0.7.x-dev",
         "doctrine/dbal": "~2.5",
         "ramsey/uuid": "^3"
     },

pkg/enqueue-bundle/Resources/config/services.yml

@@ -1,7 +1,6 @@
 parameters:
-  enqueue.queue_consumer.enable_subscription_consumer: false
   enqueue.queue_consumer.default_idle_time: 0
-  enqueue.queue_consumer.default_receive_timeout: 10
+  enqueue.queue_consumer.default_receive_timeout: 10000
 
 services:
     enqueue.consumption.extensions:
@@ -18,8 +17,6 @@ services:
             - '@enqueue.consumption.extensions'
             - '%enqueue.queue_consumer.default_idle_time%'
             - '%enqueue.queue_consumer.default_receive_timeout%'
-        calls:
-            - ['enableSubscriptionConsumer', ['%enqueue.queue_consumer.enable_subscription_consumer%']]
 
     # Deprecated. To be removed in 0.10.
     enqueue.consumption.queue_consumer:

pkg/enqueue/Consumption/Context.php

@@ -136,17 +136,17 @@ public function setPsrProcessor(PsrProcessor $psrProcessor)
     }
 
     /**
-     * @return \Exception
+     * @return \Throwable
      */
     public function getException()
     {
         return $this->exception;
     }
 
     /**
-     * @param \Exception $exception
+     * @param \Throwable $exception
      */
-    public function setException(\Exception $exception)
+    public function setException(\Throwable $exception)
     {
         $this->exception = $exception;
     }