From 9dac0ac8732b137b2349d3207c45abe9040f72b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 11 Mar 2021 17:53:45 +0200 Subject: [PATCH 1/2] Require marcusschwarz/lesserphp ^0.5.5 This resolves php 7.4 compatibility --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2fb1af2..8f64bc8 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "php": "^5.3.0 || ^7.0 || ^8.0", "ext-pcre": "*", "intervention/httpauth": "^2.0|^3.0", - "marcusschwarz/lesserphp": "^0.5.1", + "marcusschwarz/lesserphp": "^0.5.5", "monolog/monolog": "~1.1|~2.0", "mrclay/jsmin-php": "~2", "mrclay/props-dic": "^2.2|^3.0", From b314554a0fbfcc72042ce3f52a7d6f4cbaf9f8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 11 Mar 2021 14:01:46 +0200 Subject: [PATCH 2/2] Remove php 7.4 block for LessSourceTest --- tests/LessSourceTest.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/LessSourceTest.php b/tests/LessSourceTest.php index 225a0b5..16c0715 100644 --- a/tests/LessSourceTest.php +++ b/tests/LessSourceTest.php @@ -4,10 +4,6 @@ namespace Minify\Test; use Minify_HTML_Helper; -/** - * @requires php < 7.3 - * @see https://github.com/mrclay/minify/pull/685 - */ class LessSourceTest extends TestCase { public function setUp()