diff --git a/.github/mergify.yml b/.github/mergify.yml index 478be37ca6..72191a71c4 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,5 +1,11 @@ ---- pull_request_rules: + - name: Make sure PR are up to date before merging + description: This automatically updates PRs when they are out-of-date with the + base branch to avoid semantic conflicts (next step is using a merge + queue). + conditions: [] + actions: + update: - name: Close all on main conditions: - base=main diff --git a/composer.lock b/composer.lock index 927debd58a..91b59861a3 100644 --- a/composer.lock +++ b/composer.lock @@ -1878,16 +1878,16 @@ }, { "name": "laravel/framework", - "version": "v11.44.0", + "version": "v11.44.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e9a33da34815ac1ed46c7e4c477a775f4592f0a7" + "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e9a33da34815ac1ed46c7e4c477a775f4592f0a7", - "reference": "e9a33da34815ac1ed46c7e4c477a775f4592f0a7", + "url": "https://api.github.com/repos/laravel/framework/zipball/0883d4175f4e2b5c299e7087ad3c74f2ce195c6d", + "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d", "shasum": "" }, "require": { @@ -1995,7 +1995,7 @@ "league/flysystem-read-only": "^3.25.1", "league/flysystem-sftp-v3": "^3.25.1", "mockery/mockery": "^1.6.10", - "orchestra/testbench-core": "^9.9.4", + "orchestra/testbench-core": "^9.11.2", "pda/pheanstalk": "^5.0.6", "php-http/discovery": "^1.15", "phpstan/phpstan": "^2.0", @@ -2089,7 +2089,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-02-24T13:08:54+00:00" + "time": "2025-03-05T15:34:10+00:00" }, { "name": "laravel/passport", @@ -3472,30 +3472,30 @@ }, { "name": "mailersend/laravel-driver", - "version": "v2.7.0", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/mailersend/mailersend-laravel-driver.git", - "reference": "dd465077e89b903fe1dcc75c92203c7449ef57ee" + "reference": "b28fde8f6ec0cd5406100abf05f7899935e71652" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/dd465077e89b903fe1dcc75c92203c7449ef57ee", - "reference": "dd465077e89b903fe1dcc75c92203c7449ef57ee", + "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/b28fde8f6ec0cd5406100abf05f7899935e71652", + "reference": "b28fde8f6ec0cd5406100abf05f7899935e71652", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/support": "^9.0 || ^10.0 || ^11.0", - "mailersend/mailersend": "^0.8.0 || ^0.23.0 || ^0.24.0", + "illuminate/support": "^9.0 || ^10.0 || ^11.0 || ^12.0", + "mailersend/mailersend": "^0.8.0 || ^0.23.0 || ^0.24.0 || ^0.30.0", "nyholm/psr7": "^1.5", "php": ">=8.0", "php-http/guzzle7-adapter": "^1.0", "symfony/mailer": "^6.0 || ^7.0" }, "require-dev": { - "orchestra/testbench": "^7.0 || ^9.0", - "phpunit/phpunit": "^9.0 || ^10.5" + "orchestra/testbench": "^7.0 || ^9.0 || ^10.0", + "phpunit/phpunit": "^9.0 || ^10.5 || ^12.0" }, "type": "library", "extra": { @@ -3535,28 +3535,28 @@ ], "support": { "issues": "https://github.com/mailersend/mailersend-laravel-driver/issues", - "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.7.0" + "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.8.0" }, - "time": "2024-08-28T08:14:54+00:00" + "time": "2025-03-06T16:55:40+00:00" }, { "name": "mailersend/mailersend", - "version": "v0.24.0", + "version": "v0.30.0", "source": { "type": "git", "url": "https://github.com/mailersend/mailersend-php.git", - "reference": "b8086404b78c8fa34683cf7ca9d0776eb08d080b" + "reference": "7ac40e50fa914a506c58d13c82dbf0d3bf0a6487" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/b8086404b78c8fa34683cf7ca9d0776eb08d080b", - "reference": "b8086404b78c8fa34683cf7ca9d0776eb08d080b", + "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/7ac40e50fa914a506c58d13c82dbf0d3bf0a6487", + "reference": "7ac40e50fa914a506c58d13c82dbf0d3bf0a6487", "shasum": "" }, "require": { "beberlei/assert": "^3.2", "ext-json": "*", - "illuminate/collections": "^8.0 || ^9.0 || ^10.0 || ^11.0", + "illuminate/collections": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0", "php": "^7.4|^8.0", "php-http/client-common": "^2.2", "php-http/discovery": "^1.9", @@ -3567,13 +3567,13 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4.0", - "guzzlehttp/psr7": "^1.5.2", + "guzzlehttp/psr7": "^2.0.0", "http-interop/http-factory-guzzle": "^1.0", - "mockery/mockery": "^0.9.4", + "mockery/mockery": "^1.0.0", "php-http/guzzle7-adapter": "^0.1 || ^1.0", "php-http/message": "^1.0", "php-http/mock-client": "^1.0", - "phpunit/phpunit": "^7.5.15 || ^8.4 || ^9.0" + "phpunit/phpunit": "^7.5.15 || ^8.4 || ^9.0 || ^12.0" }, "type": "library", "autoload": { @@ -3602,9 +3602,9 @@ ], "support": { "issues": "https://github.com/mailersend/mailersend-php/issues", - "source": "https://github.com/mailersend/mailersend-php/tree/v0.24.0" + "source": "https://github.com/mailersend/mailersend-php/tree/v0.30.0" }, - "time": "2024-05-09T13:41:18+00:00" + "time": "2025-03-06T15:45:57+00:00" }, { "name": "monolog/monolog", @@ -11746,16 +11746,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.11", + "version": "11.5.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3946ac38410be7440186c6e74584f31b15107fc7" + "reference": "d42785840519401ed2113292263795eb4c0f95da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3946ac38410be7440186c6e74584f31b15107fc7", - "reference": "3946ac38410be7440186c6e74584f31b15107fc7", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d42785840519401ed2113292263795eb4c0f95da", + "reference": "d42785840519401ed2113292263795eb4c0f95da", "shasum": "" }, "require": { @@ -11776,7 +11776,7 @@ "phpunit/php-timer": "^7.0.1", "sebastian/cli-parser": "^3.0.2", "sebastian/code-unit": "^3.0.2", - "sebastian/comparator": "^6.3.0", + "sebastian/comparator": "^6.3.1", "sebastian/diff": "^6.0.2", "sebastian/environment": "^7.2.0", "sebastian/exporter": "^6.3.0", @@ -11827,7 +11827,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.12" }, "funding": [ { @@ -11843,7 +11843,7 @@ "type": "tidelift" } ], - "time": "2025-03-05T07:36:02+00:00" + "time": "2025-03-07T07:31:03+00:00" }, { "name": "sebastian/cli-parser", @@ -12017,16 +12017,16 @@ }, { "name": "sebastian/comparator", - "version": "6.3.0", + "version": "6.3.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115" + "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115", - "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/24b8fbc2c8e201bb1308e7b05148d6ab393b6959", + "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959", "shasum": "" }, "require": { @@ -12045,7 +12045,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.2-dev" + "dev-main": "6.3-dev" } }, "autoload": { @@ -12085,7 +12085,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.1" }, "funding": [ { @@ -12093,7 +12093,7 @@ "type": "github" } ], - "time": "2025-01-06T10:28:19+00:00" + "time": "2025-03-07T06:57:01+00:00" }, { "name": "sebastian/complexity",