From 7d26212daf1c3a4fd05785e6fec9c5d02502c822 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 17:37:53 +0100 Subject: [PATCH 01/12] remove `gluedev/laravel-stackdriver` --- composer.json | 1 - composer.lock | 1188 +++++-------------------------------------------- 2 files changed, 113 insertions(+), 1076 deletions(-) diff --git a/composer.json b/composer.json index 97a758da9..1c413835a 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,6 @@ "doctrine/dbal": "^3.1", "firebase/php-jwt": "^5.4", "fruitcake/laravel-cors": "^2.0", - "gluedev/laravel-stackdriver": "dev-develop#7fb3e78ce949dd341b5418f876c3ff74d8c1ff92", "google/recaptcha": "^1.2", "guzzlehttp/guzzle": "^7.8", "guzzlehttp/psr7": "^1.9", diff --git a/composer.lock b/composer.lock index f477a637e..bf72fede5 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": "f8991a7ea098a6818d0b441ddfa929ee", + "content-hash": "cbd4fe3f9058f73797fc63fb45a546e1", "packages": [ { "name": "asm89/stack-cors", @@ -266,129 +266,6 @@ ], "time": "2023-01-15T23:15:59+00:00" }, - { - "name": "cache/adapter-common", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/php-cache/adapter-common.git", - "reference": "8788309be72aa7be69b88cdc0687549c74a7d479" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-cache/adapter-common/zipball/8788309be72aa7be69b88cdc0687549c74a7d479", - "reference": "8788309be72aa7be69b88cdc0687549c74a7d479", - "shasum": "" - }, - "require": { - "cache/tag-interop": "^1.0", - "php": ">=7.4", - "psr/cache": "^1.0 || ^2.0", - "psr/log": "^1.0 || ^2.0 || ^3.0", - "psr/simple-cache": "^1.0" - }, - "require-dev": { - "cache/integration-tests": "^0.17", - "phpunit/phpunit": "^7.5.20 || ^9.5.10" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Cache\\Adapter\\Common\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Aaron Scherer", - "email": "aequasi@gmail.com", - "homepage": "https://github.com/aequasi" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/nyholm" - } - ], - "description": "Common classes for PSR-6 adapters", - "homepage": "http://www.php-cache.com/en/latest/", - "keywords": [ - "cache", - "psr-6", - "tag" - ], - "support": { - "source": "https://github.com/php-cache/adapter-common/tree/1.3.0" - }, - "time": "2022-01-15T15:47:19+00:00" - }, - { - "name": "cache/tag-interop", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/php-cache/tag-interop.git", - "reference": "b062b1d735357da50edf8387f7a8696f3027d328" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-cache/tag-interop/zipball/b062b1d735357da50edf8387f7a8696f3027d328", - "reference": "b062b1d735357da50edf8387f7a8696f3027d328", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0 || ^8.0", - "psr/cache": "^1.0 || ^2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Cache\\TagInterop\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/nyholm" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com", - "homepage": "https://github.com/nicolas-grekas" - } - ], - "description": "Framework interoperable interfaces for tags", - "homepage": "https://www.php-cache.com/en/latest/", - "keywords": [ - "cache", - "psr", - "psr6", - "tag" - ], - "support": { - "issues": "https://github.com/php-cache/tag-interop/issues", - "source": "https://github.com/php-cache/tag-interop/tree/1.1.0" - }, - "time": "2021-12-31T10:03:23+00:00" - }, { "name": "carbonphp/carbon-doctrine-types", "version": "2.1.0", @@ -1545,783 +1422,168 @@ "role": "Developer" } ], - "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", - "homepage": "https://github.com/firebase/php-jwt", - "keywords": [ - "jwt", - "php" - ], - "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" - ] - } - }, - "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" - }, - { - "name": "fruitcake/php-cors", - "version": "v1.3.0", - "source": { - "type": "git", - "url": "https://github.com/fruitcake/php-cors.git", - "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b", - "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b", - "shasum": "" - }, - "require": { - "php": "^7.4|^8.0", - "symfony/http-foundation": "^4.4|^5.4|^6|^7" - }, - "require-dev": { - "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^9", - "squizlabs/php_codesniffer": "^3.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "psr-4": { - "Fruitcake\\Cors\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fruitcake", - "homepage": "https://fruitcake.nl" - }, - { - "name": "Barryvdh", - "email": "barryvdh@gmail.com" - } - ], - "description": "Cross-origin resource sharing library for the Symfony HttpFoundation", - "homepage": "https://github.com/fruitcake/php-cors", - "keywords": [ - "cors", - "laravel", - "symfony" - ], - "support": { - "issues": "https://github.com/fruitcake/php-cors/issues", - "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0" - }, - "funding": [ - { - "url": "https://fruitcake.nl", - "type": "custom" - }, - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], - "time": "2023-10-12T05:21:21+00:00" - }, - { - "name": "gluedev/laravel-stackdriver", - "version": "dev-develop", - "source": { - "type": "git", - "url": "https://github.com/toban/laravel-stackdriver.git", - "reference": "7fb3e78ce949dd341b5418f876c3ff74d8c1ff92" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/toban/laravel-stackdriver/zipball/7fb3e78ce949dd341b5418f876c3ff74d8c1ff92", - "reference": "7fb3e78ce949dd341b5418f876c3ff74d8c1ff92", - "shasum": "" - }, - "require": { - "google/cloud-error-reporting": "^0.16.2", - "google/cloud-logging": "^1.14", - "illuminate/support": ">=5.7", - "opencensus/opencensus": "^0.7.0", - "opencensus/opencensus-exporter-stackdriver": "^0.1", - "php": ">=7.1" - }, - "require-dev": { - "mockery/mockery": "^1.1", - "orchestra/testbench": "~3.0", - "phpunit/phpunit": "~7.0", - "sempro/phpunit-pretty-print": "^1.0" - }, - "default-branch": true, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "GlueDev\\Laravel\\Stackdriver\\StackdriverServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "GlueDev\\Laravel\\Stackdriver\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "GlueDev\\Laravel\\Stackdriver\\Tests\\": "tests" - } - }, - "archive": { - "exclude": [ - "storage/screenshots" - ] - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Diederik van den Burger", - "email": "diederik@glue.group", - "homepage": "https://glue.group" - } - ], - "description": "Enables logging, tracing and error reporting to Google Stackdriver for the Laravel framework", - "homepage": "https://github.com/gluedev/laravel-stackdriver", - "keywords": [ - "Error Reporting", - "Google", - "Laravel", - "Logging", - "Stackdriver", - "Tracing" - ], - "support": { - "source": "https://github.com/toban/laravel-stackdriver/tree/develop" - }, - "time": "2021-06-25T14:30:50+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.16.5", - "source": { - "type": "git", - "url": "https://github.com/googleapis/google-cloud-php-errorreporting.git", - "reference": "1179cc6a23e770ec3d29818f753529ae5abe0a0a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-errorreporting/zipball/1179cc6a23e770ec3d29818f753529ae5abe0a0a", - "reference": "1179cc6a23e770ec3d29818f753529ae5abe0a0a", - "shasum": "" - }, - "require": { - "google/cloud-logging": "^1.16", - "google/gax": "^1.1" - }, - "require-dev": { - "google/cloud-core": "^1.35", - "phpdocumentor/reflection": "^3.0", - "phpunit/phpunit": "^4.8|^5.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.16.5" - }, - "time": "2020-06-19T17:49:03+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/cloud-trace", - "version": "v0.18.0", - "source": { - "type": "git", - "url": "https://github.com/googleapis/google-cloud-php-trace.git", - "reference": "153d099445d61587b20a0e821dc23ca7199774dc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-trace/zipball/153d099445d61587b20a0e821dc23ca7199774dc", - "reference": "153d099445d61587b20a0e821dc23ca7199774dc", - "shasum": "" - }, - "require": { - "google/cloud-core": "^1.35", - "google/gax": "^1.1", - "ramsey/uuid": "^3.0|^4.0" - }, - "require-dev": { - "erusev/parsedown": "^1.6", - "phpdocumentor/reflection": "^3.0", - "phpunit/phpunit": "^4.8|^5.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.", - "opencensus/opencensus": "Provides application tracing integrations." - }, - "type": "library", - "extra": { - "component": { - "id": "cloud-trace", - "target": "googleapis/google-cloud-php-trace.git", - "path": "Trace", - "entry": "src/TraceClient.php" - } - }, - "autoload": { - "psr-4": { - "Google\\Cloud\\Trace\\": "src", - "GPBMetadata\\Google\\Devtools\\Cloudtrace\\": "metadata" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Stackdriver Trace Client for PHP", - "support": { - "source": "https://github.com/googleapis/google-cloud-php-trace/tree/v0.18.0" - }, - "time": "2020-03-30T20:36:58+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": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", + "homepage": "https://github.com/firebase/php-jwt", + "keywords": [ + "jwt", + "php" ], - "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" + "issues": "https://github.com/firebase/php-jwt/issues", + "source": "https://github.com/firebase/php-jwt/tree/v5.5.1" }, - "time": "2022-10-11T15:54:47+00:00" + "time": "2021-11-08T20:18:51+00:00" }, { - "name": "google/longrunning", - "version": "v0.2.6", + "name": "fruitcake/laravel-cors", + "version": "v2.2.0", "source": { "type": "git", - "url": "https://github.com/googleapis/php-longrunning.git", - "reference": "9689b4db54cf4cf8186118d9d59aa9ba35bb5842" + "url": "https://github.com/fruitcake/laravel-cors.git", + "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/php-longrunning/zipball/9689b4db54cf4cf8186118d9d59aa9ba35bb5842", - "reference": "9689b4db54cf4cf8186118d9d59aa9ba35bb5842", + "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": { - "google/gax": "^1.13.0", - "phpunit/phpunit": "^9.0" + "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": { - "component": { - "id": "longrunning", - "path": "LongRunning", - "entry": null, - "target": "googleapis/php-longrunning" + "branch-alias": { + "dev-master": "2.1-dev" + }, + "laravel": { + "providers": [ + "Fruitcake\\Cors\\CorsServiceProvider" + ] } }, "autoload": { "psr-4": { - "Google\\LongRunning\\": "src/LongRunning", - "Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning", - "GPBMetadata\\Google\\Longrunning\\": "metadata/Longrunning" + "Fruitcake\\Cors\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "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" ], - "description": "Google LongRunning Client for PHP", "support": { - "source": "https://github.com/googleapis/php-longrunning/tree/v0.2.6" + "issues": "https://github.com/fruitcake/laravel-cors/issues", + "source": "https://github.com/fruitcake/laravel-cors/tree/v2.2.0" }, - "time": "2023-04-21T14:12:59+00:00" + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "abandoned": true, + "time": "2022-02-23T14:25:13+00:00" }, { - "name": "google/protobuf", - "version": "v3.25.2", + "name": "fruitcake/php-cors", + "version": "v1.3.0", "source": { "type": "git", - "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb" + "url": "https://github.com/fruitcake/php-cors.git", + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/83ea4c147718666ce6a9b9332ac2aa588c9211eb", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb", + "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b", + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b", "shasum": "" }, "require": { - "php": ">=7.0.0" + "php": "^7.4|^8.0", + "symfony/http-foundation": "^4.4|^5.4|^6|^7" }, "require-dev": { - "phpunit/phpunit": ">=5.0.0" - }, - "suggest": { - "ext-bcmath": "Need to support JSON deserialization" + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^9", + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, "autoload": { "psr-4": { - "Google\\Protobuf\\": "src/Google/Protobuf", - "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf" + "Fruitcake\\Cors\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" + ], + "authors": [ + { + "name": "Fruitcake", + "homepage": "https://fruitcake.nl" + }, + { + "name": "Barryvdh", + "email": "barryvdh@gmail.com" + } ], - "description": "proto library for PHP", - "homepage": "https://developers.google.com/protocol-buffers/", + "description": "Cross-origin resource sharing library for the Symfony HttpFoundation", + "homepage": "https://github.com/fruitcake/php-cors", "keywords": [ - "proto" + "cors", + "laravel", + "symfony" ], "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.2" + "issues": "https://github.com/fruitcake/php-cors/issues", + "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0" }, - "time": "2024-01-09T22:12:32+00:00" + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2023-10-12T05:21:21+00:00" }, { "name": "google/recaptcha", @@ -2437,50 +1699,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", @@ -5142,122 +4360,6 @@ ], "time": "2023-11-13T09:31:12+00:00" }, - { - "name": "opencensus/opencensus", - "version": "v0.7.0", - "source": { - "type": "git", - "url": "https://github.com/census-instrumentation/opencensus-php.git", - "reference": "0cfda5037e7fe30f5411907d377a7110c5c68b3a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/census-instrumentation/opencensus-php/zipball/0cfda5037e7fe30f5411907d377a7110c5c68b3a", - "reference": "0cfda5037e7fe30f5411907d377a7110c5c68b3a", - "shasum": "" - }, - "require": { - "cache/adapter-common": "^1.0", - "php": ">=7.1", - "psr/cache": "^1.0 || ^2.0 || ^3.0", - "psr/log": "^1.0", - "ramsey/uuid": "^3.0 || ^4.0" - }, - "conflict": { - "ext-opencensus": "< 0.1.0" - }, - "require-dev": { - "guzzlehttp/guzzle": "~5.3", - "guzzlehttp/psr7": "~1.4", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "squizlabs/php_codesniffer": "^3.0", - "symfony/yaml": "~3.3", - "twig/twig": "~2.0 || ~1.35" - }, - "suggest": { - "cache/apc-adapter": "Enable QpsSampler to use apc cache.", - "cache/apcu-adapter": "Enable QpsSampler to use apcu cache.", - "cache/memcached-adapter": "Enable QpsSampler to use memcached cache.", - "ext-opencensus": "Enable tracing arbitrary functions.", - "opencensus/opencensus-exporter-jaeger": "Export data to Jaeger", - "opencensus/opencensus-exporter-stackdriver": "Export data to Stackdriver", - "opencensus/opencensus-exporter-zipkin": "Export data to Zipkin" - }, - "type": "library", - "autoload": { - "psr-4": { - "OpenCensus\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Jeff Ching", - "email": "chingor@google.com" - }, - { - "name": "Bas van Beek", - "email": "bas.vanbeek@gmail.com" - } - ], - "description": "OpenCensus Trace Client for PHP", - "support": { - "issues": "https://github.com/census-instrumentation/opencensus-php/issues", - "source": "https://github.com/census-instrumentation/opencensus-php/tree/v0.7.0" - }, - "abandoned": true, - "time": "2021-05-31T16:10:53+00:00" - }, - { - "name": "opencensus/opencensus-exporter-stackdriver", - "version": "v0.1.0", - "source": { - "type": "git", - "url": "https://github.com/census-instrumentation/opencensus-php-exporter-stackdriver.git", - "reference": "f3017cebd5c01b212b889af7fb430921de6b45b0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/census-instrumentation/opencensus-php-exporter-stackdriver/zipball/f3017cebd5c01b212b889af7fb430921de6b45b0", - "reference": "f3017cebd5c01b212b889af7fb430921de6b45b0", - "shasum": "" - }, - "require": { - "google/cloud-trace": "~0.4", - "opencensus/opencensus": "~0.4", - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "^6.0", - "squizlabs/php_codesniffer": "2.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "OpenCensus\\Trace\\Exporter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Jeff Ching", - "email": "chingor@google.com" - } - ], - "description": "OpenCensus Stackdriver Exporter for PHP", - "support": { - "issues": "https://github.com/census-instrumentation/opencensus-php-exporter-stackdriver/issues", - "source": "https://github.com/census-instrumentation/opencensus-php-exporter-stackdriver/tree/master" - }, - "abandoned": true, - "time": "2018-04-19T16:43:12+00:00" - }, { "name": "paragonie/constant_time_encoding", "version": "v2.6.3", @@ -7452,68 +6554,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", @@ -14693,9 +13733,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "gluedev/laravel-stackdriver": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": [], @@ -14703,5 +13741,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 74ba7713c80f0d4adac423d9d2b9c9ac6e6a079f Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 17:56:20 +0100 Subject: [PATCH 02/12] add `google/cloud-error-reporting` via `composer require` --- composer.json | 1 + composer.lock | 592 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 592 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1c413835a..ab63bd955 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "doctrine/dbal": "^3.1", "firebase/php-jwt": "^5.4", "fruitcake/laravel-cors": "^2.0", + "google/cloud-error-reporting": "^0.21.0", "google/recaptcha": "^1.2", "guzzlehttp/guzzle": "^7.8", "guzzlehttp/psr7": "^1.9", diff --git a/composer.lock b/composer.lock index bf72fede5..fb8cfc3cb 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": "cbd4fe3f9058f73797fc63fb45a546e1", + "content-hash": "b75d0926abd5005456a183886ad8952e", "packages": [ { "name": "asm89/stack-cors", @@ -1585,6 +1585,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.21.0", + "source": { + "type": "git", + "url": "https://github.com/googleapis/google-cloud-php-errorreporting.git", + "reference": "9df865b393ef9c7e9136678a0b875da0b99c92d3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-errorreporting/zipball/9df865b393ef9c7e9136678a0b875da0b99c92d3", + "reference": "9df865b393ef9c7e9136678a0b875da0b99c92d3", + "shasum": "" + }, + "require": { + "google/cloud-logging": "^1.16", + "google/gax": "^1.19.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.21.0" + }, + "time": "2023-08-04T19:22:47+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" + }, { "name": "google/recaptcha", "version": "1.3.0", @@ -1699,6 +2183,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", @@ -6554,6 +7082,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 bc6f9b7ece24a1ed70a449f5c926bde8dc16be4e Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 19:29:42 +0100 Subject: [PATCH 03/12] refactor exception handler --- app/Exceptions/Handler.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 37804d3a1..63ed17646 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,10 +2,13 @@ namespace App\Exceptions; -use GlueDev\Laravel\Stackdriver\StackdriverExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Support\Facades\Log; use Throwable; +use Google\Cloud\ErrorReporting\V1beta1\ReportErrorsServiceClient; +use Google\Cloud\ErrorReporting\V1beta1\ReportedErrorEvent; + class Handler extends ExceptionHandler { @@ -43,7 +46,21 @@ class Handler extends ExceptionHandler */ public function report(Throwable $e) { - StackdriverExceptionHandler::report($e); + if (config('stackdriver.enabled')) { + $reportErrorsServiceClient = new ReportErrorsServiceClient(); + $formattedProjectName = $reportErrorsServiceClient->projectName( + config('credentials.projectId') + ); + $event = new ReportedErrorEvent(); + + try { + $response = $reportErrorsServiceClient->reportErrorEvent($formattedProjectName, $event); + Log::debug(__FILE__, [$response]); + } finally { + $reportErrorsServiceClient->close(); + } + } + parent::report($e); } } From 1a4fb4439602202f007cf7844014e9a68a828c6a Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 19:56:55 +0100 Subject: [PATCH 04/12] add debug output for testing --- app/Exceptions/Handler.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 63ed17646..a7903ef74 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -46,7 +46,9 @@ class Handler extends ExceptionHandler */ public function report(Throwable $e) { + Log::debug(__FILE__, ['starting error reporting']); if (config('stackdriver.enabled')) { + Log::debug(__FILE__, ['stackdriver error reporting enabled']); $reportErrorsServiceClient = new ReportErrorsServiceClient(); $formattedProjectName = $reportErrorsServiceClient->projectName( config('credentials.projectId') @@ -58,9 +60,12 @@ public function report(Throwable $e) Log::debug(__FILE__, [$response]); } finally { $reportErrorsServiceClient->close(); + Log::debug(__FILE__, ['stackdriver error reporting finale']); } } + Log::debug(__FILE__, [$e]); + parent::report($e); } } From 9a4aaaf1c2fd0556f5ebf439e2b8a0669df5974c Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 20:05:20 +0100 Subject: [PATCH 05/12] debug testing --- app/Exceptions/Handler.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index a7903ef74..c5c5ea173 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -53,8 +53,11 @@ public function report(Throwable $e) $formattedProjectName = $reportErrorsServiceClient->projectName( config('credentials.projectId') ); + + Log::debug(__FILE__, ['pre new ReportedErrorEvent']); $event = new ReportedErrorEvent(); - + Log::debug(__FILE__, ['post new ReportedErrorEvent']); + try { $response = $reportErrorsServiceClient->reportErrorEvent($formattedProjectName, $event); Log::debug(__FILE__, [$response]); From cd6dfb83def5f39a53fb5b4e666f7402230e3e5e Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 20:28:39 +0100 Subject: [PATCH 06/12] debug --- app/Exceptions/Handler.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index c5c5ea173..736674b65 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -50,8 +50,10 @@ public function report(Throwable $e) if (config('stackdriver.enabled')) { Log::debug(__FILE__, ['stackdriver error reporting enabled']); $reportErrorsServiceClient = new ReportErrorsServiceClient(); + Log::debug(__FILE__, ['pre projectName']); + $formattedProjectName = $reportErrorsServiceClient->projectName( - config('credentials.projectId') + config('stackdriver.credentials.projectId') ); Log::debug(__FILE__, ['pre new ReportedErrorEvent']); From efd1a61502d78536944d1062d52f27bc076ec96f Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 21:04:47 +0100 Subject: [PATCH 07/12] wip --- app/Exceptions/Handler.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 736674b65..5720927b2 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -46,20 +46,16 @@ class Handler extends ExceptionHandler */ public function report(Throwable $e) { - Log::debug(__FILE__, ['starting error reporting']); + Log::debug(__FILE__, ['>>> starting error reporting']); if (config('stackdriver.enabled')) { Log::debug(__FILE__, ['stackdriver error reporting enabled']); $reportErrorsServiceClient = new ReportErrorsServiceClient(); - Log::debug(__FILE__, ['pre projectName']); $formattedProjectName = $reportErrorsServiceClient->projectName( config('stackdriver.credentials.projectId') ); - Log::debug(__FILE__, ['pre new ReportedErrorEvent']); $event = new ReportedErrorEvent(); - Log::debug(__FILE__, ['post new ReportedErrorEvent']); - try { $response = $reportErrorsServiceClient->reportErrorEvent($formattedProjectName, $event); Log::debug(__FILE__, [$response]); @@ -69,8 +65,12 @@ public function report(Throwable $e) } } + Log::debug(__FILE__, ['pre exception logging']); Log::debug(__FILE__, [$e]); + Log::debug(__FILE__, ['pre parent::report']); parent::report($e); + + Log::debug(__FILE__, ['<<< finished error reporting']); } } From f7e2f25653f05e7ba7b1f709b8c5e41f1a7b24e6 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Fri, 26 Jan 2024 23:11:56 +0100 Subject: [PATCH 08/12] use Error Reporting API --- app/Exceptions/Handler.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5720927b2..5acd452ef 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -8,6 +8,7 @@ use Google\Cloud\ErrorReporting\V1beta1\ReportErrorsServiceClient; use Google\Cloud\ErrorReporting\V1beta1\ReportedErrorEvent; +use Google\Cloud\ErrorReporting\V1beta1\ServiceContext; class Handler extends ExceptionHandler { @@ -46,31 +47,33 @@ class Handler extends ExceptionHandler */ public function report(Throwable $e) { - Log::debug(__FILE__, ['>>> starting error reporting']); + Log::debug(__FILE__, ['>>>>>>>> starting error reporting']); + Log::debug(__FILE__, [$e->getMessage()]); + if (config('stackdriver.enabled')) { - Log::debug(__FILE__, ['stackdriver error reporting enabled']); - $reportErrorsServiceClient = new ReportErrorsServiceClient(); + Log::debug(__FILE__, ['reporting error via stackdrier']); + $reportErrorsServiceClient = new ReportErrorsServiceClient([ + 'credentials' => config('stackdriver.credentials.keyFilePath'), + ]); $formattedProjectName = $reportErrorsServiceClient->projectName( config('stackdriver.credentials.projectId') ); - $event = new ReportedErrorEvent(); + // $eventServiceContext = new ServiceContext(); + $event = (new ReportedErrorEvent()) + // ->setServiceContext($eventServiceContext) + ->setMessage($e); try { $response = $reportErrorsServiceClient->reportErrorEvent($formattedProjectName, $event); Log::debug(__FILE__, [$response]); } finally { $reportErrorsServiceClient->close(); - Log::debug(__FILE__, ['stackdriver error reporting finale']); - } + } } - - Log::debug(__FILE__, ['pre exception logging']); - Log::debug(__FILE__, [$e]); - Log::debug(__FILE__, ['pre parent::report']); - + parent::report($e); - Log::debug(__FILE__, ['<<< finished error reporting']); + Log::debug(__FILE__, ['<<<<<<<< finished error reporting']); } } From 6076faa2b04c72723998a6418d2caccea7964beb Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Mon, 29 Jan 2024 18:32:58 +0100 Subject: [PATCH 09/12] add new stackdriver package --- composer.json | 2 +- composer.lock | 460 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 320 insertions(+), 142 deletions(-) diff --git a/composer.json b/composer.json index ab63bd955..b78ea845f 100644 --- a/composer.json +++ b/composer.json @@ -8,11 +8,11 @@ "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", - "google/cloud-error-reporting": "^0.21.0", "google/recaptcha": "^1.2", "guzzlehttp/guzzle": "^7.8", "guzzlehttp/psr7": "^1.9", diff --git a/composer.lock b/composer.lock index fb8cfc3cb..692ba73bf 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": "b75d0926abd5005456a183886ad8952e", + "content-hash": "0d5aa668befcba5b2c7816ea64f1159b", "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", @@ -118,16 +172,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.296.2", + "version": "3.297.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "74dda6a5bf570ae4b394c2ed54edd573883426cc" + "reference": "bbf516a4a88f829f92cc396628be705966880dbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/74dda6a5bf570ae4b394c2ed54edd573883426cc", - "reference": "74dda6a5bf570ae4b394c2ed54edd573883426cc", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bbf516a4a88f829f92cc396628be705966880dbd", + "reference": "bbf516a4a88f829f92cc396628be705966880dbd", "shasum": "" }, "require": { @@ -207,9 +261,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.296.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.297.2" }, - "time": "2024-01-16T19:10:36+00:00" + "time": "2024-01-26T19:09:20+00:00" }, { "name": "brick/math", @@ -785,16 +839,16 @@ }, { "name": "doctrine/dbal", - "version": "3.7.2", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "0ac3c270590e54910715e9a1a044cc368df282b2" + "reference": "d244f2e6e6bf32bff5174e6729b57214923ecec9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2", - "reference": "0ac3c270590e54910715e9a1a044cc368df282b2", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/d244f2e6e6bf32bff5174e6729b57214923ecec9", + "reference": "d244f2e6e6bf32bff5174e6729b57214923ecec9", "shasum": "" }, "require": { @@ -810,14 +864,14 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "1.10.42", + "phpstan/phpstan": "1.10.56", "phpstan/phpstan-strict-rules": "^1.5", - "phpunit/phpunit": "9.6.13", + "phpunit/phpunit": "9.6.15", "psalm/plugin-phpunit": "0.18.4", "slevomat/coding-standard": "8.13.1", - "squizlabs/php_codesniffer": "3.7.2", - "symfony/cache": "^5.4|^6.0", - "symfony/console": "^4.4|^5.4|^6.0", + "squizlabs/php_codesniffer": "3.8.1", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/console": "^4.4|^5.4|^6.0|^7.0", "vimeo/psalm": "4.30.0" }, "suggest": { @@ -878,7 +932,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.7.2" + "source": "https://github.com/doctrine/dbal/tree/3.8.0" }, "funding": [ { @@ -894,7 +948,7 @@ "type": "tidelift" } ], - "time": "2023-11-19T08:06:58+00:00" + "time": "2024-01-25T21:44:02+00:00" }, { "name": "doctrine/deprecations", @@ -1710,21 +1764,21 @@ }, { "name": "google/cloud-error-reporting", - "version": "v0.21.0", + "version": "v0.19.12", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-errorreporting.git", - "reference": "9df865b393ef9c7e9136678a0b875da0b99c92d3" + "reference": "3a580346a28c11de7ff5db5319e9bcfba4c1f171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-errorreporting/zipball/9df865b393ef9c7e9136678a0b875da0b99c92d3", - "reference": "9df865b393ef9c7e9136678a0b875da0b99c92d3", + "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.19.1", + "google/gax": "^1.1", "php": ">=7.4" }, "require-dev": { @@ -1757,9 +1811,9 @@ ], "description": "Stackdriver Error Reporting Client for PHP", "support": { - "source": "https://github.com/googleapis/google-cloud-php-errorreporting/tree/v0.21.0" + "source": "https://github.com/googleapis/google-cloud-php-errorreporting/tree/v0.19.12" }, - "time": "2023-08-04T19:22:47+00:00" + "time": "2023-05-05T23:01:42+00:00" }, { "name": "google/cloud-logging", @@ -3595,16 +3649,16 @@ }, { "name": "league/flysystem", - "version": "3.23.0", + "version": "3.23.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc" + "reference": "199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc", - "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e", + "reference": "199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e", "shasum": "" }, "require": { @@ -3669,7 +3723,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.23.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.23.1" }, "funding": [ { @@ -3681,20 +3735,20 @@ "type": "github" } ], - "time": "2023-12-04T10:16:17+00:00" + "time": "2024-01-26T18:42:03+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.22.0", + "version": "3.23.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "9808919ee5d819730d9582d4e1673e8d195c38d8" + "reference": "97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/9808919ee5d819730d9582d4e1673e8d195c38d8", - "reference": "9808919ee5d819730d9582d4e1673e8d195c38d8", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240", + "reference": "97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240", "shasum": "" }, "require": { @@ -3735,7 +3789,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.22.0" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.23.1" }, "funding": [ { @@ -3747,20 +3801,20 @@ "type": "github" } ], - "time": "2023-11-18T14:03:37+00:00" + "time": "2024-01-26T18:25:23+00:00" }, { "name": "league/flysystem-local", - "version": "3.23.0", + "version": "3.23.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "5cf046ba5f059460e86a997c504dd781a39a109b" + "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/5cf046ba5f059460e86a997c504dd781a39a109b", - "reference": "5cf046ba5f059460e86a997c504dd781a39a109b", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/b884d2bf9b53bb4804a56d2df4902bb51e253f00", + "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00", "shasum": "" }, "require": { @@ -3795,7 +3849,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-local/issues", - "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.1" }, "funding": [ { @@ -3807,20 +3861,20 @@ "type": "github" } ], - "time": "2023-12-04T10:14:46+00:00" + "time": "2024-01-26T18:25:23+00:00" }, { "name": "league/mime-type-detection", - "version": "1.14.0", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", - "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", "shasum": "" }, "require": { @@ -3851,7 +3905,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" }, "funding": [ { @@ -3863,7 +3917,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T14:13:20+00:00" + "time": "2024-01-28T23:22:08+00:00" }, { "name": "league/oauth2-server", @@ -4415,16 +4469,16 @@ }, { "name": "nesbot/carbon", - "version": "2.72.1", + "version": "2.72.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78" + "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", - "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e7edc41b58d65509baeb0d4a14c8fa41d627130", + "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130", "shasum": "" }, "require": { @@ -4518,35 +4572,35 @@ "type": "tidelift" } ], - "time": "2023-12-08T23:47:49+00:00" + "time": "2024-01-19T00:21:53+00:00" }, { "name": "nette/schema", - "version": "v1.2.5", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a" + "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a", - "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a", + "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", + "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", "shasum": "" }, "require": { - "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0", - "php": "7.1 - 8.3" + "nette/utils": "^4.0", + "php": "8.1 - 8.3" }, "require-dev": { - "nette/tester": "^2.3 || ^2.4", + "nette/tester": "^2.4", "phpstan/phpstan-nette": "^1.0", - "tracy/tracy": "^2.7" + "tracy/tracy": "^2.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -4578,22 +4632,22 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.5" + "source": "https://github.com/nette/schema/tree/v1.3.0" }, - "time": "2023-10-05T20:37:59+00:00" + "time": "2023-12-11T11:54:22+00:00" }, { "name": "nette/utils", - "version": "v4.0.3", + "version": "v4.0.4", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015" + "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015", - "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015", + "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218", + "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218", "shasum": "" }, "require": { @@ -4664,9 +4718,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.3" + "source": "https://github.com/nette/utils/tree/v4.0.4" }, - "time": "2023-10-29T21:02:13+00:00" + "time": "2024-01-17T16:50:36+00:00" }, { "name": "nikic/php-parser", @@ -5758,16 +5812,16 @@ }, { "name": "psr/cache", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b" + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", - "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", "shasum": "" }, "require": { @@ -5801,9 +5855,9 @@ "psr-6" ], "support": { - "source": "https://github.com/php-fig/cache/tree/2.0.0" + "source": "https://github.com/php-fig/cache/tree/3.0.0" }, - "time": "2021-02-03T23:23:37+00:00" + "time": "2021-02-03T23:26:27+00:00" }, { "name": "psr/clock", @@ -6118,30 +6172,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -6162,31 +6216,31 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "psr/simple-cache", - "version": "1.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -6201,7 +6255,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for simple caching", @@ -6213,9 +6267,9 @@ "simple-cache" ], "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" + "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" }, - "time": "2017-10-23T01:57:42+00:00" + "time": "2021-10-29T13:26:27+00:00" }, { "name": "psy/psysh", @@ -11098,16 +11152,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/18133a2d8c24e10e58e02b700308ed3a4a60c97f", + "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f", "shasum": "" }, "require": { @@ -11118,7 +11172,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -11143,9 +11197,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.0" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-01-28T07:31:37+00:00" }, { "name": "orchestra/canvas", @@ -11290,23 +11344,23 @@ }, { "name": "orchestra/testbench", - "version": "v7.39.0", + "version": "v7.40.1", "source": { "type": "git", "url": "https://github.com/orchestral/testbench.git", - "reference": "4ea37228cbf56e4ac015946e940cfef36cfe4d55" + "reference": "731393745905ff313bad6dcedc3e24637124e2f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench/zipball/4ea37228cbf56e4ac015946e940cfef36cfe4d55", - "reference": "4ea37228cbf56e4ac015946e940cfef36cfe4d55", + "url": "https://api.github.com/repos/orchestral/testbench/zipball/731393745905ff313bad6dcedc3e24637124e2f1", + "reference": "731393745905ff313bad6dcedc3e24637124e2f1", "shasum": "" }, "require": { "fakerphp/faker": "^1.21", "laravel/framework": "^9.52.15", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": "^7.39", + "orchestra/testbench-core": "^7.40.1", "orchestra/workbench": "^1.2 || ^7.2", "php": "^8.0", "phpunit/phpunit": "^9.5.10", @@ -11343,22 +11397,22 @@ ], "support": { "issues": "https://github.com/orchestral/testbench/issues", - "source": "https://github.com/orchestral/testbench/tree/v7.39.0" + "source": "https://github.com/orchestral/testbench/tree/v7.40.1" }, - "time": "2023-12-28T14:51:59+00:00" + "time": "2024-01-22T03:12:16+00:00" }, { "name": "orchestra/testbench-core", - "version": "v7.39.1", + "version": "v7.40.1", "source": { "type": "git", "url": "https://github.com/orchestral/testbench-core.git", - "reference": "b8b56acd33e75a0d2e502864895e8fa29a197557" + "reference": "768e1942ec3a2138b62c7eb69a5745173e60d519" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/b8b56acd33e75a0d2e502864895e8fa29a197557", - "reference": "b8b56acd33e75a0d2e502864895e8fa29a197557", + "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/768e1942ec3a2138b62c7eb69a5745173e60d519", + "reference": "768e1942ec3a2138b62c7eb69a5745173e60d519", "shasum": "" }, "require": { @@ -11368,6 +11422,7 @@ "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", "orchestra/workbench": "<1.0.0", "phpunit/phpunit": "<9.5.10 || >=10.0.0" }, @@ -11440,7 +11495,7 @@ "issues": "https://github.com/orchestral/testbench/issues", "source": "https://github.com/orchestral/testbench-core" }, - "time": "2024-01-10T02:57:39+00:00" + "time": "2024-01-22T01:40:09+00:00" }, { "name": "orchestra/workbench", @@ -11835,6 +11890,68 @@ }, "time": "2024-01-04T17:06:16+00:00" }, + { + "name": "phpstan/phpstan", + "version": "1.10.57", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", + "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2024-01-24T11:51:34+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "9.2.30", @@ -12156,16 +12273,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.15", + "version": "9.6.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", "shasum": "" }, "require": { @@ -12239,7 +12356,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.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" }, "funding": [ { @@ -12255,7 +12372,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T16:55:19+00:00" + "time": "2024-01-19T07:03:14+00:00" }, { "name": "pimple/pimple", @@ -12383,6 +12500,62 @@ }, "time": "2023-02-26T18:23:48+00:00" }, + { + "name": "rector/rector", + "version": "0.19.2", + "source": { + "type": "git", + "url": "https://github.com/rectorphp/rector.git", + "reference": "bc96a99895bf47c6bfe70ea1b799f0081ed5a903" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/bc96a99895bf47c6bfe70ea1b799f0081ed5a903", + "reference": "bc96a99895bf47c6bfe70ea1b799f0081ed5a903", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0", + "phpstan/phpstan": "^1.10.56" + }, + "conflict": { + "rector/rector-doctrine": "*", + "rector/rector-downgrade-php": "*", + "rector/rector-phpunit": "*", + "rector/rector-symfony": "*" + }, + "bin": [ + "bin/rector" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Instant Upgrade and Automated Refactoring of any PHP code", + "keywords": [ + "automation", + "dev", + "migration", + "refactoring" + ], + "support": { + "issues": "https://github.com/rectorphp/rector/issues", + "source": "https://github.com/rectorphp/rector/tree/0.19.2" + }, + "funding": [ + { + "url": "https://github.com/tomasvotruba", + "type": "github" + } + ], + "time": "2024-01-19T10:58:30+00:00" + }, { "name": "sebastian/cli-parser", "version": "1.0.1", @@ -13474,16 +13647,16 @@ }, { "name": "spatie/laravel-ray", - "version": "1.33.1", + "version": "1.34.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ray.git", - "reference": "b9574cec543b932d99e68247eaeb37876c71c8eb" + "reference": "449c164c0ad0cf42a5abb52955d329199138604b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/b9574cec543b932d99e68247eaeb37876c71c8eb", - "reference": "b9574cec543b932d99e68247eaeb37876c71c8eb", + "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/449c164c0ad0cf42a5abb52955d329199138604b", + "reference": "449c164c0ad0cf42a5abb52955d329199138604b", "shasum": "" }, "require": { @@ -13493,8 +13666,9 @@ "illuminate/queue": "^7.20|^8.19|^9.0|^10.0", "illuminate/support": "^7.20|^8.19|^9.0|^10.0", "php": "^7.4|^8.0", + "rector/rector": "^0.19.2", "spatie/backtrace": "^1.0", - "spatie/ray": "^1.37", + "spatie/ray": "^1.41.1", "symfony/stopwatch": "4.2|^5.1|^6.0|^7.0", "zbateson/mail-mime-parser": "^1.3.1|^2.0" }, @@ -13503,7 +13677,7 @@ "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", - "phpstan/phpstan": "^0.12.93", + "phpstan/phpstan": "^1.10.57", "phpunit/phpunit": "^9.3", "spatie/pest-plugin-snapshots": "^1.1" }, @@ -13543,7 +13717,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-ray/issues", - "source": "https://github.com/spatie/laravel-ray/tree/1.33.1" + "source": "https://github.com/spatie/laravel-ray/tree/1.34.0" }, "funding": [ { @@ -13555,7 +13729,7 @@ "type": "other" } ], - "time": "2024-01-04T21:36:17+00:00" + "time": "2024-01-25T10:39:25+00:00" }, { "name": "spatie/macroable", @@ -13609,16 +13783,16 @@ }, { "name": "spatie/ray", - "version": "1.40.1", + "version": "1.41.1", "source": { "type": "git", "url": "https://github.com/spatie/ray.git", - "reference": "8e6547ff47aae2e4f615a5dcea1e5e4911b1dc9f" + "reference": "051a0facb1d2462fafef87ff77eb74d6f2d12944" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ray/zipball/8e6547ff47aae2e4f615a5dcea1e5e4911b1dc9f", - "reference": "8e6547ff47aae2e4f615a5dcea1e5e4911b1dc9f", + "url": "https://api.github.com/repos/spatie/ray/zipball/051a0facb1d2462fafef87ff77eb74d6f2d12944", + "reference": "051a0facb1d2462fafef87ff77eb74d6f2d12944", "shasum": "" }, "require": { @@ -13628,8 +13802,8 @@ "ramsey/uuid": "^3.0|^4.1", "spatie/backtrace": "^1.1", "spatie/macroable": "^1.0|^2.0", - "symfony/stopwatch": "^4.0|^5.1|^6.0", - "symfony/var-dumper": "^4.2|^5.1|^6.0" + "symfony/stopwatch": "^4.0|^5.1|^6.0|^7.0", + "symfony/var-dumper": "^4.2|^5.1|^6.0|^7.0" }, "require-dev": { "illuminate/support": "6.x|^8.18|^9.0", @@ -13637,9 +13811,13 @@ "pestphp/pest": "^1.22", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5", + "rector/rector": "^0.19.2", "spatie/phpunit-snapshot-assertions": "^4.2", "spatie/test-time": "^1.2" }, + "bin": [ + "bin/remove-ray.sh" + ], "type": "library", "autoload": { "files": [ @@ -13669,7 +13847,7 @@ ], "support": { "issues": "https://github.com/spatie/ray/issues", - "source": "https://github.com/spatie/ray/tree/1.40.1" + "source": "https://github.com/spatie/ray/tree/1.41.1" }, "funding": [ { @@ -13681,7 +13859,7 @@ "type": "other" } ], - "time": "2023-11-20T08:20:15+00:00" + "time": "2024-01-25T10:15:50+00:00" }, { "name": "symfony/filesystem", @@ -14005,16 +14183,16 @@ }, { "name": "vimeo/psalm", - "version": "5.19.1", + "version": "5.20.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "b9583493b08eb36259c0f6b746a787c4c9b3ac45" + "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/b9583493b08eb36259c0f6b746a787c4c9b3ac45", - "reference": "b9583493b08eb36259c0f6b746a787c4c9b3ac45", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/3f284e96c9d9be6fe6b15c79416e1d1903dcfef4", + "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4", "shasum": "" }, "require": { @@ -14111,7 +14289,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-01-14T22:41:50+00:00" + "time": "2024-01-18T12:15:06+00:00" }, { "name": "zbateson/mail-mime-parser", From bfad46614f353bb28f94b89651549e2ab05a88bb Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Mon, 29 Jan 2024 18:33:27 +0100 Subject: [PATCH 10/12] configure new stackdriver package --- app/Exceptions/Handler.php | 43 ++--------- config/error_reporting.php | 36 +++++++++ config/stackdriver.php | 145 ------------------------------------- 3 files changed, 41 insertions(+), 183 deletions(-) create mode 100644 config/error_reporting.php delete mode 100644 config/stackdriver.php diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5acd452ef..5803bb936 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -3,13 +3,8 @@ namespace App\Exceptions; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Illuminate\Support\Facades\Log; use Throwable; -use Google\Cloud\ErrorReporting\V1beta1\ReportErrorsServiceClient; -use Google\Cloud\ErrorReporting\V1beta1\ReportedErrorEvent; -use Google\Cloud\ErrorReporting\V1beta1\ServiceContext; - class Handler extends ExceptionHandler { @@ -40,40 +35,12 @@ class Handler extends ExceptionHandler ]; /** - * Report or log an exception. - * - * @param \Throwable $e - * @return void + * Register the exception handling callbacks for the application. */ - public function report(Throwable $e) + public function register() { - Log::debug(__FILE__, ['>>>>>>>> starting error reporting']); - Log::debug(__FILE__, [$e->getMessage()]); - - if (config('stackdriver.enabled')) { - Log::debug(__FILE__, ['reporting error via stackdrier']); - $reportErrorsServiceClient = new ReportErrorsServiceClient([ - 'credentials' => config('stackdriver.credentials.keyFilePath'), - ]); - - $formattedProjectName = $reportErrorsServiceClient->projectName( - config('stackdriver.credentials.projectId') - ); - - // $eventServiceContext = new ServiceContext(); - $event = (new ReportedErrorEvent()) - // ->setServiceContext($eventServiceContext) - ->setMessage($e); - try { - $response = $reportErrorsServiceClient->reportErrorEvent($formattedProjectName, $event); - Log::debug(__FILE__, [$response]); - } finally { - $reportErrorsServiceClient->close(); - } - } - - parent::report($e); - - Log::debug(__FILE__, ['<<<<<<<< finished error reporting']); + $this->reportable(function (Throwable $e) { + (new \Absszero\ErrorReporting)->report($e); + }); } } diff --git a/config/error_reporting.php b/config/error_reporting.php new file mode 100644 index 000000000..06be1a1f0 --- /dev/null +++ b/config/error_reporting.php @@ -0,0 +1,36 @@ + (bool) env('STACKDRIVER_ENABLED', false), + 'serviceId' => env('STACKDRIVER_ERROR_REPORTING_SERVICE_ID', env('APP_NAME')), + 'versionId' => env('STACKDRIVER_ERROR_REPORTING_VERSION_ID', '1.0.0'), + 'LoggingClient' => [ + // The project ID from the Google Developer's Console. + 'projectId' => env('STACKDRIVER_PROJECT_ID', env('GOOGLE_CLOUD_PROJECT')), + // The full path to your service account credentials .json file retrieved from the Google Developers Console. + 'keyFilePath' => env('STACKDRIVER_KEY_FILE_PATH', ''), + // Seconds to wait before timing out the request. + // **Defaults to** `0` with REST and `60` with gRPC. + 'requestTimeout' => 0, + // Number of retries for a failed request. + 'retries' => 3, + // The transport type used for requests. + // May be either `grpc` or `rest`. + // **Defaults to** `grpc` if gRPC support is detected on the system. + 'transport' => null + ], + 'PsrLogger' => [ + // Determines whether or not to use background batching. + 'batchEnabled' => (bool) env('STACKDRIVER_LOGGING_BATCH_ENABLED', true), + // Whether or not to output debug information. + 'debugOutput' => false, + // A set of options for a BatchJob. + 'batchOptions' => [ + 'batchSize' => 50, + 'callPeriod' => 2.0, + 'workerNum' => 1, + ], + + ] +]; diff --git a/config/stackdriver.php b/config/stackdriver.php deleted file mode 100644 index 3f2d1ab9c..000000000 --- a/config/stackdriver.php +++ /dev/null @@ -1,145 +0,0 @@ - (bool) env('STACKDRIVER_ENABLED', false), - - /* - * There are multiple way to authenticate in order to send data to Google Stackdriver - * See: https://github.com/googleapis/google-cloud-php/blob/master/AUTHENTICATION.md - */ - 'credentials' => [ - /* - * Your Google Cloud Project ID - * Note that this is a numeric value, and not the string variant - */ - 'projectId' => env('STACKDRIVER_PROJECT_ID', env('GOOGLE_CLOUD_PROJECT')), - - /* - * The contents of the service account credentials .json file retrieved from the Google Developer's Console - */ - 'keyFile' => [], - - /* - * The full path to your service account credentials .json file retrieved from the Google Developers Console - */ - 'keyFilePath' => env('STACKDRIVER_KEY_FILE_PATH', ''), - ], - - 'logger' => [ - /* - * Disable logging - */ - 'enabled' => (bool) env('STACKDRIVER_LOGGING_ENABLED', true), - - /* - * The name of the log to write entries to. Defaults to Laravel app name - */ - 'group_name' => env('STACKDRIVER_LOGGING_GROUP_NAME', env('APP_NAME')), - - /* - * The monitored resource to associate log entries with. Defaults to type global - */ - 'resource' => env('STACKDRIVER_LOGGING_RESOURCE'), - - /* - * Add any extra options for the PsrLogger - * See: http://googleapis.github.io/google-cloud-php/#/docs/cloud-trace/v0.12.0/trace/traceclient - */ - 'clientOptions' => [], - - /* - * Add any extra options for the PsrLogger - * See: http://googleapis.github.io/google-cloud-php/#/docs/cloud-logging/v1.14.0/logging/psrlogger - */ - 'psrOptions' => [ - 'batchEnabled' => (bool) env('STACKDRIVER_LOGGING_BATCH_ENABLED', true), - 'batchOptions' => [ - 'batchSize' => 50, - 'callPeriod' => 2.0, - 'workerNum' => 1, - ], - ], - ], - - 'tracing' => [ - /* - * Disable tracing alone - */ - 'enabled' => (bool) env('STACKDRIVER_TRACING_ENABLED', true), - - /* - * Add any extra options for the Tracing client here - * See: https://github.com/googleapis/google-cloud-php-trace/blob/master/src/TraceClient.php - */ - 'clientOptions' => [], - - /* - * Add any extra options for the Stackdriver - * See: https://github.com/census-ecosystem/opencensus-php-exporter-stackdriver/blob/master/src/StackdriverExporter.php - */ - 'exporterOptions' => [ - 'batchOptions' => [ - 'batchSize' => 50, - 'callPeriod' => 2.0, - 'workerNum' => 1, - ], - ], - - /* - * List url path patterns for which you want to disable tracing - * Useful for keeping third party packages (like Laravel Telescope) from clouding your tracing logs - */ - 'ignored_paths' => [], - ], - - 'error_reporting' => [ - /* - * Disable error reporting alone - */ - 'enabled' => (bool) env('STACKDRIVER_ERROR_REPORTING_ENABLED', true), - - /* - * Name of the service, defaults to the Laravel app name - */ - 'serviceId' => env('STACKDRIVER_ERROR_REPORTING_SERVICE_ID', env('APP_NAME')), - - /* - * The version of the current running app - */ - 'versionId' => env('STACKDRIVER_ERROR_REPORTING_VERSION_ID', '1.0.0'), - - /* - * If you save your app version in cache, set it here. Leave it empty otherwise - * Note: this setting takes preference over the versionId - */ - 'versionIdCacheKey' => '', - - /* - * A set of user-defined (key, value) data that provides additional information about the log entries - */ - 'labels' => [], - - /* - * Add any extra options for the Reporting client here - * See: http://googleapis.github.io/google-cloud-php/#/docs/google-cloud/v0.86.0/errorreporting/v1beta1/reporterrorsserviceclient?method=__construct - */ - 'clientOptions' => [], - - /* - * Add any extra options for the PsrLogger - * See: http://googleapis.github.io/google-cloud-php/#/docs/cloud-logging/v1.14.0/logging/psrlogger - */ - 'psrOptions' => [ - 'batchEnabled' => (bool) env('STACKDRIVER_ERROR_REPORTING_BATCH_ENABLED', true), - 'batchOptions' => [ - 'batchSize' => 50, - 'callPeriod' => 2.0, - 'workerNum' => 1, - ], - ], - ], -]; From c35d9e65bfc0db6cd871950fe2b2e3f8a52ba7fe Mon Sep 17 00:00:00 2001 From: Deniz Erdogan <91744937+deer-wmde@users.noreply.github.com> Date: Wed, 31 Jan 2024 12:09:05 +0100 Subject: [PATCH 11/12] Add `logName` to conf --- config/error_reporting.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/error_reporting.php b/config/error_reporting.php index 06be1a1f0..4f2bdedef 100644 --- a/config/error_reporting.php +++ b/config/error_reporting.php @@ -3,6 +3,7 @@ return [ // Enable error reporting 'enable' => (bool) env('STACKDRIVER_ENABLED', false), + 'logName' => env('STACKDRIVER_LOGGING_NAME', 'error-log'), 'serviceId' => env('STACKDRIVER_ERROR_REPORTING_SERVICE_ID', env('APP_NAME')), 'versionId' => env('STACKDRIVER_ERROR_REPORTING_VERSION_ID', '1.0.0'), 'LoggingClient' => [ From cb37db50e66dac32725c5df9de82f8550749da03 Mon Sep 17 00:00:00 2001 From: Deniz Erdogan Date: Tue, 6 Feb 2024 18:12:24 +0100 Subject: [PATCH 12/12] fix env var name --- config/error_reporting.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/error_reporting.php b/config/error_reporting.php index 4f2bdedef..d14cb3f4e 100644 --- a/config/error_reporting.php +++ b/config/error_reporting.php @@ -8,7 +8,7 @@ 'versionId' => env('STACKDRIVER_ERROR_REPORTING_VERSION_ID', '1.0.0'), 'LoggingClient' => [ // The project ID from the Google Developer's Console. - 'projectId' => env('STACKDRIVER_PROJECT_ID', env('GOOGLE_CLOUD_PROJECT')), + 'projectId' => env('STACKDRIVER_PROJECT_ID', env('GOOGLE_CLOUD_PROJECT_ID')), // The full path to your service account credentials .json file retrieved from the Google Developers Console. 'keyFilePath' => env('STACKDRIVER_KEY_FILE_PATH', ''), // Seconds to wait before timing out the request. @@ -32,6 +32,5 @@ 'callPeriod' => 2.0, 'workerNum' => 1, ], - ] ];