From 2539d98e5761361f9517bc20f3e3d3e0e9362c91 Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 15:36:21 +0000 Subject: [PATCH 1/9] update php-amqplib --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8f4b052..70f6949 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ }, "require-dev": { "phpunit/phpunit": "~4.8.0", - "php-amqplib/php-amqplib": "~2.12.1", + "php-amqplib/php-amqplib": "~3.7.3", "google/cloud-pubsub": "~1.3.0" }, "autoload": { From 8d7b3f1868e08a99fd3c37ea222866f77f924a6e Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 15:42:57 +0000 Subject: [PATCH 2/9] add github action tests --- .github/workflows/unit-test.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/unit-test.yml diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml new file mode 100644 index 0000000..519495a --- /dev/null +++ b/.github/workflows/unit-test.yml @@ -0,0 +1,33 @@ +name: unit-test.yml +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + unit-test: + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] + rabbit: [ '3.10', '3.11', '3.12', '3.13', '4.0', '4.1', '4.2' ] + + runs-on: ${{matrix.os}} + services: + rabbit: + image: rabbitmq:${{matrix.rabbit}}-management + ports: + - 5672:5672 + steps: + - uses: actions/checkout@v5 + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{matrix.php}} + coverage: xdebug + tools: composer, phpunit + - run: composer install -n --prefer-dist + - run: php vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-clover=coverage.xml + - run: php vendor/bin/coverage-check coverage.xml 70 From f161fe8a8ff389120f8042ce09a7d2a5ab0a71f9 Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 15:43:05 +0000 Subject: [PATCH 3/9] drop circleci --- .circleci/config.yml | 61 -------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 9cf00d2..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,61 +0,0 @@ -defaults: &defaults - steps: - # common php steps - - run: echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories - - run: if [ -n "$ADD_PACKAGES" ]; then apk -U add $ADD_PACKAGES; fi; - - run: if [ -n "$ADD_MODULES" ]; then docker-php-ext-install $ADD_MODULES; fi; - - run: echo "date.timezone = UTC" >> $(php --ini |grep Scan |awk '{print $NF}')/timezone.ini - - run: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer - - # pre-checkout steps - - # checkout - - checkout - - # post-checkout steps - - # run tests - - run: composer install -n --prefer-dist - - run: php vendor/phpunit/phpunit/phpunit -c phpunit.xml --log-junit /tmp/test-results/phpunit/junit.xml - - store_test_results: - path: /tmp/test-results - -version: 2 -jobs: - build-php71: - <<: *defaults - docker: - - image: php:7.1-alpine - environment: - ADD_MODULES: bcmath sockets - - image: rabbitmq:3.6-management - build-php72: - <<: *defaults - docker: - - image: php:7.2-alpine - environment: - ADD_MODULES: bcmath sockets - - image: rabbitmq:3.6-management - build-php73: - <<: *defaults - docker: - - image: php:7.3-alpine3.13 - environment: - ADD_MODULES: bcmath sockets - - image: rabbitmq:3.6-management - build-php74: - <<: *defaults - docker: - - image: php:7.4-alpine3.13 - environment: - ADD_MODULES: bcmath sockets - - image: rabbitmq:3.6-management - -workflows: - version: 2 - build: - jobs: - - build-php71 - - build-php72 - - build-php73 - - build-php74 From a6068f29e03434057f882e8bb18fc55448e0f9a1 Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 15:45:45 +0000 Subject: [PATCH 4/9] update phpunit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 70f6949..78f610e 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "google/cloud-pubsub": "Enables using queues in Google Cloud PubSub" }, "require-dev": { - "phpunit/phpunit": "~4.8.0", + "phpunit/phpunit": "~8.0", "php-amqplib/php-amqplib": "~3.7.3", "google/cloud-pubsub": "~1.3.0" }, From 62f286989665233982dd55d8c45689f231809353 Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 15:46:48 +0000 Subject: [PATCH 5/9] drop windows, and older php --- .github/workflows/unit-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 519495a..8ad56d8 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -11,8 +11,8 @@ jobs: unit-test: strategy: matrix: - os: [ ubuntu-latest, windows-latest ] - php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] + os: [ 'ubuntu-latest' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] rabbit: [ '3.10', '3.11', '3.12', '3.13', '4.0', '4.1', '4.2' ] runs-on: ${{matrix.os}} From 24c0c76a97ce100d8785150ad7f10415aa20e7ba Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 15:47:54 +0000 Subject: [PATCH 6/9] update test class --- tests/Provider/AmqpTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Provider/AmqpTest.php b/tests/Provider/AmqpTest.php index f817d66..b49cc23 100644 --- a/tests/Provider/AmqpTest.php +++ b/tests/Provider/AmqpTest.php @@ -4,8 +4,9 @@ use Packaged\Config\ConfigSectionInterface; use Packaged\Config\Provider\ConfigSection; use Packaged\Queue\Tests\Provider\Mock\AmqpMockProvider; +use PHPUnit\Framework\TestCase; -class AmqpTest extends \PHPUnit_Framework_TestCase +class AmqpTest extends TestCase { protected function _getProvider(string $queue, ?string $exchange = null) { From 0d8ff0cdcbb6f95d48eb664a861f685b36835262 Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 15:53:26 +0000 Subject: [PATCH 7/9] add coverage checker --- .github/workflows/unit-test.yml | 2 +- composer.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 8ad56d8..6ac0bf4 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -30,4 +30,4 @@ jobs: tools: composer, phpunit - run: composer install -n --prefer-dist - run: php vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-clover=coverage.xml - - run: php vendor/bin/coverage-check coverage.xml 70 + - run: php vendor/bin/coverage-check coverage.xml 10 diff --git a/composer.json b/composer.json index 78f610e..2707128 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ }, "require-dev": { "phpunit/phpunit": "~8.0", + "rregeer/phpunit-coverage-check": "^0.3.1", "php-amqplib/php-amqplib": "~3.7.3", "google/cloud-pubsub": "~1.3.0" }, From 136926441ad9faaf8ff6355c508d54af56bb5521 Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 16:00:11 +0000 Subject: [PATCH 8/9] update xml --- phpunit.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index 1bbd68e..2bcb563 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,10 +7,9 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" - stopOnFailure="false" - syntaxCheck="false"> + stopOnFailure="false"> - + tests @@ -18,9 +17,5 @@ src - - vendor - tests - From c1c7d282dc29cf129c2c358b264e50255093c159 Mon Sep 17 00:00:00 2001 From: Tom Kay Date: Fri, 7 Nov 2025 16:02:02 +0000 Subject: [PATCH 9/9] phpunit 9 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2707128..7bf206b 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "google/cloud-pubsub": "Enables using queues in Google Cloud PubSub" }, "require-dev": { - "phpunit/phpunit": "~8.0", + "phpunit/phpunit": "~9.0", "rregeer/phpunit-coverage-check": "^0.3.1", "php-amqplib/php-amqplib": "~3.7.3", "google/cloud-pubsub": "~1.3.0"