From e6d980ddacee8306178d5de8553aa2f87a75dbb1 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 09:49:38 +0100 Subject: [PATCH 01/30] wip composer.json --- composer.json | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 6d7805608..a3b5f7e70 100644 --- a/composer.json +++ b/composer.json @@ -8,27 +8,24 @@ "license": "MIT", "type": "project", "require": { - "absszero/laravel-stackdriver-error-reporting": "^1.7", - "cviebrock/eloquent-sluggable": "^9.0", - "doctrine/dbal": "^3.1", - "firebase/php-jwt": "^5.4", "fruitcake/laravel-cors": "^2.0", + "cviebrock/eloquent-sluggable": "^10.0", + "doctrine/dbal": "^3.1", + "firebase/php-jwt": "^6.10", "google/recaptcha": "^1.2", "guzzlehttp/guzzle": "^7.8", "guzzlehttp/psr7": "^1.9", "hackzilla/password-generator": "^1.6", - "illuminate/mail": "^9.0", - "illuminate/redis": "^9.0", "intervention/image": "^2.5", - "laravel/framework": "^9.0", - "laravel/passport": "^10.1", - "laravel/tinker": "^2.6", - "laravel/ui": "^3.3", + "laravel/framework": "^10.10", + "laravel/passport": "^11.0", + "laravel/tinker": "^2.8", + "laravel/ui": "^4.4", "lcobucci/jwt": "^4.1", "league/flysystem-aws-s3-v3": "^3.22", - "maclof/kubernetes-client": "^0.26.0", - "mxl/laravel-job": "^1.2", - "percymamedy/laravel-dev-booter": "^3.0", + "maclof/kubernetes-client": "^0.29.0", + "mxl/laravel-job": "^1.5", + "percymamedy/laravel-dev-booter": "^4.0", "php-http/guzzle7-adapter": "^1.0", "php-http/message": "^1.16", "php-http/message-factory": "^1.1", @@ -90,6 +87,6 @@ "php-http/discovery": false } }, - "minimum-stability": "dev", + "minimum-stability": "stable", "prefer-stable": true } From 4c12e0b8fd0ade8b1067e6bc6cd92fd2919b1cbc Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 09:51:08 +0100 Subject: [PATCH 02/30] WIP - departure to integrate https://github.com/googleapis/google-cloud-php-errorreporting --- composer.json | 2 +- composer.lock | 930 +++++++++++++++++++++++++------------------------- 2 files changed, 461 insertions(+), 471 deletions(-) diff --git a/composer.json b/composer.json index a3b5f7e70..f7ad1be1e 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/toban/laravel-stackdriver" + "url": "https://github.com/deer-wmde/laravel-stackdriver" } ], "autoload": { diff --git a/composer.lock b/composer.lock index 692ba73bf..223677562 100644 --- a/composer.lock +++ b/composer.lock @@ -172,6 +172,7 @@ }, { "name": "aws/aws-sdk-php", +<<<<<<< HEAD "version": "3.297.2", "source": { "type": "git", @@ -182,6 +183,18 @@ "type": "zip", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bbf516a4a88f829f92cc396628be705966880dbd", "reference": "bbf516a4a88f829f92cc396628be705966880dbd", +======= + "version": "3.297.1", + "source": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-php.git", + "reference": "5be6a9c74e1d72af75f24b4f4a9cfac51ccd6a56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5be6a9c74e1d72af75f24b4f4a9cfac51ccd6a56", + "reference": "5be6a9c74e1d72af75f24b4f4a9cfac51ccd6a56", +>>>>>>> 45d4012 (WIP - departure to integrate) "shasum": "" }, "require": { @@ -261,9 +274,15 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", +<<<<<<< HEAD "source": "https://github.com/aws/aws-sdk-php/tree/3.297.2" }, "time": "2024-01-26T19:09:20+00:00" +======= + "source": "https://github.com/aws/aws-sdk-php/tree/3.297.1" + }, + "time": "2024-01-25T19:18:40+00:00" +>>>>>>> 45d4012 (WIP - departure to integrate) }, { "name": "brick/math", @@ -531,31 +550,30 @@ }, { "name": "cviebrock/eloquent-sluggable", - "version": "9.0.0", + "version": "10.0.0", "source": { "type": "git", "url": "https://github.com/cviebrock/eloquent-sluggable.git", - "reference": "3100e37682491424dd13eaeb3ec33cbbad186992" + "reference": "92f456b10337ca97c1cccfcc853a1cf51d2cedd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/3100e37682491424dd13eaeb3ec33cbbad186992", - "reference": "3100e37682491424dd13eaeb3ec33cbbad186992", + "url": "https://api.github.com/repos/cviebrock/eloquent-sluggable/zipball/92f456b10337ca97c1cccfcc853a1cf51d2cedd0", + "reference": "92f456b10337ca97c1cccfcc853a1cf51d2cedd0", "shasum": "" }, "require": { - "cocur/slugify": "^4.0", - "illuminate/config": "^9.0", - "illuminate/database": "^9.0", - "illuminate/support": "^9.0", - "php": "^8.0" + "cocur/slugify": "^4.3", + "illuminate/config": "^10.0", + "illuminate/database": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" }, "require-dev": { "limedeck/phpunit-detailed-printer": "^6.0", - "mockery/mockery": "^1.4.2", - "orchestra/database": "^7.0", - "orchestra/testbench": "^7.0", - "phpunit/phpunit": "^9.4" + "mockery/mockery": "^1.4.4", + "orchestra/testbench": "^8.0", + "pestphp/pest": "2.x-dev" }, "type": "library", "extra": { @@ -592,7 +610,7 @@ ], "support": { "issues": "https://github.com/cviebrock/eloquent-sluggable/issues", - "source": "https://github.com/cviebrock/eloquent-sluggable/tree/9.0.0" + "source": "https://github.com/cviebrock/eloquent-sluggable/tree/10.0.0" }, "funding": [ { @@ -600,7 +618,7 @@ "type": "github" } ], - "time": "2022-01-25T02:55:58+00:00" + "time": "2023-02-16T23:01:35+00:00" }, { "name": "defuse/php-encryption", @@ -1433,25 +1451,31 @@ }, { "name": "firebase/php-jwt", - "version": "v5.5.1", + "version": "v6.10.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6" + "reference": "a49db6f0a5033aef5143295342f1c95521b075ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/83b609028194aa042ea33b5af2d41a7427de80e6", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff", + "reference": "a49db6f0a5033aef5143295342f1c95521b075ff", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.4||^8.0" }, "require-dev": { - "phpunit/phpunit": ">=4.8 <=9" + "guzzlehttp/guzzle": "^6.5||^7.4", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "psr/cache": "^1.0||^2.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0" }, "suggest": { + "ext-sodium": "Support EdDSA (Ed25519) signatures", "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" }, "type": "library", @@ -1484,89 +1508,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v5.5.1" - }, - "time": "2021-11-08T20:18:51+00:00" - }, - { - "name": "fruitcake/laravel-cors", - "version": "v2.2.0", - "source": { - "type": "git", - "url": "https://github.com/fruitcake/laravel-cors.git", - "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534", - "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534", - "shasum": "" - }, - "require": { - "asm89/stack-cors": "^2.0.1", - "illuminate/contracts": "^6|^7|^8|^9", - "illuminate/support": "^6|^7|^8|^9", - "php": ">=7.2" - }, - "require-dev": { - "laravel/framework": "^6|^7.24|^8", - "orchestra/testbench-dusk": "^4|^5|^6|^7", - "phpunit/phpunit": "^6|^7|^8|^9", - "squizlabs/php_codesniffer": "^3.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - }, - "laravel": { - "providers": [ - "Fruitcake\\Cors\\CorsServiceProvider" - ] - } + "source": "https://github.com/firebase/php-jwt/tree/v6.10.0" }, - "autoload": { - "psr-4": { - "Fruitcake\\Cors\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fruitcake", - "homepage": "https://fruitcake.nl" - }, - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application", - "keywords": [ - "api", - "cors", - "crossdomain", - "laravel" - ], - "support": { - "issues": "https://github.com/fruitcake/laravel-cors/issues", - "source": "https://github.com/fruitcake/laravel-cors/tree/v2.2.0" - }, - "funding": [ - { - "url": "https://fruitcake.nl", - "type": "custom" - }, - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], - "abandoned": true, - "time": "2022-02-23T14:25:13+00:00" + "time": "2023-12-01T16:26:39+00:00" }, { "name": "fruitcake/php-cors", @@ -1640,6 +1584,7 @@ "time": "2023-10-12T05:21:21+00:00" }, { +<<<<<<< HEAD "name": "google/auth", "version": "v1.26.0", "source": { @@ -2124,6 +2069,8 @@ "time": "2024-01-09T22:12:32+00:00" }, { +======= +>>>>>>> 45d4012 (WIP - departure to integrate) "name": "google/recaptcha", "version": "1.3.0", "source": { @@ -2237,50 +2184,6 @@ ], "time": "2023-11-12T22:16:48+00:00" }, - { - "name": "grpc/grpc", - "version": "1.57.0", - "source": { - "type": "git", - "url": "https://github.com/grpc/grpc-php.git", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf", - "shasum": "" - }, - "require": { - "php": ">=7.0.0" - }, - "require-dev": { - "google/auth": "^v1.3.0" - }, - "suggest": { - "ext-protobuf": "For better performance, install the protobuf C extension.", - "google/protobuf": "To get started using grpc quickly, install the native protobuf library." - }, - "type": "library", - "autoload": { - "psr-4": { - "Grpc\\": "src/lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "gRPC library for PHP", - "homepage": "https://grpc.io", - "keywords": [ - "rpc" - ], - "support": { - "source": "https://github.com/grpc/grpc-php/tree/v1.57.0" - }, - "time": "2023-08-14T23:57:54+00:00" - }, { "name": "guzzlehttp/guzzle", "version": "7.8.1", @@ -2409,29 +2312,33 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.3", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -2468,7 +2375,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.3" + "source": "https://github.com/guzzle/promises/tree/2.0.2" }, "funding": [ { @@ -2484,7 +2391,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T12:31:43+00:00" + "time": "2023-12-03T20:19:20+00:00" }, { "name": "guzzlehttp/psr7", @@ -2807,20 +2714,21 @@ }, { "name": "laravel/framework", - "version": "v9.52.16", + "version": "v10.42.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "082345d76fc6a55b649572efe10b11b03e279d24" + "reference": "fef1aff874a6749c44f8e142e5764eab8cb96890" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/082345d76fc6a55b649572efe10b11b03e279d24", - "reference": "082345d76fc6a55b649572efe10b11b03e279d24", + "url": "https://api.github.com/repos/laravel/framework/zipball/fef1aff874a6749c44f8e142e5764eab8cb96890", + "reference": "fef1aff874a6749c44f8e142e5764eab8cb96890", "shasum": "" }, "require": { "brick/math": "^0.9.3|^0.10.2|^0.11", + "composer-runtime-api": "^2.2", "doctrine/inflector": "^2.0.5", "dragonmantank/cron-expression": "^3.3.2", "egulias/email-validator": "^3.2.1|^4.0", @@ -2833,33 +2741,36 @@ "ext-tokenizer": "*", "fruitcake/php-cors": "^1.2", "guzzlehttp/uri-template": "^1.0", - "laravel/serializable-closure": "^1.2.2", + "laravel/prompts": "^0.1.9", + "laravel/serializable-closure": "^1.3", "league/commonmark": "^2.2.1", "league/flysystem": "^3.8.0", - "monolog/monolog": "^2.0", - "nesbot/carbon": "^2.62.1", + "monolog/monolog": "^3.0", + "nesbot/carbon": "^2.67", "nunomaduro/termwind": "^1.13", - "php": "^8.0.2", + "php": "^8.1", "psr/container": "^1.1.1|^2.0.1", "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.7", - "symfony/console": "^6.0.9", - "symfony/error-handler": "^6.0", - "symfony/finder": "^6.0", - "symfony/http-foundation": "^6.0", - "symfony/http-kernel": "^6.0", - "symfony/mailer": "^6.0", - "symfony/mime": "^6.0", - "symfony/process": "^6.0", - "symfony/routing": "^6.0", - "symfony/uid": "^6.0", - "symfony/var-dumper": "^6.0", + "symfony/console": "^6.2", + "symfony/error-handler": "^6.2", + "symfony/finder": "^6.2", + "symfony/http-foundation": "^6.4", + "symfony/http-kernel": "^6.2", + "symfony/mailer": "^6.2", + "symfony/mime": "^6.2", + "symfony/process": "^6.2", + "symfony/routing": "^6.2", + "symfony/uid": "^6.2", + "symfony/var-dumper": "^6.2", "tijsverkoyen/css-to-inline-styles": "^2.2.5", "vlucas/phpdotenv": "^5.4.1", "voku/portable-ascii": "^2.0" }, "conflict": { + "carbonphp/carbon-doctrine-types": ">=3.0", + "doctrine/dbal": ">=4.0", "tightenco/collect": "<5.5.33" }, "provide": { @@ -2890,6 +2801,7 @@ "illuminate/notifications": "self.version", "illuminate/pagination": "self.version", "illuminate/pipeline": "self.version", + "illuminate/process": "self.version", "illuminate/queue": "self.version", "illuminate/redis": "self.version", "illuminate/routing": "self.version", @@ -2903,7 +2815,7 @@ "require-dev": { "ably/ably-php": "^1.0", "aws/aws-sdk-php": "^3.235.5", - "doctrine/dbal": "^2.13.3|^3.1.4", + "doctrine/dbal": "^3.5.1", "ext-gmp": "*", "fakerphp/faker": "^1.21", "guzzlehttp/guzzle": "^7.5", @@ -2913,20 +2825,21 @@ "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": "^7.24", + "nyholm/psr7": "^1.2", + "orchestra/testbench-core": "^8.18", "pda/pheanstalk": "^4.0", - "phpstan/phpdoc-parser": "^1.15", "phpstan/phpstan": "^1.4.7", - "phpunit/phpunit": "^9.5.8", - "predis/predis": "^1.1.9|^2.0.2", - "symfony/cache": "^6.0", - "symfony/http-client": "^6.0" + "phpunit/phpunit": "^10.0.7", + "predis/predis": "^2.0.2", + "symfony/cache": "^6.2", + "symfony/http-client": "^6.2.4", + "symfony/psr-http-message-bridge": "^2.0" }, "suggest": { "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).", "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).", "brianium/paratest": "Required to run tests in parallel (^6.0).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).", "ext-apcu": "Required to use the APC cache driver.", "ext-fileinfo": "Required to use the Filesystem class.", "ext-ftp": "Required to use the Flysystem FTP driver.", @@ -2948,27 +2861,28 @@ "mockery/mockery": "Required to use mocking (^1.5.1).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", - "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8).", - "predis/predis": "Required to use the predis connector (^1.1.9|^2.0.2).", + "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).", + "predis/predis": "Required to use the predis connector (^2.0.2).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).", - "symfony/cache": "Required to PSR-6 cache bridge (^6.0).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^6.0).", - "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.0).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.0).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0).", + "symfony/cache": "Required to PSR-6 cache bridge (^6.2).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).", + "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).", "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { "files": [ "src/Illuminate/Collections/helpers.php", "src/Illuminate/Events/functions.php", + "src/Illuminate/Filesystem/functions.php", "src/Illuminate/Foundation/helpers.php", "src/Illuminate/Support/helpers.php" ], @@ -3001,50 +2915,51 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-10-03T13:02:30+00:00" + "time": "2024-01-23T15:07:56+00:00" }, { "name": "laravel/passport", - "version": "v10.3.3", + "version": "v11.10.2", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "1039d8b4aa71c45dbea2f140b131cae8802237e7" + "reference": "27a4f34aaf8b360eb64f53eb9c555ee50d565560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/1039d8b4aa71c45dbea2f140b131cae8802237e7", - "reference": "1039d8b4aa71c45dbea2f140b131cae8802237e7", + "url": "https://api.github.com/repos/laravel/passport/zipball/27a4f34aaf8b360eb64f53eb9c555ee50d565560", + "reference": "27a4f34aaf8b360eb64f53eb9c555ee50d565560", "shasum": "" }, "require": { "ext-json": "*", - "firebase/php-jwt": "^5.0", - "illuminate/auth": "^8.37|^9.0", - "illuminate/console": "^8.37|^9.0", - "illuminate/container": "^8.37|^9.0", - "illuminate/contracts": "^8.37|^9.0", - "illuminate/cookie": "^8.37|^9.0", - "illuminate/database": "^8.37|^9.0", - "illuminate/encryption": "^8.37|^9.0", - "illuminate/http": "^8.37|^9.0", - "illuminate/support": "^8.37|^9.0", - "lcobucci/jwt": "^3.4|^4.0", - "league/oauth2-server": "^8.2", - "nyholm/psr7": "^1.3", - "php": "^7.3|^8.0", + "firebase/php-jwt": "^6.4", + "illuminate/auth": "^9.0|^10.0", + "illuminate/console": "^9.0|^10.0", + "illuminate/container": "^9.0|^10.0", + "illuminate/contracts": "^9.0|^10.0", + "illuminate/cookie": "^9.0|^10.0", + "illuminate/database": "^9.0|^10.0", + "illuminate/encryption": "^9.0|^10.0", + "illuminate/http": "^9.0|^10.0", + "illuminate/support": "^9.0|^10.0", + "lcobucci/jwt": "^4.3|^5.0", + "league/oauth2-server": "^8.5.3", + "nyholm/psr7": "^1.5", + "php": "^8.0", "phpseclib/phpseclib": "^2.0|^3.0", - "symfony/psr-http-message-bridge": "^2.0" + "symfony/psr-http-message-bridge": "^2.1" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^6.0|^7.0", + "orchestra/testbench": "^7.31|^8.11", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "10.x-dev" + "dev-master": "11.x-dev" }, "laravel": { "providers": [ @@ -3078,7 +2993,64 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2022-02-23T15:04:04+00:00" + "time": "2024-01-17T14:57:00+00:00" + }, + { + "name": "laravel/prompts", + "version": "v0.1.15", + "source": { + "type": "git", + "url": "https://github.com/laravel/prompts.git", + "reference": "d814a27514d99b03c85aa42b22cfd946568636c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/prompts/zipball/d814a27514d99b03c85aa42b22cfd946568636c1", + "reference": "d814a27514d99b03c85aa42b22cfd946568636c1", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "illuminate/collections": "^10.0|^11.0", + "php": "^8.1", + "symfony/console": "^6.2|^7.0" + }, + "conflict": { + "illuminate/console": ">=10.17.0 <10.25.0", + "laravel/framework": ">=10.17.0 <10.25.0" + }, + "require-dev": { + "mockery/mockery": "^1.5", + "pestphp/pest": "^2.3", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-mockery": "^1.1" + }, + "suggest": { + "ext-pcntl": "Required for the spinner to be animated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Laravel\\Prompts\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "support": { + "issues": "https://github.com/laravel/prompts/issues", + "source": "https://github.com/laravel/prompts/tree/v0.1.15" + }, + "time": "2023-12-29T22:37:42+00:00" }, { "name": "laravel/serializable-closure", @@ -3208,32 +3180,33 @@ }, { "name": "laravel/ui", - "version": "v3.4.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c" + "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c", - "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c", + "url": "https://api.github.com/repos/laravel/ui/zipball/7335d7049b2cde345c029e9d2de839b80af62bc0", + "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0", "shasum": "" }, "require": { - "illuminate/console": "^8.42|^9.0", - "illuminate/filesystem": "^8.42|^9.0", - "illuminate/support": "^8.82|^9.0", - "illuminate/validation": "^8.42|^9.0", - "php": "^7.3|^8.0" + "illuminate/console": "^9.21|^10.0|^11.0", + "illuminate/filesystem": "^9.21|^10.0|^11.0", + "illuminate/support": "^9.21|^10.0|^11.0", + "illuminate/validation": "^9.21|^10.0|^11.0", + "php": "^8.0" }, "require-dev": { - "orchestra/testbench": "^6.23|^7.0" + "orchestra/testbench": "^7.0|^8.0|^9.0", + "phpunit/phpunit": "^9.3|^10.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "4.x-dev" }, "laravel": { "providers": [ @@ -3263,40 +3236,40 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v3.4.6" + "source": "https://github.com/laravel/ui/tree/v4.4.0" }, - "time": "2022-05-20T13:38:08+00:00" + "time": "2024-01-12T15:56:45+00:00" }, { "name": "lcobucci/clock", - "version": "3.0.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/lcobucci/clock.git", - "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc" + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc", - "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc", + "url": "https://api.github.com/repos/lcobucci/clock/zipball/6f28b826ea01306b07980cb8320ab30b966cd715", + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.2.0 || ~8.3.0", "psr/clock": "^1.0" }, "provide": { "psr/clock-implementation": "1.0" }, "require-dev": { - "infection/infection": "^0.26", - "lcobucci/coding-standard": "^9.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-deprecation-rules": "^1.1.1", - "phpstan/phpstan-phpunit": "^1.3.2", - "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.27" + "infection/infection": "^0.27", + "lcobucci/coding-standard": "^11.0.0", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.10.25", + "phpstan/phpstan-deprecation-rules": "^1.1.3", + "phpstan/phpstan-phpunit": "^1.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", + "phpunit/phpunit": "^10.2.3" }, "type": "library", "autoload": { @@ -3317,7 +3290,7 @@ "description": "Yet another clock abstraction", "support": { "issues": "https://github.com/lcobucci/clock/issues", - "source": "https://github.com/lcobucci/clock/tree/3.0.0" + "source": "https://github.com/lcobucci/clock/tree/3.2.0" }, "funding": [ { @@ -3329,7 +3302,7 @@ "type": "patreon" } ], - "time": "2022-12-19T15:00:24+00:00" + "time": "2023-11-17T17:00:27+00:00" }, { "name": "lcobucci/jwt", @@ -4183,20 +4156,20 @@ }, { "name": "maclof/kubernetes-client", - "version": "0.26.0", + "version": "0.29.0", "source": { "type": "git", "url": "https://github.com/maclof/kubernetes-client.git", - "reference": "2309c9667b44310cc828458a6a8755cff6bbfc35" + "reference": "2c1034c11f078daccc516dd96012630d7e1d0545" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maclof/kubernetes-client/zipball/2309c9667b44310cc828458a6a8755cff6bbfc35", - "reference": "2309c9667b44310cc828458a6a8755cff6bbfc35", + "url": "https://api.github.com/repos/maclof/kubernetes-client/zipball/2c1034c11f078daccc516dd96012630d7e1d0545", + "reference": "2c1034c11f078daccc516dd96012630d7e1d0545", "shasum": "" }, "require": { - "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", "php": "^7.4|^8.0", "php-http/client-common": "^2.0", "php-http/discovery": "^1.0", @@ -4236,48 +4209,47 @@ ], "support": { "issues": "https://github.com/maclof/kubernetes-client/issues", - "source": "https://github.com/maclof/kubernetes-client/tree/0.26.0" + "source": "https://github.com/maclof/kubernetes-client/tree/0.29.0" }, - "time": "2022-05-16T12:07:17+00:00" + "time": "2023-08-28T13:42:22+00:00" }, { "name": "monolog/monolog", - "version": "2.9.2", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448", + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448", "shasum": "" }, "require": { - "php": ">=7.2", - "psr/log": "^1.0.1 || ^2.0 || ^3.0" + "php": ">=8.1", + "psr/log": "^2.0 || ^3.0" }, "provide": { - "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" + "psr/log-implementation": "3.0.0" }, "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "aws/aws-sdk-php": "^3.0", "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2 || ^2@dev", - "guzzlehttp/guzzle": "^7.4", + "graylog2/gelf-php": "^1.4.2 || ^2.0", + "guzzlehttp/guzzle": "^7.4.5", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpspec/prophecy": "^1.15", - "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1 || ^2.0", - "rollbar/rollbar": "^1.3 || ^2 || ^3", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.4", + "phpunit/phpunit": "^10.1", + "predis/predis": "^1.1 || ^2", "ruflin/elastica": "^7", - "swiftmailer/swiftmailer": "^5.3|^6.0", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -4300,7 +4272,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -4328,7 +4300,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.2" + "source": "https://github.com/Seldaek/monolog/tree/3.5.0" }, "funding": [ { @@ -4340,7 +4312,7 @@ "type": "tidelift" } ], - "time": "2023-10-27T15:25:26+00:00" + "time": "2023-10-27T15:32:31+00:00" }, { "name": "mtdowling/jmespath.php", @@ -5061,25 +5033,25 @@ }, { "name": "percymamedy/laravel-dev-booter", - "version": "v3.0.1", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/percymamedy/laravel-dev-booter.git", - "reference": "308d711916272da14c3d71bf06c4f5796b1b0db4" + "reference": "2013de7060a73ae1a410484d1442c0e191dfc25c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/percymamedy/laravel-dev-booter/zipball/308d711916272da14c3d71bf06c4f5796b1b0db4", - "reference": "308d711916272da14c3d71bf06c4f5796b1b0db4", + "url": "https://api.github.com/repos/percymamedy/laravel-dev-booter/zipball/2013de7060a73ae1a410484d1442c0e191dfc25c", + "reference": "2013de7060a73ae1a410484d1442c0e191dfc25c", "shasum": "" }, "require": { - "illuminate/support": "^8.12|^v9.11", - "php": "^7.3|^8.0|^8.1" + "illuminate/support": "^10.20.0", + "php": "^8.1|^8.2" }, "require-dev": { - "orchestra/testbench": "^6.0|^7.0", - "phpunit/phpunit": "^9.5" + "orchestra/testbench": "^8.9.0", + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { @@ -5113,9 +5085,9 @@ ], "support": { "issues": "https://github.com/percymamedy/laravel-dev-booter/issues", - "source": "https://github.com/percymamedy/laravel-dev-booter/tree/v3.0.1" + "source": "https://github.com/percymamedy/laravel-dev-booter/tree/v4.0.0" }, - "time": "2022-06-08T20:31:29+00:00" + "time": "2023-08-28T20:44:19+00:00" }, { "name": "php-http/client-common", @@ -6172,6 +6144,7 @@ }, { "name": "psr/log", +<<<<<<< HEAD "version": "2.0.0", "source": { "type": "git", @@ -6182,6 +6155,18 @@ "type": "zip", "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", +======= + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", +>>>>>>> 45d4012 (WIP - departure to integrate) "shasum": "" }, "require": { @@ -6190,7 +6175,11 @@ "type": "library", "extra": { "branch-alias": { +<<<<<<< HEAD "dev-master": "2.0.x-dev" +======= + "dev-master": "3.x-dev" +>>>>>>> 45d4012 (WIP - departure to integrate) } }, "autoload": { @@ -6216,9 +6205,15 @@ "psr-3" ], "support": { +<<<<<<< HEAD "source": "https://github.com/php-fig/log/tree/2.0.0" }, "time": "2021-07-14T16:41:46+00:00" +======= + "source": "https://github.com/php-fig/log/tree/3.0.0" + }, + "time": "2021-07-14T16:46:02+00:00" +>>>>>>> 45d4012 (WIP - departure to integrate) }, { "name": "psr/simple-cache", @@ -7136,68 +7131,6 @@ ], "time": "2023-06-16T10:52:11+00:00" }, - { - "name": "rize/uri-template", - "version": "0.3.5", - "source": { - "type": "git", - "url": "https://github.com/rize/UriTemplate.git", - "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rize/UriTemplate/zipball/5ed4ba8ea34af84485dea815d4b6b620794d1168", - "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.8.36" - }, - "type": "library", - "autoload": { - "psr-4": { - "Rize\\": "src/Rize" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marut K", - "homepage": "http://twitter.com/rezigned" - } - ], - "description": "PHP URI Template (RFC 6570) supports both expansion & extraction", - "keywords": [ - "RFC 6570", - "template", - "uri" - ], - "support": { - "issues": "https://github.com/rize/UriTemplate/issues", - "source": "https://github.com/rize/UriTemplate/tree/0.3.5" - }, - "funding": [ - { - "url": "https://www.paypal.me/rezigned", - "type": "custom" - }, - { - "url": "https://github.com/rezigned", - "type": "github" - }, - { - "url": "https://opencollective.com/rize-uri-template", - "type": "open_collective" - } - ], - "time": "2022-10-12T17:22:51+00:00" - }, { "name": "softcreatr/jsonpath", "version": "0.8.3", @@ -7362,20 +7295,20 @@ }, { "name": "symfony/css-selector", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4" + "reference": "bb51d46e53ef8d50d523f0c5faedba056a27943e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4", - "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/bb51d46e53ef8d50d523f0c5faedba056a27943e", + "reference": "bb51d46e53ef8d50d523f0c5faedba056a27943e", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "autoload": { @@ -7407,7 +7340,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.0" + "source": "https://github.com/symfony/css-selector/tree/v7.0.0" }, "funding": [ { @@ -7423,7 +7356,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:40:20+00:00" + "time": "2023-10-31T17:59:56+00:00" }, { "name": "symfony/deprecation-contracts", @@ -7569,24 +7502,24 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.4.2", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "e95216850555cd55e71b857eb9d6c2674124603a" + "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e95216850555cd55e71b857eb9d6c2674124603a", - "reference": "e95216850555cd55e71b857eb9d6c2674124603a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/098b62ae81fdd6cbf941f355059f617db28f4f9a", + "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<5.4", + "symfony/dependency-injection": "<6.4", "symfony/service-contracts": "<2.5" }, "provide": { @@ -7595,13 +7528,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/error-handler": "^5.4|^6.0|^7.0", - "symfony/expression-language": "^5.4|^6.0|^7.0", - "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/error-handler": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^5.4|^6.0|^7.0" + "symfony/stopwatch": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -7629,7 +7562,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.2" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.2" }, "funding": [ { @@ -7645,7 +7578,7 @@ "type": "tidelift" } ], - "time": "2023-12-27T22:16:42+00:00" + "time": "2023-12-27T22:24:19+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -8143,20 +8076,20 @@ }, { "name": "symfony/options-resolver", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "22301f0e7fdeaacc14318928612dee79be99860e" + "reference": "700ff4096e346f54cb628ea650767c8130f1001f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22301f0e7fdeaacc14318928612dee79be99860e", - "reference": "22301f0e7fdeaacc14318928612dee79be99860e", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f", + "reference": "700ff4096e346f54cb628ea650767c8130f1001f", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/deprecation-contracts": "^2.5|^3" }, "type": "library", @@ -8190,7 +8123,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v6.4.0" + "source": "https://github.com/symfony/options-resolver/tree/v7.0.0" }, "funding": [ { @@ -8206,7 +8139,7 @@ "type": "tidelift" } ], - "time": "2023-08-08T10:16:24+00:00" + "time": "2023-08-08T10:20:21+00:00" }, { "name": "symfony/polyfill-ctype", @@ -9263,20 +9196,20 @@ }, { "name": "symfony/string", - "version": "v6.4.2", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" + "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "url": "https://api.github.com/repos/symfony/string/zipball/cc78f14f91f5e53b42044d0620961c48028ff9f5", + "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -9286,11 +9219,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0|^7.0", - "symfony/http-client": "^5.4|^6.0|^7.0", - "symfony/intl": "^6.2|^7.0", + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0|^7.0" + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -9329,7 +9262,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.2" + "source": "https://github.com/symfony/string/tree/v7.0.2" }, "funding": [ { @@ -9345,7 +9278,7 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2023-12-10T16:54:46+00:00" }, { "name": "symfony/translation", @@ -11203,32 +11136,37 @@ }, { "name": "orchestra/canvas", - "version": "v7.11.1", + "version": "v8.11.6", "source": { "type": "git", "url": "https://github.com/orchestral/canvas.git", - "reference": "ccfbf44bfd2b959fa05b6ad5c770c89641991edc" + "reference": "6ab236c7a190f7f53ce2e9c65fd9ee781e5aeb6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/canvas/zipball/ccfbf44bfd2b959fa05b6ad5c770c89641991edc", - "reference": "ccfbf44bfd2b959fa05b6ad5c770c89641991edc", + "url": "https://api.github.com/repos/orchestral/canvas/zipball/6ab236c7a190f7f53ce2e9c65fd9ee781e5aeb6c", + "reference": "6ab236c7a190f7f53ce2e9c65fd9ee781e5aeb6c", "shasum": "" }, "require": { - "illuminate/database": "^9.52.15", - "illuminate/support": "^9.52.15", - "orchestra/canvas-core": "^7.7", - "orchestra/testbench-core": "^7.31", - "php": "^8.0", - "symfony/yaml": "^5.4 || ^6.0" + "composer-runtime-api": "^2.2", + "composer/semver": "^3.0", + "illuminate/console": "^10.39", + "illuminate/database": "^10.39", + "illuminate/filesystem": "^10.39", + "illuminate/support": "^10.39", + "orchestra/canvas-core": "^8.10.2", + "orchestra/testbench-core": "^8.19", + "php": "^8.1", + "symfony/polyfill-php83": "^1.28", + "symfony/yaml": "^6.2" }, "require-dev": { - "laravel/framework": "^9.52.15", - "laravel/pint": "^1.4", + "laravel/framework": "^10.39", + "laravel/pint": "^1.6", "mockery/mockery": "^1.5.1", "phpstan/phpstan": "^1.10.5", - "phpunit/phpunit": "^9.5.10", + "phpunit/phpunit": "^10.1", "spatie/laravel-ray": "^1.32.4" }, "bin": [ @@ -11237,7 +11175,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.0-dev" + "dev-master": "9.0-dev" }, "laravel": { "providers": [ @@ -11267,48 +11205,49 @@ "description": "Code Generators for Laravel Applications and Packages", "support": { "issues": "https://github.com/orchestral/canvas/issues", - "source": "https://github.com/orchestral/canvas/tree/v7.11.1" + "source": "https://github.com/orchestral/canvas/tree/v8.11.6" }, - "time": "2023-09-25T08:18:28+00:00" + "time": "2023-12-28T15:08:19+00:00" }, { "name": "orchestra/canvas-core", - "version": "v7.7.0", + "version": "v8.10.2", "source": { "type": "git", "url": "https://github.com/orchestral/canvas-core.git", - "reference": "7e1bc8933fd0bd40464e4119060065000fc2ab2f" + "reference": "3af8fb6b1ebd85903ba5d0e6df1c81aedacfedfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/canvas-core/zipball/7e1bc8933fd0bd40464e4119060065000fc2ab2f", - "reference": "7e1bc8933fd0bd40464e4119060065000fc2ab2f", + "url": "https://api.github.com/repos/orchestral/canvas-core/zipball/3af8fb6b1ebd85903ba5d0e6df1c81aedacfedfc", + "reference": "3af8fb6b1ebd85903ba5d0e6df1c81aedacfedfc", "shasum": "" }, "require": { - "illuminate/console": "^9.52.15", - "illuminate/filesystem": "^9.52.15", - "php": "^8.0" + "composer-runtime-api": "^2.2", + "composer/semver": "^3.0", + "illuminate/console": "^10.38.1", + "illuminate/filesystem": "^10.38.1", + "php": "^8.1", + "symfony/polyfill-php83": "^1.28" }, "conflict": { - "orchestra/canvas": "<7.10.0", - "orchestra/testbench-core": "<7.25.0" + "orchestra/canvas": "<8.11.0", + "orchestra/testbench-core": "<8.2.0" }, "require-dev": { - "fakerphp/faker": "^1.21", - "laravel/framework": "^9.52.15", - "laravel/pint": "^1.1", + "laravel/framework": "^10.38.1", + "laravel/pint": "^1.6", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": "^7.31", - "orchestra/workbench": "^0.3", + "orchestra/testbench-core": "^8.19", "phpstan/phpstan": "^1.10.6", - "phpunit/phpunit": "^9.6", - "symfony/yaml": "^6.0.9" + "phpunit/phpunit": "^10.1", + "symfony/yaml": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "8.0-dev" + "dev-master": "9.0-dev" }, "laravel": { "providers": [ @@ -11338,12 +11277,13 @@ "description": "Code Generators Builder for Laravel Applications and Packages", "support": { "issues": "https://github.com/orchestral/canvas/issues", - "source": "https://github.com/orchestral/canvas-core/tree/v7.7.0" + "source": "https://github.com/orchestral/canvas-core/tree/v8.10.2" }, - "time": "2023-09-19T04:21:54+00:00" + "time": "2023-12-28T01:27:59+00:00" }, { "name": "orchestra/testbench", +<<<<<<< HEAD "version": "v7.40.1", "source": { "type": "git", @@ -11354,26 +11294,43 @@ "type": "zip", "url": "https://api.github.com/repos/orchestral/testbench/zipball/731393745905ff313bad6dcedc3e24637124e2f1", "reference": "731393745905ff313bad6dcedc3e24637124e2f1", +======= + "version": "v8.21.1", + "source": { + "type": "git", + "url": "https://github.com/orchestral/testbench.git", + "reference": "c22a81802a68e746e032edf65cbb68af28a52670" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/orchestral/testbench/zipball/c22a81802a68e746e032edf65cbb68af28a52670", + "reference": "c22a81802a68e746e032edf65cbb68af28a52670", +>>>>>>> 45d4012 (WIP - departure to integrate) "shasum": "" }, "require": { + "composer-runtime-api": "^2.2", "fakerphp/faker": "^1.21", - "laravel/framework": "^9.52.15", + "laravel/framework": "^10.40", "mockery/mockery": "^1.5.1", +<<<<<<< HEAD "orchestra/testbench-core": "^7.40.1", "orchestra/workbench": "^1.2 || ^7.2", "php": "^8.0", "phpunit/phpunit": "^9.5.10", "symfony/process": "^6.0.9", "symfony/yaml": "^6.0.9", +======= + "orchestra/testbench-core": "^8.21.1", + "orchestra/workbench": "^1.2 || ^8.2", + "php": "^8.1", + "phpunit/phpunit": "^9.6 || ^10.1", + "symfony/process": "^6.2", + "symfony/yaml": "^6.2", +>>>>>>> 45d4012 (WIP - departure to integrate) "vlucas/phpdotenv": "^5.4.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.0-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -11397,6 +11354,7 @@ ], "support": { "issues": "https://github.com/orchestral/testbench/issues", +<<<<<<< HEAD "source": "https://github.com/orchestral/testbench/tree/v7.40.1" }, "time": "2024-01-22T03:12:16+00:00" @@ -11413,55 +11371,76 @@ "type": "zip", "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/768e1942ec3a2138b62c7eb69a5745173e60d519", "reference": "768e1942ec3a2138b62c7eb69a5745173e60d519", +======= + "source": "https://github.com/orchestral/testbench/tree/v8.21.1" + }, + "time": "2024-01-22T03:22:22+00:00" + }, + { + "name": "orchestra/testbench-core", + "version": "v8.21.1", + "source": { + "type": "git", + "url": "https://github.com/orchestral/testbench-core.git", + "reference": "c6bf49a1b7ef4afe58e5bda676158c4de41f9a81" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/c6bf49a1b7ef4afe58e5bda676158c4de41f9a81", + "reference": "c6bf49a1b7ef4afe58e5bda676158c4de41f9a81", +>>>>>>> 45d4012 (WIP - departure to integrate) "shasum": "" }, "require": { - "php": "^8.0" + "composer-runtime-api": "^2.2", + "php": "^8.1", + "symfony/polyfill-php83": "^1.28" }, "conflict": { +<<<<<<< HEAD "brianium/paratest": "<6.4.0 || >=7.0.0", "laravel/framework": "<9.52.9 || >=10.0.0", "nunomaduro/collision": "<6.2.0 || >=7.0.0", "orchestra/testbench-dusk": "<7.39.0 || >=8.0.0", +======= + "brianium/paratest": "<6.4.0 || >=7.0.0 <7.1.4 || >=8.0.0", + "laravel/framework": "<10.40 || >=11.0.0", + "nunomaduro/collision": "<6.4.0 || >=7.0.0 <7.4.0 || >=8.0.0", + "orchestra/testbench-dusk": "<8.21.0 || >=9.0.0", +>>>>>>> 45d4012 (WIP - departure to integrate) "orchestra/workbench": "<1.0.0", - "phpunit/phpunit": "<9.5.10 || >=10.0.0" + "phpunit/phpunit": "<9.6.0 || >=10.6.0" }, "require-dev": { - "composer-runtime-api": "^2.2", "fakerphp/faker": "^1.21", - "laravel/framework": "^9.52.9", - "laravel/pint": "^1.4", + "laravel/framework": "^10.40", + "laravel/pint": "^1.6", "mockery/mockery": "^1.5.1", "phpstan/phpstan": "^1.10.7", - "phpunit/phpunit": "^9.5.10", + "phpunit/phpunit": "^10.1", "spatie/laravel-ray": "^1.32.4", - "symfony/process": "^6.0.9", - "symfony/yaml": "^6.0.9", + "symfony/process": "^6.2", + "symfony/yaml": "^6.2", "vlucas/phpdotenv": "^5.4.1" }, "suggest": { - "brianium/paratest": "Allow using parallel testing (^6.4).", + "brianium/paratest": "Allow using parallel testing (^6.4 || ^7.1.4).", "ext-pcntl": "Required to use all features of the console signal trapping.", "fakerphp/faker": "Allow using Faker for testing (^1.21).", - "laravel/framework": "Required for testing (^9.52.9).", + "laravel/framework": "Required for testing (^10.40).", "mockery/mockery": "Allow using Mockery for testing (^1.5.1).", - "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^6.2).", - "orchestra/testbench-browser-kit": "Allow using legacy Laravel BrowserKit for testing (^7.0).", - "orchestra/testbench-dusk": "Allow using Laravel Dusk for testing (^7.0).", - "phpunit/phpunit": "Allow using PHPUnit for testing (^9.5.10).", - "symfony/process": "Required to use Orchestra\\Testbench\\remote function (^6.0.9).", - "symfony/yaml": "Required for Testbench CLI (^6.0.9).", + "nunomaduro/collision": "Allow using Laravel style tests output and parallel testing (^6.4 || ^7.4).", + "orchestra/testbench-browser-kit": "Allow using legacy Laravel BrowserKit for testing (^8.0).", + "orchestra/testbench-dusk": "Allow using Laravel Dusk for testing (^8.0).", + "phpunit/phpunit": "Allow using PHPUnit for testing (^9.6 || ^10.1).", + "symfony/process": "Required to use Orchestra\\Testbench\\remote function (^6.2).", + "symfony/yaml": "Required for Testbench CLI (^6.2).", "vlucas/phpdotenv": "Required for Testbench CLI (^5.4.1)." }, "bin": [ "testbench" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.0-dev" - } - }, "autoload": { "files": [ "src/functions.php" @@ -11495,40 +11474,47 @@ "issues": "https://github.com/orchestral/testbench/issues", "source": "https://github.com/orchestral/testbench-core" }, +<<<<<<< HEAD "time": "2024-01-22T01:40:09+00:00" +======= + "time": "2024-01-22T01:45:47+00:00" +>>>>>>> 45d4012 (WIP - departure to integrate) }, { "name": "orchestra/workbench", - "version": "v7.2.0", + "version": "v8.2.1", "source": { "type": "git", "url": "https://github.com/orchestral/workbench.git", - "reference": "a29f84c2cc53917d010b18b4330e699596e9ee1c" + "reference": "e8e6e4dcf6fb26ea1924c3581e49aa347691a8ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/workbench/zipball/a29f84c2cc53917d010b18b4330e699596e9ee1c", - "reference": "a29f84c2cc53917d010b18b4330e699596e9ee1c", + "url": "https://api.github.com/repos/orchestral/workbench/zipball/e8e6e4dcf6fb26ea1924c3581e49aa347691a8ea", + "reference": "e8e6e4dcf6fb26ea1924c3581e49aa347691a8ea", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", "fakerphp/faker": "^1.21", - "laravel/framework": "^9.52.15", + "laravel/framework": "^10.38.1", "laravel/tinker": "^2.8.2", - "orchestra/canvas": "^7.11.1", - "orchestra/testbench-core": "^7.37", - "php": "^8.0", + "orchestra/canvas": "^8.11.4", + "orchestra/testbench-core": "^8.17", + "php": "^8.1", "spatie/laravel-ray": "^1.32.4", "symfony/polyfill-php83": "^1.28", - "symfony/yaml": "^6.0.9" + "symfony/yaml": "^6.2" }, "require-dev": { "laravel/pint": "^1.4", "mockery/mockery": "^1.5.1", "phpstan/phpstan": "^1.10.7", - "phpunit/phpunit": "^9.6", - "symfony/process": "^6.0.9" + "phpunit/phpunit": "^10.1", + "symfony/process": "^6.2" + }, + "suggest": { + "ext-pcntl": "Required to use all features of the console signal trapping." }, "type": "library", "extra": { @@ -11560,9 +11546,9 @@ ], "support": { "issues": "https://github.com/orchestral/workbench/issues", - "source": "https://github.com/orchestral/workbench/tree/v7.2.0" + "source": "https://github.com/orchestral/workbench/tree/v8.2.1" }, - "time": "2023-12-06T02:55:16+00:00" + "time": "2023-12-28T15:15:44+00:00" }, { "name": "phar-io/manifest", @@ -13863,20 +13849,20 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" + "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7", + "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, @@ -13906,7 +13892,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.0" + "source": "https://github.com/symfony/filesystem/tree/v7.0.0" }, "funding": [ { @@ -13922,7 +13908,7 @@ "type": "tidelift" } ], - "time": "2023-07-26T17:27:13+00:00" + "time": "2023-07-27T06:33:22+00:00" }, { "name": "symfony/polyfill-iconv", @@ -14009,20 +13995,20 @@ }, { "name": "symfony/stopwatch", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2" + "reference": "7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2", - "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a", + "reference": "7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/service-contracts": "^2.5|^3" }, "type": "library", @@ -14051,7 +14037,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v6.4.0" + "source": "https://github.com/symfony/stopwatch/tree/v7.0.0" }, "funding": [ { @@ -14067,7 +14053,7 @@ "type": "tidelift" } ], - "time": "2023-02-16T10:14:28+00:00" + "time": "2023-07-05T13:06:06+00:00" }, { "name": "theseer/tokenizer", @@ -14500,7 +14486,11 @@ } ], "aliases": [], +<<<<<<< HEAD "minimum-stability": "dev", +======= + "minimum-stability": "stable", +>>>>>>> 45d4012 (WIP - departure to integrate) "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, From 8bec342c48edeffd7c0dd91fc0f20b87cda17839 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 09:51:24 +0100 Subject: [PATCH 03/30] replace `gluedev/laravel-stackdriver` --- composer.json | 4 + composer.lock | 561 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 345 insertions(+), 220 deletions(-) diff --git a/composer.json b/composer.json index f7ad1be1e..03b29a360 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,11 @@ "license": "MIT", "type": "project", "require": { +<<<<<<< HEAD "fruitcake/laravel-cors": "^2.0", +======= + "absszero/laravel-stackdriver-error-reporting": "^1.7", +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "cviebrock/eloquent-sluggable": "^10.0", "doctrine/dbal": "^3.1", "firebase/php-jwt": "^6.10", diff --git a/composer.lock b/composer.lock index 223677562..e287fbc70 100644 --- a/composer.lock +++ b/composer.lock @@ -970,16 +970,16 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { @@ -1011,9 +1011,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.2" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2023-09-27T20:04:15+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "doctrine/event-manager", @@ -1199,27 +1199,27 @@ }, { "name": "doctrine/lexer", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "84a527db05647743d50373e0ec53a152f2cde568" + "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568", - "reference": "84a527db05647743d50373e0ec53a152f2cde568", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", + "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", "shasum": "" }, "require": { "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^10", - "phpstan/phpstan": "^1.9", - "phpunit/phpunit": "^9.5", + "doctrine/coding-standard": "^12", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^10.5", "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^5.0" + "vimeo/psalm": "^5.21" }, "type": "library", "autoload": { @@ -1256,7 +1256,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/3.0.0" + "source": "https://github.com/doctrine/lexer/tree/3.0.1" }, "funding": [ { @@ -1272,7 +1272,7 @@ "type": "tidelift" } ], - "time": "2022-12-15T16:57:16+00:00" + "time": "2024-02-05T11:56:58+00:00" }, { "name": "dragonmantank/cron-expression", @@ -1585,6 +1585,9 @@ }, { <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "name": "google/auth", "version": "v1.26.0", "source": { @@ -2069,8 +2072,11 @@ "time": "2024-01-09T22:12:32+00:00" }, { +<<<<<<< HEAD ======= >>>>>>> 45d4012 (WIP - departure to integrate) +======= +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "name": "google/recaptcha", "version": "1.3.0", "source": { @@ -2184,6 +2190,50 @@ ], "time": "2023-11-12T22:16:48+00:00" }, + { + "name": "grpc/grpc", + "version": "1.57.0", + "source": { + "type": "git", + "url": "https://github.com/grpc/grpc-php.git", + "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf", + "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "google/auth": "^v1.3.0" + }, + "suggest": { + "ext-protobuf": "For better performance, install the protobuf C extension.", + "google/protobuf": "To get started using grpc quickly, install the native protobuf library." + }, + "type": "library", + "autoload": { + "psr-4": { + "Grpc\\": "src/lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "gRPC library for PHP", + "homepage": "https://grpc.io", + "keywords": [ + "rpc" + ], + "support": { + "source": "https://github.com/grpc/grpc-php/tree/v1.57.0" + }, + "time": "2023-08-14T23:57:54+00:00" + }, { "name": "guzzlehttp/guzzle", "version": "7.8.1", @@ -2312,33 +2362,29 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0" + "php": ">=5.5" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, "autoload": { + "files": [ + "src/functions_include.php" + ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -2375,7 +2421,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.2" + "source": "https://github.com/guzzle/promises/tree/1.5.3" }, "funding": [ { @@ -2391,7 +2437,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:19:20+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", @@ -2714,20 +2760,20 @@ }, { "name": "laravel/framework", - "version": "v10.42.0", + "version": "v10.43.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "fef1aff874a6749c44f8e142e5764eab8cb96890" + "reference": "4f7802dfc9993cb57cf69615491ce1a7eb2e9529" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/fef1aff874a6749c44f8e142e5764eab8cb96890", - "reference": "fef1aff874a6749c44f8e142e5764eab8cb96890", + "url": "https://api.github.com/repos/laravel/framework/zipball/4f7802dfc9993cb57cf69615491ce1a7eb2e9529", + "reference": "4f7802dfc9993cb57cf69615491ce1a7eb2e9529", "shasum": "" }, "require": { - "brick/math": "^0.9.3|^0.10.2|^0.11", + "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12", "composer-runtime-api": "^2.2", "doctrine/inflector": "^2.0.5", "dragonmantank/cron-expression": "^3.3.2", @@ -2915,7 +2961,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-01-23T15:07:56+00:00" + "time": "2024-01-30T16:25:02+00:00" }, { "name": "laravel/passport", @@ -3380,16 +3426,16 @@ }, { "name": "league/commonmark", - "version": "2.4.1", + "version": "2.4.2", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5" + "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5", - "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf", + "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf", "shasum": "" }, "require": { @@ -3402,7 +3448,7 @@ }, "require-dev": { "cebe/markdown": "^1.0", - "commonmark/cmark": "0.30.0", + "commonmark/cmark": "0.30.3", "commonmark/commonmark.js": "0.30.0", "composer/package-versions-deprecated": "^1.8", "embed/embed": "^4.4", @@ -3412,10 +3458,10 @@ "michelf/php-markdown": "^1.4 || ^2.0", "nyholm/psr7": "^1.5", "phpstan/phpstan": "^1.8.2", - "phpunit/phpunit": "^9.5.21", + "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0", "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0", + "symfony/finder": "^5.3 | ^6.0 || ^7.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0", "unleashedtech/php-coding-standard": "^3.1.1", "vimeo/psalm": "^4.24.0 || ^5.0.0" }, @@ -3482,7 +3528,7 @@ "type": "tidelift" } ], - "time": "2023-08-30T16:55:00+00:00" + "time": "2024-02-02T11:59:32+00:00" }, { "name": "league/config", @@ -3622,6 +3668,7 @@ }, { "name": "league/flysystem", +<<<<<<< HEAD "version": "3.23.1", "source": { "type": "git", @@ -3632,6 +3679,18 @@ "type": "zip", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e", "reference": "199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e", +======= + "version": "3.24.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "b25a361508c407563b34fac6f64a8a17a8819675" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675", + "reference": "b25a361508c407563b34fac6f64a8a17a8819675", +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "shasum": "" }, "require": { @@ -3651,7 +3710,7 @@ "require-dev": { "async-aws/s3": "^1.5 || ^2.0", "async-aws/simple-s3": "^1.1 || ^2.0", - "aws/aws-sdk-php": "^3.220.0", + "aws/aws-sdk-php": "^3.295.10", "composer/semver": "^3.0", "ext-fileinfo": "*", "ext-ftp": "*", @@ -3662,7 +3721,7 @@ "phpseclib/phpseclib": "^3.0.34", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5.11|^10.0", - "sabre/dav": "^4.3.1" + "sabre/dav": "^4.6.0" }, "type": "library", "autoload": { @@ -3696,7 +3755,11 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", +<<<<<<< HEAD "source": "https://github.com/thephpleague/flysystem/tree/3.23.1" +======= + "source": "https://github.com/thephpleague/flysystem/tree/3.24.0" +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) }, "funding": [ { @@ -3708,7 +3771,11 @@ "type": "github" } ], +<<<<<<< HEAD "time": "2024-01-26T18:42:03+00:00" +======= + "time": "2024-02-04T12:10:17+00:00" +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) }, { "name": "league/flysystem-aws-s3-v3", @@ -4441,16 +4508,16 @@ }, { "name": "nesbot/carbon", - "version": "2.72.2", + "version": "2.72.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130" + "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e7edc41b58d65509baeb0d4a14c8fa41d627130", - "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83", + "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83", "shasum": "" }, "require": { @@ -4544,7 +4611,7 @@ "type": "tidelift" } ], - "time": "2024-01-19T00:21:53+00:00" + "time": "2024-01-25T10:35:09+00:00" }, { "name": "nette/schema", @@ -6144,6 +6211,7 @@ }, { "name": "psr/log", +<<<<<<< HEAD <<<<<<< HEAD "version": "2.0.0", "source": { @@ -6157,16 +6225,24 @@ "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", ======= "version": "3.0.0", +======= + "version": "2.0.0", +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", +<<<<<<< HEAD "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", >>>>>>> 45d4012 (WIP - departure to integrate) +======= + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "shasum": "" }, "require": { @@ -6175,11 +6251,15 @@ "type": "library", "extra": { "branch-alias": { +<<<<<<< HEAD <<<<<<< HEAD "dev-master": "2.0.x-dev" ======= "dev-master": "3.x-dev" >>>>>>> 45d4012 (WIP - departure to integrate) +======= + "dev-master": "2.0.x-dev" +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) } }, "autoload": { @@ -6205,6 +6285,7 @@ "psr-3" ], "support": { +<<<<<<< HEAD <<<<<<< HEAD "source": "https://github.com/php-fig/log/tree/2.0.0" }, @@ -6214,6 +6295,11 @@ }, "time": "2021-07-14T16:46:02+00:00" >>>>>>> 45d4012 (WIP - departure to integrate) +======= + "source": "https://github.com/php-fig/log/tree/2.0.0" + }, + "time": "2021-07-14T16:41:46+00:00" +>>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) }, { "name": "psr/simple-cache", @@ -7131,6 +7217,68 @@ ], "time": "2023-06-16T10:52:11+00:00" }, + { + "name": "rize/uri-template", + "version": "0.3.5", + "source": { + "type": "git", + "url": "https://github.com/rize/UriTemplate.git", + "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rize/UriTemplate/zipball/5ed4ba8ea34af84485dea815d4b6b620794d1168", + "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8.36" + }, + "type": "library", + "autoload": { + "psr-4": { + "Rize\\": "src/Rize" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marut K", + "homepage": "http://twitter.com/rezigned" + } + ], + "description": "PHP URI Template (RFC 6570) supports both expansion & extraction", + "keywords": [ + "RFC 6570", + "template", + "uri" + ], + "support": { + "issues": "https://github.com/rize/UriTemplate/issues", + "source": "https://github.com/rize/UriTemplate/tree/0.3.5" + }, + "funding": [ + { + "url": "https://www.paypal.me/rezigned", + "type": "custom" + }, + { + "url": "https://github.com/rezigned", + "type": "github" + }, + { + "url": "https://opencollective.com/rize-uri-template", + "type": "open_collective" + } + ], + "time": "2022-10-12T17:22:51+00:00" + }, { "name": "softcreatr/jsonpath", "version": "0.8.3", @@ -7201,16 +7349,16 @@ }, { "name": "symfony/console", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" + "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", - "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", + "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", + "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", "shasum": "" }, "require": { @@ -7275,7 +7423,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.2" + "source": "https://github.com/symfony/console/tree/v6.4.3" }, "funding": [ { @@ -7291,20 +7439,20 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/css-selector", - "version": "v7.0.0", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "bb51d46e53ef8d50d523f0c5faedba056a27943e" + "reference": "ec60a4edf94e63b0556b6a0888548bb400a3a3be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/bb51d46e53ef8d50d523f0c5faedba056a27943e", - "reference": "bb51d46e53ef8d50d523f0c5faedba056a27943e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/ec60a4edf94e63b0556b6a0888548bb400a3a3be", + "reference": "ec60a4edf94e63b0556b6a0888548bb400a3a3be", "shasum": "" }, "require": { @@ -7340,7 +7488,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.0.0" + "source": "https://github.com/symfony/css-selector/tree/v7.0.3" }, "funding": [ { @@ -7356,7 +7504,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:59:56+00:00" + "time": "2024-01-23T15:02:46+00:00" }, { "name": "symfony/deprecation-contracts", @@ -7427,16 +7575,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788" + "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c873490a1c97b3a0a4838afc36ff36c112d02788", - "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/6dc3c76a278b77f01d864a6005d640822c6f26a6", + "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6", "shasum": "" }, "require": { @@ -7482,7 +7630,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/v6.4.0" + "source": "https://github.com/symfony/error-handler/tree/v6.4.3" }, "funding": [ { @@ -7498,20 +7646,20 @@ "type": "tidelift" } ], - "time": "2023-10-18T09:43:34+00:00" + "time": "2024-01-29T15:40:36+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.0.2", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a" + "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/098b62ae81fdd6cbf941f355059f617db28f4f9a", - "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/834c28d533dd0636f910909d01b9ff45cc094b5e", + "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e", "shasum": "" }, "require": { @@ -7562,7 +7710,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.2" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.3" }, "funding": [ { @@ -7578,7 +7726,7 @@ "type": "tidelift" } ], - "time": "2023-12-27T22:24:19+00:00" + "time": "2024-01-23T15:02:46+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -7722,16 +7870,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "172d807f9ef3fc3fbed8377cc57c20d389269271" + "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/172d807f9ef3fc3fbed8377cc57c20d389269271", - "reference": "172d807f9ef3fc3fbed8377cc57c20d389269271", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5677bdf7cade4619cb17fc9e1e7b31ec392244a9", + "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9", "shasum": "" }, "require": { @@ -7779,7 +7927,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.2" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.3" }, "funding": [ { @@ -7795,20 +7943,20 @@ "type": "tidelift" } ], - "time": "2023-12-27T22:16:42+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "13e8387320b5942d0dc408440c888e2d526efef4" + "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/13e8387320b5942d0dc408440c888e2d526efef4", - "reference": "13e8387320b5942d0dc408440c888e2d526efef4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c6ec4e543044f7568a53a76ab1484ecd30637a2", + "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2", "shasum": "" }, "require": { @@ -7892,7 +8040,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/v6.4.2" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.3" }, "funding": [ { @@ -7908,20 +8056,20 @@ "type": "tidelift" } ], - "time": "2023-12-30T15:31:44+00:00" + "time": "2024-01-31T07:21:29+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "6da89e5c9202f129717a770a03183fb140720168" + "reference": "74412c62f88a85a41b61f0b71ab0afcaad6f03ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/6da89e5c9202f129717a770a03183fb140720168", - "reference": "6da89e5c9202f129717a770a03183fb140720168", + "url": "https://api.github.com/repos/symfony/mailer/zipball/74412c62f88a85a41b61f0b71ab0afcaad6f03ee", + "reference": "74412c62f88a85a41b61f0b71ab0afcaad6f03ee", "shasum": "" }, "require": { @@ -7972,7 +8120,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.2" + "source": "https://github.com/symfony/mailer/tree/v6.4.3" }, "funding": [ { @@ -7988,20 +8136,20 @@ "type": "tidelift" } ], - "time": "2023-12-19T09:12:31+00:00" + "time": "2024-01-29T15:01:07+00:00" }, { "name": "symfony/mime", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205" + "reference": "5017e0a9398c77090b7694be46f20eb796262a34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ca4f58b2ef4baa8f6cecbeca2573f88cd577d205", - "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205", + "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34", + "reference": "5017e0a9398c77090b7694be46f20eb796262a34", "shasum": "" }, "require": { @@ -8056,7 +8204,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.0" + "source": "https://github.com/symfony/mime/tree/v6.4.3" }, "funding": [ { @@ -8072,7 +8220,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T11:49:05+00:00" + "time": "2024-01-30T08:32:12+00:00" }, { "name": "symfony/options-resolver", @@ -8143,16 +8291,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -8166,9 +8314,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8205,7 +8350,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -8221,20 +8366,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -8245,9 +8390,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8286,7 +8428,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -8302,20 +8444,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" + "reference": "a287ed7475f85bf6f61890146edbc932c0fff919" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", - "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919", + "reference": "a287ed7475f85bf6f61890146edbc932c0fff919", "shasum": "" }, "require": { @@ -8328,9 +8470,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8373,7 +8512,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0" }, "funding": [ { @@ -8389,20 +8528,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:30:37+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -8413,9 +8552,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8457,7 +8593,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -8473,20 +8609,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -8500,9 +8636,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8540,7 +8673,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -8556,20 +8689,20 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", "shasum": "" }, "require": { @@ -8577,9 +8710,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8616,7 +8746,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" }, "funding": [ { @@ -8632,20 +8762,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -8653,9 +8783,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8699,7 +8826,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -8715,20 +8842,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11" + "reference": "86fcae159633351e5fd145d1c47de6c528f8caff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", - "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", + "reference": "86fcae159633351e5fd145d1c47de6c528f8caff", "shasum": "" }, "require": { @@ -8737,9 +8864,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8779,7 +8903,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0" }, "funding": [ { @@ -8795,20 +8919,20 @@ "type": "tidelift" } ], - "time": "2023-08-16T06:22:46+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-uuid", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-uuid.git", - "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e" + "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e", - "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853", + "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853", "shasum": "" }, "require": { @@ -8822,9 +8946,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -8861,7 +8982,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/polyfill-uuid/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0" }, "funding": [ { @@ -8877,20 +8998,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/process", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241" + "reference": "31642b0818bfcff85930344ef93193f8c607e0a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c4b1ef0bc80533d87a2e969806172f1c2a980241", - "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241", + "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3", + "reference": "31642b0818bfcff85930344ef93193f8c607e0a3", "shasum": "" }, "require": { @@ -8922,7 +9043,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.2" + "source": "https://github.com/symfony/process/tree/v6.4.3" }, "funding": [ { @@ -8938,7 +9059,7 @@ "type": "tidelift" } ], - "time": "2023-12-22T16:42:54+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -9031,16 +9152,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "98eab13a07fddc85766f1756129c69f207ffbc21" + "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/98eab13a07fddc85766f1756129c69f207ffbc21", - "reference": "98eab13a07fddc85766f1756129c69f207ffbc21", + "url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842", + "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842", "shasum": "" }, "require": { @@ -9094,7 +9215,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.2" + "source": "https://github.com/symfony/routing/tree/v6.4.3" }, "funding": [ { @@ -9110,7 +9231,7 @@ "type": "tidelift" } ], - "time": "2023-12-29T15:34:34+00:00" + "time": "2024-01-30T13:55:02+00:00" }, { "name": "symfony/service-contracts", @@ -9196,16 +9317,16 @@ }, { "name": "symfony/string", - "version": "v7.0.2", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5" + "reference": "524aac4a280b90a4420d8d6a040718d0586505ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/cc78f14f91f5e53b42044d0620961c48028ff9f5", - "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5", + "url": "https://api.github.com/repos/symfony/string/zipball/524aac4a280b90a4420d8d6a040718d0586505ac", + "reference": "524aac4a280b90a4420d8d6a040718d0586505ac", "shasum": "" }, "require": { @@ -9262,7 +9383,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.2" + "source": "https://github.com/symfony/string/tree/v7.0.3" }, "funding": [ { @@ -9278,20 +9399,20 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:54:46+00:00" + "time": "2024-01-29T15:41:16+00:00" }, { "name": "symfony/translation", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a2ab2ec1a462e53016de8e8d5e8912bfd62ea681" + "reference": "637c51191b6b184184bbf98937702bcf554f7d04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a2ab2ec1a462e53016de8e8d5e8912bfd62ea681", - "reference": "a2ab2ec1a462e53016de8e8d5e8912bfd62ea681", + "url": "https://api.github.com/repos/symfony/translation/zipball/637c51191b6b184184bbf98937702bcf554f7d04", + "reference": "637c51191b6b184184bbf98937702bcf554f7d04", "shasum": "" }, "require": { @@ -9314,7 +9435,7 @@ "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { - "nikic/php-parser": "^4.13", + "nikic/php-parser": "^4.18|^5.0", "psr/log": "^1|^2|^3", "symfony/config": "^5.4|^6.0|^7.0", "symfony/console": "^5.4|^6.0|^7.0", @@ -9357,7 +9478,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.2" + "source": "https://github.com/symfony/translation/tree/v6.4.3" }, "funding": [ { @@ -9373,7 +9494,7 @@ "type": "tidelift" } ], - "time": "2023-12-18T09:25:29+00:00" + "time": "2024-01-29T13:11:52+00:00" }, { "name": "symfony/translation-contracts", @@ -9455,16 +9576,16 @@ }, { "name": "symfony/uid", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "8092dd1b1a41372110d06374f99ee62f7f0b9a92" + "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/8092dd1b1a41372110d06374f99ee62f7f0b9a92", - "reference": "8092dd1b1a41372110d06374f99ee62f7f0b9a92", + "url": "https://api.github.com/repos/symfony/uid/zipball/1d31267211cc3a2fff32bcfc7c1818dac41b6fc0", + "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0", "shasum": "" }, "require": { @@ -9509,7 +9630,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v6.4.0" + "source": "https://github.com/symfony/uid/tree/v6.4.3" }, "funding": [ { @@ -9525,20 +9646,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:18:17+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f" + "reference": "0435a08f69125535336177c29d56af3abc1f69da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/68d6573ec98715ddcae5a0a85bee3c1c27a4c33f", - "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da", + "reference": "0435a08f69125535336177c29d56af3abc1f69da", "shasum": "" }, "require": { @@ -9594,7 +9715,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.2" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.3" }, "funding": [ { @@ -9610,7 +9731,7 @@ "type": "tidelift" } ], - "time": "2023-12-28T19:16:56+00:00" + "time": "2024-01-23T14:53:30+00:00" }, { "name": "symfony/yaml", From d9c231d9d7523abad112c5997952692afc695fea Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 7 Feb 2024 16:17:19 +0100 Subject: [PATCH 04/30] configure `absszero/laravel-stackdriver-error-reporting` see https://github.com/wbstack/api/pull/731 --- app/Exceptions/Handler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5803bb936..48c10c7eb 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -44,3 +44,4 @@ public function register() }); } } + From a4b1a4e3e60220cf55d90b214db0951990af3c77 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 7 Feb 2024 16:19:58 +0100 Subject: [PATCH 05/30] remove call to `registerPolicies` see https://laravel.com/docs/10.x/upgrade#register-policies --- app/Providers/AuthServiceProvider.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 0b01e636d..4d3c6f606 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -23,8 +23,6 @@ class AuthServiceProvider extends ServiceProvider */ public function boot() { - $this->registerPolicies(); - Passport::personalAccessTokensExpireIn(now()->addDays(30)); } } From d5e3e62e3e86e02680fbb6bfea60ca34559fb610 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 7 Feb 2024 16:21:48 +0100 Subject: [PATCH 06/30] schedule redis stale tag pruning --- app/Console/Kernel.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index af6a1665f..884bc0544 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -48,6 +48,9 @@ protected function schedule(Schedule $schedule) // Schedule site stat updates for each wiki and platform-summary $schedule->command('schedule:stats')->dailyAt('7:00'); + // https://laravel.com/docs/10.x/upgrade#redis-cache-tags + $schedule->command('cache:prune-stale-tags')->hourly(); + $schedule->job(new PollForMediaWikiJobsJob)->everyFifteenMinutes(); $schedule->job(new UpdateWikiSiteStatsJob)->dailyAt('19:00'); From 5c9f61cc7ac131f53ed8fcf5eb86c0106d4fe89f Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 7 Feb 2024 16:35:26 +0100 Subject: [PATCH 07/30] use `$casts` property see https://laravel.com/docs/10.x/upgrade#model-dates-property --- app/Wiki.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Wiki.php b/app/Wiki.php index 13c3abeb7..13da303e0 100644 --- a/app/Wiki.php +++ b/app/Wiki.php @@ -63,8 +63,8 @@ class Wiki extends Model 'domain_decoded', ]; - protected $dates = [ - 'deleted_at', + protected $casts = [ + 'deleted_at' => 'datetime', ]; public function wikiDbVersion() From 7b9b7f2f18faaa38cdba81b110d5d691834e432c Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 09:54:37 +0100 Subject: [PATCH 08/30] run `composer update --ignore-platform-reqs` Composer version 2.6.5 2023-10-06 10:11:52 --- composer.json | 5 - composer.lock | 1109 ++++++------------------------------------------- 2 files changed, 132 insertions(+), 982 deletions(-) diff --git a/composer.json b/composer.json index 03b29a360..99e990114 100644 --- a/composer.json +++ b/composer.json @@ -8,11 +8,6 @@ "license": "MIT", "type": "project", "require": { -<<<<<<< HEAD - "fruitcake/laravel-cors": "^2.0", -======= - "absszero/laravel-stackdriver-error-reporting": "^1.7", ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "cviebrock/eloquent-sluggable": "^10.0", "doctrine/dbal": "^3.1", "firebase/php-jwt": "^6.10", diff --git a/composer.lock b/composer.lock index e287fbc70..d2c79b648 100644 --- a/composer.lock +++ b/composer.lock @@ -4,118 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0d5aa668befcba5b2c7816ea64f1159b", + "content-hash": "cf4e4a6b15623ff55acec8d3382ced16", "packages": [ - { - "name": "absszero/laravel-stackdriver-error-reporting", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/absszero/laravel-stackdriver-error-reporting.git", - "reference": "3c7c5d9ceb0ca1f52fd56f8da2edf02b842c615b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/absszero/laravel-stackdriver-error-reporting/zipball/3c7c5d9ceb0ca1f52fd56f8da2edf02b842c615b", - "reference": "3c7c5d9ceb0ca1f52fd56f8da2edf02b842c615b", - "shasum": "" - }, - "require": { - "google/cloud-error-reporting": "^0.19", - "illuminate/support": ">=5.1", - "php": ">=5.5" - }, - "conflict": { - "psr/log": ">=3" - }, - "require-dev": { - "phpunit/phpunit": ">=4.0" - }, - "type": "laravel", - "extra": { - "laravel": { - "providers": [ - "Absszero\\ErrorReportingServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Absszero\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "absszero" - } - ], - "description": "Stackdriver Error Reporting for Laravel", - "support": { - "issues": "https://github.com/absszero/laravel-stackdriver-error-reporting/issues", - "source": "https://github.com/absszero/laravel-stackdriver-error-reporting/tree/1.7.3" - }, - "time": "2023-10-30T07:48:04+00:00" - }, - { - "name": "asm89/stack-cors", - "version": "v2.2.0", - "source": { - "type": "git", - "url": "https://github.com/asm89/stack-cors.git", - "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea", - "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea", - "shasum": "" - }, - "require": { - "php": "^7.3|^8.0", - "symfony/http-foundation": "^5.3|^6|^7", - "symfony/http-kernel": "^5.3|^6|^7" - }, - "require-dev": { - "phpunit/phpunit": "^9", - "squizlabs/php_codesniffer": "^3.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "psr-4": { - "Asm89\\Stack\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Alexander", - "email": "iam.asm89@gmail.com" - } - ], - "description": "Cross-origin resource sharing library and stack middleware", - "homepage": "https://github.com/asm89/stack-cors", - "keywords": [ - "cors", - "stack" - ], - "support": { - "issues": "https://github.com/asm89/stack-cors/issues", - "source": "https://github.com/asm89/stack-cors/tree/v2.2.0" - }, - "time": "2023-11-14T13:51:46+00:00" - }, { "name": "aws/aws-crt-php", "version": "v1.2.4", @@ -172,29 +62,16 @@ }, { "name": "aws/aws-sdk-php", -<<<<<<< HEAD - "version": "3.297.2", + "version": "3.299.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "bbf516a4a88f829f92cc396628be705966880dbd" + "reference": "76d1165568d949b430a87eaa42f6dbc4b6705b6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bbf516a4a88f829f92cc396628be705966880dbd", - "reference": "bbf516a4a88f829f92cc396628be705966880dbd", -======= - "version": "3.297.1", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5be6a9c74e1d72af75f24b4f4a9cfac51ccd6a56" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5be6a9c74e1d72af75f24b4f4a9cfac51ccd6a56", - "reference": "5be6a9c74e1d72af75f24b4f4a9cfac51ccd6a56", ->>>>>>> 45d4012 (WIP - departure to integrate) + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/76d1165568d949b430a87eaa42f6dbc4b6705b6f", + "reference": "76d1165568d949b430a87eaa42f6dbc4b6705b6f", "shasum": "" }, "require": { @@ -274,15 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", -<<<<<<< HEAD - "source": "https://github.com/aws/aws-sdk-php/tree/3.297.2" - }, - "time": "2024-01-26T19:09:20+00:00" -======= - "source": "https://github.com/aws/aws-sdk-php/tree/3.297.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.299.0" }, - "time": "2024-01-25T19:18:40+00:00" ->>>>>>> 45d4012 (WIP - departure to integrate) + "time": "2024-02-15T19:08:34+00:00" }, { "name": "brick/math", @@ -857,16 +728,16 @@ }, { "name": "doctrine/dbal", - "version": "3.8.0", + "version": "3.8.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "d244f2e6e6bf32bff5174e6729b57214923ecec9" + "reference": "a19a1d05ca211f41089dffcc387733a6875196cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/d244f2e6e6bf32bff5174e6729b57214923ecec9", - "reference": "d244f2e6e6bf32bff5174e6729b57214923ecec9", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/a19a1d05ca211f41089dffcc387733a6875196cb", + "reference": "a19a1d05ca211f41089dffcc387733a6875196cb", "shasum": "" }, "require": { @@ -882,9 +753,9 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "1.10.56", + "phpstan/phpstan": "1.10.57", "phpstan/phpstan-strict-rules": "^1.5", - "phpunit/phpunit": "9.6.15", + "phpunit/phpunit": "9.6.16", "psalm/plugin-phpunit": "0.18.4", "slevomat/coding-standard": "8.13.1", "squizlabs/php_codesniffer": "3.8.1", @@ -950,7 +821,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.8.0" + "source": "https://github.com/doctrine/dbal/tree/3.8.2" }, "funding": [ { @@ -966,7 +837,7 @@ "type": "tidelift" } ], - "time": "2024-01-25T21:44:02+00:00" + "time": "2024-02-12T18:36:36+00:00" }, { "name": "doctrine/deprecations", @@ -1584,499 +1455,6 @@ "time": "2023-10-12T05:21:21+00:00" }, { -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) - "name": "google/auth", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "f1f0d0319e2e7750ebfaa523c78819792a9ed9f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/f1f0d0319e2e7750ebfaa523c78819792a9ed9f7", - "reference": "f1f0d0319e2e7750ebfaa523c78819792a9ed9f7", - "shasum": "" - }, - "require": { - "firebase/php-jwt": "^5.5||^6.0", - "guzzlehttp/guzzle": "^6.2.1|^7.0", - "guzzlehttp/psr7": "^1.7|^2.0", - "php": "^7.1||^8.0", - "psr/cache": "^1.0|^2.0|^3.0", - "psr/http-message": "^1.0" - }, - "require-dev": { - "guzzlehttp/promises": "0.1.1|^1.3", - "kelvinmo/simplejwt": "0.7.0", - "phpseclib/phpseclib": "^2.0.31||^3.0", - "phpspec/prophecy-phpunit": "^1.1||^2.0", - "phpunit/phpunit": "^7.5||^9.0.0", - "sebastian/comparator": ">=1.2.3", - "squizlabs/php_codesniffer": "^3.5" - }, - "suggest": { - "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." - }, - "type": "library", - "autoload": { - "psr-4": { - "Google\\Auth\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Google Auth Library for PHP", - "homepage": "http://github.com/google/google-auth-library-php", - "keywords": [ - "Authentication", - "google", - "oauth2" - ], - "support": { - "docs": "https://googleapis.github.io/google-auth-library-php/main/", - "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.26.0" - }, - "time": "2023-04-05T15:11:57+00:00" - }, - { - "name": "google/cloud-core", - "version": "v1.52.10", - "source": { - "type": "git", - "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "5e34556498ecadee2161402fd1024bec7ce33186" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/5e34556498ecadee2161402fd1024bec7ce33186", - "reference": "5e34556498ecadee2161402fd1024bec7ce33186", - "shasum": "" - }, - "require": { - "google/auth": "^1.18", - "guzzlehttp/guzzle": "^6.5.8|^7.4.4", - "guzzlehttp/promises": "^1.4||^2.0", - "guzzlehttp/psr7": "^1.7|^2.0", - "monolog/monolog": "^1.1|^2.0|^3.0", - "php": ">=7.4", - "psr/http-message": "^1.0|^2.0", - "rize/uri-template": "~0.3" - }, - "require-dev": { - "erusev/parsedown": "^1.6", - "google/cloud-common-protos": "^0.4", - "google/gax": "^1.24.0", - "opis/closure": "^3", - "phpdocumentor/reflection": "^5.0", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.0", - "squizlabs/php_codesniffer": "2.*" - }, - "suggest": { - "opis/closure": "May be used to serialize closures to process jobs in the batch daemon. Please require version ^3.", - "symfony/lock": "Required for the Spanner cached based session pool. Please require the following commit: 3.3.x-dev#1ba6ac9" - }, - "bin": [ - "bin/google-cloud-batch" - ], - "type": "library", - "extra": { - "component": { - "id": "cloud-core", - "target": "googleapis/google-cloud-php-core.git", - "path": "Core", - "entry": "src/ServiceBuilder.php" - } - }, - "autoload": { - "psr-4": { - "Google\\Cloud\\Core\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", - "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.10" - }, - "time": "2023-12-08T22:36:35+00:00" - }, - { - "name": "google/cloud-error-reporting", - "version": "v0.19.12", - "source": { - "type": "git", - "url": "https://github.com/googleapis/google-cloud-php-errorreporting.git", - "reference": "3a580346a28c11de7ff5db5319e9bcfba4c1f171" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-errorreporting/zipball/3a580346a28c11de7ff5db5319e9bcfba4c1f171", - "reference": "3a580346a28c11de7ff5db5319e9bcfba4c1f171", - "shasum": "" - }, - "require": { - "google/cloud-logging": "^1.16", - "google/gax": "^1.1", - "php": ">=7.4" - }, - "require-dev": { - "google/cloud-core": "^1.39", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.0" - }, - "suggest": { - "ext-grpc": "The gRPC extension allows more granular control over Error Reporting", - "ext-protobuf": "Provides a significant increase in throughput over the pure PHP protobuf implementation. See https://cloud.google.com/php/grpc for installation instructions." - }, - "type": "library", - "extra": { - "component": { - "id": "cloud-error-reporting", - "target": "googleapis/google-cloud-php-errorreporting.git", - "path": "ErrorReporting", - "entry": null - } - }, - "autoload": { - "psr-4": { - "Google\\Cloud\\ErrorReporting\\": "src", - "GPBMetadata\\Google\\Devtools\\Clouderrorreporting\\": "metadata" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Stackdriver Error Reporting Client for PHP", - "support": { - "source": "https://github.com/googleapis/google-cloud-php-errorreporting/tree/v0.19.12" - }, - "time": "2023-05-05T23:01:42+00:00" - }, - { - "name": "google/cloud-logging", - "version": "v1.28.2", - "source": { - "type": "git", - "url": "https://github.com/googleapis/google-cloud-php-logging.git", - "reference": "a59fc90e9498ba2e2313e8fd54b9be04e8579b80" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-logging/zipball/a59fc90e9498ba2e2313e8fd54b9be04e8579b80", - "reference": "a59fc90e9498ba2e2313e8fd54b9be04e8579b80", - "shasum": "" - }, - "require": { - "google/cloud-core": "^1.39", - "google/gax": "^1.19.1", - "php": ">=7.4" - }, - "conflict": { - "psr/log": ">=3" - }, - "provide": { - "psr/log-implementation": "1.0|2.0" - }, - "require-dev": { - "erusev/parsedown": "^1.6", - "fig/log-test": "^1.0", - "google/cloud-bigquery": "^1.0", - "google/cloud-pubsub": "^1.0", - "google/cloud-storage": "^1.3", - "opis/closure": "^3", - "phpdocumentor/reflection": "^5.0", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.0", - "squizlabs/php_codesniffer": "2.*" - }, - "suggest": { - "ext-grpc": "The gRPC extension enables use of the performant gRPC transport", - "ext-protobuf": "Provides a significant increase in throughput over the pure PHP protobuf implementation. See https://cloud.google.com/php/grpc for installation instructions.", - "psr/log": "For using the PSR logger. Currently supports versions 1 and 2." - }, - "type": "library", - "extra": { - "component": { - "id": "cloud-logging", - "target": "googleapis/google-cloud-php-logging.git", - "path": "Logging", - "entry": "src/LoggingClient.php" - } - }, - "autoload": { - "psr-4": { - "Google\\Cloud\\Logging\\": "src", - "GPBMetadata\\Google\\Logging\\": "metadata" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Stackdriver Logging Client for PHP", - "support": { - "source": "https://github.com/googleapis/google-cloud-php-logging/tree/v1.28.2" - }, - "time": "2023-09-30T16:50:41+00:00" - }, - { - "name": "google/common-protos", - "version": "v3.2.0", - "source": { - "type": "git", - "url": "https://github.com/googleapis/common-protos-php.git", - "reference": "57d4ad36cc48cc0369123042908013ef2a86bb98" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/common-protos-php/zipball/57d4ad36cc48cc0369123042908013ef2a86bb98", - "reference": "57d4ad36cc48cc0369123042908013ef2a86bb98", - "shasum": "" - }, - "require": { - "google/protobuf": "^3.6.1" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36||^8.5", - "sami/sami": "*" - }, - "type": "library", - "autoload": { - "psr-4": { - "Google\\Api\\": "src/Api", - "Google\\Iam\\": "src/Iam", - "Google\\Rpc\\": "src/Rpc", - "Google\\Type\\": "src/Type", - "Google\\Cloud\\": "src/Cloud", - "GPBMetadata\\Google\\Api\\": "metadata/Api", - "GPBMetadata\\Google\\Iam\\": "metadata/Iam", - "GPBMetadata\\Google\\Rpc\\": "metadata/Rpc", - "GPBMetadata\\Google\\Type\\": "metadata/Type", - "GPBMetadata\\Google\\Cloud\\": "metadata/Cloud", - "GPBMetadata\\Google\\Logging\\": "metadata/Logging" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Google API Common Protos for PHP", - "homepage": "https://github.com/googleapis/common-protos-php", - "keywords": [ - "google" - ], - "support": { - "issues": "https://github.com/googleapis/common-protos-php/issues", - "source": "https://github.com/googleapis/common-protos-php/tree/v3.2.0" - }, - "time": "2023-01-12T16:51:46+00:00" - }, - { - "name": "google/gax", - "version": "v1.19.1", - "source": { - "type": "git", - "url": "https://github.com/googleapis/gax-php.git", - "reference": "30f6b307faa9858bf58d967664467098dbbc354f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/gax-php/zipball/30f6b307faa9858bf58d967664467098dbbc354f", - "reference": "30f6b307faa9858bf58d967664467098dbbc354f", - "shasum": "" - }, - "require": { - "google/auth": "1.19.1||^1.25.0", - "google/common-protos": "^1.3.1||^2.0||^3.0", - "google/grpc-gcp": "^0.2", - "google/longrunning": "^0.2", - "google/protobuf": "^3.21.4", - "grpc/grpc": "^1.13", - "guzzlehttp/promises": "^1.3", - "guzzlehttp/psr7": "^1.7.0||^2", - "php": ">=7.0" - }, - "conflict": { - "ext-protobuf": "<3.7.0" - }, - "require-dev": { - "phpspec/prophecy": "^1.10", - "phpunit/phpunit": "^5.5||^8.5", - "squizlabs/php_codesniffer": "3.*", - "yoast/phpunit-polyfills": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Google\\ApiCore\\": "src", - "GPBMetadata\\ApiCore\\": "metadata/ApiCore" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Google API Core for PHP", - "homepage": "https://github.com/googleapis/gax-php", - "keywords": [ - "google" - ], - "support": { - "issues": "https://github.com/googleapis/gax-php/issues", - "source": "https://github.com/googleapis/gax-php/tree/v1.19.1" - }, - "time": "2023-03-16T19:58:19+00:00" - }, - { - "name": "google/grpc-gcp", - "version": "v0.2.1", - "source": { - "type": "git", - "url": "https://github.com/GoogleCloudPlatform/grpc-gcp-php.git", - "reference": "899d0112812a812df7692617a59f4076f0d01719" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/GoogleCloudPlatform/grpc-gcp-php/zipball/899d0112812a812df7692617a59f4076f0d01719", - "reference": "899d0112812a812df7692617a59f4076f0d01719", - "shasum": "" - }, - "require": { - "google/auth": "^1.3", - "google/protobuf": "^v3.3.0", - "grpc/grpc": "^v1.13.0", - "php": ">=5.5.0", - "psr/cache": "^1.0.1||^2.0.0||^3.0.0" - }, - "require-dev": { - "google/cloud-spanner": "^1.7", - "phpunit/phpunit": "4.8.36" - }, - "type": "library", - "autoload": { - "psr-4": { - "Grpc\\Gcp\\": "src/" - }, - "classmap": [ - "src/generated/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "gRPC GCP library for channel management", - "support": { - "issues": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/issues", - "source": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/tree/v0.2.1" - }, - "time": "2022-10-11T15:54:47+00:00" - }, - { - "name": "google/longrunning", - "version": "v0.2.6", - "source": { - "type": "git", - "url": "https://github.com/googleapis/php-longrunning.git", - "reference": "9689b4db54cf4cf8186118d9d59aa9ba35bb5842" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/php-longrunning/zipball/9689b4db54cf4cf8186118d9d59aa9ba35bb5842", - "reference": "9689b4db54cf4cf8186118d9d59aa9ba35bb5842", - "shasum": "" - }, - "require-dev": { - "google/gax": "^1.13.0", - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "component": { - "id": "longrunning", - "path": "LongRunning", - "entry": null, - "target": "googleapis/php-longrunning" - } - }, - "autoload": { - "psr-4": { - "Google\\LongRunning\\": "src/LongRunning", - "Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning", - "GPBMetadata\\Google\\Longrunning\\": "metadata/Longrunning" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Google LongRunning Client for PHP", - "support": { - "source": "https://github.com/googleapis/php-longrunning/tree/v0.2.6" - }, - "time": "2023-04-21T14:12:59+00:00" - }, - { - "name": "google/protobuf", - "version": "v3.25.2", - "source": { - "type": "git", - "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/83ea4c147718666ce6a9b9332ac2aa588c9211eb", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb", - "shasum": "" - }, - "require": { - "php": ">=7.0.0" - }, - "require-dev": { - "phpunit/phpunit": ">=5.0.0" - }, - "suggest": { - "ext-bcmath": "Need to support JSON deserialization" - }, - "type": "library", - "autoload": { - "psr-4": { - "Google\\Protobuf\\": "src/Google/Protobuf", - "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "proto library for PHP", - "homepage": "https://developers.google.com/protocol-buffers/", - "keywords": [ - "proto" - ], - "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.2" - }, - "time": "2024-01-09T22:12:32+00:00" - }, - { -<<<<<<< HEAD -======= ->>>>>>> 45d4012 (WIP - departure to integrate) -======= ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "name": "google/recaptcha", "version": "1.3.0", "source": { @@ -2190,50 +1568,6 @@ ], "time": "2023-11-12T22:16:48+00:00" }, - { - "name": "grpc/grpc", - "version": "1.57.0", - "source": { - "type": "git", - "url": "https://github.com/grpc/grpc-php.git", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf", - "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf", - "shasum": "" - }, - "require": { - "php": ">=7.0.0" - }, - "require-dev": { - "google/auth": "^v1.3.0" - }, - "suggest": { - "ext-protobuf": "For better performance, install the protobuf C extension.", - "google/protobuf": "To get started using grpc quickly, install the native protobuf library." - }, - "type": "library", - "autoload": { - "psr-4": { - "Grpc\\": "src/lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "gRPC library for PHP", - "homepage": "https://grpc.io", - "keywords": [ - "rpc" - ], - "support": { - "source": "https://github.com/grpc/grpc-php/tree/v1.57.0" - }, - "time": "2023-08-14T23:57:54+00:00" - }, { "name": "guzzlehttp/guzzle", "version": "7.8.1", @@ -2362,29 +1696,33 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.3", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -2421,7 +1759,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.3" + "source": "https://github.com/guzzle/promises/tree/2.0.2" }, "funding": [ { @@ -2437,7 +1775,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T12:31:43+00:00" + "time": "2023-12-03T20:19:20+00:00" }, { "name": "guzzlehttp/psr7", @@ -2760,16 +2098,16 @@ }, { "name": "laravel/framework", - "version": "v10.43.0", + "version": "v10.44.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "4f7802dfc9993cb57cf69615491ce1a7eb2e9529" + "reference": "1199dbe361787bbe9648131a79f53921b4148cf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/4f7802dfc9993cb57cf69615491ce1a7eb2e9529", - "reference": "4f7802dfc9993cb57cf69615491ce1a7eb2e9529", + "url": "https://api.github.com/repos/laravel/framework/zipball/1199dbe361787bbe9648131a79f53921b4148cf6", + "reference": "1199dbe361787bbe9648131a79f53921b4148cf6", "shasum": "" }, "require": { @@ -2817,6 +2155,7 @@ "conflict": { "carbonphp/carbon-doctrine-types": ">=3.0", "doctrine/dbal": ">=4.0", + "phpunit/phpunit": ">=11.0.0", "tightenco/collect": "<5.5.33" }, "provide": { @@ -2961,20 +2300,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-01-30T16:25:02+00:00" + "time": "2024-02-13T16:01:16+00:00" }, { "name": "laravel/passport", - "version": "v11.10.2", + "version": "v11.10.5", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "27a4f34aaf8b360eb64f53eb9c555ee50d565560" + "reference": "4d81207941d6efc198857847d9e4c17520f28d75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/27a4f34aaf8b360eb64f53eb9c555ee50d565560", - "reference": "27a4f34aaf8b360eb64f53eb9c555ee50d565560", + "url": "https://api.github.com/repos/laravel/passport/zipball/4d81207941d6efc198857847d9e4c17520f28d75", + "reference": "4d81207941d6efc198857847d9e4c17520f28d75", "shasum": "" }, "require": { @@ -3039,7 +2378,7 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2024-01-17T14:57:00+00:00" + "time": "2024-02-09T16:27:49+00:00" }, { "name": "laravel/prompts", @@ -3668,18 +3007,6 @@ }, { "name": "league/flysystem", -<<<<<<< HEAD - "version": "3.23.1", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e", - "reference": "199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e", -======= "version": "3.24.0", "source": { "type": "git", @@ -3690,7 +3017,6 @@ "type": "zip", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675", "reference": "b25a361508c407563b34fac6f64a8a17a8819675", ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "shasum": "" }, "require": { @@ -3755,11 +3081,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", -<<<<<<< HEAD - "source": "https://github.com/thephpleague/flysystem/tree/3.23.1" -======= "source": "https://github.com/thephpleague/flysystem/tree/3.24.0" ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) }, "funding": [ { @@ -3771,28 +3093,24 @@ "type": "github" } ], -<<<<<<< HEAD - "time": "2024-01-26T18:42:03+00:00" -======= "time": "2024-02-04T12:10:17+00:00" ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.23.1", + "version": "3.24.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240" + "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240", - "reference": "97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513", + "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513", "shasum": "" }, "require": { - "aws/aws-sdk-php": "^3.220.0", + "aws/aws-sdk-php": "^3.295.10", "league/flysystem": "^3.10.0", "league/mime-type-detection": "^1.0.0", "php": "^8.0.2" @@ -3828,8 +3146,7 @@ "storage" ], "support": { - "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.23.1" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.24.0" }, "funding": [ { @@ -3841,7 +3158,7 @@ "type": "github" } ], - "time": "2024-01-26T18:25:23+00:00" + "time": "2024-01-26T18:43:21+00:00" }, { "name": "league/flysystem-local", @@ -6211,38 +5528,16 @@ }, { "name": "psr/log", -<<<<<<< HEAD -<<<<<<< HEAD - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", -======= "version": "3.0.0", -======= - "version": "2.0.0", ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" }, "dist": { "type": "zip", -<<<<<<< HEAD "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", ->>>>>>> 45d4012 (WIP - departure to integrate) -======= - "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) "shasum": "" }, "require": { @@ -6251,15 +5546,7 @@ "type": "library", "extra": { "branch-alias": { -<<<<<<< HEAD -<<<<<<< HEAD - "dev-master": "2.0.x-dev" -======= "dev-master": "3.x-dev" ->>>>>>> 45d4012 (WIP - departure to integrate) -======= - "dev-master": "2.0.x-dev" ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) } }, "autoload": { @@ -6285,21 +5572,9 @@ "psr-3" ], "support": { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "https://github.com/php-fig/log/tree/2.0.0" - }, - "time": "2021-07-14T16:41:46+00:00" -======= "source": "https://github.com/php-fig/log/tree/3.0.0" }, "time": "2021-07-14T16:46:02+00:00" ->>>>>>> 45d4012 (WIP - departure to integrate) -======= - "source": "https://github.com/php-fig/log/tree/2.0.0" - }, - "time": "2021-07-14T16:41:46+00:00" ->>>>>>> b47c222 (replace `gluedev/laravel-stackdriver`) }, { "name": "psr/simple-cache", @@ -7217,68 +6492,6 @@ ], "time": "2023-06-16T10:52:11+00:00" }, - { - "name": "rize/uri-template", - "version": "0.3.5", - "source": { - "type": "git", - "url": "https://github.com/rize/UriTemplate.git", - "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rize/UriTemplate/zipball/5ed4ba8ea34af84485dea815d4b6b620794d1168", - "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.8.36" - }, - "type": "library", - "autoload": { - "psr-4": { - "Rize\\": "src/Rize" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marut K", - "homepage": "http://twitter.com/rezigned" - } - ], - "description": "PHP URI Template (RFC 6570) supports both expansion & extraction", - "keywords": [ - "RFC 6570", - "template", - "uri" - ], - "support": { - "issues": "https://github.com/rize/UriTemplate/issues", - "source": "https://github.com/rize/UriTemplate/tree/0.3.5" - }, - "funding": [ - { - "url": "https://www.paypal.me/rezigned", - "type": "custom" - }, - { - "url": "https://github.com/rezigned", - "type": "github" - }, - { - "url": "https://opencollective.com/rize-uri-template", - "type": "open_collective" - } - ], - "time": "2022-10-12T17:22:51+00:00" - }, { "name": "softcreatr/jsonpath", "version": "0.8.3", @@ -9735,16 +8948,16 @@ }, { "name": "symfony/yaml", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587" + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587", - "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90", + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90", "shasum": "" }, "require": { @@ -9787,7 +9000,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.0" + "source": "https://github.com/symfony/yaml/tree/v6.4.3" }, "funding": [ { @@ -9803,7 +9016,7 @@ "type": "tidelift" } ], - "time": "2023-11-06T11:00:25+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -10952,16 +10165,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", "shasum": "" }, "require": { @@ -11001,7 +10214,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" }, "funding": [ { @@ -11009,7 +10222,7 @@ "type": "github" } ], - "time": "2023-09-17T21:38:23+00:00" + "time": "2024-02-07T09:43:46+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -11206,16 +10419,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f" + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/18133a2d8c24e10e58e02b700308ed3a4a60c97f", - "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", "shasum": "" }, "require": { @@ -11251,22 +10464,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" }, - "time": "2024-01-28T07:31:37+00:00" + "time": "2024-01-31T06:18:54+00:00" }, { "name": "orchestra/canvas", - "version": "v8.11.6", + "version": "v8.11.7", "source": { "type": "git", "url": "https://github.com/orchestral/canvas.git", - "reference": "6ab236c7a190f7f53ce2e9c65fd9ee781e5aeb6c" + "reference": "e4a0157f522222725f1559bde0da1091a91542fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/canvas/zipball/6ab236c7a190f7f53ce2e9c65fd9ee781e5aeb6c", - "reference": "6ab236c7a190f7f53ce2e9c65fd9ee781e5aeb6c", + "url": "https://api.github.com/repos/orchestral/canvas/zipball/e4a0157f522222725f1559bde0da1091a91542fb", + "reference": "e4a0157f522222725f1559bde0da1091a91542fb", "shasum": "" }, "require": { @@ -11326,9 +10539,9 @@ "description": "Code Generators for Laravel Applications and Packages", "support": { "issues": "https://github.com/orchestral/canvas/issues", - "source": "https://github.com/orchestral/canvas/tree/v8.11.6" + "source": "https://github.com/orchestral/canvas/tree/v8.11.7" }, - "time": "2023-12-28T15:08:19+00:00" + "time": "2024-02-07T10:29:23+00:00" }, { "name": "orchestra/canvas-core", @@ -11404,18 +10617,6 @@ }, { "name": "orchestra/testbench", -<<<<<<< HEAD - "version": "v7.40.1", - "source": { - "type": "git", - "url": "https://github.com/orchestral/testbench.git", - "reference": "731393745905ff313bad6dcedc3e24637124e2f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench/zipball/731393745905ff313bad6dcedc3e24637124e2f1", - "reference": "731393745905ff313bad6dcedc3e24637124e2f1", -======= "version": "v8.21.1", "source": { "type": "git", @@ -11426,7 +10627,6 @@ "type": "zip", "url": "https://api.github.com/repos/orchestral/testbench/zipball/c22a81802a68e746e032edf65cbb68af28a52670", "reference": "c22a81802a68e746e032edf65cbb68af28a52670", ->>>>>>> 45d4012 (WIP - departure to integrate) "shasum": "" }, "require": { @@ -11434,21 +10634,12 @@ "fakerphp/faker": "^1.21", "laravel/framework": "^10.40", "mockery/mockery": "^1.5.1", -<<<<<<< HEAD - "orchestra/testbench-core": "^7.40.1", - "orchestra/workbench": "^1.2 || ^7.2", - "php": "^8.0", - "phpunit/phpunit": "^9.5.10", - "symfony/process": "^6.0.9", - "symfony/yaml": "^6.0.9", -======= "orchestra/testbench-core": "^8.21.1", "orchestra/workbench": "^1.2 || ^8.2", "php": "^8.1", "phpunit/phpunit": "^9.6 || ^10.1", "symfony/process": "^6.2", "symfony/yaml": "^6.2", ->>>>>>> 45d4012 (WIP - departure to integrate) "vlucas/phpdotenv": "^5.4.1" }, "type": "library", @@ -11475,24 +10666,6 @@ ], "support": { "issues": "https://github.com/orchestral/testbench/issues", -<<<<<<< HEAD - "source": "https://github.com/orchestral/testbench/tree/v7.40.1" - }, - "time": "2024-01-22T03:12:16+00:00" - }, - { - "name": "orchestra/testbench-core", - "version": "v7.40.1", - "source": { - "type": "git", - "url": "https://github.com/orchestral/testbench-core.git", - "reference": "768e1942ec3a2138b62c7eb69a5745173e60d519" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/768e1942ec3a2138b62c7eb69a5745173e60d519", - "reference": "768e1942ec3a2138b62c7eb69a5745173e60d519", -======= "source": "https://github.com/orchestral/testbench/tree/v8.21.1" }, "time": "2024-01-22T03:22:22+00:00" @@ -11509,7 +10682,6 @@ "type": "zip", "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/c6bf49a1b7ef4afe58e5bda676158c4de41f9a81", "reference": "c6bf49a1b7ef4afe58e5bda676158c4de41f9a81", ->>>>>>> 45d4012 (WIP - departure to integrate) "shasum": "" }, "require": { @@ -11518,17 +10690,10 @@ "symfony/polyfill-php83": "^1.28" }, "conflict": { -<<<<<<< HEAD - "brianium/paratest": "<6.4.0 || >=7.0.0", - "laravel/framework": "<9.52.9 || >=10.0.0", - "nunomaduro/collision": "<6.2.0 || >=7.0.0", - "orchestra/testbench-dusk": "<7.39.0 || >=8.0.0", -======= "brianium/paratest": "<6.4.0 || >=7.0.0 <7.1.4 || >=8.0.0", "laravel/framework": "<10.40 || >=11.0.0", "nunomaduro/collision": "<6.4.0 || >=7.0.0 <7.4.0 || >=8.0.0", "orchestra/testbench-dusk": "<8.21.0 || >=9.0.0", ->>>>>>> 45d4012 (WIP - departure to integrate) "orchestra/workbench": "<1.0.0", "phpunit/phpunit": "<9.6.0 || >=10.6.0" }, @@ -11595,11 +10760,7 @@ "issues": "https://github.com/orchestral/testbench/issues", "source": "https://github.com/orchestral/testbench-core" }, -<<<<<<< HEAD - "time": "2024-01-22T01:40:09+00:00" -======= "time": "2024-01-22T01:45:47+00:00" ->>>>>>> 45d4012 (WIP - departure to integrate) }, { "name": "orchestra/workbench", @@ -11999,16 +11160,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.57", + "version": "1.10.58", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + "reference": "a23518379ec4defd9e47cbf81019526861623ec2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", + "reference": "a23518379ec4defd9e47cbf81019526861623ec2", "shasum": "" }, "require": { @@ -12057,7 +11218,7 @@ "type": "tidelift" } ], - "time": "2024-01-24T11:51:34+00:00" + "time": "2024-02-12T20:02:57+00:00" }, { "name": "phpunit/php-code-coverage", @@ -12609,21 +11770,21 @@ }, { "name": "rector/rector", - "version": "0.19.2", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "bc96a99895bf47c6bfe70ea1b799f0081ed5a903" + "reference": "258b775511e62a7188f8ce114d44acaf244d9a7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/bc96a99895bf47c6bfe70ea1b799f0081ed5a903", - "reference": "bc96a99895bf47c6bfe70ea1b799f0081ed5a903", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/258b775511e62a7188f8ce114d44acaf244d9a7d", + "reference": "258b775511e62a7188f8ce114d44acaf244d9a7d", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.10.56" + "phpstan/phpstan": "^1.10.57" }, "conflict": { "rector/rector-doctrine": "*", @@ -12653,7 +11814,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.19.2" + "source": "https://github.com/rectorphp/rector/tree/1.0.1" }, "funding": [ { @@ -12661,7 +11822,7 @@ "type": "github" } ], - "time": "2024-01-19T10:58:30+00:00" + "time": "2024-02-16T07:53:23+00:00" }, { "name": "sebastian/cli-parser", @@ -13629,16 +12790,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "96be97e664c87613121d073ea39af4c74e57a7f8" + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/96be97e664c87613121d073ea39af4c74e57a7f8", - "reference": "96be97e664c87613121d073ea39af4c74e57a7f8", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab", + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab", "shasum": "" }, "require": { @@ -13676,7 +12837,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.2" + "source": "https://github.com/spatie/array-to-xml/tree/3.2.3" }, "funding": [ { @@ -13688,7 +12849,7 @@ "type": "github" } ], - "time": "2023-11-14T14:08:51+00:00" + "time": "2024-02-07T10:39:02+00:00" }, { "name": "spatie/backtrace", @@ -13754,26 +12915,26 @@ }, { "name": "spatie/laravel-ray", - "version": "1.34.0", + "version": "1.35.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ray.git", - "reference": "449c164c0ad0cf42a5abb52955d329199138604b" + "reference": "f504d3787d88c7e5de7a4290658f7ad9b1352f22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/449c164c0ad0cf42a5abb52955d329199138604b", - "reference": "449c164c0ad0cf42a5abb52955d329199138604b", + "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/f504d3787d88c7e5de7a4290658f7ad9b1352f22", + "reference": "f504d3787d88c7e5de7a4290658f7ad9b1352f22", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/contracts": "^7.20|^8.19|^9.0|^10.0", - "illuminate/database": "^7.20|^8.19|^9.0|^10.0", - "illuminate/queue": "^7.20|^8.19|^9.0|^10.0", - "illuminate/support": "^7.20|^8.19|^9.0|^10.0", + "illuminate/contracts": "^7.20|^8.19|^9.0|^10.0|^11.0", + "illuminate/database": "^7.20|^8.19|^9.0|^10.0|^11.0", + "illuminate/queue": "^7.20|^8.19|^9.0|^10.0|^11.0", + "illuminate/support": "^7.20|^8.19|^9.0|^10.0|^11.0", "php": "^7.4|^8.0", - "rector/rector": "^0.19.2", + "rector/rector": "^0.19.2|^1.0", "spatie/backtrace": "^1.0", "spatie/ray": "^1.41.1", "symfony/stopwatch": "4.2|^5.1|^6.0|^7.0", @@ -13781,12 +12942,13 @@ }, "require-dev": { "guzzlehttp/guzzle": "^7.3", - "laravel/framework": "^7.20|^8.19|^9.0|^10.0", - "orchestra/testbench-core": "^5.0|^6.0|^7.0|^8.0", - "pestphp/pest": "^1.22", + "laravel/framework": "^7.20|^8.19|^9.0|^10.0|^11.0", + "orchestra/testbench-core": "^5.0|^6.0|^7.0|^8.0|^9.0", + "pestphp/pest": "^1.22|^2.0", "phpstan/phpstan": "^1.10.57", - "phpunit/phpunit": "^9.3", - "spatie/pest-plugin-snapshots": "^1.1" + "phpunit/phpunit": "^9.3|^10.1", + "spatie/pest-plugin-snapshots": "^1.1|^2.0", + "symfony/var-dumper": "^4.2|^5.1|^6.0|^7.0.3" }, "type": "library", "extra": { @@ -13824,7 +12986,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-ray/issues", - "source": "https://github.com/spatie/laravel-ray/tree/1.34.0" + "source": "https://github.com/spatie/laravel-ray/tree/1.35.1" }, "funding": [ { @@ -13836,7 +12998,7 @@ "type": "other" } ], - "time": "2024-01-25T10:39:25+00:00" + "time": "2024-02-13T14:19:41+00:00" }, { "name": "spatie/macroable", @@ -13970,16 +13132,16 @@ }, { "name": "symfony/filesystem", - "version": "v7.0.0", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7" + "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/7da8ea2362a283771478c5f7729cfcb43a76b8b7", - "reference": "7da8ea2362a283771478c5f7729cfcb43a76b8b7", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12", + "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12", "shasum": "" }, "require": { @@ -14013,7 +13175,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.0.0" + "source": "https://github.com/symfony/filesystem/tree/v7.0.3" }, "funding": [ { @@ -14029,20 +13191,20 @@ "type": "tidelift" } ], - "time": "2023-07-27T06:33:22+00:00" + "time": "2024-01-23T15:02:46+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" + "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", - "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", + "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f", "shasum": "" }, "require": { @@ -14056,9 +13218,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -14096,7 +13255,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.29.0" }, "funding": [ { @@ -14112,20 +13271,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/stopwatch", - "version": "v7.0.0", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a" + "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a", - "reference": "7bbfa3dd564a0ce12eb4acaaa46823c740f9cb7a", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/983900d6fddf2b0cbaacacbbad07610854bd8112", + "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112", "shasum": "" }, "require": { @@ -14158,7 +13317,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v7.0.0" + "source": "https://github.com/symfony/stopwatch/tree/v7.0.3" }, "funding": [ { @@ -14174,7 +13333,7 @@ "type": "tidelift" } ], - "time": "2023-07-05T13:06:06+00:00" + "time": "2024-01-23T15:02:46+00:00" }, { "name": "theseer/tokenizer", @@ -14290,16 +13449,16 @@ }, { "name": "vimeo/psalm", - "version": "5.20.0", + "version": "5.22.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4" + "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/3f284e96c9d9be6fe6b15c79416e1d1903dcfef4", - "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/e9dad66e11274315dac27e08349c628c7d6a1a43", + "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43", "shasum": "" }, "require": { @@ -14322,7 +13481,7 @@ "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "nikic/php-parser": "^4.16", "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", - "sebastian/diff": "^4.0 || ^5.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" @@ -14396,7 +13555,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-01-18T12:15:06+00:00" + "time": "2024-02-15T22:52:31+00:00" }, { "name": "zbateson/mail-mime-parser", @@ -14607,11 +13766,7 @@ } ], "aliases": [], -<<<<<<< HEAD - "minimum-stability": "dev", -======= "minimum-stability": "stable", ->>>>>>> 45d4012 (WIP - departure to integrate) "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, From 2e5381abc5857a6900f5c868de8f3cb53b87eb8b Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 7 Feb 2024 16:55:07 +0100 Subject: [PATCH 09/30] rename `$routeMiddleware` see https://laravel.com/docs/10.x/upgrade#middleware-aliases --- app/Http/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index b5d9909d3..bcf4ce8bd 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -32,7 +32,7 @@ class Kernel extends HttpKernel * * @var array */ - protected $routeMiddleware = [ + protected $middlewareAliases = [ // Came with Laravel 'auth' => \App\Http\Middleware\Authenticate::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, From d1cc531e01f87942857de18e3ddecfba0d7c9c4a Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 7 Feb 2024 17:24:32 +0100 Subject: [PATCH 10/30] Apply curated changes from https://github.com/laravel/laravel/compare/9.x...10.x --- app/Console/Kernel.php | 7 +-- app/Exceptions/Handler.php | 21 +-------- app/Http/Controllers/Controller.php | 3 +- .../Middleware/RedirectIfAuthenticated.php | 15 +++--- app/Providers/AppServiceProvider.php | 8 +--- app/Providers/AuthServiceProvider.php | 8 +--- app/Providers/BroadcastServiceProvider.php | 4 +- app/Providers/EventServiceProvider.php | 8 +--- app/Providers/RouteServiceProvider.php | 8 +--- app/User.php | 10 ++++ config/app.php | 47 +++---------------- config/broadcasting.php | 1 + config/cache.php | 1 + config/hashing.php | 4 +- config/logging.php | 9 ++++ config/mail.php | 21 ++++++++- config/queue.php | 16 +++++++ 17 files changed, 89 insertions(+), 102 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 884bc0544..3e8db0880 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -22,9 +22,8 @@ class Kernel extends ConsoleKernel * Define the application's command schedule. * * @param \Illuminate\Console\Scheduling\Schedule $schedule - * @return void */ - protected function schedule(Schedule $schedule) + protected function schedule(Schedule $schedule): void { // Make sure that the DB and QS pools are always populated somewhat. // This will create at most 1 new entry for each per minute... @@ -60,10 +59,8 @@ protected function schedule(Schedule $schedule) /** * Register the commands for the application. - * - * @return void */ - protected function commands() + protected function commands(): void { $this->load(__DIR__.'/Commands'); $this->load(__DIR__.'/Commands/User'); diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 48c10c7eb..a6ec12f04 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -7,25 +7,8 @@ class Handler extends ExceptionHandler { - - /** - * A list of exception types with their corresponding custom log levels. - * - * @var array, \Psr\Log\LogLevel::*> - */ - protected $levels = [ - // - ]; - - /** - * A list of the exception types that are not reported. - * - * @var array> - */ - protected $dontReport = []; - /** - * A list of the inputs that are never flashed for validation exceptions. + * The list of the inputs that are never flashed to the session on validation exceptions. * * @var array */ @@ -37,7 +20,7 @@ class Handler extends ExceptionHandler /** * Register the exception handling callbacks for the application. */ - public function register() + public function register(): void { $this->reportable(function (Throwable $e) { (new \Absszero\ErrorReporting)->report($e); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index a0a2a8a34..77ec359ab 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -3,11 +3,10 @@ namespace App\Http\Controllers; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; -use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { - use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + use AuthorizesRequests, ValidatesRequests; } diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index da628333e..2d0b724e1 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -3,7 +3,9 @@ namespace App\Http\Middleware; use Closure; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Symfony\Component\HttpFoundation\Response; /** * The purpose of RedirectIfAuthenticated is to keep an already authenticated user @@ -17,15 +19,16 @@ class RedirectIfAuthenticated * @param \Illuminate\Http\Request $request * @param \Closure $next * @param string|null $guard - * @return mixed */ - public function handle($request, Closure $next, $guard = null) + public function handle(Request $request, Closure $next, string ...$guards): Response { - if (Auth::guard($guard)->check()) { - return response()->json('Endpoint not needed', 400); - //return redirect('/home'); - } + $guards = empty($guards) ? [null] : $guards; + foreach ($guards as $guard) { + if (Auth::guard($guard)->check()) { + return response()->json('Endpoint not needed', 400); + } + } return $next($request); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b2332db04..7816cecac 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -12,20 +12,16 @@ class AppServiceProvider extends ServiceProvider { /** * Register any application services. - * - * @return void */ - public function register() + public function register(): void { $this->app->bind(HttpRequest::class, CurlRequest::class); } /** * Bootstrap any application services. - * - * @return void */ - public function boot() + public function boot(): void { Queue::failing(function (JobFailed $event) { $name = data_get($event->job->payload(), 'data.commandName'); diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 4d3c6f606..c846f56cf 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -12,16 +12,12 @@ class AuthServiceProvider extends ServiceProvider * * @var array */ - protected $policies = [ - // 'App\Model' => 'App\Policies\ModelPolicy', - ]; + protected $policies = []; /** * Register any authentication / authorization services. - * - * @return void */ - public function boot() + public function boot(): void { Passport::personalAccessTokensExpireIn(now()->addDays(30)); } diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 395c518bc..2be04f5d9 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -9,10 +9,8 @@ class BroadcastServiceProvider extends ServiceProvider { /** * Bootstrap any application services. - * - * @return void */ - public function boot() + public function boot(): void { Broadcast::routes(); diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 737c4c181..fbfb66bd2 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -21,10 +21,8 @@ class EventServiceProvider extends ServiceProvider /** * Register any events for your application. - * - * @return void */ - public function boot() + public function boot(): void { parent::boot(); @@ -33,10 +31,8 @@ public function boot() /** * Determine if events and listeners should be automatically discovered. - * - * @return bool */ - public function shouldDiscoverEvents() + public function shouldDiscoverEvents(): bool { return false; } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f1dba12fd..4b89e9a99 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -18,10 +18,8 @@ class RouteServiceProvider extends ServiceProvider /** * Define your route model bindings, pattern filters, etc. - * - * @return void */ - public function boot() + public function boot(): void { // @@ -31,10 +29,8 @@ public function boot() /** * Define the routes for the application. * These are optionally loaded based on environment variables. - * - * @return void */ - public function map() + public function map(): void { $this->mapGeneralRoutes(); if (getenv('ROUTES_LOAD_WEB') == 1) { diff --git a/app/User.php b/app/User.php index 9084a3cf4..d0b7e618d 100644 --- a/app/User.php +++ b/app/User.php @@ -76,6 +76,16 @@ class User extends Authenticatable implements MustVerifyEmail 'card_last_four', ]; + /** + * The attributes that should be cast. + * + * @var array + */ + protected $casts = [ + 'email_verified_at' => 'datetime', + 'password' => 'hashed', + ]; + public function sendPasswordResetNotification($token) { $this->notify(new ResetPasswordNotification($token)); diff --git a/config/app.php b/config/app.php index cdb982b77..fa4c4b786 100644 --- a/config/app.php +++ b/config/app.php @@ -1,6 +1,7 @@ [ - - /* - * Laravel Framework Service Providers... - */ - Illuminate\Auth\AuthServiceProvider::class, - Illuminate\Broadcasting\BroadcastServiceProvider::class, - Illuminate\Bus\BusServiceProvider::class, - Illuminate\Cache\CacheServiceProvider::class, - Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, - Illuminate\Cookie\CookieServiceProvider::class, - Illuminate\Database\DatabaseServiceProvider::class, - Illuminate\Encryption\EncryptionServiceProvider::class, - Illuminate\Filesystem\FilesystemServiceProvider::class, - Illuminate\Foundation\Providers\FoundationServiceProvider::class, - Illuminate\Hashing\HashServiceProvider::class, - Illuminate\Mail\MailServiceProvider::class, - Illuminate\Notifications\NotificationServiceProvider::class, - Illuminate\Pagination\PaginationServiceProvider::class, - Illuminate\Pipeline\PipelineServiceProvider::class, - Illuminate\Queue\QueueServiceProvider::class, - Illuminate\Redis\RedisServiceProvider::class, - Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, - Illuminate\Session\SessionServiceProvider::class, - Illuminate\Translation\TranslationServiceProvider::class, - Illuminate\Validation\ValidationServiceProvider::class, - Illuminate\View\ViewServiceProvider::class, - + 'providers' => ServiceProvider::defaultProviders()->merge([ /* * Package Service Providers... */ + Intervention\Image\ImageServiceProvider::class, + Laravel\Tinker\TinkerServiceProvider::class, + App\Providers\DomainValidatorServiceProvider::class, /* * Application Service Providers... @@ -207,17 +184,7 @@ */ PercyMamedy\LaravelDevBooter\ServiceProvider::class, - - Intervention\Image\ImageServiceProvider::class, - Laravel\Tinker\TinkerServiceProvider::class, - App\Providers\DomainValidatorServiceProvider::class - ], - - // TODO maybe this should only be in dev? - 'dev_providers' => [ - ], - 'local_providers' => [ - ], + ])->toArray(), /* |-------------------------------------------------------------------------- @@ -231,6 +198,6 @@ */ 'aliases' => Facade::defaultAliases()->merge([ - // 'ExampleClass' => App\Example\ExampleClass::class, + // 'Example' => App\Facades\Example::class, ])->toArray(), ]; diff --git a/config/broadcasting.php b/config/broadcasting.php index 70229a708..4eb4ce49a 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -36,6 +36,7 @@ 'secret' => env('PUSHER_APP_SECRET'), 'app_id' => env('PUSHER_APP_ID'), 'options' => [ + 'cluster' => env('PUSHER_APP_CLUSTER'), 'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com', 'port' => env('PUSHER_PORT', 443), 'scheme' => env('PUSHER_SCHEME', 'https'), diff --git a/config/cache.php b/config/cache.php index 4fbf65e0b..a41651ff0 100644 --- a/config/cache.php +++ b/config/cache.php @@ -51,6 +51,7 @@ 'file' => [ 'driver' => 'file', 'path' => storage_path('framework/cache/data'), + 'lock_path' => storage_path('framework/cache/data'), ], 'memcached' => [ diff --git a/config/hashing.php b/config/hashing.php index 842577087..b58a2ef7c 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -29,7 +29,8 @@ */ 'bcrypt' => [ - 'rounds' => env('BCRYPT_ROUNDS', 10), + 'rounds' => env('BCRYPT_ROUNDS', 12), + 'verify' => true, ], /* @@ -47,6 +48,7 @@ 'memory' => 1024, 'threads' => 2, 'time' => 2, + 'verify' => true, ], ]; diff --git a/config/logging.php b/config/logging.php index 572fadd12..77b6606b3 100644 --- a/config/logging.php +++ b/config/logging.php @@ -2,6 +2,7 @@ use Monolog\Handler\StreamHandler; use Monolog\Handler\SyslogUdpHandler; +use Monolog\Processor\PsrLogMessageProcessor; return [ @@ -44,6 +45,7 @@ 'driver' => 'single', 'path' => storage_path('logs/laravel.log'), 'level' => 'debug', + 'replace_placeholders' => true, ], 'daily' => [ @@ -51,6 +53,7 @@ 'path' => storage_path('logs/laravel.log'), 'level' => 'debug', 'days' => 14, + 'replace_placeholders' => true, ], 'slack' => [ @@ -59,6 +62,7 @@ 'username' => 'Laravel Log', 'emoji' => ':boom:', 'level' => 'critical', + 'replace_placeholders' => true, ], 'papertrail' => [ @@ -69,6 +73,7 @@ 'host' => env('PAPERTRAIL_URL'), 'port' => env('PAPERTRAIL_PORT'), ], + 'processors' => [PsrLogMessageProcessor::class], ], 'stderr' => [ @@ -79,16 +84,20 @@ 'with' => [ 'stream' => 'php://stderr', ], + 'processors' => [PsrLogMessageProcessor::class], ], 'syslog' => [ 'driver' => 'syslog', 'level' => 'debug', + 'facility' => LOG_USER, + 'replace_placeholders' => true, ], 'errorlog' => [ 'driver' => 'errorlog', 'level' => 'debug', + 'replace_placeholders' => true, ], ], diff --git a/config/mail.php b/config/mail.php index 5201bb76f..2e8c0e810 100644 --- a/config/mail.php +++ b/config/mail.php @@ -28,14 +28,15 @@ | sending an e-mail. You will specify which one you are using for your | mailers below. You are free to add additional mailers as required. | - | Supported: "smtp", "sendmail", "mailgun", "ses", - | "postmark", "log", "array" + | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", + | "postmark", "log", "array", "failover", "roundrobin" | */ 'mailers' => [ 'smtp' => [ 'transport' => 'smtp', + 'url' => env('MAIL_URL'), 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), 'port' => env('MAIL_PORT', 587), 'encryption' => env('MAIL_ENCRYPTION', 'tls'), @@ -69,6 +70,22 @@ 'array' => [ 'transport' => 'array', ], + + 'failover' => [ + 'transport' => 'failover', + 'mailers' => [ + 'smtp', + 'log', + ], + ], + + 'roundrobin' => [ + 'transport' => 'roundrobin', + 'mailers' => [ + 'ses', + 'postmark', + ], + ], ], /* diff --git a/config/queue.php b/config/queue.php index 5c25da3d5..359b97a46 100644 --- a/config/queue.php +++ b/config/queue.php @@ -68,6 +68,22 @@ ], ], + /* + |-------------------------------------------------------------------------- + | Job Batching + |-------------------------------------------------------------------------- + | + | The following options configure the database and table that store job + | batching information. These options can be updated to any database + | connection and table which has been defined by your application. + | + */ + + 'batching' => [ + 'database' => env('DB_CONNECTION', 'mysql'), + 'table' => 'job_batches', + ], + /* |-------------------------------------------------------------------------- | Failed Queue Jobs From a7af73bd4cd6514edf00a1dea07ce53620ca9a89 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 7 Feb 2024 17:51:22 +0100 Subject: [PATCH 11/30] test: php 8.2 --- .github/workflows/composer.test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.test.yml b/.github/workflows/composer.test.yml index 197493fd6..b027a7b85 100644 --- a/.github/workflows/composer.test.yml +++ b/.github/workflows/composer.test.yml @@ -22,7 +22,7 @@ jobs: - name: Install dependencies uses: php-actions/composer@v6 with: - php_version: 8.1 + php_version: 8.2 command: install - name: Copy example .env file From 057906a18405b8b1af9041ae08d961689c7498a8 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 09:55:16 +0100 Subject: [PATCH 12/30] update php version in composer --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index d2c79b648..f0728a231 100644 --- a/composer.lock +++ b/composer.lock @@ -13773,7 +13773,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "8.1" + "php": "8.2" }, "plugin-api-version": "2.6.0" } From af1f342ae3df7a5559f7a7b62ebce42e2ea036c6 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 12:31:45 +0100 Subject: [PATCH 13/30] remove custom stackdriver repo --- composer.json | 6 ------ composer.lock | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 99e990114..657f9d41c 100644 --- a/composer.json +++ b/composer.json @@ -39,12 +39,6 @@ "timacdonald/log-fake": "^2.1", "vimeo/psalm": "^5.19" }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/deer-wmde/laravel-stackdriver" - } - ], "autoload": { "classmap": [ "database/seeds", diff --git a/composer.lock b/composer.lock index f0728a231..834bfc051 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": "cf4e4a6b15623ff55acec8d3382ced16", + "content-hash": "65fabbe52e91c8c3e6447f7de4b92fc0", "packages": [ { "name": "aws/aws-crt-php", From 6320805e61e3a83c662ab8e737bd73ce5d8417d0 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 15:35:42 +0100 Subject: [PATCH 14/30] upgrade to phpunit 10 --- composer.json | 2 +- composer.lock | 583 ++++++++++++++++++++------------------------------ phpunit.xml | 2 +- 3 files changed, 234 insertions(+), 353 deletions(-) diff --git a/composer.json b/composer.json index 657f9d41c..d68aad729 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "barryvdh/laravel-ide-helper": "2.13", "fakerphp/faker": "^1.17", "mockery/mockery": "^1.4", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^10.0", "psalm/plugin-laravel": "^2.8", "timacdonald/log-fake": "^2.1", "vimeo/psalm": "^5.19" diff --git a/composer.lock b/composer.lock index 834bfc051..ab5e9d05b 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": "65fabbe52e91c8c3e6447f7de4b92fc0", + "content-hash": "baa48daf533c4f5fdf40f6b180ccda14", "packages": [ { "name": "aws/aws-crt-php", @@ -9929,76 +9929,6 @@ }, "time": "2019-12-04T15:06:13+00:00" }, - { - "name": "doctrine/instantiator", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "shasum": "" - }, - "require": { - "php": "^8.1" - }, - "require-dev": { - "doctrine/coding-standard": "^11", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^5.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/2.0.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2022-12-30T00:23:10+00:00" - }, { "name": "fakerphp/faker", "version": "v1.23.1", @@ -11222,16 +11152,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.30", + "version": "10.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + "reference": "78c3b7625965c2513ee96569a4dbb62601784145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145", "shasum": "" }, "require": { @@ -11239,18 +11169,18 @@ "ext-libxml": "*", "ext-xmlwriter": "*", "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", + "php": ">=8.1", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-text-template": "^3.0", + "sebastian/code-unit-reverse-lookup": "^3.0", + "sebastian/complexity": "^3.0", + "sebastian/environment": "^6.0", + "sebastian/lines-of-code": "^2.0", + "sebastian/version": "^4.0", "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.1" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -11259,7 +11189,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "10.1-dev" } }, "autoload": { @@ -11288,7 +11218,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/9.2.30" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" }, "funding": [ { @@ -11296,32 +11226,32 @@ "type": "github" } ], - "time": "2023-12-22T06:47:57+00:00" + "time": "2023-12-21T15:38:30+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "3.0.6", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c", + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -11348,7 +11278,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0" }, "funding": [ { @@ -11356,28 +11287,28 @@ "type": "github" } ], - "time": "2021-12-02T12:48:52+00:00" + "time": "2023-08-31T06:24:48+00:00" }, { "name": "phpunit/php-invoker", - "version": "3.1.1", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", + "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { "ext-pcntl": "*", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "suggest": { "ext-pcntl": "*" @@ -11385,7 +11316,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -11411,7 +11342,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0" }, "funding": [ { @@ -11419,32 +11350,32 @@ "type": "github" } ], - "time": "2020-09-28T05:58:55+00:00" + "time": "2023-02-03T06:56:09+00:00" }, { "name": "phpunit/php-text-template", - "version": "2.0.4", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -11470,7 +11401,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1" }, "funding": [ { @@ -11478,32 +11410,32 @@ "type": "github" } ], - "time": "2020-10-26T05:33:50+00:00" + "time": "2023-08-31T14:07:24+00:00" }, { "name": "phpunit/php-timer", - "version": "5.0.3", + "version": "6.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d", + "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -11529,7 +11461,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0" }, "funding": [ { @@ -11537,24 +11469,23 @@ "type": "github" } ], - "time": "2020-10-26T13:16:10+00:00" + "time": "2023-02-03T06:57:52+00:00" }, { "name": "phpunit/phpunit", - "version": "9.6.16", + "version": "10.5.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" + "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50b8e314b6d0dd06521dc31d1abffa73f25f850c", + "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -11564,27 +11495,26 @@ "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", - "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", - "sebastian/version": "^3.0.2" + "php": ">=8.1", + "phpunit/php-code-coverage": "^10.1.5", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-invoker": "^4.0", + "phpunit/php-text-template": "^3.0", + "phpunit/php-timer": "^6.0", + "sebastian/cli-parser": "^2.0", + "sebastian/code-unit": "^2.0", + "sebastian/comparator": "^5.0", + "sebastian/diff": "^5.0", + "sebastian/environment": "^6.0", + "sebastian/exporter": "^5.1", + "sebastian/global-state": "^6.0.1", + "sebastian/object-enumerator": "^5.0", + "sebastian/recursion-context": "^5.0", + "sebastian/type": "^4.0", + "sebastian/version": "^4.0" }, "suggest": { - "ext-soap": "To be able to generate mocks based on WSDL files", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + "ext-soap": "To be able to generate mocks based on WSDL files" }, "bin": [ "phpunit" @@ -11592,7 +11522,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.6-dev" + "dev-main": "10.5-dev" } }, "autoload": { @@ -11624,7 +11554,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.10" }, "funding": [ { @@ -11640,7 +11570,7 @@ "type": "tidelift" } ], - "time": "2024-01-19T07:03:14+00:00" + "time": "2024-02-04T09:07:51+00:00" }, { "name": "pimple/pimple", @@ -11826,28 +11756,28 @@ }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae", + "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "2.0-dev" } }, "autoload": { @@ -11870,7 +11800,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0" }, "funding": [ { @@ -11878,32 +11808,32 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2023-02-03T06:58:15+00:00" }, { "name": "sebastian/code-unit", - "version": "1.0.8", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + "reference": "a81fee9eef0b7a76af11d121767abc44c104e503" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503", + "reference": "a81fee9eef0b7a76af11d121767abc44c104e503", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "2.0-dev" } }, "autoload": { @@ -11926,7 +11856,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit", "support": { "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0" }, "funding": [ { @@ -11934,32 +11864,32 @@ "type": "github" } ], - "time": "2020-10-26T13:08:54+00:00" + "time": "2023-02-03T06:58:43+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "2.0.3", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", + "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -11981,7 +11911,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0" }, "funding": [ { @@ -11989,34 +11919,36 @@ "type": "github" } ], - "time": "2020-09-28T05:30:19+00:00" + "time": "2023-02-03T06:59:15+00:00" }, { "name": "sebastian/comparator", - "version": "4.0.8", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + "reference": "2db5010a484d53ebf536087a70b4a5423c102372" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", + "reference": "2db5010a484d53ebf536087a70b4a5423c102372", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/diff": "^4.0", - "sebastian/exporter": "^4.0" + "ext-dom": "*", + "ext-mbstring": "*", + "php": ">=8.1", + "sebastian/diff": "^5.0", + "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -12055,7 +11987,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" }, "funding": [ { @@ -12063,33 +11996,33 @@ "type": "github" } ], - "time": "2022-09-14T12:41:17+00:00" + "time": "2023-08-14T13:18:12+00:00" }, { "name": "sebastian/complexity", - "version": "2.0.3", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + "reference": "68ff824baeae169ec9f2137158ee529584553799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", - "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", "shasum": "" }, "require": { "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "3.2-dev" } }, "autoload": { @@ -12112,7 +12045,8 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" }, "funding": [ { @@ -12120,33 +12054,33 @@ "type": "github" } ], - "time": "2023-12-22T06:19:30+00:00" + "time": "2023-12-21T08:37:17+00:00" }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3", + "phpunit/phpunit": "^10.0", "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -12178,7 +12112,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" }, "funding": [ { @@ -12186,27 +12121,27 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2023-12-22T10:55:06+00:00" }, { "name": "sebastian/environment", - "version": "5.1.5", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", - "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "suggest": { "ext-posix": "*" @@ -12214,7 +12149,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.1-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -12233,7 +12168,7 @@ } ], "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", + "homepage": "https://github.com/sebastianbergmann/environment", "keywords": [ "Xdebug", "environment", @@ -12241,7 +12176,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" }, "funding": [ { @@ -12249,34 +12185,34 @@ "type": "github" } ], - "time": "2023-02-03T06:03:51+00:00" + "time": "2023-04-11T05:39:26+00:00" }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/recursion-context": "^4.0" + "ext-mbstring": "*", + "php": ">=8.1", + "sebastian/recursion-context": "^5.0" }, "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -12318,7 +12254,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" }, "funding": [ { @@ -12326,38 +12263,35 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2023-09-24T13:22:09+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" + "php": ">=8.1", + "sebastian/object-reflector": "^3.0", + "sebastian/recursion-context": "^5.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-uopz": "*" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -12382,7 +12316,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" }, "funding": [ { @@ -12390,33 +12325,33 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2023-07-19T07:19:23+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.4", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", - "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", "shasum": "" }, "require": { "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "2.0-dev" } }, "autoload": { @@ -12439,7 +12374,8 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" }, "funding": [ { @@ -12447,34 +12383,34 @@ "type": "github" } ], - "time": "2023-12-22T06:20:34+00:00" + "time": "2023-12-21T08:38:20+00:00" }, { "name": "sebastian/object-enumerator", - "version": "4.0.4", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906", + "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" + "php": ">=8.1", + "sebastian/object-reflector": "^3.0", + "sebastian/recursion-context": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -12496,7 +12432,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0" }, "funding": [ { @@ -12504,32 +12440,32 @@ "type": "github" } ], - "time": "2020-10-26T13:12:34+00:00" + "time": "2023-02-03T07:08:32+00:00" }, { "name": "sebastian/object-reflector", - "version": "2.0.4", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + "reference": "24ed13d98130f0e7122df55d06c5c4942a577957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957", + "reference": "24ed13d98130f0e7122df55d06c5c4942a577957", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -12551,7 +12487,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0" }, "funding": [ { @@ -12559,32 +12495,32 @@ "type": "github" } ], - "time": "2020-10-26T13:14:26+00:00" + "time": "2023-02-03T07:06:18+00:00" }, { "name": "sebastian/recursion-context", - "version": "4.0.5", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + "reference": "05909fb5bc7df4c52992396d0116aed689f93712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", + "reference": "05909fb5bc7df4c52992396d0116aed689f93712", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -12614,62 +12550,7 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:07:39+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" }, "funding": [ { @@ -12677,32 +12558,32 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2023-02-03T07:05:40+00:00" }, { "name": "sebastian/type", - "version": "3.2.1", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" + "reference": "462699a16464c3944eefc02ebdd77882bd3925bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", - "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf", + "reference": "462699a16464c3944eefc02ebdd77882bd3925bf", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^10.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -12725,7 +12606,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" + "source": "https://github.com/sebastianbergmann/type/tree/4.0.0" }, "funding": [ { @@ -12733,29 +12614,29 @@ "type": "github" } ], - "time": "2023-02-03T06:13:03+00:00" + "time": "2023-02-03T07:10:45+00:00" }, { "name": "sebastian/version", - "version": "3.0.2", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c6c1022351a901512170118436c764e473f6de8c" + "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", - "reference": "c6c1022351a901512170118436c764e473f6de8c", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17", + "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -12778,7 +12659,7 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + "source": "https://github.com/sebastianbergmann/version/tree/4.0.1" }, "funding": [ { @@ -12786,7 +12667,7 @@ "type": "github" } ], - "time": "2020-09-28T06:39:44+00:00" + "time": "2023-02-07T11:34:05+00:00" }, { "name": "spatie/array-to-xml", diff --git a/phpunit.xml b/phpunit.xml index 68f608ecd..b5bb7670a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,6 +1,6 @@ - + ./app From 9790236915d1031cea5f871555161cb02c2cff08 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 15:38:06 +0100 Subject: [PATCH 15/30] migrate phpunit configuration --- phpunit.xml | 12 ++++++------ phpunit.xml.bak | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 phpunit.xml.bak diff --git a/phpunit.xml b/phpunit.xml index b5bb7670a..1b31238df 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,10 +1,5 @@ - - - - ./app - - + ./tests @@ -17,4 +12,9 @@ + + + ./app + + diff --git a/phpunit.xml.bak b/phpunit.xml.bak new file mode 100644 index 000000000..b5bb7670a --- /dev/null +++ b/phpunit.xml.bak @@ -0,0 +1,20 @@ + + + + + ./app + + + + + ./tests + + + + + + + + + + From 6aa3dd5dcf86d6c1143bd229bdf9b55d9bab93e7 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 15:44:09 +0100 Subject: [PATCH 16/30] re-add "absszero/laravel-stackdriver-error-reporting" --- .gitignore | 1 + composer.json | 1 + composer.lock | 686 ++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 665 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 93922e0e1..a457e7600 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ Homestead.yaml .env .php_cs.cache .phpunit.result.cache +.phpunit.cache /storage/*.key /public/storage _ide_helper.php diff --git a/composer.json b/composer.json index d68aad729..a3eae4a7e 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "license": "MIT", "type": "project", "require": { + "absszero/laravel-stackdriver-error-reporting": "^1.7", "cviebrock/eloquent-sluggable": "^10.0", "doctrine/dbal": "^3.1", "firebase/php-jwt": "^6.10", diff --git a/composer.lock b/composer.lock index ab5e9d05b..f29cb3664 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,62 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "baa48daf533c4f5fdf40f6b180ccda14", + "content-hash": "0759a15170f78588227aa9a50e8735bc", "packages": [ + { + "name": "absszero/laravel-stackdriver-error-reporting", + "version": "1.7.3", + "source": { + "type": "git", + "url": "https://github.com/absszero/laravel-stackdriver-error-reporting.git", + "reference": "3c7c5d9ceb0ca1f52fd56f8da2edf02b842c615b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/absszero/laravel-stackdriver-error-reporting/zipball/3c7c5d9ceb0ca1f52fd56f8da2edf02b842c615b", + "reference": "3c7c5d9ceb0ca1f52fd56f8da2edf02b842c615b", + "shasum": "" + }, + "require": { + "google/cloud-error-reporting": "^0.19", + "illuminate/support": ">=5.1", + "php": ">=5.5" + }, + "conflict": { + "psr/log": ">=3" + }, + "require-dev": { + "phpunit/phpunit": ">=4.0" + }, + "type": "laravel", + "extra": { + "laravel": { + "providers": [ + "Absszero\\ErrorReportingServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Absszero\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "absszero" + } + ], + "description": "Stackdriver Error Reporting for Laravel", + "support": { + "issues": "https://github.com/absszero/laravel-stackdriver-error-reporting/issues", + "source": "https://github.com/absszero/laravel-stackdriver-error-reporting/tree/1.7.3" + }, + "time": "2023-10-30T07:48:04+00:00" + }, { "name": "aws/aws-crt-php", "version": "v1.2.4", @@ -1454,6 +1508,490 @@ ], "time": "2023-10-12T05:21:21+00:00" }, + { + "name": "google/auth", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-auth-library-php.git", + "reference": "f1f0d0319e2e7750ebfaa523c78819792a9ed9f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/f1f0d0319e2e7750ebfaa523c78819792a9ed9f7", + "reference": "f1f0d0319e2e7750ebfaa523c78819792a9ed9f7", + "shasum": "" + }, + "require": { + "firebase/php-jwt": "^5.5||^6.0", + "guzzlehttp/guzzle": "^6.2.1|^7.0", + "guzzlehttp/psr7": "^1.7|^2.0", + "php": "^7.1||^8.0", + "psr/cache": "^1.0|^2.0|^3.0", + "psr/http-message": "^1.0" + }, + "require-dev": { + "guzzlehttp/promises": "0.1.1|^1.3", + "kelvinmo/simplejwt": "0.7.0", + "phpseclib/phpseclib": "^2.0.31||^3.0", + "phpspec/prophecy-phpunit": "^1.1||^2.0", + "phpunit/phpunit": "^7.5||^9.0.0", + "sebastian/comparator": ">=1.2.3", + "squizlabs/php_codesniffer": "^3.5" + }, + "suggest": { + "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\Auth\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Google Auth Library for PHP", + "homepage": "http://github.com/google/google-auth-library-php", + "keywords": [ + "Authentication", + "google", + "oauth2" + ], + "support": { + "docs": "https://googleapis.github.io/google-auth-library-php/main/", + "issues": "https://github.com/googleapis/google-auth-library-php/issues", + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.26.0" + }, + "time": "2023-04-05T15:11:57+00:00" + }, + { + "name": "google/cloud-core", + "version": "v1.52.10", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-cloud-php-core.git", + "reference": "5e34556498ecadee2161402fd1024bec7ce33186" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/5e34556498ecadee2161402fd1024bec7ce33186", + "reference": "5e34556498ecadee2161402fd1024bec7ce33186", + "shasum": "" + }, + "require": { + "google/auth": "^1.18", + "guzzlehttp/guzzle": "^6.5.8|^7.4.4", + "guzzlehttp/promises": "^1.4||^2.0", + "guzzlehttp/psr7": "^1.7|^2.0", + "monolog/monolog": "^1.1|^2.0|^3.0", + "php": ">=7.4", + "psr/http-message": "^1.0|^2.0", + "rize/uri-template": "~0.3" + }, + "require-dev": { + "erusev/parsedown": "^1.6", + "google/cloud-common-protos": "^0.4", + "google/gax": "^1.24.0", + "opis/closure": "^3", + "phpdocumentor/reflection": "^5.0", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.0", + "squizlabs/php_codesniffer": "2.*" + }, + "suggest": { + "opis/closure": "May be used to serialize closures to process jobs in the batch daemon. Please require version ^3.", + "symfony/lock": "Required for the Spanner cached based session pool. Please require the following commit: 3.3.x-dev#1ba6ac9" + }, + "bin": [ + "bin/google-cloud-batch" + ], + "type": "library", + "extra": { + "component": { + "id": "cloud-core", + "target": "googleapis/google-cloud-php-core.git", + "path": "Core", + "entry": "src/ServiceBuilder.php" + } + }, + "autoload": { + "psr-4": { + "Google\\Cloud\\Core\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", + "support": { + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.10" + }, + "time": "2023-12-08T22:36:35+00:00" + }, + { + "name": "google/cloud-error-reporting", + "version": "v0.19.12", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-cloud-php-errorreporting.git", + "reference": "3a580346a28c11de7ff5db5319e9bcfba4c1f171" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-errorreporting/zipball/3a580346a28c11de7ff5db5319e9bcfba4c1f171", + "reference": "3a580346a28c11de7ff5db5319e9bcfba4c1f171", + "shasum": "" + }, + "require": { + "google/cloud-logging": "^1.16", + "google/gax": "^1.1", + "php": ">=7.4" + }, + "require-dev": { + "google/cloud-core": "^1.39", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.0" + }, + "suggest": { + "ext-grpc": "The gRPC extension allows more granular control over Error Reporting", + "ext-protobuf": "Provides a significant increase in throughput over the pure PHP protobuf implementation. See https://cloud.google.com/php/grpc for installation instructions." + }, + "type": "library", + "extra": { + "component": { + "id": "cloud-error-reporting", + "target": "googleapis/google-cloud-php-errorreporting.git", + "path": "ErrorReporting", + "entry": null + } + }, + "autoload": { + "psr-4": { + "Google\\Cloud\\ErrorReporting\\": "src", + "GPBMetadata\\Google\\Devtools\\Clouderrorreporting\\": "metadata" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Stackdriver Error Reporting Client for PHP", + "support": { + "source": "https://github.com/googleapis/google-cloud-php-errorreporting/tree/v0.19.12" + }, + "time": "2023-05-05T23:01:42+00:00" + }, + { + "name": "google/cloud-logging", + "version": "v1.28.2", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-cloud-php-logging.git", + "reference": "a59fc90e9498ba2e2313e8fd54b9be04e8579b80" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-logging/zipball/a59fc90e9498ba2e2313e8fd54b9be04e8579b80", + "reference": "a59fc90e9498ba2e2313e8fd54b9be04e8579b80", + "shasum": "" + }, + "require": { + "google/cloud-core": "^1.39", + "google/gax": "^1.19.1", + "php": ">=7.4" + }, + "conflict": { + "psr/log": ">=3" + }, + "provide": { + "psr/log-implementation": "1.0|2.0" + }, + "require-dev": { + "erusev/parsedown": "^1.6", + "fig/log-test": "^1.0", + "google/cloud-bigquery": "^1.0", + "google/cloud-pubsub": "^1.0", + "google/cloud-storage": "^1.3", + "opis/closure": "^3", + "phpdocumentor/reflection": "^5.0", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.0", + "squizlabs/php_codesniffer": "2.*" + }, + "suggest": { + "ext-grpc": "The gRPC extension enables use of the performant gRPC transport", + "ext-protobuf": "Provides a significant increase in throughput over the pure PHP protobuf implementation. See https://cloud.google.com/php/grpc for installation instructions.", + "psr/log": "For using the PSR logger. Currently supports versions 1 and 2." + }, + "type": "library", + "extra": { + "component": { + "id": "cloud-logging", + "target": "googleapis/google-cloud-php-logging.git", + "path": "Logging", + "entry": "src/LoggingClient.php" + } + }, + "autoload": { + "psr-4": { + "Google\\Cloud\\Logging\\": "src", + "GPBMetadata\\Google\\Logging\\": "metadata" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Stackdriver Logging Client for PHP", + "support": { + "source": "https://github.com/googleapis/google-cloud-php-logging/tree/v1.28.2" + }, + "time": "2023-09-30T16:50:41+00:00" + }, + { + "name": "google/common-protos", + "version": "v3.2.0", + "source": { + "type": "git", + "url": "https://github.com/googleapis/common-protos-php.git", + "reference": "57d4ad36cc48cc0369123042908013ef2a86bb98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/common-protos-php/zipball/57d4ad36cc48cc0369123042908013ef2a86bb98", + "reference": "57d4ad36cc48cc0369123042908013ef2a86bb98", + "shasum": "" + }, + "require": { + "google/protobuf": "^3.6.1" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36||^8.5", + "sami/sami": "*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\Api\\": "src/Api", + "Google\\Iam\\": "src/Iam", + "Google\\Rpc\\": "src/Rpc", + "Google\\Type\\": "src/Type", + "Google\\Cloud\\": "src/Cloud", + "GPBMetadata\\Google\\Api\\": "metadata/Api", + "GPBMetadata\\Google\\Iam\\": "metadata/Iam", + "GPBMetadata\\Google\\Rpc\\": "metadata/Rpc", + "GPBMetadata\\Google\\Type\\": "metadata/Type", + "GPBMetadata\\Google\\Cloud\\": "metadata/Cloud", + "GPBMetadata\\Google\\Logging\\": "metadata/Logging" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Google API Common Protos for PHP", + "homepage": "https://github.com/googleapis/common-protos-php", + "keywords": [ + "google" + ], + "support": { + "issues": "https://github.com/googleapis/common-protos-php/issues", + "source": "https://github.com/googleapis/common-protos-php/tree/v3.2.0" + }, + "time": "2023-01-12T16:51:46+00:00" + }, + { + "name": "google/gax", + "version": "v1.19.1", + "source": { + "type": "git", + "url": "https://github.com/googleapis/gax-php.git", + "reference": "30f6b307faa9858bf58d967664467098dbbc354f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/gax-php/zipball/30f6b307faa9858bf58d967664467098dbbc354f", + "reference": "30f6b307faa9858bf58d967664467098dbbc354f", + "shasum": "" + }, + "require": { + "google/auth": "1.19.1||^1.25.0", + "google/common-protos": "^1.3.1||^2.0||^3.0", + "google/grpc-gcp": "^0.2", + "google/longrunning": "^0.2", + "google/protobuf": "^3.21.4", + "grpc/grpc": "^1.13", + "guzzlehttp/promises": "^1.3", + "guzzlehttp/psr7": "^1.7.0||^2", + "php": ">=7.0" + }, + "conflict": { + "ext-protobuf": "<3.7.0" + }, + "require-dev": { + "phpspec/prophecy": "^1.10", + "phpunit/phpunit": "^5.5||^8.5", + "squizlabs/php_codesniffer": "3.*", + "yoast/phpunit-polyfills": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\ApiCore\\": "src", + "GPBMetadata\\ApiCore\\": "metadata/ApiCore" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Google API Core for PHP", + "homepage": "https://github.com/googleapis/gax-php", + "keywords": [ + "google" + ], + "support": { + "issues": "https://github.com/googleapis/gax-php/issues", + "source": "https://github.com/googleapis/gax-php/tree/v1.19.1" + }, + "time": "2023-03-16T19:58:19+00:00" + }, + { + "name": "google/grpc-gcp", + "version": "v0.2.1", + "source": { + "type": "git", + "url": "https://github.com/GoogleCloudPlatform/grpc-gcp-php.git", + "reference": "899d0112812a812df7692617a59f4076f0d01719" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GoogleCloudPlatform/grpc-gcp-php/zipball/899d0112812a812df7692617a59f4076f0d01719", + "reference": "899d0112812a812df7692617a59f4076f0d01719", + "shasum": "" + }, + "require": { + "google/auth": "^1.3", + "google/protobuf": "^v3.3.0", + "grpc/grpc": "^v1.13.0", + "php": ">=5.5.0", + "psr/cache": "^1.0.1||^2.0.0||^3.0.0" + }, + "require-dev": { + "google/cloud-spanner": "^1.7", + "phpunit/phpunit": "4.8.36" + }, + "type": "library", + "autoload": { + "psr-4": { + "Grpc\\Gcp\\": "src/" + }, + "classmap": [ + "src/generated/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "gRPC GCP library for channel management", + "support": { + "issues": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/issues", + "source": "https://github.com/GoogleCloudPlatform/grpc-gcp-php/tree/v0.2.1" + }, + "time": "2022-10-11T15:54:47+00:00" + }, + { + "name": "google/longrunning", + "version": "v0.2.6", + "source": { + "type": "git", + "url": "https://github.com/googleapis/php-longrunning.git", + "reference": "9689b4db54cf4cf8186118d9d59aa9ba35bb5842" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/php-longrunning/zipball/9689b4db54cf4cf8186118d9d59aa9ba35bb5842", + "reference": "9689b4db54cf4cf8186118d9d59aa9ba35bb5842", + "shasum": "" + }, + "require-dev": { + "google/gax": "^1.13.0", + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "component": { + "id": "longrunning", + "path": "LongRunning", + "entry": null, + "target": "googleapis/php-longrunning" + } + }, + "autoload": { + "psr-4": { + "Google\\LongRunning\\": "src/LongRunning", + "Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning", + "GPBMetadata\\Google\\Longrunning\\": "metadata/Longrunning" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Google LongRunning Client for PHP", + "support": { + "source": "https://github.com/googleapis/php-longrunning/tree/v0.2.6" + }, + "time": "2023-04-21T14:12:59+00:00" + }, + { + "name": "google/protobuf", + "version": "v3.25.3", + "source": { + "type": "git", + "url": "https://github.com/protocolbuffers/protobuf-php.git", + "reference": "983a87f4f8798a90ca3a25b0f300b8fda38df643" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/983a87f4f8798a90ca3a25b0f300b8fda38df643", + "reference": "983a87f4f8798a90ca3a25b0f300b8fda38df643", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": ">=5.0.0" + }, + "suggest": { + "ext-bcmath": "Need to support JSON deserialization" + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\Protobuf\\": "src/Google/Protobuf", + "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "proto library for PHP", + "homepage": "https://developers.google.com/protocol-buffers/", + "keywords": [ + "proto" + ], + "support": { + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.3" + }, + "time": "2024-02-15T21:11:49+00:00" + }, { "name": "google/recaptcha", "version": "1.3.0", @@ -1568,6 +2106,50 @@ ], "time": "2023-11-12T22:16:48+00:00" }, + { + "name": "grpc/grpc", + "version": "1.57.0", + "source": { + "type": "git", + "url": "https://github.com/grpc/grpc-php.git", + "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grpc/grpc-php/zipball/b610c42022ed3a22f831439cb93802f2a4502fdf", + "reference": "b610c42022ed3a22f831439cb93802f2a4502fdf", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "google/auth": "^v1.3.0" + }, + "suggest": { + "ext-protobuf": "For better performance, install the protobuf C extension.", + "google/protobuf": "To get started using grpc quickly, install the native protobuf library." + }, + "type": "library", + "autoload": { + "psr-4": { + "Grpc\\": "src/lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "gRPC library for PHP", + "homepage": "https://grpc.io", + "keywords": [ + "rpc" + ], + "support": { + "source": "https://github.com/grpc/grpc-php/tree/v1.57.0" + }, + "time": "2023-08-14T23:57:54+00:00" + }, { "name": "guzzlehttp/guzzle", "version": "7.8.1", @@ -1696,33 +2278,29 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0" + "php": ">=5.5" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, "autoload": { + "files": [ + "src/functions_include.php" + ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -1759,7 +2337,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.2" + "source": "https://github.com/guzzle/promises/tree/1.5.3" }, "funding": [ { @@ -1775,7 +2353,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:19:20+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", @@ -5528,16 +6106,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { @@ -5546,7 +6124,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -5572,9 +6150,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "psr/simple-cache", @@ -6492,6 +7070,68 @@ ], "time": "2023-06-16T10:52:11+00:00" }, + { + "name": "rize/uri-template", + "version": "0.3.5", + "source": { + "type": "git", + "url": "https://github.com/rize/UriTemplate.git", + "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rize/UriTemplate/zipball/5ed4ba8ea34af84485dea815d4b6b620794d1168", + "reference": "5ed4ba8ea34af84485dea815d4b6b620794d1168", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8.36" + }, + "type": "library", + "autoload": { + "psr-4": { + "Rize\\": "src/Rize" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marut K", + "homepage": "http://twitter.com/rezigned" + } + ], + "description": "PHP URI Template (RFC 6570) supports both expansion & extraction", + "keywords": [ + "RFC 6570", + "template", + "uri" + ], + "support": { + "issues": "https://github.com/rize/UriTemplate/issues", + "source": "https://github.com/rize/UriTemplate/tree/0.3.5" + }, + "funding": [ + { + "url": "https://www.paypal.me/rezigned", + "type": "custom" + }, + { + "url": "https://github.com/rezigned", + "type": "github" + }, + { + "url": "https://opencollective.com/rize-uri-template", + "type": "open_collective" + } + ], + "time": "2022-10-12T17:22:51+00:00" + }, { "name": "softcreatr/jsonpath", "version": "0.8.3", From 220b8b14bc5e394f1c14e5cead17ff5b6f863296 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 15:48:19 +0100 Subject: [PATCH 17/30] replace CORS Handler --- app/Http/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index bcf4ce8bd..f8dfb5839 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -14,7 +14,7 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - \Fruitcake\Cors\HandleCors::class, + \Illuminate\Http\Middleware\HandleCors::class, \Illuminate\Http\Middleware\TrustProxies::class, ]; From 6dbb7f9d9b60da961b00f2b5c8ba1a532a6c15cd Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 15:50:02 +0100 Subject: [PATCH 18/30] refactor data providers --- tests/Routes/Wiki/SettingUpdateTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Routes/Wiki/SettingUpdateTest.php b/tests/Routes/Wiki/SettingUpdateTest.php index 081ec9b6f..1495486b3 100644 --- a/tests/Routes/Wiki/SettingUpdateTest.php +++ b/tests/Routes/Wiki/SettingUpdateTest.php @@ -52,7 +52,7 @@ public function testValidSettingNoWiki() ->assertStatus(401); } - public function provideValidSettings() + static public function provideValidSettings() { yield ['wgDefaultSkin', 'vector', 'vector']; yield ['wwExtEnableConfirmAccount', '1', '1']; @@ -105,7 +105,7 @@ public function testValidSetting($settingName, $settingValue, $expectedStored) ); } - public function provideValidSettingsBadValues() + static public function provideValidSettingsBadValues() { yield ['wgDefaultSkin', 'foo']; yield ['wwExtEnableConfirmAccount', 'foo']; From f6b19ccc5ba0cce51d9bd4328d68278d084b5217 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 16:35:02 +0100 Subject: [PATCH 19/30] refactor `$this->dispatch` & `dispatchNow` --- app/Http/Controllers/Sandbox/SandboxController.php | 6 +++--- app/Http/Controllers/WikiController.php | 10 +++++----- app/Jobs/CirrusSearch/ForceSearchIndex.php | 2 +- app/Jobs/CirrusSearch/QueueSearchIndexBatches.php | 4 ++-- app/Jobs/CreateEmptyWikiDb.php | 2 +- app/Jobs/KubernetesIngressCreate.php | 2 +- app/Jobs/MediawikiUpdate.php | 6 +++--- app/Jobs/PlatformStatsSummaryJob.php | 2 +- app/Jobs/ProvisionQueryserviceNamespaceJob.php | 2 +- app/Jobs/ProvisionWikiDbJob.php | 2 +- app/Jobs/SetWikiLogo.php | 4 ++-- app/Jobs/SiteStatsUpdateJob.php | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/Sandbox/SandboxController.php b/app/Http/Controllers/Sandbox/SandboxController.php index c3aa05af1..6d3340f83 100644 --- a/app/Http/Controllers/Sandbox/SandboxController.php +++ b/app/Http/Controllers/Sandbox/SandboxController.php @@ -86,12 +86,12 @@ public function create(Request $request): \Illuminate\Http\Response // For now only schedule this job for 1 dataSet type // As the extension API is dumb currently if ($dataSet === 'library') { - $this->dispatch(new MediawikiSandboxLoadData($domain, $dataSet)); + dispatch(new MediawikiSandboxLoadData($domain, $dataSet)); } // opportunistic dispatching of jobs to make sure storage pools are topped up - $this->dispatch(new ProvisionWikiDbJob(null, null, 10)); - $this->dispatch(new ProvisionQueryserviceNamespaceJob(null, 10)); + dispatch(new ProvisionWikiDbJob(null, null, 10)); + dispatch(new ProvisionQueryserviceNamespaceJob(null, 10)); $res['success'] = true; $res['message'] = 'Success!'; diff --git a/app/Http/Controllers/WikiController.php b/app/Http/Controllers/WikiController.php index ef18a01be..b44c98b5e 100644 --- a/app/Http/Controllers/WikiController.php +++ b/app/Http/Controllers/WikiController.php @@ -114,22 +114,22 @@ public function create(Request $request): \Illuminate\Http\Response ]); // TODO maybe always make these run in a certain order..? - $this->dispatch(new MediawikiInit($wiki->domain, $request->input('username'), $user->email)); + dispatch(new MediawikiInit($wiki->domain, $request->input('username'), $user->email)); // Only dispatch a job to add a k8s ingress IF we are using a custom domain... if (! $isSubdomain) { - $this->dispatch(new KubernetesIngressCreate($wiki->id, $wiki->domain)); + dispatch(new KubernetesIngressCreate($wiki->id, $wiki->domain)); } }); // dispatch elasticsearch init job to enable the feature if ( Config::get('wbstack.elasticsearch_enabled_by_default') ) { - $this->dispatch(new ElasticSearchIndexInit($wiki->id)); + dispatch(new ElasticSearchIndexInit($wiki->id)); } // opportunistic dispatching of jobs to make sure storage pools are topped up - $this->dispatch(new ProvisionWikiDbJob(null, null, 10)); - $this->dispatch(new ProvisionQueryserviceNamespaceJob(null, 10)); + dispatch(new ProvisionWikiDbJob(null, null, 10)); + dispatch(new ProvisionQueryserviceNamespaceJob(null, 10)); $res['success'] = true; $res['message'] = 'Success!'; diff --git a/app/Jobs/CirrusSearch/ForceSearchIndex.php b/app/Jobs/CirrusSearch/ForceSearchIndex.php index e26502d92..b12a9bf60 100644 --- a/app/Jobs/CirrusSearch/ForceSearchIndex.php +++ b/app/Jobs/CirrusSearch/ForceSearchIndex.php @@ -11,7 +11,7 @@ * * Example: * - * php artisan job:dispatchNow CirrusSearch\\ForceSearchIndex id 1 0 1000 + * php artisan job:dispatchSync CirrusSearch\\ForceSearchIndex id 1 0 1000 */ class ForceSearchIndex extends CirrusSearchJob { diff --git a/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php b/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php index fc32fe7fa..74ebfce3c 100644 --- a/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php +++ b/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php @@ -12,7 +12,7 @@ * * Example: * - * php artisan job:dispatchNow CirrusSearch\\QueueSearchIndexBatches 1 + * php artisan job:dispatchSync CirrusSearch\\QueueSearchIndexBatches 1 */ class QueueSearchIndexBatches extends CirrusSearchJob { @@ -84,7 +84,7 @@ public function handleResponse( string $rawResponse, $error ) : void { if ( !empty($batches) ) { // todo rewrite as batch foreach ($batches as $job) { - $this->dispatch($job); + dispatch($job); } } else { diff --git a/app/Jobs/CreateEmptyWikiDb.php b/app/Jobs/CreateEmptyWikiDb.php index c16118dd4..3b028d63f 100644 --- a/app/Jobs/CreateEmptyWikiDb.php +++ b/app/Jobs/CreateEmptyWikiDb.php @@ -11,7 +11,7 @@ * To be deleted after migration * * Example usage that will always provision a new DB: - * php artisan job:dispatchNow CreateEmptyWikiDb + * php artisan job:dispatchSync CreateEmptyWikiDb */ class CreateEmptyWikiDb extends Job { diff --git a/app/Jobs/KubernetesIngressCreate.php b/app/Jobs/KubernetesIngressCreate.php index 0a62b987f..999d538d1 100644 --- a/app/Jobs/KubernetesIngressCreate.php +++ b/app/Jobs/KubernetesIngressCreate.php @@ -8,7 +8,7 @@ /** * This can be run with for example: - * php artisan job:dispatchNow KubernetesIngressCreate 999999999 wiki.addshore.com + * php artisan job:dispatchSync KubernetesIngressCreate 999999999 wiki.addshore.com * * If you need to cleanup a test run of this you need to remove the ingress and the related secret */ diff --git a/app/Jobs/MediawikiUpdate.php b/app/Jobs/MediawikiUpdate.php index 914665893..09cf42877 100644 --- a/app/Jobs/MediawikiUpdate.php +++ b/app/Jobs/MediawikiUpdate.php @@ -15,13 +15,13 @@ * Usage: * * wikidb id 38 is addshore-alpha - * php artisan job:dispatchNow MediawikiUpdate wikis.id 38 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 + * php artisan job:dispatchSync MediawikiUpdate wikis.id 38 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 * * If you want to update any random wiki then... - * php artisan job:dispatchNow MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 + * php artisan job:dispatchSync MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 * * And loop them (10 at a time) - * for i in {1..10}; do php artisan job:dispatchNow MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135; done + * for i in {1..10}; do php artisan job:dispatchSync MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135; done */ class MediawikiUpdate extends Job { diff --git a/app/Jobs/PlatformStatsSummaryJob.php b/app/Jobs/PlatformStatsSummaryJob.php index 15ba44680..a85294f9d 100644 --- a/app/Jobs/PlatformStatsSummaryJob.php +++ b/app/Jobs/PlatformStatsSummaryJob.php @@ -23,7 +23,7 @@ * TODO The stats from wiki statistics doesn't add up https://github.com/wbstack/mediawiki/issues/59 * We need to fix that before we can get total pages/edits/users * -* Example: php artisan job:dispatchNow PlatformStatsSummaryJob +* Example: php artisan job:dispatchSync PlatformStatsSummaryJob */ class PlatformStatsSummaryJob extends Job { diff --git a/app/Jobs/ProvisionQueryserviceNamespaceJob.php b/app/Jobs/ProvisionQueryserviceNamespaceJob.php index 3ac62e1b4..68dd9ac63 100644 --- a/app/Jobs/ProvisionQueryserviceNamespaceJob.php +++ b/app/Jobs/ProvisionQueryserviceNamespaceJob.php @@ -9,7 +9,7 @@ /** * Example usage - * php artisan job:dispatchNow ProvisionQueryserviceNamespaceJob + * php artisan job:dispatchSync ProvisionQueryserviceNamespaceJob */ class ProvisionQueryserviceNamespaceJob extends Job { diff --git a/app/Jobs/ProvisionWikiDbJob.php b/app/Jobs/ProvisionWikiDbJob.php index dd4c49ebb..4ad5a8da6 100644 --- a/app/Jobs/ProvisionWikiDbJob.php +++ b/app/Jobs/ProvisionWikiDbJob.php @@ -8,7 +8,7 @@ /** * Example usage that will always provision a new DB: - * php artisan job:dispatchNow ProvisionWikiDbJob + * php artisan job:dispatchSync ProvisionWikiDbJob */ class ProvisionWikiDbJob extends Job { diff --git a/app/Jobs/SetWikiLogo.php b/app/Jobs/SetWikiLogo.php index 2f7d4efb9..e9e1a8e90 100644 --- a/app/Jobs/SetWikiLogo.php +++ b/app/Jobs/SetWikiLogo.php @@ -12,8 +12,8 @@ /** * This can be run with the artisan job command, for example: - * php artisan job:dispatchNow SetWikiLogo domain wiki.addshore.com /path/to/logo.png - * php artisan job:dispatchNow SetWikiLogo id 1234 /path/to/logo.png + * php artisan job:dispatchSync SetWikiLogo domain wiki.addshore.com /path/to/logo.png + * php artisan job:dispatchSync SetWikiLogo id 1234 /path/to/logo.png * * NOTE: This job needs to be run as the correct user if run via artisan (instead of via the UI) */ diff --git a/app/Jobs/SiteStatsUpdateJob.php b/app/Jobs/SiteStatsUpdateJob.php index 4710f5fd6..a83b5bbc4 100644 --- a/app/Jobs/SiteStatsUpdateJob.php +++ b/app/Jobs/SiteStatsUpdateJob.php @@ -12,7 +12,7 @@ * * Job that updates site_stats table in mediawiki by calling initSiteStats.php * -* Example: php artisan job:dispatchNow SiteStatsUpdateJob +* Example: php artisan job:dispatchSync SiteStatsUpdateJob */ class SiteStatsUpdateJob extends Job { From 82e9c2944e378137d81a346dc58849ffb4f16ab5 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 16:35:50 +0100 Subject: [PATCH 20/30] fix test class name --- tests/Jobs/CreateQueryserviceBatchesJobTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Jobs/CreateQueryserviceBatchesJobTest.php b/tests/Jobs/CreateQueryserviceBatchesJobTest.php index a3e4378e4..e44b956f4 100644 --- a/tests/Jobs/CreateQueryserviceBatchesJobTest.php +++ b/tests/Jobs/CreateQueryserviceBatchesJobTest.php @@ -12,7 +12,7 @@ use Illuminate\Contracts\Queue\Job; use Illuminate\Support\Facades\Config; -class CreateQueryserviceBatchesTest extends TestCase +class CreateQueryserviceBatchesJobTest extends TestCase { use RefreshDatabase; From 084ef40ae855b75caa1de18c5d0379f35109923b Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 16 Feb 2024 16:46:38 +0100 Subject: [PATCH 21/30] refactor some tests --- tests/Helper/DomainHelperTest.php | 4 ++-- tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php | 2 +- tests/Jobs/DeleteWikiJobTest.php | 5 +++-- tests/Jobs/Integration/ElasticSearchIndexDeleteTest.php | 2 +- tests/Jobs/Integration/QueryserviceNamespaceJobTest.php | 4 ++-- tests/Jobs/SetWikiLogoTest.php | 8 ++++---- tests/Routes/Wiki/CreateTest.php | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/Helper/DomainHelperTest.php b/tests/Helper/DomainHelperTest.php index b3266e844..61b6ec286 100644 --- a/tests/Helper/DomainHelperTest.php +++ b/tests/Helper/DomainHelperTest.php @@ -9,7 +9,7 @@ class DomainHelperTest extends TestCase { /** * @return string[][] */ - public function provideUnicodeDomains(): array { + static public function provideUnicodeDomains(): array { return [ 'Example IDNA encoding' => [ 'bücher.example', @@ -49,7 +49,7 @@ public function provideUnicodeDomains(): array { /** * @return string[][] */ - public function provideAsciiDomains(): array { + static public function provideAsciiDomains(): array { return [ 'Example IDNA decoding' => [ 'xn--bcher-kva.example', diff --git a/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php b/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php index 63aacdb9a..4a4b04447 100644 --- a/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php +++ b/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php @@ -49,7 +49,7 @@ public function testDispatching() { $job->setJob($mockJob); $mockJob->expects($this->once()) ->method('fail'); - $this->dispatchNow($job); + $this->dispatchSync($job); } public function testSuccess() diff --git a/tests/Jobs/DeleteWikiJobTest.php b/tests/Jobs/DeleteWikiJobTest.php index 3135c1a9e..e0551428e 100644 --- a/tests/Jobs/DeleteWikiJobTest.php +++ b/tests/Jobs/DeleteWikiJobTest.php @@ -51,7 +51,7 @@ public function testDispatching() { $job->setJob($mockJob); $mockJob->expects($this->once()) ->method('fail'); - $this->dispatchNow($job); + $this->dispatchSync($job); } public function testDeletesWiki() @@ -172,7 +172,8 @@ public function testFailure( $wiki_id, $deleted_at, string $expectedFailure) $job->handle($mockMananger); } - public function failureProvider() { + static public function failureProvider() + { yield [ -1, diff --git a/tests/Jobs/Integration/ElasticSearchIndexDeleteTest.php b/tests/Jobs/Integration/ElasticSearchIndexDeleteTest.php index 38bd31a92..5f091010b 100644 --- a/tests/Jobs/Integration/ElasticSearchIndexDeleteTest.php +++ b/tests/Jobs/Integration/ElasticSearchIndexDeleteTest.php @@ -101,7 +101,7 @@ public function testDeletion() $mockJob->expects($this->never())->method('fail'); $job = new ElasticSearchIndexDelete( $this->wiki->id); $job->setJob($mockJob); - $this->dispatchNow($job); + $this->dispatchSync($job); // feature should get disabled $this->assertNull( WikiSetting::where( ['wiki_id' => $this->wiki->id, 'name' => WikiSetting::wwExtEnableElasticSearch, 'value' => true])->first()); diff --git a/tests/Jobs/Integration/QueryserviceNamespaceJobTest.php b/tests/Jobs/Integration/QueryserviceNamespaceJobTest.php index 84715ab89..2b95e3a81 100644 --- a/tests/Jobs/Integration/QueryserviceNamespaceJobTest.php +++ b/tests/Jobs/Integration/QueryserviceNamespaceJobTest.php @@ -46,7 +46,7 @@ public function testIntegrationCreate() $namespace = 'testnamespace'; $job = new ProvisionQueryserviceNamespaceJob($namespace); $job->setJob($mockJob); - $this->dispatchNow($job); + $this->dispatchSync($job); DB::table('queryservice_namespaces')->where(['namespace'=>$namespace])->limit(1)->update(['wiki_id' => $wiki->id]); @@ -56,7 +56,7 @@ public function testIntegrationCreate() $job = new DeleteQueryserviceNamespaceJob($wiki->id); $job->setJob($mockJob); - $this->dispatchNow($job); + $this->dispatchSync($job); $this->assertNull( QueryserviceNamespace::whereWikiId($wiki->id)->first() diff --git a/tests/Jobs/SetWikiLogoTest.php b/tests/Jobs/SetWikiLogoTest.php index 9cc008c9b..2a0c9e634 100644 --- a/tests/Jobs/SetWikiLogoTest.php +++ b/tests/Jobs/SetWikiLogoTest.php @@ -28,7 +28,7 @@ private function assertJobFails(string $wikiKey, string $wikiValue, string $logo $job->setJob($mockJob); $mockJob->expects($this->once()) ->method('fail'); - $this->dispatchNow($job); + $this->dispatchSync($job); } private function assertJobSucceeds(string $wikiKey, string $wikiValue, string $logoPath) @@ -38,7 +38,7 @@ private function assertJobSucceeds(string $wikiKey, string $wikiValue, string $l $job->setJob($mockJob); $mockJob->expects($this->never()) ->method('fail'); - $this->dispatchNow($job); + $this->dispatchSync($job); } /** @@ -108,14 +108,14 @@ public function testSetLogoSucceeds($wikiKey, $wikiValue, $logoPath) $this->assertStringEndsWith($logoDir . '/64.ico', $currentFaviconSettingURL['path']); } - public function validProvider() + static public function validProvider() { # $wikiKey, $wikiValue, $logoPath yield ['id', 42, __DIR__ . "/../data/logo_200x200.png"]; yield ['domain', 'example.test.dev', __DIR__ . "/../data/logo_200x200.png"]; } - public function invalidProvider() + static public function invalidProvider() { # $wikiKey, $wikiValue, $logoPath yield "id doesn't exist" => ['id', 999, __DIR__ . "/../data/logo_200x200.png"]; diff --git a/tests/Routes/Wiki/CreateTest.php b/tests/Routes/Wiki/CreateTest.php index 05dbc1b2f..ef550ce25 100644 --- a/tests/Routes/Wiki/CreateTest.php +++ b/tests/Routes/Wiki/CreateTest.php @@ -83,7 +83,7 @@ public function testWikiCreateDispatchesSomeJobs( $elasticSearchEnabledForNewWik ); } - public function createProvider() { + static public function createProvider() { yield [ true // elasticsearch enabled for new wikis From 69e426e6426d1b07befb623584669bba2e2715e3 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Mon, 19 Feb 2024 16:16:19 +0100 Subject: [PATCH 22/30] update phpunit to 10.5, run composer update --- composer.json | 2 +- composer.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index a3eae4a7e..0ca5c7ce4 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "barryvdh/laravel-ide-helper": "2.13", "fakerphp/faker": "^1.17", "mockery/mockery": "^1.4", - "phpunit/phpunit": "^10.0", + "phpunit/phpunit": "^10.5", "psalm/plugin-laravel": "^2.8", "timacdonald/log-fake": "^2.1", "vimeo/psalm": "^5.19" diff --git a/composer.lock b/composer.lock index f29cb3664..85ca62f63 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": "0759a15170f78588227aa9a50e8735bc", + "content-hash": "c34ad70c6423a950cec473c9824ffbba", "packages": [ { "name": "absszero/laravel-stackdriver-error-reporting", @@ -116,16 +116,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.299.0", + "version": "3.299.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "76d1165568d949b430a87eaa42f6dbc4b6705b6f" + "reference": "a0f87b8e8bfb9afd0ffd702fcda556b465eee457" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/76d1165568d949b430a87eaa42f6dbc4b6705b6f", - "reference": "76d1165568d949b430a87eaa42f6dbc4b6705b6f", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a0f87b8e8bfb9afd0ffd702fcda556b465eee457", + "reference": "a0f87b8e8bfb9afd0ffd702fcda556b465eee457", "shasum": "" }, "require": { @@ -205,9 +205,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.299.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.299.1" }, - "time": "2024-02-15T19:08:34+00:00" + "time": "2024-02-16T19:08:34+00:00" }, { "name": "brick/math", @@ -1033,16 +1033,16 @@ }, { "name": "doctrine/inflector", - "version": "2.0.9", + "version": "2.0.10", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", "shasum": "" }, "require": { @@ -1104,7 +1104,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.9" + "source": "https://github.com/doctrine/inflector/tree/2.0.10" }, "funding": [ { @@ -1120,7 +1120,7 @@ "type": "tidelift" } ], - "time": "2024-01-15T18:05:13+00:00" + "time": "2024-02-18T20:23:39+00:00" }, { "name": "doctrine/lexer", From 8753b4697381fc579caaeb7b5527788effb40048 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Mon, 19 Feb 2024 19:14:05 +0100 Subject: [PATCH 23/30] migrate ElasticSearchIndexDeleteTest.php --- .../ElasticSearchIndexDeleteTest.php | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/tests/Jobs/ElasticSearch/ElasticSearchIndexDeleteTest.php b/tests/Jobs/ElasticSearch/ElasticSearchIndexDeleteTest.php index 2281611f9..8ab9b4f42 100644 --- a/tests/Jobs/ElasticSearch/ElasticSearchIndexDeleteTest.php +++ b/tests/Jobs/ElasticSearch/ElasticSearchIndexDeleteTest.php @@ -20,12 +20,10 @@ class ElasticSearchIndexDeleteTest extends TestCase private $wiki; private $user; private $wikiDb; - private $elasticSearchHost; public function setUp(): void { parent::setUp(); - $this->elasticSearchHost = data_get(Config::get('wbstack.elasticsearch_hosts'), 0); $this->user = User::factory()->create(['verified' => true]); $this->wiki = Wiki::factory()->create(); WikiManager::factory()->create(['wiki_id' => $this->wiki->id, 'user_id' => $this->user->id]); @@ -56,24 +54,7 @@ public function testDeletesElasticSearchIndex() $request->expects($this->exactly(2)) - ->method('setOptions') - ->withConsecutive( - [[ - CURLOPT_URL => $this->elasticSearchHost.'/_cat/indices/'.$this->wikiDb->name.'*?v&s=index&h=index', - CURLOPT_RETURNTRANSFER => true, - CURLOPT_ENCODING => '', - CURLOPT_TIMEOUT => 10, - CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, - CURLOPT_CUSTOMREQUEST => 'GET', - ]], - [[ - CURLOPT_URL => $this->elasticSearchHost.'/'.$this->wikiDb->name.'*', - CURLOPT_RETURNTRANSFER => true, - CURLOPT_ENCODING => '', - CURLOPT_TIMEOUT => 60, - CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, - CURLOPT_CUSTOMREQUEST => 'DELETE', - ]]); + ->method('setOptions'); $mockJob = $this->createMock(Job::class); @@ -93,8 +74,10 @@ public function testDeletesElasticSearchIndex() /** * @dataProvider failureProvider */ - public function testFailure( $request, string $expectedFailure, $mockResponse, $settingStateInDatabase, $deleteWiki = true ) + public function testFailure(string $expectedFailure, $mockResponse, $settingStateInDatabase, $deleteWiki = true ) { + $request = $this->createMock(HttpRequest::class); + if ( $deleteWiki ) { $this->wiki->delete(); } @@ -121,37 +104,35 @@ public function testFailure( $request, string $expectedFailure, $mockResponse, $ } - public function failureProvider() { + static public function failureProvider() { $mockResponse = "index\n" . "some_index_content_blabla\n" . "some_index_general_bla\n"; $mockJsonSuccess = '{"acknowledged" : true}'; $mockFailure = '{"acknowledged" : false}'; + $elasticSearchHost = 'localhost:9200'; // evil hardcoded value? previously read via Config::get('wbstack.elasticsearch_hosts'), but not possible anymore in static context + yield [ - $this->createMock(HttpRequest::class), 'ElasticSearchIndexDelete job for was not successful: {"acknowledged" : false}', [ $mockResponse, $mockFailure ], true ]; yield [ - $this->createMock(HttpRequest::class), 'ElasticSearchIndexDelete job for was not successful: ', [ $mockResponse, '' ], true ]; - if ( $this->elasticSearchHost ) { + if ($elasticSearchHost) { yield [ - $this->createMock(HttpRequest::class), - 'Response looks weird when querying http://'.$this->elasticSearchHost.'/_cat/indices/*?v&s=index&h=index', + 'Response looks weird when querying http://'.$elasticSearchHost.'/_cat/indices/*?v&s=index&h=index', [ "asdasd\n\nasdasd", $mockJsonSuccess ], true ]; } yield [ - $this->createMock(HttpRequest::class), 'ElasticSearchIndexDelete job for but that wiki is not marked as deleted.', [$mockResponse, $mockJsonSuccess ], true, From a0a8c046440f200d05f0865aea97171238fe217a Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 21 Feb 2024 16:22:08 +0100 Subject: [PATCH 24/30] fix deprecated string interpolation --- app/Console/Commands/Wiki/SetSetting.php | 4 ++-- app/Http/Controllers/WikiController.php | 2 +- app/Jobs/CirrusSearch/ForceSearchIndex.php | 2 +- app/Jobs/DeleteWikiFinalizeJob.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/Wiki/SetSetting.php b/app/Console/Commands/Wiki/SetSetting.php index 53b7d973f..0d8d907a8 100644 --- a/app/Console/Commands/Wiki/SetSetting.php +++ b/app/Console/Commands/Wiki/SetSetting.php @@ -41,7 +41,7 @@ public function handle() 'wiki_id' => $wiki->id, 'name' => $settingKey, ])->delete(); - $this->line("Deleted setting ${settingKey} for wiki id ${wikiId}"); + $this->line("Deleted setting {$settingKey} for wiki id {$wikiId}"); return; } @@ -54,7 +54,7 @@ public function handle() 'value' => $settingValue, ] ); - $this->line("Set setting ${settingKey} to ${settingValue} for wiki id ${wikiId}"); + $this->line("Set setting {$settingKey} to {$settingValue} for wiki id {$wikiId}"); return 0; } diff --git a/app/Http/Controllers/WikiController.php b/app/Http/Controllers/WikiController.php index b44c98b5e..4bdc050bb 100644 --- a/app/Http/Controllers/WikiController.php +++ b/app/Http/Controllers/WikiController.php @@ -68,7 +68,7 @@ public function create(Request $request): \Illuminate\Http\Response $maxWikis = config('wbstack.wiki_max_per_user'); if ( config('wbstack.wiki_max_per_user') !== false && $numWikis > config('wbstack.wiki_max_per_user')) { - abort(403, "Too many wikis. Your new total of {$numWikis} would exceed the limit of ${maxWikis} per user."); + abort(403, "Too many wikis. Your new total of {$numWikis} would exceed the limit of {$maxWikis} per user."); } $wiki = Wiki::create([ diff --git a/app/Jobs/CirrusSearch/ForceSearchIndex.php b/app/Jobs/CirrusSearch/ForceSearchIndex.php index b12a9bf60..1a0d9ef64 100644 --- a/app/Jobs/CirrusSearch/ForceSearchIndex.php +++ b/app/Jobs/CirrusSearch/ForceSearchIndex.php @@ -59,7 +59,7 @@ public function handleResponse( string $rawResponse, $error ) : void { if ( count($successMatches) === 2 && is_numeric($successMatches[1][0]) ) { $numIndexedPages = intVal($successMatches[1][0]); - Log::info(__METHOD__ . ": Finished batch! Indexed ${numIndexedPages} pages. From id {$this->fromId} to {$this->toId}"); + Log::info(__METHOD__ . ": Finished batch! Indexed {$numIndexedPages} pages. From id {$this->fromId} to {$this->toId}"); } else { dd($successMatches); Log::error(__METHOD__ . ": Job finished but did not contain the expected output."); diff --git a/app/Jobs/DeleteWikiFinalizeJob.php b/app/Jobs/DeleteWikiFinalizeJob.php index 83512b3c9..26b3e0f82 100644 --- a/app/Jobs/DeleteWikiFinalizeJob.php +++ b/app/Jobs/DeleteWikiFinalizeJob.php @@ -68,7 +68,7 @@ public function handle( HttpRequest $request ) continue; } - $this->fail(new \RuntimeException("WikiDb for ${$wiki->id} still exists")); + $this->fail(new \RuntimeException("WikiDb for {$wiki->id} still exists")); } return; } From 985ead483005fcd18df6b1c2a285afb67298086b Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 21 Feb 2024 16:24:35 +0100 Subject: [PATCH 25/30] tests: replace job to queue dispatching with calling handle() --- tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php | 5 ++--- tests/Jobs/CirrusSearch/QueueSearchIndexBatchesTest.php | 3 --- tests/Jobs/DeleteWikiJobTest.php | 3 +-- tests/Jobs/SetWikiLogoTest.php | 5 ++--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php b/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php index 4a4b04447..58f2b9ebc 100644 --- a/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php +++ b/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php @@ -2,9 +2,9 @@ namespace Tests\Jobs\CirrusSearch; +use App\Http\Curl\CurlRequest; use App\User; use Illuminate\Foundation\Testing\DatabaseTransactions; -use RuntimeException; use Tests\TestCase; use App\Jobs\CirrusSearch\ElasticSearchIndexInit; use App\Http\Curl\HttpRequest; @@ -49,7 +49,7 @@ public function testDispatching() { $job->setJob($mockJob); $mockJob->expects($this->once()) ->method('fail'); - $this->dispatchSync($job); + $job->handle(new CurlRequest); } public function testSuccess() @@ -145,7 +145,6 @@ public function testJobTriggeredButNoSetting() */ public function testFailure( $request, string $expectedFailure, $mockResponse ) { - $mockJob = $this->createMock(Job::class); $mockJob->expects($this->once()) ->method('fail'); diff --git a/tests/Jobs/CirrusSearch/QueueSearchIndexBatchesTest.php b/tests/Jobs/CirrusSearch/QueueSearchIndexBatchesTest.php index cbc6f1318..ed1740f10 100644 --- a/tests/Jobs/CirrusSearch/QueueSearchIndexBatchesTest.php +++ b/tests/Jobs/CirrusSearch/QueueSearchIndexBatchesTest.php @@ -5,7 +5,6 @@ use App\User; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; -use App\Jobs\CirrusSearch\ElasticSearchIndexInit; use App\Http\Curl\HttpRequest; use App\WikiManager; use App\WikiSetting; @@ -13,11 +12,9 @@ use Illuminate\Contracts\Queue\Job; use App\WikiDb; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Support\Facades\DB; use PHPUnit\TextUI\RuntimeException; use App\Jobs\CirrusSearch\QueueSearchIndexBatches; use App\Jobs\CirrusSearch\ForceSearchIndex; -use Illuminate\Support\Facades\Bus; use Queue; class QueueSearchIndexBatchesTest extends TestCase diff --git a/tests/Jobs/DeleteWikiJobTest.php b/tests/Jobs/DeleteWikiJobTest.php index e0551428e..ef7eaccb5 100644 --- a/tests/Jobs/DeleteWikiJobTest.php +++ b/tests/Jobs/DeleteWikiJobTest.php @@ -2,7 +2,6 @@ namespace Tests\Jobs; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; use App\Jobs\DeleteWikiDbJob; use App\User; @@ -51,7 +50,7 @@ public function testDispatching() { $job->setJob($mockJob); $mockJob->expects($this->once()) ->method('fail'); - $this->dispatchSync($job); + $job->handle($this->app->make('db')); } public function testDeletesWiki() diff --git a/tests/Jobs/SetWikiLogoTest.php b/tests/Jobs/SetWikiLogoTest.php index 2a0c9e634..c5d83e00f 100644 --- a/tests/Jobs/SetWikiLogoTest.php +++ b/tests/Jobs/SetWikiLogoTest.php @@ -14,7 +14,6 @@ use Illuminate\Support\Facades\Storage; use Intervention\Image\Facades\Image; use Tests\TestCase; -use Psalm\Type\Union; class SetWikiLogoTest extends TestCase { @@ -28,7 +27,7 @@ private function assertJobFails(string $wikiKey, string $wikiValue, string $logo $job->setJob($mockJob); $mockJob->expects($this->once()) ->method('fail'); - $this->dispatchSync($job); + $job->handle(); } private function assertJobSucceeds(string $wikiKey, string $wikiValue, string $logoPath) @@ -38,7 +37,7 @@ private function assertJobSucceeds(string $wikiKey, string $wikiValue, string $l $job->setJob($mockJob); $mockJob->expects($this->never()) ->method('fail'); - $this->dispatchSync($job); + $job->handle(); } /** From af5121d8270f8dbcae401dac9f25658f08cf86fb Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Wed, 21 Feb 2024 16:47:03 +0100 Subject: [PATCH 26/30] implement ForceSearchIndex::uniqueId --- app/Jobs/CirrusSearch/ForceSearchIndex.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Jobs/CirrusSearch/ForceSearchIndex.php b/app/Jobs/CirrusSearch/ForceSearchIndex.php index 1a0d9ef64..2e607d781 100644 --- a/app/Jobs/CirrusSearch/ForceSearchIndex.php +++ b/app/Jobs/CirrusSearch/ForceSearchIndex.php @@ -25,6 +25,13 @@ public function __construct( string $selectCol, $selectValue, int $fromId, int $ $this->toId = $toId; parent::__construct($wiki->id); } + + public function uniqueId() { + return parent::uniqueId() . '_' + . $this->fromId . '_' + . $this->toId; + } + public function fromId(): int { return $this->fromId; } From 78423e537623bc1d72b6f04f055c0c33e68a040d Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Thu, 22 Feb 2024 16:34:01 +0100 Subject: [PATCH 27/30] move to `dispatch` as mostly recommended example --- app/Jobs/CirrusSearch/ForceSearchIndex.php | 2 +- app/Jobs/CirrusSearch/QueueSearchIndexBatches.php | 2 +- app/Jobs/CreateEmptyWikiDb.php | 2 +- app/Jobs/KubernetesIngressCreate.php | 2 +- app/Jobs/MediawikiUpdate.php | 6 +++--- app/Jobs/PlatformStatsSummaryJob.php | 2 +- app/Jobs/ProvisionQueryserviceNamespaceJob.php | 2 +- app/Jobs/ProvisionWikiDbJob.php | 2 +- app/Jobs/SetWikiLogo.php | 4 ++-- app/Jobs/SiteStatsUpdateJob.php | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Jobs/CirrusSearch/ForceSearchIndex.php b/app/Jobs/CirrusSearch/ForceSearchIndex.php index 2e607d781..6967d2724 100644 --- a/app/Jobs/CirrusSearch/ForceSearchIndex.php +++ b/app/Jobs/CirrusSearch/ForceSearchIndex.php @@ -11,7 +11,7 @@ * * Example: * - * php artisan job:dispatchSync CirrusSearch\\ForceSearchIndex id 1 0 1000 + * php artisan job:dispatch CirrusSearch\\ForceSearchIndex id 1 0 1000 */ class ForceSearchIndex extends CirrusSearchJob { diff --git a/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php b/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php index 74ebfce3c..264e349a6 100644 --- a/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php +++ b/app/Jobs/CirrusSearch/QueueSearchIndexBatches.php @@ -12,7 +12,7 @@ * * Example: * - * php artisan job:dispatchSync CirrusSearch\\QueueSearchIndexBatches 1 + * php artisan job:dispatch CirrusSearch\\QueueSearchIndexBatches 1 */ class QueueSearchIndexBatches extends CirrusSearchJob { diff --git a/app/Jobs/CreateEmptyWikiDb.php b/app/Jobs/CreateEmptyWikiDb.php index 3b028d63f..1352b5ce8 100644 --- a/app/Jobs/CreateEmptyWikiDb.php +++ b/app/Jobs/CreateEmptyWikiDb.php @@ -11,7 +11,7 @@ * To be deleted after migration * * Example usage that will always provision a new DB: - * php artisan job:dispatchSync CreateEmptyWikiDb + * php artisan job:dispatch CreateEmptyWikiDb */ class CreateEmptyWikiDb extends Job { diff --git a/app/Jobs/KubernetesIngressCreate.php b/app/Jobs/KubernetesIngressCreate.php index 999d538d1..c566af145 100644 --- a/app/Jobs/KubernetesIngressCreate.php +++ b/app/Jobs/KubernetesIngressCreate.php @@ -8,7 +8,7 @@ /** * This can be run with for example: - * php artisan job:dispatchSync KubernetesIngressCreate 999999999 wiki.addshore.com + * php artisan job:dispatch KubernetesIngressCreate 999999999 wiki.addshore.com * * If you need to cleanup a test run of this you need to remove the ingress and the related secret */ diff --git a/app/Jobs/MediawikiUpdate.php b/app/Jobs/MediawikiUpdate.php index 09cf42877..914665893 100644 --- a/app/Jobs/MediawikiUpdate.php +++ b/app/Jobs/MediawikiUpdate.php @@ -15,13 +15,13 @@ * Usage: * * wikidb id 38 is addshore-alpha - * php artisan job:dispatchSync MediawikiUpdate wikis.id 38 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 + * php artisan job:dispatchNow MediawikiUpdate wikis.id 38 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 * * If you want to update any random wiki then... - * php artisan job:dispatchSync MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 + * php artisan job:dispatchNow MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135 * * And loop them (10 at a time) - * for i in {1..10}; do php artisan job:dispatchSync MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135; done + * for i in {1..10}; do php artisan job:dispatchNow MediawikiUpdate wiki_dbs.version mw1.34-wbs1 mw1.34-wbs1 mw1.35-wbs1 mediawiki-135; done */ class MediawikiUpdate extends Job { diff --git a/app/Jobs/PlatformStatsSummaryJob.php b/app/Jobs/PlatformStatsSummaryJob.php index a85294f9d..99b2c7108 100644 --- a/app/Jobs/PlatformStatsSummaryJob.php +++ b/app/Jobs/PlatformStatsSummaryJob.php @@ -23,7 +23,7 @@ * TODO The stats from wiki statistics doesn't add up https://github.com/wbstack/mediawiki/issues/59 * We need to fix that before we can get total pages/edits/users * -* Example: php artisan job:dispatchSync PlatformStatsSummaryJob +* Example: php artisan job:dispatch PlatformStatsSummaryJob */ class PlatformStatsSummaryJob extends Job { diff --git a/app/Jobs/ProvisionQueryserviceNamespaceJob.php b/app/Jobs/ProvisionQueryserviceNamespaceJob.php index 68dd9ac63..1826118c5 100644 --- a/app/Jobs/ProvisionQueryserviceNamespaceJob.php +++ b/app/Jobs/ProvisionQueryserviceNamespaceJob.php @@ -9,7 +9,7 @@ /** * Example usage - * php artisan job:dispatchSync ProvisionQueryserviceNamespaceJob + * php artisan job:dispatch ProvisionQueryserviceNamespaceJob */ class ProvisionQueryserviceNamespaceJob extends Job { diff --git a/app/Jobs/ProvisionWikiDbJob.php b/app/Jobs/ProvisionWikiDbJob.php index 4ad5a8da6..b16eb48ee 100644 --- a/app/Jobs/ProvisionWikiDbJob.php +++ b/app/Jobs/ProvisionWikiDbJob.php @@ -8,7 +8,7 @@ /** * Example usage that will always provision a new DB: - * php artisan job:dispatchSync ProvisionWikiDbJob + * php artisan job:dispatch ProvisionWikiDbJob */ class ProvisionWikiDbJob extends Job { diff --git a/app/Jobs/SetWikiLogo.php b/app/Jobs/SetWikiLogo.php index e9e1a8e90..cb9816964 100644 --- a/app/Jobs/SetWikiLogo.php +++ b/app/Jobs/SetWikiLogo.php @@ -12,8 +12,8 @@ /** * This can be run with the artisan job command, for example: - * php artisan job:dispatchSync SetWikiLogo domain wiki.addshore.com /path/to/logo.png - * php artisan job:dispatchSync SetWikiLogo id 1234 /path/to/logo.png + * php artisan job:dispatch SetWikiLogo domain wiki.addshore.com /path/to/logo.png + * php artisan job:dispatch SetWikiLogo id 1234 /path/to/logo.png * * NOTE: This job needs to be run as the correct user if run via artisan (instead of via the UI) */ diff --git a/app/Jobs/SiteStatsUpdateJob.php b/app/Jobs/SiteStatsUpdateJob.php index a83b5bbc4..537e8bf15 100644 --- a/app/Jobs/SiteStatsUpdateJob.php +++ b/app/Jobs/SiteStatsUpdateJob.php @@ -12,7 +12,7 @@ * * Job that updates site_stats table in mediawiki by calling initSiteStats.php * -* Example: php artisan job:dispatchSync SiteStatsUpdateJob +* Example: php artisan job:dispatch SiteStatsUpdateJob */ class SiteStatsUpdateJob extends Job { From 863f66028a05bf288a4740f4e1cab78299cc8ead Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Thu, 22 Feb 2024 16:36:24 +0100 Subject: [PATCH 28/30] remove leftover phpunit conf cbackup --- phpunit.xml.bak | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 phpunit.xml.bak diff --git a/phpunit.xml.bak b/phpunit.xml.bak deleted file mode 100644 index b5bb7670a..000000000 --- a/phpunit.xml.bak +++ /dev/null @@ -1,20 +0,0 @@ - - - - - ./app - - - - - ./tests - - - - - - - - - - From e7a98cac3032d0e5988f61696878d40e53c01978 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Thu, 22 Feb 2024 16:36:49 +0100 Subject: [PATCH 29/30] remove unused `MAIL_URL` conf --- config/mail.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index 2e8c0e810..c7960ef83 100644 --- a/config/mail.php +++ b/config/mail.php @@ -36,7 +36,6 @@ 'mailers' => [ 'smtp' => [ 'transport' => 'smtp', - 'url' => env('MAIL_URL'), 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), 'port' => env('MAIL_PORT', 587), 'encryption' => env('MAIL_ENCRYPTION', 'tls'), From 35ef59ba6a1c3ef1eeca54f52af99f864b42502c Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Mon, 26 Feb 2024 11:16:56 +0100 Subject: [PATCH 30/30] CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b754fbc5..68a1b3bbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # api +## 10x.0.0 - 26 February 2024 +- Update Laravel to v10.10 - T341797 + - schedule redis stale tag pruning + - refactor: `dispatchNow` was removed +- Update to PHPUnit v10.5 +- fix: Implemented ForceSearchIndex::uniqueId T358106 + ## 9x.1.0 - 16 Februrary 2024 - Switching to PHP 8.2