From ffc7ea16056cd1c65e45fc75349f6ca4a91e2045 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 20 Nov 2023 15:49:29 +0100 Subject: [PATCH 1/3] Add PHP 8.3 support, drop PHP < 8.2 --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 00d49ac3..16492623 100644 --- a/composer.json +++ b/composer.json @@ -21,23 +21,23 @@ } ], "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.2.0 || ~8.3.0", "dflydev/fig-cookies": "^3.1.0", - "lcobucci/jwt": "^4.3.0 || ^5.0.0", - "lcobucci/clock": "^3.0.0", + "lcobucci/jwt": "^5.1.0", + "lcobucci/clock": "^3.2.0", "psr/http-message": "^1.1 || ^2.0", "psr/http-server-handler": "^1.0.2", "psr/http-server-middleware": "^1.0.2" }, "require-dev": { "doctrine/coding-standard": "^12.0.0", - "laminas/laminas-diactoros": "^3.0.0", - "laminas/laminas-httphandlerrunner": "^2.6.1", - "phpunit/phpunit": "^9.6.10", + "laminas/laminas-diactoros": "^3.3.0", + "laminas/laminas-httphandlerrunner": "^2.9.0", + "phpunit/phpunit": "^9.6.13", "psalm/plugin-phpunit": "^0.18.4", - "roave/infection-static-analysis-plugin": "^1.32.0", + "roave/infection-static-analysis-plugin": "^1.33.0", "squizlabs/php_codesniffer": "^3.7.2", - "vimeo/psalm": "^5.13.1" + "vimeo/psalm": "^5.15.0" }, "config": { "allow-plugins": { @@ -45,7 +45,7 @@ "infection/extension-installer": false }, "platform": { - "php": "8.1.99" + "php": "8.2.99" }, "sort-packages": true }, From 58cef735519b6c906ddc2caf5ed6a243bb390d06 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 20 Nov 2023 15:49:53 +0100 Subject: [PATCH 2/3] `composer config type library` --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 16492623..8f0b9efb 100644 --- a/composer.json +++ b/composer.json @@ -61,5 +61,6 @@ "psr-4": { "PSR7SessionsTest\\Storageless\\": "test/StoragelessTest" } - } + }, + "type": "library" } From f73fd1ed8e2b973be09f3e8c244ab8bd56fe7ff2 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 20 Nov 2023 15:50:22 +0100 Subject: [PATCH 3/3] `composer-normalize` --- composer.json | 68 ++++++++++---------- composer.lock | 173 +++++++++++++++++++++++++++----------------------- 2 files changed, 126 insertions(+), 115 deletions(-) diff --git a/composer.json b/composer.json index 8f0b9efb..341e05a7 100644 --- a/composer.json +++ b/composer.json @@ -1,53 +1,44 @@ { - "name": "psr7-sessions/storageless", + "name": "psr7-sessions/storageless", "description": "Storageless PSR-7 Session support", - "license": "MIT", + "license": "MIT", + "type": "library", "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", "homepage": "http://ocramius.github.io/", - "role": "Developer" + "role": "Developer" }, { - "name": "Jefersson Nathan", + "name": "Jefersson Nathan", "email": "malukenho@phpse.net", - "role": "Developer" + "role": "Developer" }, { - "name": "Luís Otávio Cobucci Oblonczyk", + "name": "Luís Otávio Cobucci Oblonczyk", "email": "lcobucci@gmail.com", - "role": "Developer" + "role": "Developer" } ], "require": { - "php": "~8.2.0 || ~8.3.0", - "dflydev/fig-cookies": "^3.1.0", - "lcobucci/jwt": "^5.1.0", - "lcobucci/clock": "^3.2.0", - "psr/http-message": "^1.1 || ^2.0", - "psr/http-server-handler": "^1.0.2", - "psr/http-server-middleware": "^1.0.2" + "php": "~8.2.0 || ~8.3.0", + "dflydev/fig-cookies": "^3.1.0", + "lcobucci/clock": "^3.2.0", + "lcobucci/jwt": "^5.1.0", + "psr/http-message": "^1.1 || ^2.0", + "psr/http-server-handler": "^1.0.2", + "psr/http-server-middleware": "^1.0.2" }, "require-dev": { - "doctrine/coding-standard": "^12.0.0", - "laminas/laminas-diactoros": "^3.3.0", - "laminas/laminas-httphandlerrunner": "^2.9.0", - "phpunit/phpunit": "^9.6.13", - "psalm/plugin-phpunit": "^0.18.4", + "doctrine/coding-standard": "^12.0.0", + "laminas/laminas-diactoros": "^3.3.0", + "laminas/laminas-httphandlerrunner": "^2.9.0", + "phpunit/phpunit": "^9.6.13", + "psalm/plugin-phpunit": "^0.18.4", "roave/infection-static-analysis-plugin": "^1.33.0", - "squizlabs/php_codesniffer": "^3.7.2", - "vimeo/psalm": "^5.15.0" - }, - "config": { - "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true, - "infection/extension-installer": false - }, - "platform": { - "php": "8.2.99" - }, - "sort-packages": true + "squizlabs/php_codesniffer": "^3.7.2", + "vimeo/psalm": "^5.15.0" }, "replace": { "ocramius/psr7-session": "self.version" @@ -62,5 +53,14 @@ "PSR7SessionsTest\\Storageless\\": "test/StoragelessTest" } }, - "type": "library" + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true, + "infection/extension-installer": false + }, + "platform": { + "php": "8.2.99" + }, + "sort-packages": true + } } diff --git a/composer.lock b/composer.lock index c426494e..348c6139 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": "04ddac4e07546c6f9ca239cb971a77b0", + "content-hash": "8d594d3e5824ee2823aea8df3bb29c28", "packages": [ { "name": "dflydev/fig-cookies", @@ -70,34 +70,34 @@ }, { "name": "lcobucci/clock", - "version": "3.0.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/lcobucci/clock.git", - "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc" + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc", - "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc", + "url": "https://api.github.com/repos/lcobucci/clock/zipball/6f28b826ea01306b07980cb8320ab30b966cd715", + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.2.0 || ~8.3.0", "psr/clock": "^1.0" }, "provide": { "psr/clock-implementation": "1.0" }, "require-dev": { - "infection/infection": "^0.26", - "lcobucci/coding-standard": "^9.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-deprecation-rules": "^1.1.1", - "phpstan/phpstan-phpunit": "^1.3.2", - "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.27" + "infection/infection": "^0.27", + "lcobucci/coding-standard": "^11.0.0", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.10.25", + "phpstan/phpstan-deprecation-rules": "^1.1.3", + "phpstan/phpstan-phpunit": "^1.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", + "phpunit/phpunit": "^10.2.3" }, "type": "library", "autoload": { @@ -118,7 +118,7 @@ "description": "Yet another clock abstraction", "support": { "issues": "https://github.com/lcobucci/clock/issues", - "source": "https://github.com/lcobucci/clock/tree/3.0.0" + "source": "https://github.com/lcobucci/clock/tree/3.2.0" }, "funding": [ { @@ -130,7 +130,7 @@ "type": "patreon" } ], - "time": "2022-12-19T15:00:24+00:00" + "time": "2023-11-17T17:00:27+00:00" }, { "name": "lcobucci/jwt", @@ -680,6 +680,79 @@ ], "time": "2022-12-27T16:44:40+00:00" }, + { + "name": "composer/package-versions-deprecated", + "version": "1.11.99.5", + "source": { + "type": "git", + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" + }, + "replace": { + "ocramius/package-versions": "1.11.99" + }, + "require-dev": { + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-01-17T14:14:24+00:00" + }, { "name": "composer/pcre", "version": "3.1.1", @@ -2045,68 +2118,6 @@ }, "time": "2023-08-13T19:53:39+00:00" }, - { - "name": "ocramius/package-versions", - "version": "2.8.0", - "source": { - "type": "git", - "url": "https://github.com/Ocramius/PackageVersions.git", - "reference": "7b5821f854cf1e6753c4ed7ceb3b11ae83bbad4e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/7b5821f854cf1e6753c4ed7ceb3b11ae83bbad4e", - "reference": "7b5821f854cf1e6753c4ed7ceb3b11ae83bbad4e", - "shasum": "" - }, - "require": { - "composer-runtime-api": "^2.2.0", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "replace": { - "composer/package-versions-deprecated": "*" - }, - "require-dev": { - "composer/composer": "^2.6.3", - "doctrine/coding-standard": "^12.0.0", - "ext-zip": "^1.15.0", - "phpunit/phpunit": "^9.6.12", - "roave/infection-static-analysis-plugin": "^1.33", - "vimeo/psalm": "^5.15.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - } - ], - "description": "Provides efficient querying for installed package versions (no runtime IO)", - "support": { - "issues": "https://github.com/Ocramius/PackageVersions/issues", - "source": "https://github.com/Ocramius/PackageVersions/tree/2.8.0" - }, - "funding": [ - { - "url": "https://github.com/Ocramius", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ocramius/package-versions", - "type": "tidelift" - } - ], - "time": "2023-09-15T11:02:59+00:00" - }, { "name": "ondram/ci-detector", "version": "4.1.0", @@ -5686,11 +5697,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1.0 || ~8.2.0" + "php": "~8.2.0 || ~8.3.0" }, "platform-dev": [], "platform-overrides": { - "php": "8.1.99" + "php": "8.2.99" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" }