From d9b9c0c3544e3408db88aa7fbf5d9199874c8583 Mon Sep 17 00:00:00 2001 From: Cristiano Pacheco Date: Tue, 18 Apr 2023 09:36:51 -0300 Subject: [PATCH 1/2] Removes the composer version from composer.json file to avoid issues on packagist --- composer.json | 1 - composer.lock | 90 ++++++++++++++++++++++++--------------------------- 2 files changed, 43 insertions(+), 48 deletions(-) diff --git a/composer.json b/composer.json index 85a0aaf..b78cce0 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,6 @@ "description": "Provides message queue retry processing functionality via RabbitMQ's dead letter exchange.", "type": "magento2-module", "license": "MIT", - "version": "2.0.1", "authors": [ { "name": "Cristiano Pacheco", diff --git a/composer.lock b/composer.lock index 32a0db8..73f99bc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,30 +4,29 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5c429901d292396b6784f3b883d1ce53", + "content-hash": "d81ad6a316acd9bc8fb4e2d699f3bff9", "packages": [ { "name": "brick/math", - "version": "0.10.2", + "version": "0.11.0", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f" + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f", + "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478", + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478", "shasum": "" }, "require": { - "ext-json": "*", - "php": "^7.4 || ^8.0" + "php": "^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^9.0", - "vimeo/psalm": "4.25.0" + "vimeo/psalm": "5.0.0" }, "type": "library", "autoload": { @@ -52,7 +51,7 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.10.2" + "source": "https://github.com/brick/math/tree/0.11.0" }, "funding": [ { @@ -60,7 +59,7 @@ "type": "github" } ], - "time": "2022-08-10T22:54:19+00:00" + "time": "2023-01-15T23:15:59+00:00" }, { "name": "colinmollenhour/credis", @@ -845,22 +844,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.5.0", + "version": "7.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" + "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b964ca597e86b752cd994f27293e9fa6b6a95ed9", + "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.9 || ^2.4", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -953,7 +952,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.5.0" + "source": "https://github.com/guzzle/guzzle/tree/7.5.1" }, "funding": [ { @@ -969,7 +968,7 @@ "type": "tidelift" } ], - "time": "2022-08-28T15:39:27+00:00" + "time": "2023-04-17T16:30:08+00:00" }, { "name": "guzzlehttp/promises", @@ -1057,22 +1056,22 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.4", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" + "reference": "b635f279edd83fc275f822a1188157ffea568ff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", + "reference": "b635f279edd83fc275f822a1188157ffea568ff6", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -1092,9 +1091,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -1156,7 +1152,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.4" + "source": "https://github.com/guzzle/psr7/tree/2.5.0" }, "funding": [ { @@ -1172,7 +1168,7 @@ "type": "tidelift" } ], - "time": "2023-03-09T13:19:02+00:00" + "time": "2023-04-17T16:11:26+00:00" }, { "name": "justinrainbow/json-schema", @@ -2892,11 +2888,11 @@ }, { "name": "magento/composer-dependency-version-audit-plugin", - "version": "0.1.4", + "version": "0.1.5", "dist": { "type": "zip", - "url": "https://mirror.mage-os.org/packages/magento/composer-dependency-version-audit-plugin-0.1.4.zip", - "shasum": "e74426113ab655c48027ceefd83b6c3446c7ec6d" + "url": "https://mirror.mage-os.org/packages/magento/composer-dependency-version-audit-plugin-0.1.5.zip", + "shasum": "fe54a6c60983f05bb18a7cbe3dba23a0de91c622" }, "require": { "composer-plugin-api": "^1.0 || ^2.0", @@ -6340,20 +6336,20 @@ }, { "name": "ramsey/uuid", - "version": "4.7.3", + "version": "4.7.4", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2" + "reference": "60a4c63ab724854332900504274f6150ff26d286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286", + "reference": "60a4c63ab724854332900504274f6150ff26d286", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10", + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11", "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" @@ -6416,7 +6412,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.3" + "source": "https://github.com/ramsey/uuid/tree/4.7.4" }, "funding": [ { @@ -6428,7 +6424,7 @@ "type": "tidelift" } ], - "time": "2023-01-12T18:13:24+00:00" + "time": "2023-04-15T23:01:58+00:00" }, { "name": "react/promise", @@ -8145,16 +8141,16 @@ }, { "name": "webonyx/graphql-php", - "version": "v15.2.4", + "version": "v15.2.5", "source": { "type": "git", "url": "https://github.com/webonyx/graphql-php.git", - "reference": "ac27a8692622ac13e72a6fe354027cc81ef31a6e" + "reference": "8371e2e7f4502bfb3a0bed85315dce6a8e4a667d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/ac27a8692622ac13e72a6fe354027cc81ef31a6e", - "reference": "ac27a8692622ac13e72a6fe354027cc81ef31a6e", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/8371e2e7f4502bfb3a0bed85315dce6a8e4a667d", + "reference": "8371e2e7f4502bfb3a0bed85315dce6a8e4a667d", "shasum": "" }, "require": { @@ -8171,11 +8167,11 @@ "nyholm/psr7": "^1.5", "phpbench/phpbench": "^1.2", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "1.10.6", - "phpstan/phpstan-phpunit": "1.3.10", - "phpstan/phpstan-strict-rules": "1.5.0", + "phpstan/phpstan": "1.10.13", + "phpstan/phpstan-phpunit": "1.3.11", + "phpstan/phpstan-strict-rules": "1.5.1", "phpunit/phpunit": "^9.5", - "psr/http-message": "^1", + "psr/http-message": "^1 || ^2", "react/http": "^1.6", "react/promise": "^2.9", "rector/rector": "^0.15.18", @@ -8206,7 +8202,7 @@ ], "support": { "issues": "https://github.com/webonyx/graphql-php/issues", - "source": "https://github.com/webonyx/graphql-php/tree/v15.2.4" + "source": "https://github.com/webonyx/graphql-php/tree/v15.2.5" }, "funding": [ { @@ -8214,7 +8210,7 @@ "type": "open_collective" } ], - "time": "2023-03-20T18:50:41+00:00" + "time": "2023-04-17T09:11:55+00:00" }, { "name": "wikimedia/less.php", From 6c068b0cfc35511b6a25c0cc4b37e2fa4bfa118e Mon Sep 17 00:00:00 2001 From: Cristiano Pacheco Date: Tue, 18 Apr 2023 09:37:21 -0300 Subject: [PATCH 2/2] Adds the config/topic id attribute to support multiple topics configuration in the same file --- src/etc/di.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/etc/di.xml b/src/etc/di.xml index c1e979c..471cd64 100644 --- a/src/etc/di.xml +++ b/src/etc/di.xml @@ -49,6 +49,9 @@ RunAsRoot\MessageQueueRetry\SchemaLocator\QueueRetrySchemaLocator + + name +