From bf128ed69414438b16aecc9bdafd4be3517d41a3 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Tue, 8 Oct 2024 15:42:21 +0200 Subject: [PATCH] chore: remove psr/log as dependency The psr/log package is provided by nextcloud server. Signed-off-by: Daniel Kesselberg --- composer.json | 4 +++- composer.lock | 54 ++------------------------------------------------- 2 files changed, 5 insertions(+), 53 deletions(-) diff --git a/composer.json b/composer.json index ae85623850..1ad9a32a30 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,6 @@ "nextcloud/kitinerary-flatpak": "^1.0", "nextcloud/kitinerary-sys": "^1.0.1", "phpmailer/dkimvalidator": "^0.3.0", - "psr/log": "^1", "rubix/ml": "2.5.1", "sabberworm/php-css-parser": "^8.6.0", "youthweb/urllinker": "^2.0" @@ -55,6 +54,9 @@ "OCA\\Mail\\": "lib/" } }, + "replace": { + "psr/log": "*" + }, "scripts": { "cs:check": "php-cs-fixer fix --dry-run --diff", "cs:fix": "php-cs-fixer fix", diff --git a/composer.lock b/composer.lock index 58a819b903..fe43f53cb2 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": "d819eff83d42c2dc823cdba3934c1c72", + "content-hash": "025d5df2989a0c100eed894791f6b5e2", "packages": [ { "name": "amphp/amp", @@ -2266,56 +2266,6 @@ }, "time": "2019-10-10T17:19:06+00:00" }, - { - "name": "psr/log", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" - }, - "time": "2021-05-03T11:20:27+00:00" - }, { "name": "rubix/ml", "version": "2.5.1", @@ -4160,7 +4110,7 @@ "php": ">=8.0 <=8.3", "ext-openssl": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1" },