From 2d5fb37cc4a90f6604da6c2c3ac4b42d52eee913 Mon Sep 17 00:00:00 2001 From: Jason Jackson Date: Fri, 2 Aug 2024 10:23:06 -0400 Subject: [PATCH 1/6] update docker-compose to docker compose --- .github/workflows/ci.yml | 2 +- Makefile | 50 ++++++++++++++++++++-------------------- docker-compose.yml | 1 - 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8813ce3..b595dd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - name: Run tests - run: docker-compose -f action-services.yml run portal /data/run-tests.sh + run: docker compose -f action-services.yml run portal /data/run-tests.sh - name: Log in to Docker Hub uses: docker/login-action@v3 diff --git a/Makefile b/Makefile index 00eeeb2..5890a41 100644 --- a/Makefile +++ b/Makefile @@ -2,75 +2,75 @@ start: web api: - docker-compose up -d api + docker compose up -d api apiaxle: redis api proxy axlesetup axlesetup: - docker-compose up -d axlesetup + docker compose up -d axlesetup bounce: - docker-compose up -d web + docker compose up -d web clean: - docker-compose kill - docker-compose rm -f + docker compose kill + docker compose rm -f composer: - docker-compose run --rm composer + docker compose run --rm composer composerupdate: - docker-compose run --rm composerupdate + docker compose run --rm composerupdate db: - docker-compose up -d db + docker compose up -d db httpbin: - docker-compose up -d httpbin + docker compose up -d httpbin phpmyadmin: - docker-compose up -d phpmyadmin + docker compose up -d phpmyadmin phpunit: - docker-compose run --rm phpunit + docker compose run --rm phpunit proxy: - docker-compose up -d proxy + docker compose up -d proxy ps: - docker-compose ps + docker compose ps redis: - docker-compose up -d redis + docker compose up -d redis rmapiaxle: - docker-compose kill redis api proxy axlesetup - docker-compose rm -f redis api proxy axlesetup + docker compose kill redis api proxy axlesetup + docker compose rm -f redis api proxy axlesetup rmdb: - docker-compose kill db - docker-compose rm -f db + docker compose kill db + docker compose rm -f db rmtestdb: - docker-compose kill testdb - docker-compose rm -f testdb + docker compose kill testdb + docker compose rm -f testdb test: testunit testdb: - docker-compose up -d testdb + docker compose up -d testdb testenv: composer rmtestdb testdb yiimigratetestdb rmapiaxle apiaxle web @echo "\n\n../../vendor/bin/phpunit --testsuite DeveloperPortal\n" - docker-compose run --rm phpunit bash + docker compose run --rm phpunit bash testunit: composer rmtestdb testdb yiimigratetestdb rmapiaxle apiaxle web phpunit web: apiaxle db composer yiimigrate - docker-compose up -d web + docker compose up -d web yiimigrate: - docker-compose run --rm yiimigrate + docker compose run --rm yiimigrate yiimigratetestdb: - docker-compose run --rm yiimigratetestdb + docker compose run --rm yiimigratetestdb diff --git a/docker-compose.yml b/docker-compose.yml index 233c29f..dab1e4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2' services: data: image: silintl/data-volume:latest From 93504393778743dd7b9214bf9674f6e499a9237f Mon Sep 17 00:00:00 2001 From: "Matt H." Date: Wed, 13 Nov 2024 10:18:20 -0500 Subject: [PATCH 2/6] Stop using `volumes_from` a data container --- docker-compose.yml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dab1e4e..12649d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,4 @@ services: - data: - image: silintl/data-volume:latest - volumes: - - ./application:/data - base: build: . image: silintl/developer-portal:local @@ -41,8 +36,8 @@ services: image: silintl/developer-portal:local depends_on: - base - volumes_from: - - data + volumes: + - ./application:/data ports: - "80:80" links: @@ -57,8 +52,8 @@ services: image: silintl/developer-portal:local depends_on: - base - volumes_from: - - data + volumes: + - ./application:/data working_dir: /data command: composer install --no-scripts @@ -66,8 +61,8 @@ services: image: silintl/developer-portal:local depends_on: - base - volumes_from: - - data + volumes: + - ./application:/data working_dir: /data command: bash -c "composer update --no-scripts; composer show --direct > direct-dependencies.txt" @@ -75,8 +70,8 @@ services: image: silintl/developer-portal:local depends_on: - base - volumes_from: - - data + volumes: + - ./application:/data links: - db env_file: @@ -89,8 +84,8 @@ services: image: silintl/developer-portal:local depends_on: - base - volumes_from: - - data + volumes: + - ./application:/data links: - testdb env_file: @@ -106,8 +101,8 @@ services: image: silintl/developer-portal:local depends_on: - base - volumes_from: - - data + volumes: + - ./application:/data links: - testdb - proxy:apiaxle.api.proxy From 2d52a83c56f3aced79ecbeae593e196758df2bfb Mon Sep 17 00:00:00 2001 From: "Matt H." Date: Wed, 13 Nov 2024 10:21:38 -0500 Subject: [PATCH 3/6] Specifically request the platform we build our apiaxle-js image for --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 12649d8..ebdbf12 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -125,6 +125,7 @@ services: api: image: silintl/apiaxle-js:1.15.2 + platform: linux/amd64 links: - redis ports: @@ -133,6 +134,7 @@ services: proxy: image: silintl/apiaxle-js:1.15.2 + platform: linux/amd64 links: - api - redis From edab6420eb078a3a460fb71d31386becdb6ffed6 Mon Sep 17 00:00:00 2001 From: "Matt H." Date: Wed, 13 Nov 2024 10:53:59 -0500 Subject: [PATCH 4/6] Have `make composer` and `make composerupdate` use the same container --- Makefile | 4 ++-- docker-compose.yml | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 5890a41..6b61739 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ clean: docker compose rm -f composer: - docker compose run --rm composer + docker compose run --rm composer composer install --no-scripts composerupdate: - docker compose run --rm composerupdate + docker compose run --rm composer bash -c "composer update --no-scripts; composer show --direct > direct-dependencies.txt" db: docker compose up -d db diff --git a/docker-compose.yml b/docker-compose.yml index ebdbf12..57f10ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,16 +55,6 @@ services: volumes: - ./application:/data working_dir: /data - command: composer install --no-scripts - - composerupdate: - image: silintl/developer-portal:local - depends_on: - - base - volumes: - - ./application:/data - working_dir: /data - command: bash -c "composer update --no-scripts; composer show --direct > direct-dependencies.txt" yiimigrate: image: silintl/developer-portal:local From 71105aa974d86f2878e5fd43b341352ad83dc267 Mon Sep 17 00:00:00 2001 From: "Matt H." Date: Wed, 13 Nov 2024 10:59:36 -0500 Subject: [PATCH 5/6] 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 From 28d43140a5575e9636ec5e8a42f8510ba7fb0863 Mon Sep 17 00:00:00 2001 From: "Matt H." Date: Wed, 13 Nov 2024 11:31:01 -0500 Subject: [PATCH 6/6] Update many of our dependencies --- application/composer.lock | 123 +++++++++++++++++----------------- application/dependencies.json | 16 ++--- 2 files changed, 70 insertions(+), 69 deletions(-) diff --git a/application/composer.lock b/application/composer.lock index ef5d302..31f89d1 100644 --- a/application/composer.lock +++ b/application/composer.lock @@ -283,16 +283,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.8.0", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", "shasum": "" }, "require": { @@ -307,11 +307,11 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -389,7 +389,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" }, "funding": [ { @@ -405,7 +405,7 @@ "type": "tidelift" } ], - "time": "2023-08-27T10:20:53+00:00" + "time": "2023-12-03T20:35:24+00:00" }, { "name": "guzzlehttp/guzzle-services", @@ -775,16 +775,16 @@ }, { "name": "hybridauth/hybridauth", - "version": "v3.10.0", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/hybridauth/hybridauth.git", - "reference": "9b5e8a7782b630d5b1151003999d6db91a863ffe" + "reference": "b70b9cbe1c7fa99b5847c5868610a8f024cc7d38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hybridauth/hybridauth/zipball/9b5e8a7782b630d5b1151003999d6db91a863ffe", - "reference": "9b5e8a7782b630d5b1151003999d6db91a863ffe", + "url": "https://api.github.com/repos/hybridauth/hybridauth/zipball/b70b9cbe1c7fa99b5847c5868610a8f024cc7d38", + "reference": "b70b9cbe1c7fa99b5847c5868610a8f024cc7d38", "shasum": "" }, "require": { @@ -831,9 +831,9 @@ "support": { "gitter": "https://gitter.im/hybridauth/hybridauth", "issues": "https://github.com/hybridauth/hybridauth/issues", - "source": "https://github.com/hybridauth/hybridauth/tree/v3.10.0" + "source": "https://github.com/hybridauth/hybridauth/tree/v3.11.0" }, - "time": "2023-07-25T15:02:07+00:00" + "time": "2024-01-02T23:09:56+00:00" }, { "name": "phpfastcache/riak-client", @@ -2137,16 +2137,16 @@ }, { "name": "silinternational/apiaxle-sdk-php", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/silinternational/apiaxle-sdk-php.git", - "reference": "ab900c7d23c67f0f9e84575ca6fd3e711000084a" + "reference": "ec94fbae600be1e1ed91acefb47ba935c6be35ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silinternational/apiaxle-sdk-php/zipball/ab900c7d23c67f0f9e84575ca6fd3e711000084a", - "reference": "ab900c7d23c67f0f9e84575ca6fd3e711000084a", + "url": "https://api.github.com/repos/silinternational/apiaxle-sdk-php/zipball/ec94fbae600be1e1ed91acefb47ba935c6be35ec", + "reference": "ec94fbae600be1e1ed91acefb47ba935c6be35ec", "shasum": "" }, "require": { @@ -2177,29 +2177,29 @@ ], "authors": [ { - "name": "Phillip Shipley", - "email": "phillip.shipley@gmail.com" + "name": "SIL GTIS", + "email": "gtis_itse_support@sil.org" } ], "description": "PHP client for ApiAxle APIs", "support": { "issues": "https://github.com/silinternational/apiaxle-sdk-php/issues", - "source": "https://github.com/silinternational/apiaxle-sdk-php/tree/2.0.1" + "source": "https://github.com/silinternational/apiaxle-sdk-php/tree/2.0.2" }, - "time": "2023-06-14T15:38:03+00:00" + "time": "2024-10-30T15:33:02+00:00" }, { "name": "silinternational/php-env", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/silinternational/php-env.git", - "reference": "d69cf17b7fc02cf6450d7d947634d07b7c2168af" + "reference": "9a60ee2653d89c1719263122cbb3abbbe7880d1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silinternational/php-env/zipball/d69cf17b7fc02cf6450d7d947634d07b7c2168af", - "reference": "d69cf17b7fc02cf6450d7d947634d07b7c2168af", + "url": "https://api.github.com/repos/silinternational/php-env/zipball/9a60ee2653d89c1719263122cbb3abbbe7880d1f", + "reference": "9a60ee2653d89c1719263122cbb3abbbe7880d1f", "shasum": "" }, "require": { @@ -2221,9 +2221,9 @@ "description": "Simple PHP library for getting (or requiring) environment variables, designed to handle true, false, and null more intelligently. If desired, an environment variable's value can be split into an array automatically.", "support": { "issues": "https://github.com/silinternational/php-env/issues", - "source": "https://github.com/silinternational/php-env/tree/3.1.0" + "source": "https://github.com/silinternational/php-env/tree/3.2.0" }, - "time": "2022-08-29T20:48:09+00:00" + "time": "2024-07-17T13:16:07+00:00" }, { "name": "simplesamlphp/assert", @@ -5039,16 +5039,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.31", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f84fd4fd8311a541ceb2ae3f257841d002450a90" + "reference": "168b77c71e6f02d8fc479db78beaf742a37d3cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f84fd4fd8311a541ceb2ae3f257841d002450a90", - "reference": "f84fd4fd8311a541ceb2ae3f257841d002450a90", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/168b77c71e6f02d8fc479db78beaf742a37d3cab", + "reference": "168b77c71e6f02d8fc479db78beaf742a37d3cab", "shasum": "" }, "require": { @@ -5058,7 +5058,7 @@ "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "predis/predis": "~1.0", + "predis/predis": "^1.0|^2.0", "symfony/cache": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", @@ -5095,7 +5095,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.31" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.46" }, "funding": [ { @@ -5111,7 +5111,7 @@ "type": "tidelift" } ], - "time": "2023-11-06T22:05:57+00:00" + "time": "2024-11-05T15:52:21+00:00" }, { "name": "symfony/http-kernel", @@ -6047,16 +6047,16 @@ }, { "name": "symfony/string", - "version": "v5.4.31", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "2765096c03f39ddf54f6af532166e42aaa05b24b" + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/2765096c03f39ddf54f6af532166e42aaa05b24b", - "reference": "2765096c03f39ddf54f6af532166e42aaa05b24b", + "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799", + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799", "shasum": "" }, "require": { @@ -6113,7 +6113,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.31" + "source": "https://github.com/symfony/string/tree/v5.4.47" }, "funding": [ { @@ -6129,20 +6129,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:19:44+00:00" + "time": "2024-11-10T20:33:58+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" + "reference": "b0073a77ac0b7ea55131020e87b1e3af540f4664" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b0073a77ac0b7ea55131020e87b1e3af540f4664", + "reference": "b0073a77ac0b7ea55131020e87b1e3af540f4664", "shasum": "" }, "require": { @@ -6191,7 +6191,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.3" }, "funding": [ { @@ -6207,7 +6207,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "symfony/var-dumper", @@ -6689,16 +6689,16 @@ }, { "name": "yiisoft/yii", - "version": "1.1.29", + "version": "1.1.30", "source": { "type": "git", "url": "https://github.com/yiisoft/yii.git", - "reference": "f89b76ecca1d342e346ebb9bfc1e2c589f696345" + "reference": "5f760e818b8bc6e4c11b6cd36d9549892fe4747b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii/zipball/f89b76ecca1d342e346ebb9bfc1e2c589f696345", - "reference": "f89b76ecca1d342e346ebb9bfc1e2c589f696345", + "url": "https://api.github.com/repos/yiisoft/yii/zipball/5f760e818b8bc6e4c11b6cd36d9549892fe4747b", + "reference": "5f760e818b8bc6e4c11b6cd36d9549892fe4747b", "shasum": "" }, "require": { @@ -6706,7 +6706,7 @@ }, "require-dev": { "cweagans/composer-patches": "^1.7", - "pear/archive_tar": "~1.4.6", + "pear/archive_tar": "~1.5.0", "phing/phing": "2.*", "phpseclib/mcrypt_compat": "^1.0", "phpunit/phpunit": "4.8.34", @@ -6735,7 +6735,8 @@ "phpunit/phpunit": { "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch", "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch", - "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php81.patch" + "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php81.patch", + "Fix PHP 8.3 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php83.patch" } } }, @@ -6827,7 +6828,7 @@ "type": "tidelift" } ], - "time": "2023-11-14T09:26:00+00:00" + "time": "2024-10-14T11:01:44+00:00" } ], "packages-dev": [ @@ -7510,16 +7511,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.13", + "version": "9.6.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", "shasum": "" }, "require": { @@ -7593,7 +7594,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" }, "funding": [ { @@ -7609,7 +7610,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:39:22+00:00" + "time": "2024-04-05T04:35:58+00:00" }, { "name": "sebastian/cli-parser", @@ -8635,5 +8636,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/application/dependencies.json b/application/dependencies.json index ce4cbb3..3c876fa 100644 --- a/application/dependencies.json +++ b/application/dependencies.json @@ -17,7 +17,7 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.8.0" + "version": "7.8.1" }, { "name": "guzzlehttp/guzzle-services", @@ -37,7 +37,7 @@ }, { "name": "hybridauth/hybridauth", - "version": "v3.10.0" + "version": "v3.11.0" }, { "name": "phpfastcache/riak-client", @@ -89,11 +89,11 @@ }, { "name": "silinternational/apiaxle-sdk-php", - "version": "2.0.1" + "version": "2.0.2" }, { "name": "silinternational/php-env", - "version": "3.1.0" + "version": "3.2.0" }, { "name": "simplesamlphp/assert", @@ -277,7 +277,7 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.31" + "version": "v5.4.46" }, { "name": "symfony/http-kernel", @@ -325,11 +325,11 @@ }, { "name": "symfony/string", - "version": "v5.4.31" + "version": "v5.4.47" }, { "name": "symfony/translation-contracts", - "version": "v2.5.2" + "version": "v2.5.3" }, { "name": "symfony/var-dumper", @@ -361,6 +361,6 @@ }, { "name": "yiisoft/yii", - "version": "1.1.29" + "version": "1.1.30" } ]