From 5c4972ec12340cbffb8ac941d390ee6c2c89b635 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Tue, 22 Apr 2025 14:33:08 +0700 Subject: [PATCH] misc: Composer dependencies are installed according to the minimum supported PHP version (#1881) --- .github/workflows/cd.yml | 3 + .github/workflows/ci.yml | 3 + composer.lock | 171 ++++++++++++--------------------------- install.php | 2 + 4 files changed, 59 insertions(+), 120 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 19301d0e6..47028004c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -43,6 +43,9 @@ jobs: with: php-version: '8.1' + - name: Update composer.lock file + run: composer update --no-install + - name: Install Composer dependencies run: composer install --no-progress --prefer-dist --optimize-autoloader diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ab197a68..4c63b3393 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,9 @@ jobs: with: php-version: '8.1' + - name: Update composer.lock file + run: composer update --no-install + - name: Install Composer dependencies 🪚 run: composer install --no-progress --prefer-dist --optimize-autoloader diff --git a/composer.lock b/composer.lock index c244f2380..94753599d 100644 --- a/composer.lock +++ b/composer.lock @@ -144,12 +144,12 @@ "source": { "type": "git", "url": "https://github.com/arokettu/monsterid.git", - "reference": "de2873a5cf6f2ed7cf2c8709ee1bae0e6aec1ed8" + "reference": "4e7484a593c42eba960ee555877dd9b26577fe8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/arokettu/monsterid/zipball/de2873a5cf6f2ed7cf2c8709ee1bae0e6aec1ed8", - "reference": "de2873a5cf6f2ed7cf2c8709ee1bae0e6aec1ed8", + "url": "https://api.github.com/repos/arokettu/monsterid/zipball/4e7484a593c42eba960ee555877dd9b26577fe8a", + "reference": "4e7484a593c42eba960ee555877dd9b26577fe8a", "shasum": "" }, "require": { @@ -157,20 +157,26 @@ "arokettu/random-polyfill": "^1.0.1", "ext-gd": "*", "php": "^8.0", - "php-http/discovery": "^1.19", "psr/http-factory": "^1.0" }, "require-dev": { "arokettu/random-polyfill": ">= 1.0.1 < 1.99", "httpsoft/http-message": "^1.1", + "php-http/discovery": "^1.20", "phpunit/phpunit": ">= 7.0 < 10", "psy/psysh": "*", - "sandfox.dev/code-standard": "^1.2024.07.05", + "sandfox.dev/code-standard": "^1.2025.03.27", + "slim/psr7": "^1.7", "squizlabs/php_codesniffer": "*", - "vimeo/psalm": "^5.4" + "vimeo/psalm": "^5.4 || ^6.0" }, "default-branch": true, "type": "library", + "extra": { + "discovery": { + "psr/http-factory-implementation": "Arokettu\\MonsterID\\Tests\\Helpers\\HttpFactory" + } + }, "autoload": { "files": [ "src/functions.php" @@ -191,7 +197,7 @@ }, { "name": "Anton Smirnov", - "email": "sandfox@sandfox.me", + "email": "sandfox+composer@sandfox.me", "homepage": "https://sandfox.me/", "role": "maintainer" } @@ -203,11 +209,12 @@ "monsterid" ], "support": { + "chat": "https://gitter.im/arokettu/community", "docs": "https://monsterid.readthedocs.io/", "issues": "https://gitlab.com/sandfox/monsterid/-/issues", "source": "https://gitlab.com/sandfox/monsterid" }, - "time": "2024-10-13T00:45:20+00:00" + "time": "2025-04-03T13:37:00+00:00" }, { "name": "arokettu/random-polyfill", @@ -347,16 +354,16 @@ }, { "name": "arokettu/unsigned", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/arokettu/unsigned.git", - "reference": "559dd1247fb4bbc9d70a6ff8581d8e9fd742e096" + "reference": "1e5b3a131d669ee31c4d941bc27e4ba4ef64ae76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/arokettu/unsigned/zipball/559dd1247fb4bbc9d70a6ff8581d8e9fd742e096", - "reference": "559dd1247fb4bbc9d70a6ff8581d8e9fd742e096", + "url": "https://api.github.com/repos/arokettu/unsigned/zipball/1e5b3a131d669ee31c4d941bc27e4ba4ef64ae76", + "reference": "1e5b3a131d669ee31c4d941bc27e4ba4ef64ae76", "shasum": "" }, "require": { @@ -365,13 +372,16 @@ "require-dev": { "phpunit/phpunit": ">= 6.5 <10", "psy/psysh": "*", - "sandfox.dev/code-standard": "^1.2023.12.09", + "sandfox.dev/code-standard": "^1.2025.03.27", "squizlabs/php_codesniffer": "*" }, "type": "library", "autoload": { "files": [ "src/lib.php" + ], + "classmap": [ + "src/Unsigned.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -398,7 +408,7 @@ "issues": "https://gitlab.com/sandfox/unsigned/-/issues", "source": "https://gitlab.com/sandfox/unsigned" }, - "time": "2024-02-01T20:40:11+00:00" + "time": "2025-03-31T23:49:37+00:00" }, { "name": "belomaxorka/captcha", @@ -883,20 +893,20 @@ "source": { "type": "git", "url": "https://github.com/Gemorroj/M3uParser.git", - "reference": "6e6a35df8d5410d8884c7dadcde611607aae3b12" + "reference": "92fc0fe236d77e1b5a26c735ffcb6fc637eb298a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Gemorroj/M3uParser/zipball/6e6a35df8d5410d8884c7dadcde611607aae3b12", - "reference": "6e6a35df8d5410d8884c7dadcde611607aae3b12", + "url": "https://api.github.com/repos/Gemorroj/M3uParser/zipball/92fc0fe236d77e1b5a26c735ffcb6fc637eb298a", + "reference": "92fc0fe236d77e1b5a26c735ffcb6fc637eb298a", "shasum": "" }, "require": { "php": ">=8.0.2" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.68.5", - "phpstan/phpstan": "^2", + "friendsofphp/php-cs-fixer": "^3.73.1", + "phpstan/phpstan": "^2.1", "phpunit/phpunit": "^9.6.22" }, "default-branch": true, @@ -923,9 +933,9 @@ ], "support": { "issues": "https://github.com/Gemorroj/M3uParser/issues", - "source": "https://github.com/Gemorroj/M3uParser/tree/master" + "source": "https://github.com/Gemorroj/M3uParser/tree/6.0.1" }, - "time": "2025-03-03T18:16:38+00:00" + "time": "2025-03-25T19:21:43+00:00" }, { "name": "gigablah/sphinxphp", @@ -1098,16 +1108,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.9.2", + "version": "7.9.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "d281ed313b989f213357e3be1a179f02196ac99b" + "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", - "reference": "d281ed313b989f213357e3be1a179f02196ac99b", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", + "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", "shasum": "" }, "require": { @@ -1204,7 +1214,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.9.2" + "source": "https://github.com/guzzle/guzzle/tree/7.9.3" }, "funding": [ { @@ -1220,20 +1230,20 @@ "type": "tidelift" } ], - "time": "2024-07-24T11:22:20+00:00" + "time": "2025-03-27T13:37:11+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.4", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" + "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", - "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c", + "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c", "shasum": "" }, "require": { @@ -1287,7 +1297,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.4" + "source": "https://github.com/guzzle/promises/tree/2.2.0" }, "funding": [ { @@ -1303,20 +1313,20 @@ "type": "tidelift" } ], - "time": "2024-10-17T10:06:22+00:00" + "time": "2025-03-27T13:27:01+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.7.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" + "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", - "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16", + "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16", "shasum": "" }, "require": { @@ -1403,7 +1413,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.7.0" + "source": "https://github.com/guzzle/psr7/tree/2.7.1" }, "funding": [ { @@ -1419,7 +1429,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T11:15:46+00:00" + "time": "2025-03-27T12:30:47+00:00" }, { "name": "jacklul/monolog-telegram", @@ -2189,85 +2199,6 @@ }, "time": "2025-03-25T18:04:16+00:00" }, - { - "name": "php-http/discovery", - "version": "1.20.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/discovery.git", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0|^2.0", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "nyholm/psr7": "<1.0", - "zendframework/zend-diactoros": "*" - }, - "provide": { - "php-http/async-client-implementation": "*", - "php-http/client-implementation": "*", - "psr/http-client-implementation": "*", - "psr/http-factory-implementation": "*", - "psr/http-message-implementation": "*" - }, - "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "graham-campbell/phpspec-skip-example-extension": "^5.0", - "php-http/httplug": "^1.0 || ^2.0", - "php-http/message-factory": "^1.0", - "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", - "sebastian/comparator": "^3.0.5 || ^4.0.8", - "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" - }, - "type": "composer-plugin", - "extra": { - "class": "Http\\Discovery\\Composer\\Plugin", - "plugin-optional": true - }, - "autoload": { - "psr-4": { - "Http\\Discovery\\": "src/" - }, - "exclude-from-classmap": [ - "src/Composer/Plugin.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", - "homepage": "http://php-http.org", - "keywords": [ - "adapter", - "client", - "discovery", - "factory", - "http", - "message", - "psr17", - "psr7" - ], - "support": { - "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.20.0" - }, - "time": "2024-10-02T11:20:13+00:00" - }, { "name": "phpoption/phpoption", "version": "1.9.3", @@ -3812,6 +3743,6 @@ "platform": { "php": "^8.1 | ^8.2 | ^8.3 | ^8.4" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" } diff --git a/install.php b/install.php index 72bd12068..b095c8bd5 100644 --- a/install.php +++ b/install.php @@ -257,6 +257,8 @@ if (!is_file(BB_ROOT . 'vendor/autoload.php')) { // Installing dependencies if (is_file(BB_ROOT . 'composer.phar')) { out('- Installing dependencies...', 'info'); + runProcess('php ' . BB_ROOT . 'composer.phar update --no-install'); + sleep(3); runProcess('php ' . BB_ROOT . 'composer.phar install --no-interaction --no-ansi'); define('COMPOSER_COMPLETED', true); } else {