From e868b2980b230dd3b4d8b499743bfffe256a5be4 Mon Sep 17 00:00:00 2001 From: Valentin Udaltsov Date: Thu, 21 Nov 2024 17:08:34 +0300 Subject: [PATCH] Refactoring --- composer-require-checker.json | 4 +- composer.json | 6 +- composer.lock | 368 +++++++++++----------------------- tools/infection/composer.lock | 6 +- tools/psalm/composer.lock | 6 +- 5 files changed, 131 insertions(+), 259 deletions(-) diff --git a/composer-require-checker.json b/composer-require-checker.json index 0a6d246..d5d255c 100644 --- a/composer-require-checker.json +++ b/composer-require-checker.json @@ -1,8 +1,10 @@ { "symbol-whitelist" : [ + "class_like_exists", + "get_constant_extension", "Composer\\Autoload\\ClassLoader", "PhpParser\\Node\\Scalar\\DNumber", "PhpParser\\Node\\Scalar\\LNumber", - "Typhoon\\PhpStormReflectionStubs\\PhpStormStubsLocator" + "JetBrains\\PHPStormStub\\PhpStormStubsMap" ] } diff --git a/composer.json b/composer.json index cc3af99..77227d4 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,9 @@ "ext-tokenizer": "*", "nikic/php-parser": "^4.18 || ^5.0", "phpstan/phpdoc-parser": "^1.21", - "psr/simple-cache": "^3.0", - "symfony/deprecation-contracts": "^3.0", - "symfony/polyfill-php84": "^1.31", "typhoon/change-detector": "^0.4.5", "typhoon/declaration-id": "^0.4", - "typhoon/type": "^0.4.4", - "typhoon/typed-map": "^0.4" + "typhoon/type": "^0.4.4" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", diff --git a/composer.lock b/composer.lock index 69c6f31..3baf4a9 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": "df49c3078d0422a0cb35f9995efc260b", + "content-hash": "d4c9c52615356f3711017d46122a5164", "packages": [ { "name": "nikic/php-parser", @@ -111,200 +111,6 @@ }, "time": "2024-10-13T11:25:22+00:00" }, - { - "name": "psr/simple-cache", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", - "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", - "shasum": "" - }, - "require": { - "php": ">=8.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" - }, - "time": "2021-10-29T13:26:27+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v3.5.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-04-18T09:32:20+00:00" - }, - { - "name": "symfony/polyfill-php84", - "version": "v1.31.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php84.git", - "reference": "e5493eb51311ab0b1cc2243416613f06ed8f18bd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/e5493eb51311ab0b1cc2243416613f06ed8f18bd", - "reference": "e5493eb51311ab0b1cc2243416613f06ed8f18bd", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php84\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php84/tree/v1.31.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-09-09T12:04:04+00:00" - }, { "name": "typhoon/change-detector", "version": "0.4.5", @@ -480,56 +286,6 @@ } ], "time": "2024-08-18T19:46:47+00:00" - }, - { - "name": "typhoon/typed-map", - "version": "0.4.4", - "source": { - "type": "git", - "url": "https://github.com/typhoon-php/typed-map.git", - "reference": "a43cbefbf45474143371952f0e7bda27838e8b3a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/typhoon-php/typed-map/zipball/a43cbefbf45474143371952f0e7bda27838e8b3a", - "reference": "a43cbefbf45474143371952f0e7bda27838e8b3a", - "shasum": "" - }, - "require": { - "php": "^8.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Typhoon\\TypedMap\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Valentin Udaltsov", - "email": "udaltsov.valentin@gmail.com" - }, - { - "name": "Typhoon Team", - "homepage": "https://github.com/orgs/typhoon-php/people" - } - ], - "description": "Typhoon Typed Map", - "support": { - "issues": "https://github.com/typhoon-php/typed-map/issues", - "source": "https://github.com/typhoon-php/typed-map/tree/0.4.4" - }, - "funding": [ - { - "url": "https://www.tinkoff.ru/cf/1isj40pCfIc", - "type": "custom" - } - ], - "time": "2024-08-07T01:07:37+00:00" } ], "packages-dev": [ @@ -2958,6 +2714,57 @@ }, "time": "2024-09-11T13:17:53+00:00" }, + { + "name": "psr/simple-cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" + }, + "time": "2021-10-29T13:26:27+00:00" + }, { "name": "react/cache", "version": "v1.2.0", @@ -4498,6 +4305,73 @@ ], "time": "2024-11-06T14:19:14+00:00" }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, { "name": "symfony/error-handler", "version": "v6.4.14", @@ -6451,14 +6325,14 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { "php": "^8.1", "ext-tokenizer": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1" }, diff --git a/tools/infection/composer.lock b/tools/infection/composer.lock index 6214810..c31629c 100644 --- a/tools/infection/composer.lock +++ b/tools/infection/composer.lock @@ -2199,11 +2199,11 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { "php": "8.1" }, diff --git a/tools/psalm/composer.lock b/tools/psalm/composer.lock index 49e486f..df0fd07 100644 --- a/tools/psalm/composer.lock +++ b/tools/psalm/composer.lock @@ -3792,11 +3792,11 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { "php": "8.1" },