diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed066369b..9e9887e2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: extensions: mongodb, redis, :xdebug ini-values: memory_limit=2048M - - run: php ./bin/fix-symfony-version.php "4.3.*" + - run: php ./bin/fix-symfony-version.php "5.2.*" - uses: "ramsey/composer-install@v1" @@ -50,7 +50,7 @@ jobs: extensions: mongodb, redis, :xdebug ini-values: memory_limit=2048M - - run: php ./bin/fix-symfony-version.php "4.3.*" + - run: php ./bin/fix-symfony-version.php "5.2.*" - uses: "ramsey/composer-install@v1" @@ -102,6 +102,12 @@ jobs: functional_tests: false rdkafka_tests: false prepare_container: false + - php: 7.4 + symfony_version: 5.2.* + unit_tests: true + functional_tests: false + rdkafka_tests: false + prepare_container: false - php: 7.3 # same as in the container symfony_version: 4.3.* unit_tests: false @@ -120,6 +126,23 @@ jobs: functional_tests: false rdkafka_tests: true prepare_container: true + - php: "8.0" + symfony_version: 5.2.* + unit_tests: true + functional_tests: false + rdkafka_tests: false + prepare_container: false + - php: "8.0" + symfony_version: 5.2.* + unit_tests: false + functional_tests: true + rdkafka_tests: false + prepare_container: true + - php: "8.0" + symfony_version: 5.2.* + unit_tests: false + rdkafka_tests: true + prepare_container: true name: PHP ${{ matrix.php }} tests on Sf ${{ matrix.symfony_version }}, unit=${{ matrix.unit_tests }}, func=${{ matrix.functional_tests }}, rdkafka=${{ matrix.rdkafka_tests }} @@ -140,6 +163,8 @@ jobs: - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php - run: bin/dev -b + env: + PHP_VERSION: "${{ matrix.php }}" if: matrix.prepare_container - run: bin/phpunit --exclude-group=functional diff --git a/bin/dev b/bin/dev index e5f40ffbd..a50b7ad66 100755 --- a/bin/dev +++ b/bin/dev @@ -6,7 +6,7 @@ set -e while getopts "bustefdp" OPTION; do case $OPTION in b) - docker-compose pull && docker-compose build + docker-compose pull -q && docker-compose build ;; u) docker-compose up diff --git a/composer.json b/composer.json index b1ba9ff8b..9d899a5f4 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,14 @@ "cs-lint": "bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff", "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon" }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git" + } + ], "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-amqp": "^1.9.3", "ext-gearman": "^2.0", @@ -20,7 +26,7 @@ "queue-interop/queue-interop": "^0.7|^0.8", "bunny/bunny": "^0.2.4|^0.3|^0.4", "php-amqplib/php-amqplib": "^2.7", - "doctrine/dbal": "^2.6,<2.10", + "doctrine/dbal": "^2.12", "ramsey/uuid": "^2|^3.5|^4.0", "psr/log": "^1", "psr/container": "^1", @@ -30,10 +36,10 @@ "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", - "stomp-php/stomp-php": "^4", - "php-http/guzzle6-adapter": "^1.1", - "php-http/client-common": "^1.7@dev", - "richardfullmer/rabbitmq-management-api": "^2.0", + "stomp-php/stomp-php": "^4|^5", + "php-http/guzzle7-adapter": "^0.1.1", + "php-http/client-common": "^2.2.1", + "richardfullmer/rabbitmq-management-api": "^2.1.1", "predis/predis": "^1.1", "thruway/client": "^0.5.0", "thruway/pawl-transport": "^0.5.0", @@ -58,7 +64,7 @@ "symfony/yaml": "^4.3|^5", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "~1.2|^2", - "doctrine/mongodb-odm-bundle": "^3.5|^4", + "doctrine/mongodb-odm-bundle": "^3.5|^4.3", "alcaeus/mongo-php-adapter": "^1.0", "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0", "friendsofphp/php-cs-fixer": "^2", diff --git a/docker-compose.yml b/docker-compose.yml index f782de48e..ae4256c42 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,12 @@ version: '2' services: dev: - image: enqueue/dev:latest + # when image publishing gets sorted: + # image: enqueue/dev:${PHP_VERSION} + build: + context: docker + args: + PHP_VERSION: "${PHP_VERSION:-7.3}" depends_on: - rabbitmq - mysql diff --git a/docker/Dockerfile b/docker/Dockerfile index 86f460f8e..2b21de82b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,24 +1,55 @@ -FROM formapro/nginx-php-fpm:7.3-latest-all-exts +ARG PHP_VERSION=7.3 +FROM makasim/nginx-php-fpm:${PHP_VERSION}-all-exts + +ARG PHP_VERSION ## libs RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php7.3-dev php7.3-redis php7.3-pgsql git python php-amqp + apt-get install -y --no-install-recommends --no-install-suggests \ + wget \ + curl \ + openssl \ + ca-certificates \ + nano \ + netcat \ + php${PHP_VERSION}-dev \ + php${PHP_VERSION}-redis \ + php${PHP_VERSION}-pgsql \ + git \ + python \ + php${PHP_VERSION}-amqp \ + php${PHP_VERSION}-xml \ + php${PHP_VERSION}-mysql \ + php${PHP_VERSION}-curl \ + libgearman-dev \ + php-pear \ + make \ + && \ + pecl channel-update pecl.php.net && \ + pecl install gearman && \ + if [ ! -f /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini ]; then \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini && \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/20-gearman.ini \ + ; \ + fi; ## librdkafka RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php7.3-dev make && \ + apt-get install -y --no-install-recommends --no-install-suggests \ + g++ \ + && \ mkdir -p $HOME/librdkafka && \ cd $HOME/librdkafka && \ git clone https://github.com/edenhill/librdkafka.git . && \ git checkout v1.0.0 && \ ./configure && make && make install && \ pecl install rdkafka && \ - echo "extension=rdkafka.so" > /etc/php/7.3/cli/conf.d/10-rdkafka.ini && \ - echo "extension=rdkafka.so" > /etc/php/7.3/fpm/conf.d/10-rdkafka.ini + echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-rdkafka.ini && \ + echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-rdkafka.ini -COPY ./php/cli.ini /etc/php/7.3/cli/conf.d/1-dev_cli.ini +COPY ./php/cli.ini /etc/php/${PHP_VERSION}/cli/conf.d/1-dev_cli.ini COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh RUN chmod u+x /usr/local/bin/entrypoint.sh diff --git a/docker/thruway/Dockerfile b/docker/thruway/Dockerfile index c9e795478..3bca735b2 100644 --- a/docker/thruway/Dockerfile +++ b/docker/thruway/Dockerfile @@ -1,4 +1,4 @@ -FROM formapro/nginx-php-fpm:latest-all-exts +FROM makasim/nginx-php-fpm:latest-all-exts RUN mkdir -p /thruway WORKDIR /thruway diff --git a/pkg/amqp-bunny/.github/workflows/ci.yml b/pkg/amqp-bunny/.github/workflows/ci.yml index bd62476f1..67837ef97 100644 --- a/pkg/amqp-bunny/.github/workflows/ci.yml +++ b/pkg/amqp-bunny/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json index 01d6a8c4a..9e7d83bb4 100644 --- a/pkg/amqp-bunny/composer.json +++ b/pkg/amqp-bunny/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", "bunny/bunny": "^0.4", diff --git a/pkg/amqp-ext/.github/workflows/ci.yml b/pkg/amqp-ext/.github/workflows/ci.yml index 24af1bbc1..fd96b2abe 100644 --- a/pkg/amqp-ext/.github/workflows/ci.yml +++ b/pkg/amqp-ext/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json index 203908160..18b1f72cb 100644 --- a/pkg/amqp-ext/composer.json +++ b/pkg/amqp-ext/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-amqp": "^1.9.3", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/amqp-lib/.github/workflows/ci.yml b/pkg/amqp-lib/.github/workflows/ci.yml index e60e63b9b..a168dca05 100644 --- a/pkg/amqp-lib/.github/workflows/ci.yml +++ b/pkg/amqp-lib/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json index 2d9d2515f..71867a911 100644 --- a/pkg/amqp-lib/composer.json +++ b/pkg/amqp-lib/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "php-amqplib/php-amqplib": "^2.10", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/amqp-tools/.github/workflows/ci.yml b/pkg/amqp-tools/.github/workflows/ci.yml index bd62476f1..67837ef97 100644 --- a/pkg/amqp-tools/.github/workflows/ci.yml +++ b/pkg/amqp-tools/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json index 52c582954..cdb2321fd 100644 --- a/pkg/amqp-tools/composer.json +++ b/pkg/amqp-tools/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10" diff --git a/pkg/async-command/.github/workflows/ci.yml b/pkg/async-command/.github/workflows/ci.yml index e60e63b9b..a168dca05 100644 --- a/pkg/async-command/.github/workflows/ci.yml +++ b/pkg/async-command/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/async-command/composer.json b/pkg/async-command/composer.json index 24a24e80a..4317d1eca 100644 --- a/pkg/async-command/composer.json +++ b/pkg/async-command/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=7.1", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", "symfony/console": "^4.3|^5", diff --git a/pkg/async-event-dispatcher/.github/workflows/ci.yml b/pkg/async-event-dispatcher/.github/workflows/ci.yml index e60e63b9b..a168dca05 100644 --- a/pkg/async-event-dispatcher/.github/workflows/ci.yml +++ b/pkg/async-event-dispatcher/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index d4a72125b..d5adc5f7b 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", "symfony/event-dispatcher": "^4.3|^5" diff --git a/pkg/dbal/.github/workflows/ci.yml b/pkg/dbal/.github/workflows/ci.yml index e60e63b9b..a168dca05 100644 --- a/pkg/dbal/.github/workflows/ci.yml +++ b/pkg/dbal/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index dfeba65f3..fc9c4a595 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -6,9 +6,9 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", - "doctrine/dbal": "^2.6", + "doctrine/dbal": "^2.12", "ramsey/uuid": "^3|^4" }, "require-dev": { diff --git a/pkg/dsn/.github/workflows/ci.yml b/pkg/dsn/.github/workflows/ci.yml index 8486752a8..b23e42104 100644 --- a/pkg/dsn/.github/workflows/ci.yml +++ b/pkg/dsn/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/dsn/composer.json b/pkg/dsn/composer.json index 06ef139e9..3cdac4c2d 100644 --- a/pkg/dsn/composer.json +++ b/pkg/dsn/composer.json @@ -6,10 +6,10 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.1.3" + "php": "^7.3|^8.0" }, "require-dev": { - "phpunit/phpunit": "~7.5" + "phpunit/phpunit": "^9.5" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/enqueue-bundle/.github/workflows/ci.yml b/pkg/enqueue-bundle/.github/workflows/ci.yml index 99b7fc6bf..0185cad38 100644 --- a/pkg/enqueue-bundle/.github/workflows/ci.yml +++ b/pkg/enqueue-bundle/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php index d641227ef..c9356f1ec 100644 --- a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php @@ -113,7 +113,11 @@ public function testThrowIfClientDriverOptionsIsNotArray() $processor = new Processor(); $this->expectException(InvalidTypeException::class); - $this->expectExceptionMessage('Invalid type for path "enqueue.default.client.driver_options". Expected array, but got string'); + // Exception messages vary slightly between versions + $this->expectExceptionMessageMatches( + '/Invalid type for path "enqueue\.default\.client\.driver_options"\. Expected "?array"?, but got "?string"?/' + ); + $processor->processConfiguration($configuration, [[ 'default' => [ 'transport' => 'null:', diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 43a73fa34..aded35069 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "symfony/framework-bundle": "^4.3|^5", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", @@ -37,7 +37,7 @@ "enqueue/async-command": "0.10.x-dev", "php-amqplib/php-amqplib": "^2.7", "doctrine/doctrine-bundle": "~1.2|^2", - "doctrine/mongodb-odm-bundle": "^3.5|^4", + "doctrine/mongodb-odm-bundle": "^3.5|^4.3", "alcaeus/mongo-php-adapter": "^1.0", "symfony/browser-kit": "^4.3|^5", "symfony/expression-language": "^4.3|^5", diff --git a/pkg/enqueue/.github/workflows/ci.yml b/pkg/enqueue/.github/workflows/ci.yml index 390f70724..b39495855 100644 --- a/pkg/enqueue/.github/workflows/ci.yml +++ b/pkg/enqueue/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php index bf6e3cd01..e0dcf2e09 100644 --- a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php +++ b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php @@ -69,7 +69,11 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType() $registry = new ContainerProcessorRegistry($containerMock); $this->expectException(\TypeError::class); - $this->expectExceptionMessage('Return value of Enqueue\Symfony\ContainerProcessorRegistry::get() must implement interface Interop\Queue\Processor, instance of stdClass returned'); + // Exception messages vary slightly between versions + $this->expectExceptionMessageMatches( + '/Enqueue\\\\Symfony\\\\ContainerProcessorRegistry::get\(\).+ Interop\\\\Queue\\\\Processor,.*stdClass returned/' + ); + $registry->get('processor-name'); } diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index e8c3f3ade..3c525f510 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", "enqueue/null": "^0.10", diff --git a/pkg/fs/.github/workflows/ci.yml b/pkg/fs/.github/workflows/ci.yml index e9a20ead1..2a2fabfb7 100644 --- a/pkg/fs/.github/workflows/ci.yml +++ b/pkg/fs/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json index 40cfe59c3..e2b8119f1 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "symfony/filesystem": "^4.3|^5", diff --git a/pkg/gearman/.github/workflows/ci.yml b/pkg/gearman/.github/workflows/ci.yml index eae3a9cfa..401aab590 100644 --- a/pkg/gearman/.github/workflows/ci.yml +++ b/pkg/gearman/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json index 92dd3bc09..b88fa542e 100644 --- a/pkg/gearman/composer.json +++ b/pkg/gearman/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-gearman": "^2.0", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/gps/.github/workflows/ci.yml b/pkg/gps/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 100644 --- a/pkg/gps/.github/workflows/ci.yml +++ b/pkg/gps/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index 116a5dbf8..1d2ed5fd3 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "google/cloud-pubsub": "^1.0", "enqueue/dsn": "^0.10" diff --git a/pkg/job-queue/.github/workflows/ci.yml b/pkg/job-queue/.github/workflows/ci.yml index ef204f16b..2df5ff80c 100644 --- a/pkg/job-queue/.github/workflows/ci.yml +++ b/pkg/job-queue/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/job-queue/Test/DbalPersistedConnection.php b/pkg/job-queue/Test/DbalPersistedConnection.php index 51160c03b..add0f3ddc 100644 --- a/pkg/job-queue/Test/DbalPersistedConnection.php +++ b/pkg/job-queue/Test/DbalPersistedConnection.php @@ -33,7 +33,6 @@ public function connect() if ($this->hasPersistedConnection()) { $this->_conn = $this->getPersistedConnection(); - $this->setConnected(true); } else { parent::connect(); $this->persistConnection($this->_conn); @@ -66,22 +65,6 @@ public function rollBack() $this->wrapTransactionNestingLevel('rollBack'); } - /** - * @param bool $connected - */ - protected function setConnected($connected) - { - $rc = new \ReflectionClass(Connection::class); - $rp = $rc->hasProperty('isConnected') ? - $rc->getProperty('isConnected') : - $rc->getProperty('_isConnected') - ; - - $rp->setAccessible(true); - $rp->setValue($this, $connected); - $rp->setAccessible(false); - } - /** * @return int */ diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index cbe720e28..980e57619 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -6,12 +6,12 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "enqueue/null": "^0.10", "queue-interop/queue-interop": "^0.8", "doctrine/orm": "~2.4", - "doctrine/dbal": "<2.10" + "doctrine/dbal": "^2.12" }, "require-dev": { "phpunit/phpunit": "^9.5", diff --git a/pkg/mongodb/.github/workflows/ci.yml b/pkg/mongodb/.github/workflows/ci.yml index abee78209..7a2a6f365 100644 --- a/pkg/mongodb/.github/workflows/ci.yml +++ b/pkg/mongodb/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/mongodb/composer.json b/pkg/mongodb/composer.json index d84c6e68f..a894816f7 100644 --- a/pkg/mongodb/composer.json +++ b/pkg/mongodb/composer.json @@ -10,7 +10,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "mongodb/mongodb": "^1.2", "ext-mongodb": "^1.5" diff --git a/pkg/monitoring/.github/workflows/ci.yml b/pkg/monitoring/.github/workflows/ci.yml index 1dabd6bc3..237a49da1 100644 --- a/pkg/monitoring/.github/workflows/ci.yml +++ b/pkg/monitoring/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/monitoring/composer.json b/pkg/monitoring/composer.json index 92d31ec96..9942ec910 100644 --- a/pkg/monitoring/composer.json +++ b/pkg/monitoring/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "enqueue/dsn": "^0.10" }, diff --git a/pkg/null/.github/workflows/ci.yml b/pkg/null/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 100644 --- a/pkg/null/.github/workflows/ci.yml +++ b/pkg/null/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/null/composer.json b/pkg/null/composer.json index 5c43f40bc..bd00fb0b0 100644 --- a/pkg/null/composer.json +++ b/pkg/null/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8" }, "require-dev": { diff --git a/pkg/pheanstalk/.github/workflows/ci.yml b/pkg/pheanstalk/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 100644 --- a/pkg/pheanstalk/.github/workflows/ci.yml +++ b/pkg/pheanstalk/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json index 40a32fb3c..0274089a5 100644 --- a/pkg/pheanstalk/composer.json +++ b/pkg/pheanstalk/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "pda/pheanstalk": "^3", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/rdkafka/.github/workflows/ci.yml b/pkg/rdkafka/.github/workflows/ci.yml index 24af1bbc1..fd96b2abe 100644 --- a/pkg/rdkafka/.github/workflows/ci.yml +++ b/pkg/rdkafka/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json index 8db8e9cc3..7128a525f 100644 --- a/pkg/rdkafka/composer.json +++ b/pkg/rdkafka/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-rdkafka": "^3.0.3|^4.0|^5.0", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/redis/.github/workflows/ci.yml b/pkg/redis/.github/workflows/ci.yml index d2311341a..5dc982ea7 100644 --- a/pkg/redis/.github/workflows/ci.yml +++ b/pkg/redis/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json index ace7230e5..2bd867650 100644 --- a/pkg/redis/composer.json +++ b/pkg/redis/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "ramsey/uuid": "^3|^4" diff --git a/pkg/simple-client/.github/workflows/ci.yml b/pkg/simple-client/.github/workflows/ci.yml index c9683ac90..7fcc096a9 100644 --- a/pkg/simple-client/.github/workflows/ci.yml +++ b/pkg/simple-client/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index e06d880af..6b277c6ad 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/sns/.github/workflows/ci.yml b/pkg/sns/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 100644 --- a/pkg/sns/.github/workflows/ci.yml +++ b/pkg/sns/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/sns/composer.json b/pkg/sns/composer.json index cde4dab79..25fd1a345 100644 --- a/pkg/sns/composer.json +++ b/pkg/sns/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "aws/aws-sdk-php": "~3.26" diff --git a/pkg/snsqs/.github/workflows/ci.yml b/pkg/snsqs/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 100644 --- a/pkg/snsqs/.github/workflows/ci.yml +++ b/pkg/snsqs/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/snsqs/composer.json b/pkg/snsqs/composer.json index ddf8d80cf..ec52b67bc 100644 --- a/pkg/snsqs/composer.json +++ b/pkg/snsqs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "enqueue/sns": "^0.10", diff --git a/pkg/sqs/.github/workflows/ci.yml b/pkg/sqs/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 100644 --- a/pkg/sqs/.github/workflows/ci.yml +++ b/pkg/sqs/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json index 1ca52ab41..96dc89252 100644 --- a/pkg/sqs/composer.json +++ b/pkg/sqs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "aws/aws-sdk-php": "~3.26" diff --git a/pkg/stomp/.github/workflows/ci.yml b/pkg/stomp/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 100644 --- a/pkg/stomp/.github/workflows/ci.yml +++ b/pkg/stomp/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 0509d34b0..301631f43 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -5,14 +5,20 @@ "keywords": ["messaging", "queue", "stomp"], "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", + "repositories": [ + { + "type": "git", + "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git" + } + ], "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/dsn": "^0.10", - "stomp-php/stomp-php": "^4", + "stomp-php/stomp-php": "^4.0|^5.0", "queue-interop/queue-interop": "^0.8", - "php-http/guzzle6-adapter": "^1.1", - "php-http/client-common": "^1.7@dev", - "richardfullmer/rabbitmq-management-api": "^2.0" + "php-http/guzzle7-adapter": "^0.1.1", + "php-http/client-common": "^2.2.1", + "richardfullmer/rabbitmq-management-api": "^2.1.1" }, "require-dev": { "phpunit/phpunit": "^9.5", diff --git a/pkg/wamp/.github/workflows/ci.yml b/pkg/wamp/.github/workflows/ci.yml index 1dabd6bc3..237a49da1 100644 --- a/pkg/wamp/.github/workflows/ci.yml +++ b/pkg/wamp/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json index f868b00eb..1ad6b5110 100644 --- a/pkg/wamp/composer.json +++ b/pkg/wamp/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "thruway/client": "^0.5.0",