From 9b47d1937a842cc2aa6554f1f0409c2dc5e5b9f5 Mon Sep 17 00:00:00 2001 From: JoshuaLicense Date: Fri, 26 Jan 2024 11:42:06 +0000 Subject: [PATCH 1/2] fix: replace `laminas-form` with patched fork --- composer.json | 4 ++++ composer.lock | 56 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 6fe1ffe2f..981bbfbf7 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,10 @@ { "name": "olcs/olcs-selfserve", "description": "OLCS Self Service Web Site", + "repositories": [{ + "type": "vcs", + "url": "https://github.com/JoshuaLicense/laminas-form.git" + }], "require": { "php": "^7.4", "doctrine/annotations": "^1.14.2", diff --git a/composer.lock b/composer.lock index bdaa6bf29..3eb7e15e6 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": "b84b5dc026d0ee153cd48a27959cd63e", + "content-hash": "497ef053eff38cf4431cc8be0e0d444e", "packages": [ { "name": "brick/varexporter", @@ -1812,16 +1812,16 @@ }, { "name": "laminas/laminas-form", - "version": "3.4.1", + "version": "3.4.2", "source": { "type": "git", - "url": "https://github.com/laminas/laminas-form.git", - "reference": "cd3f9d3e345b075d34793e46b0759a4dfd12f674" + "url": "https://github.com/JoshuaLicense/laminas-form.git", + "reference": "733ea7eda2689147a6b2f7ad86d00133eea1f421" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-form/zipball/cd3f9d3e345b075d34793e46b0759a4dfd12f674", - "reference": "cd3f9d3e345b075d34793e46b0759a4dfd12f674", + "url": "https://api.github.com/repos/JoshuaLicense/laminas-form/zipball/733ea7eda2689147a6b2f7ad86d00133eea1f421", + "reference": "733ea7eda2689147a6b2f7ad86d00133eea1f421", "shasum": "" }, "require": { @@ -1882,7 +1882,33 @@ "Laminas\\Form\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "LaminasTest\\Form\\": "test/" + } + }, + "scripts": { + "check": [ + "@cs-check", + "@static-analysis", + "@test" + ], + "cs-check": [ + "phpcs" + ], + "cs-fix": [ + "phpcbf" + ], + "static-analysis": [ + "psalm --shepherd --stats" + ], + "test": [ + "phpunit --colors=always" + ], + "test-coverage": [ + "phpunit --colors=always --coverage-clover clover.xml" + ] + }, "license": [ "BSD-3-Clause" ], @@ -1893,20 +1919,14 @@ "laminas" ], "support": { + "issues": "https://github.com/laminas/laminas-form/issues", + "forum": "https://discourse.laminas.dev", "chat": "https://laminas.dev/chat", + "source": "https://github.com/laminas/laminas-form", "docs": "https://docs.laminas.dev/laminas-form/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-form/issues", - "rss": "https://github.com/laminas/laminas-form/releases.atom", - "source": "https://github.com/laminas/laminas-form" + "rss": "https://github.com/laminas/laminas-form/releases.atom" }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2022-08-01T09:48:44+00:00" + "time": "2024-01-26T11:35:31+00:00" }, { "name": "laminas/laminas-http", From 0253daf4e5538da14ee24430b775dc2c7afc53a7 Mon Sep 17 00:00:00 2001 From: JoshuaLicense Date: Fri, 26 Jan 2024 11:55:21 +0000 Subject: [PATCH 2/2] fix: point to `dvsa` fork --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 981bbfbf7..54382b1e0 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "OLCS Self Service Web Site", "repositories": [{ "type": "vcs", - "url": "https://github.com/JoshuaLicense/laminas-form.git" + "url": "https://github.com/dvsa/laminas-form.git" }], "require": { "php": "^7.4", diff --git a/composer.lock b/composer.lock index 3eb7e15e6..1beb717b1 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": "497ef053eff38cf4431cc8be0e0d444e", + "content-hash": "ee109a47f556b23ead54adbd0e62c99e", "packages": [ { "name": "brick/varexporter", @@ -1815,13 +1815,13 @@ "version": "3.4.2", "source": { "type": "git", - "url": "https://github.com/JoshuaLicense/laminas-form.git", - "reference": "733ea7eda2689147a6b2f7ad86d00133eea1f421" + "url": "https://github.com/dvsa/laminas-form.git", + "reference": "246a46c1a926fd4d7ce227e251118106f73ea2fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JoshuaLicense/laminas-form/zipball/733ea7eda2689147a6b2f7ad86d00133eea1f421", - "reference": "733ea7eda2689147a6b2f7ad86d00133eea1f421", + "url": "https://api.github.com/repos/dvsa/laminas-form/zipball/246a46c1a926fd4d7ce227e251118106f73ea2fe", + "reference": "246a46c1a926fd4d7ce227e251118106f73ea2fe", "shasum": "" }, "require": { @@ -1926,7 +1926,7 @@ "docs": "https://docs.laminas.dev/laminas-form/", "rss": "https://github.com/laminas/laminas-form/releases.atom" }, - "time": "2024-01-26T11:35:31+00:00" + "time": "2024-01-26T11:54:40+00:00" }, { "name": "laminas/laminas-http",