From d19f759e68ae3e4c478757b8b690e1031a81c20f Mon Sep 17 00:00:00 2001 From: George Steel Date: Wed, 12 Jan 2022 13:51:24 +0000 Subject: [PATCH 1/5] Add Composer Require Checker configuration Signed-off-by: George Steel --- composer-require-checker.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 composer-require-checker.json diff --git a/composer-require-checker.json b/composer-require-checker.json new file mode 100644 index 000000000..13a82702d --- /dev/null +++ b/composer-require-checker.json @@ -0,0 +1,19 @@ +{ + "symbol-whitelist" : [ + "null", "true", "false", + "static", "self", "parent", + "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object", "mixed", "never" + ], + "php-core-extensions" : [ + "Core", + "date", + "pcre", + "Phar", + "Reflection", + "SPL", + "standard" + ], + "scan-files" : [ + "bin/*.php" + ] +} From d0f43ad668af6417214894ed27807fdc2740f983 Mon Sep 17 00:00:00 2001 From: George Steel Date: Wed, 12 Jan 2022 14:00:17 +0000 Subject: [PATCH 2/5] Adds require-checker as a dev dependency Signed-off-by: George Steel --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 3473d3847..8862a4aac 100644 --- a/composer.json +++ b/composer.json @@ -55,6 +55,7 @@ "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", "laminas/laminas-uri": "^2.5", + "maglnet/composer-require-checker": "^3.8", "phpspec/prophecy": "^1.12", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5.5", From dde4ef2f499af14790ad78040beb6b3e1ab61655 Mon Sep 17 00:00:00 2001 From: George Steel Date: Wed, 12 Jan 2022 19:21:25 +0000 Subject: [PATCH 3/5] Removes configuration defaults and updates lock file Signed-off-by: George Steel --- composer-require-checker.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/composer-require-checker.json b/composer-require-checker.json index 13a82702d..813cf6a67 100644 --- a/composer-require-checker.json +++ b/composer-require-checker.json @@ -1,18 +1,4 @@ { - "symbol-whitelist" : [ - "null", "true", "false", - "static", "self", "parent", - "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object", "mixed", "never" - ], - "php-core-extensions" : [ - "Core", - "date", - "pcre", - "Phar", - "Reflection", - "SPL", - "standard" - ], "scan-files" : [ "bin/*.php" ] From 3f14ecb825d0bb825e78fe030219bf5d25206c48 Mon Sep 17 00:00:00 2001 From: George Steel Date: Tue, 1 Feb 2022 14:11:05 +0000 Subject: [PATCH 4/5] Require `laminas-escaper` as a hard dependency Signed-off-by: George Steel --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 8862a4aac..39797efa3 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,6 @@ "require-dev": { "laminas/laminas-authentication": "^2.5", "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-escaper": "^2.5", "laminas/laminas-feed": "^2.15", "laminas/laminas-filter": "^2.13.0", "laminas/laminas-http": "^2.15", From e357fb5c671258887e2cf2e75e9f289c7b297624 Mon Sep 17 00:00:00 2001 From: George Steel Date: Wed, 23 Mar 2022 20:56:08 +0000 Subject: [PATCH 5/5] Periodic rebase and lock update to track missing deps Signed-off-by: George Steel --- composer.lock | 132 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 082c1ac39..bf278989f 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": "0f00486d475406252bb25572f2c9a2d3", + "content-hash": "5a7edda5057701408ffeda83933a24b3", "packages": [ { "name": "container-interop/container-interop", @@ -2592,6 +2592,86 @@ ], "time": "2022-03-08T18:16:51+00:00" }, + { + "name": "maglnet/composer-require-checker", + "version": "3.8.0", + "source": { + "type": "git", + "url": "https://github.com/maglnet/ComposerRequireChecker.git", + "reference": "537138b833ab0f9ad72b667a72bece2a765e88ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maglnet/ComposerRequireChecker/zipball/537138b833ab0f9ad72b667a72bece2a765e88ab", + "reference": "537138b833ab0f9ad72b667a72bece2a765e88ab", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2.0.0", + "ext-json": "*", + "ext-phar": "*", + "nikic/php-parser": "^4.13.0", + "php": "^7.4 || ^8.0", + "symfony/console": "^5.4.0", + "webmozart/assert": "^1.9.1", + "webmozart/glob": "^4.4.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9.0.0", + "ext-zend-opcache": "*", + "mikey179/vfsstream": "^1.6.10", + "phing/phing": "^2.17.0", + "phpstan/phpstan": "^1.2.0", + "phpunit/phpunit": "^9.5.10", + "vimeo/psalm": "^4.14.0" + }, + "bin": [ + "bin/composer-require-checker" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "psr-4": { + "ComposerRequireChecker\\": "src/ComposerRequireChecker" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.io/" + }, + { + "name": "Matthias Glaub", + "email": "magl@magl.net", + "homepage": "http://magl.net" + } + ], + "description": "CLI tool to analyze composer dependencies and verify that no unknown symbols are used in the sources of a package", + "homepage": "https://github.com/maglnet/ComposerRequireChecker", + "keywords": [ + "analysis", + "cli", + "composer", + "dependency", + "imports", + "require", + "requirements" + ], + "support": { + "issues": "https://github.com/maglnet/ComposerRequireChecker/issues", + "source": "https://github.com/maglnet/ComposerRequireChecker/tree/3.8.0" + }, + "time": "2021-12-07T14:25:47+00:00" + }, { "name": "myclabs/deep-copy", "version": "1.11.0", @@ -6017,6 +6097,56 @@ }, "time": "2021-03-09T10:59:23+00:00" }, + { + "name": "webmozart/glob", + "version": "4.4.0", + "source": { + "type": "git", + "url": "https://github.com/webmozarts/glob.git", + "reference": "539b5dbc10021d3f9242e7a9e9b6b37843179e83" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozarts/glob/zipball/539b5dbc10021d3f9242e7a9e9b6b37843179e83", + "reference": "539b5dbc10021d3f9242e7a9e9b6b37843179e83", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8.0.0", + "webmozart/path-util": "^2.2" + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "symfony/filesystem": "^5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Glob\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "A PHP implementation of Ant's glob.", + "support": { + "issues": "https://github.com/webmozarts/glob/issues", + "source": "https://github.com/webmozarts/glob/tree/4.4.0" + }, + "time": "2021-10-07T16:13:08+00:00" + }, { "name": "webmozart/path-util", "version": "2.3.0",