From 71105aa974d86f2878e5fd43b341352ad83dc267 Mon Sep 17 00:00:00 2001
From: "Matt H." <matt_henderson@sil.org>
Date: Wed, 13 Nov 2024 10:59:36 -0500
Subject: [PATCH] Use our improved approach for a developer-friendly list of
 dependencies

---
 Makefile                            |   6 +-
 application/dependencies.json       | 366 ++++++++++++++++++++++++++++
 application/direct-dependencies.txt |  13 -
 3 files changed, 371 insertions(+), 14 deletions(-)
 create mode 100644 application/dependencies.json
 delete mode 100644 application/direct-dependencies.txt

diff --git a/Makefile b/Makefile
index 6b61739..550e2e5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,12 @@ clean:
 composer:
 	docker compose run --rm composer composer install --no-scripts
 
+composershow:
+	docker compose run --rm composer bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq "[.locked[] | { \"name\": .name, \"version\": .version }]" > dependencies.json'
+
 composerupdate:
-	docker compose run --rm composer bash -c "composer update --no-scripts; composer show --direct > direct-dependencies.txt"
+	docker compose run --rm composer composer update --no-scripts
+	make composershow
 
 db:
 	docker compose up -d db
diff --git a/application/dependencies.json b/application/dependencies.json
new file mode 100644
index 0000000..ce4cbb3
--- /dev/null
+++ b/application/dependencies.json
@@ -0,0 +1,366 @@
+[
+  {
+    "name": "forevermatt/calc-api-sig",
+    "version": "0.1.1"
+  },
+  {
+    "name": "gettext/gettext",
+    "version": "v4.8.11"
+  },
+  {
+    "name": "gettext/languages",
+    "version": "2.10.0"
+  },
+  {
+    "name": "guzzlehttp/command",
+    "version": "1.3.0"
+  },
+  {
+    "name": "guzzlehttp/guzzle",
+    "version": "7.8.0"
+  },
+  {
+    "name": "guzzlehttp/guzzle-services",
+    "version": "1.4.0"
+  },
+  {
+    "name": "guzzlehttp/promises",
+    "version": "2.0.1"
+  },
+  {
+    "name": "guzzlehttp/psr7",
+    "version": "2.6.1"
+  },
+  {
+    "name": "guzzlehttp/uri-template",
+    "version": "v1.0.2"
+  },
+  {
+    "name": "hybridauth/hybridauth",
+    "version": "v3.10.0"
+  },
+  {
+    "name": "phpfastcache/riak-client",
+    "version": "3.4.3"
+  },
+  {
+    "name": "phpmailer/phpmailer",
+    "version": "v6.8.1"
+  },
+  {
+    "name": "psr/cache",
+    "version": "2.0.0"
+  },
+  {
+    "name": "psr/container",
+    "version": "1.1.2"
+  },
+  {
+    "name": "psr/event-dispatcher",
+    "version": "1.0.0"
+  },
+  {
+    "name": "psr/http-client",
+    "version": "1.0.3"
+  },
+  {
+    "name": "psr/http-factory",
+    "version": "1.0.2"
+  },
+  {
+    "name": "psr/http-message",
+    "version": "2.0"
+  },
+  {
+    "name": "psr/log",
+    "version": "2.0.0"
+  },
+  {
+    "name": "ralouphie/getallheaders",
+    "version": "3.0.3"
+  },
+  {
+    "name": "roave/security-advisories",
+    "version": "dev-master 4bca2ea"
+  },
+  {
+    "name": "robrichards/xmlseclibs",
+    "version": "3.1.1"
+  },
+  {
+    "name": "silinternational/apiaxle-sdk-php",
+    "version": "2.0.1"
+  },
+  {
+    "name": "silinternational/php-env",
+    "version": "3.1.0"
+  },
+  {
+    "name": "simplesamlphp/assert",
+    "version": "v0.0.13"
+  },
+  {
+    "name": "simplesamlphp/composer-module-installer",
+    "version": "v1.2.0"
+  },
+  {
+    "name": "simplesamlphp/saml2",
+    "version": "v4.6.10"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp",
+    "version": "1.19.8"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-adfs",
+    "version": "v1.0.9"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-authcrypt",
+    "version": "v0.9.4"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-authfacebook",
+    "version": "v0.9.3"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-authorize",
+    "version": "v0.9.4"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-authtwitter",
+    "version": "v0.9.3"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-authwindowslive",
+    "version": "v0.9.1"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-authx509",
+    "version": "v0.9.9"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-authyubikey",
+    "version": "v0.9.3"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-cas",
+    "version": "v0.9.1"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-cdc",
+    "version": "v0.9.2"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-consent",
+    "version": "v0.9.8"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-consentadmin",
+    "version": "v0.9.2"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-discopower",
+    "version": "v0.10.1"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-exampleattributeserver",
+    "version": "v1.0.0"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-expirycheck",
+    "version": "v0.9.4"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-ldap",
+    "version": "v0.9.17"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-memcachemonitor",
+    "version": "v0.9.3"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-memcookie",
+    "version": "v1.2.2"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-metarefresh",
+    "version": "v0.10.0"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-negotiate",
+    "version": "v0.9.12"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-oauth",
+    "version": "v0.9.3"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-preprodwarning",
+    "version": "v0.9.3"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-radius",
+    "version": "v0.9.4"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-riak",
+    "version": "v0.9.1"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-sanitycheck",
+    "version": "v0.9.1"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-smartattributes",
+    "version": "v0.9.3"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-sqlauth",
+    "version": "v0.9.4"
+  },
+  {
+    "name": "simplesamlphp/simplesamlphp-module-statistics",
+    "version": "v0.9.6"
+  },
+  {
+    "name": "simplesamlphp/twig-configurable-i18n",
+    "version": "v2.3.5"
+  },
+  {
+    "name": "symfony/cache",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/cache-contracts",
+    "version": "v2.5.2"
+  },
+  {
+    "name": "symfony/config",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/console",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/dependency-injection",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/deprecation-contracts",
+    "version": "v3.4.0"
+  },
+  {
+    "name": "symfony/error-handler",
+    "version": "v6.3.5"
+  },
+  {
+    "name": "symfony/event-dispatcher",
+    "version": "v6.3.2"
+  },
+  {
+    "name": "symfony/event-dispatcher-contracts",
+    "version": "v3.4.0"
+  },
+  {
+    "name": "symfony/filesystem",
+    "version": "v6.3.1"
+  },
+  {
+    "name": "symfony/finder",
+    "version": "v5.4.27"
+  },
+  {
+    "name": "symfony/framework-bundle",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/http-foundation",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/http-kernel",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/polyfill-ctype",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/polyfill-intl-grapheme",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/polyfill-intl-normalizer",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/polyfill-mbstring",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/polyfill-php72",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/polyfill-php73",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/polyfill-php80",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/polyfill-php81",
+    "version": "v1.28.0"
+  },
+  {
+    "name": "symfony/routing",
+    "version": "v5.4.26"
+  },
+  {
+    "name": "symfony/service-contracts",
+    "version": "v2.5.2"
+  },
+  {
+    "name": "symfony/string",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "symfony/translation-contracts",
+    "version": "v2.5.2"
+  },
+  {
+    "name": "symfony/var-dumper",
+    "version": "v6.3.8"
+  },
+  {
+    "name": "symfony/var-exporter",
+    "version": "v5.4.26"
+  },
+  {
+    "name": "symfony/yaml",
+    "version": "v5.4.31"
+  },
+  {
+    "name": "twig/extensions",
+    "version": "v1.5.4"
+  },
+  {
+    "name": "twig/twig",
+    "version": "v2.15.5"
+  },
+  {
+    "name": "webmozart/assert",
+    "version": "1.11.0"
+  },
+  {
+    "name": "whitehat101/apr1-md5",
+    "version": "v1.0.0"
+  },
+  {
+    "name": "yiisoft/yii",
+    "version": "1.1.29"
+  }
+]
diff --git a/application/direct-dependencies.txt b/application/direct-dependencies.txt
deleted file mode 100644
index 103daaa..0000000
--- a/application/direct-dependencies.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-forevermatt/calc-api-sig         0.1.1             
-guzzlehttp/guzzle                7.8.0              Guzzle is a PHP HTTP client library
-guzzlehttp/guzzle-services       1.4.0              Provides an implementation of the Guzzle Command library that uses ...
-hybridauth/hybridauth            v3.10.0            PHP Social Authentication Library
-phake/phake                      v3.1.9             The Phake mock testing library
-phpunit/phpunit                  9.6.13             The PHP Unit Testing framework.
-roave/security-advisories        dev-master 4bca2ea Prevents installation of composer packages with known security vuln...
-silinternational/apiaxle-sdk-php 2.0.1              PHP client for ApiAxle APIs
-silinternational/php-env         3.1.0              Simple PHP library for getting (or requiring) environment variables...
-simplesamlphp/simplesamlphp      1.19.8             A PHP implementation of a SAML 2.0 service provider and identity pr...
-symfony/string                   v5.4.31            Provides an object-oriented API to strings and deals with bytes, UT...
-symfony/translation-contracts    v2.5.2             Generic abstractions related to translation
-yiisoft/yii                      1.1.29             Yii Web Programming Framework