From c08762f1c461a88a7f64e83ea1b98227cae8fa87 Mon Sep 17 00:00:00 2001 From: Max Nuding Date: Fri, 26 Nov 2021 21:40:36 +0100 Subject: [PATCH] Re-added php 7.4 compatibility --- composer.json | 8 +++++++- composer.lock | 27 ++++++++++++++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 7da28bf..ff89544 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,13 @@ { "require": { - "monolog/monolog": "^2.3" + "monolog/monolog": "^2.3", + "php": "^7.2 || ^8.0" }, + "config": { + "platform": { + "php": "7.4.1" + } + }, "autoload": { "psr-4": {"PhotoPrismUpload\\": "src"} } diff --git a/composer.lock b/composer.lock index 7909d64..c43912b 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": "a2eae41321c2d6bf3b57063bb8fe8c3b", + "content-hash": "76e9fca30f4b93057e0d8f62a47f2010", "packages": [ { "name": "monolog/monolog", @@ -107,30 +107,30 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "src" + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -151,9 +151,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2021-05-03T11:20:27+00:00" } ], "packages-dev": [], @@ -162,7 +162,12 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": "^7.2 || ^8.0" + }, "platform-dev": [], + "platform-overrides": { + "php": "7.4.1" + }, "plugin-api-version": "2.1.0" }