From deaa809442964a964047451f7eba93cd19246fef Mon Sep 17 00:00:00 2001 From: kaioken Date: Tue, 2 Jul 2024 08:21:06 -0400 Subject: [PATCH] fix: psr4 issue and optimize composer files --- composer.json | 1 - composer.lock | 270 +++++++----------- docker-compose.1.x.yml | 172 ++++------- docker-compose.development.yml | 178 +++--------- .../Workflows/SendEmailWorkflow.php | 3 +- .../Notifications/DynamicNotificationTest.php | 2 +- 6 files changed, 205 insertions(+), 421 deletions(-) diff --git a/composer.json b/composer.json index ac883ea1e8..9ffe4913c7 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,6 @@ "symfony/expression-language": "^7.0", "symfony/http-client": "^7.0", "symfony/mailgun-mailer": "^7.0", - "timokoerber/laravel-one-time-operations": "^1.4", "twilio/sdk": "^8.0", "vladimir-yuldashev/laravel-queue-rabbitmq": "^14.0", "vlucas/phpdotenv": "^5.5", diff --git a/composer.lock b/composer.lock index 42f45cf9c5..afea9cb07e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2939262e81b0fe33577c46164f677afb", + "content-hash": "66a75e57f8f8feba0b4e9acf4ac16f7c", "packages": [ { "name": "algolia/algoliasearch-client-php", @@ -1195,16 +1195,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.314.6", + "version": "3.315.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "d04da330b0201edab71edd33a03b8d5ad6e4a313" + "reference": "3f9ec5e5115947843f586284bdbfe7310479688d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d04da330b0201edab71edd33a03b8d5ad6e4a313", - "reference": "d04da330b0201edab71edd33a03b8d5ad6e4a313", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3f9ec5e5115947843f586284bdbfe7310479688d", + "reference": "3f9ec5e5115947843f586284bdbfe7310479688d", "shasum": "" }, "require": { @@ -1284,9 +1284,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.314.6" + "source": "https://github.com/aws/aws-sdk-php/tree/3.315.3" }, - "time": "2024-06-20T18:09:51+00:00" + "time": "2024-07-01T20:07:58+00:00" }, { "name": "berkayk/onesignal-laravel", @@ -2503,16 +2503,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.361.0", + "version": "v0.362.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "f90e9a059ce5a6076b4fc8571a4fac6564012782" + "reference": "c5016217c8aba823a8ebeed6ccd75d93522e3311" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/f90e9a059ce5a6076b4fc8571a4fac6564012782", - "reference": "f90e9a059ce5a6076b4fc8571a4fac6564012782", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/c5016217c8aba823a8ebeed6ccd75d93522e3311", + "reference": "c5016217c8aba823a8ebeed6ccd75d93522e3311", "shasum": "" }, "require": { @@ -2541,9 +2541,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.361.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.362.0" }, - "time": "2024-06-23T01:02:19+00:00" + "time": "2024-06-28T01:06:13+00:00" }, { "name": "google/auth", @@ -2928,16 +2928,16 @@ }, { "name": "google/protobuf", - "version": "v4.27.1", + "version": "v4.27.2", "source": { "type": "git", "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "c471e2b3afe61bf41f22d1ca926b24e7ce96c598" + "reference": "1b9bfead0ea8108e6ab411258fc38417b62d4bf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/c471e2b3afe61bf41f22d1ca926b24e7ce96c598", - "reference": "c471e2b3afe61bf41f22d1ca926b24e7ce96c598", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/1b9bfead0ea8108e6ab411258fc38417b62d4bf6", + "reference": "1b9bfead0ea8108e6ab411258fc38417b62d4bf6", "shasum": "" }, "require": { @@ -2966,9 +2966,9 @@ "proto" ], "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.27.1" + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.27.2" }, - "time": "2024-06-05T16:59:28+00:00" + "time": "2024-06-25T19:14:44+00:00" }, { "name": "graham-campbell/result-type", @@ -5559,16 +5559,16 @@ }, { "name": "meilisearch/meilisearch-php", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/meilisearch/meilisearch-php.git", - "reference": "77058e5cd0c9ee1236eaf8dfabdde2b339370b21" + "reference": "57f15d3cc13305c09d7d218720340b5f71157ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/meilisearch/meilisearch-php/zipball/77058e5cd0c9ee1236eaf8dfabdde2b339370b21", - "reference": "77058e5cd0c9ee1236eaf8dfabdde2b339370b21", + "url": "https://api.github.com/repos/meilisearch/meilisearch-php/zipball/57f15d3cc13305c09d7d218720340b5f71157ae3", + "reference": "57f15d3cc13305c09d7d218720340b5f71157ae3", "shasum": "" }, "require": { @@ -5583,7 +5583,7 @@ "guzzlehttp/guzzle": "^7.1", "http-interop/http-factory-guzzle": "^1.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "1.10.67", + "phpstan/phpstan": "1.11.5", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", @@ -5621,9 +5621,9 @@ ], "support": { "issues": "https://github.com/meilisearch/meilisearch-php/issues", - "source": "https://github.com/meilisearch/meilisearch-php/tree/v1.8.0" + "source": "https://github.com/meilisearch/meilisearch-php/tree/v1.9.0" }, - "time": "2024-05-06T13:58:08+00:00" + "time": "2024-07-01T11:36:46+00:00" }, { "name": "mll-lab/graphql-php-scalars", @@ -5753,16 +5753,16 @@ }, { "name": "monolog/monolog", - "version": "3.6.0", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654" + "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654", - "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", + "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", "shasum": "" }, "require": { @@ -5838,7 +5838,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.6.0" + "source": "https://github.com/Seldaek/monolog/tree/3.7.0" }, "funding": [ { @@ -5850,7 +5850,7 @@ "type": "tidelift" } ], - "time": "2024-04-12T21:02:21+00:00" + "time": "2024-06-28T09:40:51+00:00" }, { "name": "mtdowling/jmespath.php", @@ -6236,16 +6236,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", "shasum": "" }, "require": { @@ -6256,7 +6256,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -6288,9 +6288,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-07-01T20:03:41+00:00" }, { "name": "nunomaduro/termwind", @@ -6382,16 +6382,16 @@ }, { "name": "nuwave/lighthouse", - "version": "v6.38.1", + "version": "v6.39.0", "source": { "type": "git", "url": "https://github.com/nuwave/lighthouse.git", - "reference": "16ffb6f45207b7cb25697730694b14887f736421" + "reference": "29b99f7dae3fe3a65e4a7f7951603da072ad023e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/16ffb6f45207b7cb25697730694b14887f736421", - "reference": "16ffb6f45207b7cb25697730694b14887f736421", + "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/29b99f7dae3fe3a65e4a7f7951603da072ad023e", + "reference": "29b99f7dae3fe3a65e4a7f7951603da072ad023e", "shasum": "" }, "require": { @@ -6512,7 +6512,7 @@ "type": "patreon" } ], - "time": "2024-06-21T10:12:39+00:00" + "time": "2024-07-02T08:10:31+00:00" }, { "name": "nyholm/psr7", @@ -9732,16 +9732,16 @@ }, { "name": "symfony/cache", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "760294dc7158372699dccd077965c16c328f8719" + "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/760294dc7158372699dccd077965c16c328f8719", - "reference": "760294dc7158372699dccd077965c16c328f8719", + "url": "https://api.github.com/repos/symfony/cache/zipball/e933e1d947ffb88efcdd34a2bd51561cab7deaae", + "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae", "shasum": "" }, "require": { @@ -9809,7 +9809,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.1.1" + "source": "https://github.com/symfony/cache/tree/v7.1.2" }, "funding": [ { @@ -9825,7 +9825,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-11T13:32:38+00:00" }, { "name": "symfony/cache-contracts", @@ -9979,16 +9979,16 @@ }, { "name": "symfony/console", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3" + "reference": "0aa29ca177f432ab68533432db0de059f39c92ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", - "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", + "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae", + "reference": "0aa29ca177f432ab68533432db0de059f39c92ae", "shasum": "" }, "require": { @@ -10052,7 +10052,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.1" + "source": "https://github.com/symfony/console/tree/v7.1.2" }, "funding": [ { @@ -10068,7 +10068,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-28T10:03:55+00:00" }, { "name": "symfony/css-selector", @@ -10204,16 +10204,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "e9b8bbce0b4f322939332ab7b6b81d8c11da27dd" + "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/e9b8bbce0b4f322939332ab7b6b81d8c11da27dd", - "reference": "e9b8bbce0b4f322939332ab7b6b81d8c11da27dd", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/2412d3dddb5c9ea51a39cfbff1c565fc9844ca32", + "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32", "shasum": "" }, "require": { @@ -10259,7 +10259,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.1.1" + "source": "https://github.com/symfony/error-handler/tree/v7.1.2" }, "funding": [ { @@ -10275,7 +10275,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-25T19:55:06+00:00" }, { "name": "symfony/event-dispatcher", @@ -10812,16 +10812,16 @@ }, { "name": "symfony/http-kernel", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "fa8d1c75b5f33b1302afccf81811f93976c6e26f" + "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fa8d1c75b5f33b1302afccf81811f93976c6e26f", - "reference": "fa8d1c75b5f33b1302afccf81811f93976c6e26f", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6", + "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6", "shasum": "" }, "require": { @@ -10906,7 +10906,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.1.1" + "source": "https://github.com/symfony/http-kernel/tree/v7.1.2" }, "funding": [ { @@ -10922,7 +10922,7 @@ "type": "tidelift" } ], - "time": "2024-06-04T06:52:15+00:00" + "time": "2024-06-28T13:13:31+00:00" }, { "name": "symfony/mailer", @@ -12244,16 +12244,16 @@ }, { "name": "symfony/string", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "60bc311c74e0af215101235aa6f471bcbc032df2" + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2", - "reference": "60bc311c74e0af215101235aa6f471bcbc032df2", + "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8", + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8", "shasum": "" }, "require": { @@ -12311,7 +12311,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.1" + "source": "https://github.com/symfony/string/tree/v7.1.2" }, "funding": [ { @@ -12327,7 +12327,7 @@ "type": "tidelift" } ], - "time": "2024-06-04T06:40:14+00:00" + "time": "2024-06-28T09:27:18+00:00" }, { "name": "symfony/translation", @@ -12577,16 +12577,16 @@ }, { "name": "symfony/var-dumper", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "deb2c2b506ff6fdbb340e00b34e9901e1605f293" + "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/deb2c2b506ff6fdbb340e00b34e9901e1605f293", - "reference": "deb2c2b506ff6fdbb340e00b34e9901e1605f293", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5857c57c6b4b86524c08cf4f4bc95327270a816d", + "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d", "shasum": "" }, "require": { @@ -12640,7 +12640,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.1.1" + "source": "https://github.com/symfony/var-dumper/tree/v7.1.2" }, "funding": [ { @@ -12656,20 +12656,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-28T08:00:31+00:00" }, { "name": "symfony/var-exporter", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "db82c2b73b88734557cfc30e3270d83fa651b712" + "reference": "b80a669a2264609f07f1667f891dbfca25eba44c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db82c2b73b88734557cfc30e3270d83fa651b712", - "reference": "db82c2b73b88734557cfc30e3270d83fa651b712", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b80a669a2264609f07f1667f891dbfca25eba44c", + "reference": "b80a669a2264609f07f1667f891dbfca25eba44c", "shasum": "" }, "require": { @@ -12716,7 +12716,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.1.1" + "source": "https://github.com/symfony/var-exporter/tree/v7.1.2" }, "funding": [ { @@ -12732,7 +12732,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-28T08:00:31+00:00" }, { "name": "thecodingmachine/safe", @@ -12926,82 +12926,18 @@ }, "time": "2023-12-08T13:03:43+00:00" }, - { - "name": "timokoerber/laravel-one-time-operations", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/TimoKoerber/laravel-one-time-operations.git", - "reference": "33292b8606ff51b8bebe2d6f62fe057621e56942" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/TimoKoerber/laravel-one-time-operations/zipball/33292b8606ff51b8bebe2d6f62fe057621e56942", - "reference": "33292b8606ff51b8bebe2d6f62fe057621e56942", - "shasum": "" - }, - "require": { - "illuminate/contracts": "^9.0|^10.0|^11.0", - "illuminate/support": "^9.0|^10.0|^11.0", - "php": "^8.0" - }, - "require-dev": { - "orchestra/testbench": "7|^9.0", - "phpunit/phpunit": "^9.4|^10.5" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "TimoKoerber\\LaravelOneTimeOperations\\Providers\\OneTimeOperationsServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "TimoKoerber\\LaravelOneTimeOperations\\": "src/", - "TimoKoerber\\LaravelOneTimeOperations\\Database\\Factories\\": "database/factories/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "timo.koerber", - "email": "koerber.timo@gmail.com", - "homepage": "https://www.timokoerber.com", - "role": "Developer" - } - ], - "description": "Run operations once after deployment - just like you do it with migrations!", - "homepage": "https://github.com/timokoerber/laravel-one-time-operations", - "keywords": [ - "deployment", - "jobs", - "laravel", - "migrations", - "operations" - ], - "support": { - "issues": "https://github.com/TimoKoerber/laravel-one-time-operations/issues", - "source": "https://github.com/TimoKoerber/laravel-one-time-operations/tree/1.4.2" - }, - "time": "2024-04-04T11:16:58+00:00" - }, { "name": "twilio/sdk", - "version": "8.2.1", + "version": "8.2.2", "source": { "type": "git", "url": "https://github.com/twilio/twilio-php.git", - "reference": "7b85c1a71ea68750a008c43c76c76e14edc2fdac" + "reference": "10dbd6ecbc6ac1e0c61ab7d70c44e0794f8d3a1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twilio/twilio-php/zipball/7b85c1a71ea68750a008c43c76c76e14edc2fdac", - "reference": "7b85c1a71ea68750a008c43c76c76e14edc2fdac", + "url": "https://api.github.com/repos/twilio/twilio-php/zipball/10dbd6ecbc6ac1e0c61ab7d70c44e0794f8d3a1f", + "reference": "10dbd6ecbc6ac1e0c61ab7d70c44e0794f8d3a1f", "shasum": "" }, "require": { @@ -13039,9 +12975,9 @@ ], "support": { "issues": "https://github.com/twilio/twilio-php/issues", - "source": "https://github.com/twilio/twilio-php/tree/8.2.1" + "source": "https://github.com/twilio/twilio-php/tree/8.2.2" }, - "time": "2024-06-27T19:41:42+00:00" + "time": "2024-07-02T09:32:09+00:00" }, { "name": "vladimir-yuldashev/laravel-queue-rabbitmq", @@ -14143,16 +14079,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.11.5", + "version": "1.11.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443" + "reference": "6ac78f1165346c83b4a753f7e4186d969c6ad0ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6ac78f1165346c83b4a753f7e4186d969c6ad0ee", + "reference": "6ac78f1165346c83b4a753f7e4186d969c6ad0ee", "shasum": "" }, "require": { @@ -14197,20 +14133,20 @@ "type": "github" } ], - "time": "2024-06-17T15:10:54+00:00" + "time": "2024-07-01T15:33:06+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "11.0.3", + "version": "11.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "7e35a2cbcabac0e6865fd373742ea432a3c34f92" + "reference": "4dc2b7a606073f0fb80da09842ffb068b627c38f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e35a2cbcabac0e6865fd373742ea432a3c34f92", - "reference": "7e35a2cbcabac0e6865fd373742ea432a3c34f92", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4dc2b7a606073f0fb80da09842ffb068b627c38f", + "reference": "4dc2b7a606073f0fb80da09842ffb068b627c38f", "shasum": "" }, "require": { @@ -14267,7 +14203,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.3" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.4" }, "funding": [ { @@ -14275,7 +14211,7 @@ "type": "github" } ], - "time": "2024-03-12T15:35:40+00:00" + "time": "2024-06-29T08:26:25+00:00" }, { "name": "phpunit/php-file-iterator", diff --git a/docker-compose.1.x.yml b/docker-compose.1.x.yml index edb2141181..489bb435fc 100644 --- a/docker-compose.1.x.yml +++ b/docker-compose.1.x.yml @@ -1,3 +1,28 @@ +version: '3.8' + +x-common-queue-settings: &common-queue-settings + restart: always + build: + context: . + dockerfile: development.Dockerfile + extra_hosts: + - "host.docker.internal:host-gateway" + command: + - "sh" + - "-c" + - "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750" + environment: + WWWUSER: "${WWWUSER}" + LARAVEL_SAIL: 1 + XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" + XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" + volumes: + - ".:/var/www/html" + - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini + - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini + networks: + - sail + services: php: container_name: php${APP_CONTAINER_NAME} @@ -19,134 +44,44 @@ services: - sail queue: + <<: *common-queue-settings container_name: queue - restart: always - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail queue2: + <<: *common-queue-settings container_name: queue2 - restart: always - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail queue3: + <<: *common-queue-settings container_name: queue3 - restart: always - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + + queue4: + <<: *common-queue-settings + container_name: queue4 + + queue5: + <<: *common-queue-settings + container_name: queue5 + + queue6: + <<: *common-queue-settings + container_name: queue6 queue-social: + <<: *common-queue-settings container_name: queue-social - restart: always - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --queue kanvas-social --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + command: + - "sh" + - "-c" + - "php artisan config:cache && php artisan queue:work --queue kanvas-social --tries=3 --timeout=3750" queue-notifications: + <<: *common-queue-settings container_name: queue-notifications - restart: always - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --queue notifications --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + command: + - "sh" + - "-c" + - "php artisan config:cache && php artisan queue:work --queue notifications --tries=3 --timeout=3750" laravel-scheduler: container_name: laravel-scheduler @@ -157,7 +92,9 @@ services: extra_hosts: - "host.docker.internal:host-gateway" command: - ["sh", "-c", "php artisan config:cache && php artisan schedule:work"] + - "sh" + - "-c" + - "php artisan config:cache && php artisan schedule:work" environment: WWWUSER: "${WWWUSER}" LARAVEL_SAIL: 1 @@ -206,6 +143,7 @@ services: networks: sail: driver: bridge + volumes: sail-redis: - driver: local + driver: local \ No newline at end of file diff --git a/docker-compose.development.yml b/docker-compose.development.yml index 35bd1c0b3f..c08250debf 100644 --- a/docker-compose.development.yml +++ b/docker-compose.development.yml @@ -1,168 +1,79 @@ +version: '3.8' + +x-common-settings: &common-settings + build: + context: . + dockerfile: development.Dockerfile + extra_hosts: + - "host.docker.internal:host-gateway" + environment: + WWWUSER: "${WWWUSER}" + LARAVEL_SAIL: 1 + XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" + XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" + volumes: + - ".:/var/www/html" + - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini + - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini + networks: + - sail + +x-common-queue-command: &common-queue-command + [ + "sh", + "-c", + "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750", + ] + services: php: container_name: php${APP_CONTAINER_NAME} - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + <<: *common-settings queue: container_name: queue - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + <<: *common-settings + command: *common-queue-command queue2: container_name: queue2 - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + <<: *common-settings + command: *common-queue-command queue3: container_name: queue3 - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - [ - "sh", - "-c", - "php artisan config:cache && php artisan queue:work --tries=3 --timeout=3750", - ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + <<: *common-settings + command: *common-queue-command queue-social: container_name: queue-social - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" + <<: *common-settings command: [ "sh", "-c", "php artisan config:cache && php artisan queue:work --queue kanvas-social --tries=3 --timeout=3750", ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail queue-notifications: container_name: queue-notifications - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" + <<: *common-settings command: [ "sh", "-c", "php artisan config:cache && php artisan queue:work --queue notifications --tries=3 --timeout=3750", ] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail laravel-scheduler: container_name: laravel-scheduler - build: - context: . - dockerfile: development.Dockerfile - extra_hosts: - - "host.docker.internal:host-gateway" - command: - ["sh", "-c", "php artisan config:cache && php artisan schedule:work"] - environment: - WWWUSER: "${WWWUSER}" - LARAVEL_SAIL: 1 - XDEBUG_MODE: "${SAIL_XDEBUG_MODE:-off}" - XDEBUG_CONFIG: "${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}" - volumes: - - ".:/var/www/html" - - ./docker/docker-php-ext-opcache.ini:/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini - - ./docker/php.ini:/usr/local/etc/php/conf.d/xz-custom.ini - networks: - - sail + <<: *common-settings + command: + [ + "sh", + "-c", + "php artisan config:cache && php artisan schedule:work", + ] nginx: image: nginx:latest @@ -200,6 +111,7 @@ services: networks: sail: driver: bridge + volumes: sail-redis: - driver: local + driver: local \ No newline at end of file diff --git a/src/Domains/Connectors/Notifications/Workflows/SendEmailWorkflow.php b/src/Domains/Connectors/Notifications/Workflows/SendEmailWorkflow.php index 6860f510a7..92bbb66c9c 100644 --- a/src/Domains/Connectors/Notifications/Workflows/SendEmailWorkflow.php +++ b/src/Domains/Connectors/Notifications/Workflows/SendEmailWorkflow.php @@ -2,11 +2,10 @@ declare(strict_types=1); -namespace Kanvas\Connectors\Zoho\Workflows; +namespace Kanvas\Connectors\Notifications\Workflows; use Baka\Contracts\AppInterface; use Generator; -use Kanvas\Connectors\Notifications\Workflows\SendEmailActivity; use Kanvas\Users\Models\Users; use Workflow\ActivityStub; use Workflow\Workflow; diff --git a/tests/Ecosystem/Integration/Notifications/DynamicNotificationTest.php b/tests/Ecosystem/Integration/Notifications/DynamicNotificationTest.php index 751d75f502..a4c1aa316e 100644 --- a/tests/Ecosystem/Integration/Notifications/DynamicNotificationTest.php +++ b/tests/Ecosystem/Integration/Notifications/DynamicNotificationTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Tests\Ecosystem\Integration\Templates; +namespace Tests\Ecosystem\Integration\Notifications; use Illuminate\Support\Facades\Notification; use Kanvas\Apps\Models\Apps;