From 557ff031b2a197761da505599cdac0cec8a15f63 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Mon, 30 Jun 2025 15:51:05 -0400 Subject: [PATCH 01/14] Attempt CI action without private plugins --- composer.json | 10 --------- composer.lock | 62 +-------------------------------------------------- 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/composer.json b/composer.json index d21ee7b7..bcc188b2 100644 --- a/composer.json +++ b/composer.json @@ -61,14 +61,6 @@ "type": "vcs", "url": "https://github.com/matt-bernhardt/WP-SCSS" }, - { - "type": "vcs", - "url": "https://github.com/mitlibraries/acf-location-field" - }, - { - "type": "vcs", - "url": "https://github.com/mitlibraries/dynamic-menu-manager" - }, { "type": "path", "url": "upstream-configuration" @@ -80,8 +72,6 @@ "connectthink/wp-scss": "^2.4@beta", "cweagans/composer-patches": "^1.7", "google/apiclient": "^2.12", - "mitlibraries/acf-location-field": "^1.0", - "mitlibraries/dynamic-menu-manager": "^1.0", "oscarotero/env": "^2.1", "pantheon-systems/pantheon-mu-plugin": "*", "pantheon-upstreams/upstream-configuration": "dev-main", diff --git a/composer.lock b/composer.lock index 5d18a8b1..83aa1abe 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": "ec6638b233d495702e8e67b60aef1dba", + "content-hash": "02c0b8810b2ea3af6e7e35f186cfd40a", "packages": [ { "name": "ConnectThink/WP-SCSS", @@ -849,66 +849,6 @@ ], "time": "2025-03-27T12:30:47+00:00" }, - { - "name": "mitlibraries/acf-location-field", - "version": "1.0.0", - "source": { - "type": "git", - "url": "git@github.com:MITLibraries/acf-location-field.git", - "reference": "8f6857fe8331bd0ca608116392c5cee135297fca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/MITLibraries/acf-location-field/zipball/8f6857fe8331bd0ca608116392c5cee135297fca", - "reference": "8f6857fe8331bd0ca608116392c5cee135297fca", - "shasum": "" - }, - "type": "wordpress-plugin", - "license": [ - "GPL-2.0-only" - ], - "authors": [ - { - "name": "Elliot Condon" - } - ], - "description": "Adds a 'Google Maps' field type for the Advanced Custom Fields WordPress plugin", - "support": { - "source": "https://github.com/MITLibraries/acf-location-field/tree/1.0.0", - "issues": "https://github.com/MITLibraries/acf-location-field/issues" - }, - "time": "2022-12-06T20:22:05+00:00" - }, - { - "name": "mitlibraries/dynamic-menu-manager", - "version": "1.0.4", - "source": { - "type": "git", - "url": "git@github.com:MITLibraries/dynamic-menu-manager.git", - "reference": "7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/MITLibraries/dynamic-menu-manager/zipball/7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7", - "reference": "7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7", - "shasum": "" - }, - "type": "wordpress-plugin", - "license": [ - "GPL-2.0-only" - ], - "authors": [ - { - "name": "Duogeek" - } - ], - "description": "Add different wordpress menu in different pages", - "support": { - "source": "https://github.com/MITLibraries/dynamic-menu-manager/tree/1.0.4", - "issues": "https://github.com/MITLibraries/dynamic-menu-manager/issues" - }, - "time": "2022-12-06T20:59:34+00:00" - }, { "name": "monolog/monolog", "version": "3.9.0", From 5cfae2480fd3b88e038eb8e06d5b1bd9f323b6e9 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Mon, 30 Jun 2025 16:17:48 -0400 Subject: [PATCH 02/14] Re-add one private plugin --- composer.json | 5 +++++ composer.lock | 32 +++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bcc188b2..62815d4b 100644 --- a/composer.json +++ b/composer.json @@ -57,6 +57,10 @@ "type": "composer", "url": "https://connect.advancedcustomfields.com" }, + { + "type": "vcs", + "url": "https://github.com/MITLibraries/dynamic-menu-manager" + }, { "type": "vcs", "url": "https://github.com/matt-bernhardt/WP-SCSS" @@ -72,6 +76,7 @@ "connectthink/wp-scss": "^2.4@beta", "cweagans/composer-patches": "^1.7", "google/apiclient": "^2.12", + "mitlibraries/dynamic-menu-manager": "^1.0", "oscarotero/env": "^2.1", "pantheon-systems/pantheon-mu-plugin": "*", "pantheon-upstreams/upstream-configuration": "dev-main", diff --git a/composer.lock b/composer.lock index 83aa1abe..fa922bbb 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": "02c0b8810b2ea3af6e7e35f186cfd40a", + "content-hash": "187d8a24c9e1f3cd1e6ac2450571319b", "packages": [ { "name": "ConnectThink/WP-SCSS", @@ -849,6 +849,36 @@ ], "time": "2025-03-27T12:30:47+00:00" }, + { + "name": "mitlibraries/dynamic-menu-manager", + "version": "1.0.4", + "source": { + "type": "git", + "url": "git@github.com:MITLibraries/dynamic-menu-manager.git", + "reference": "7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MITLibraries/dynamic-menu-manager/zipball/7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7", + "reference": "7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7", + "shasum": "" + }, + "type": "wordpress-plugin", + "license": [ + "GPL-2.0-only" + ], + "authors": [ + { + "name": "Duogeek" + } + ], + "description": "Add different wordpress menu in different pages", + "support": { + "source": "https://github.com/MITLibraries/dynamic-menu-manager/tree/1.0.4", + "issues": "https://github.com/MITLibraries/dynamic-menu-manager/issues" + }, + "time": "2022-12-06T20:59:34+00:00" + }, { "name": "monolog/monolog", "version": "3.9.0", From a8e30418ffb7e6151d4dd4dfd602b257ebcd8d30 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Mon, 30 Jun 2025 16:23:36 -0400 Subject: [PATCH 03/14] Add composer diagnose to ci workflow --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f93fe54..b1719368 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,9 @@ jobs: with: php-version: ${{ matrix.php-version }} + - name: Composer diagnose + run: composer diagnose + - name: Cache Composer dependencies id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT From 63ce24215853f3c8bbcbcffe0f269bf9129ceade Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Mon, 30 Jun 2025 16:26:41 -0400 Subject: [PATCH 04/14] Lowercase URL for github --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 62815d4b..2d272327 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ }, { "type": "vcs", - "url": "https://github.com/MITLibraries/dynamic-menu-manager" + "url": "https://github.com/mitlibraries/dynamic-menu-manager" }, { "type": "vcs", From bd4a203b0bf5f1107c40e373acc95580a7a1d702 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Mon, 30 Jun 2025 16:45:27 -0400 Subject: [PATCH 05/14] Remove composer diagnose --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1719368..5f93fe54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,6 @@ jobs: with: php-version: ${{ matrix.php-version }} - - name: Composer diagnose - run: composer diagnose - - name: Cache Composer dependencies id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT From fa8d9f08e3564b8d91230235e77f8eb392c21a44 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Mon, 30 Jun 2025 16:47:23 -0400 Subject: [PATCH 06/14] Update composer.lock --- composer.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index fa922bbb..8dda729e 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": "187d8a24c9e1f3cd1e6ac2450571319b", + "content-hash": "0393eba1f8f804f04b2afb59b7037a78", "packages": [ { "name": "ConnectThink/WP-SCSS", @@ -4534,6 +4534,6 @@ "platform": { "php": ">=7.4" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" } From d5e9b5939db03d2e0b64eb47ce07ae0f95492cca Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Mon, 30 Jun 2025 16:51:54 -0400 Subject: [PATCH 07/14] Drop PHP8.1, more verbose composer install --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f93fe54..ca05283b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - php-version: ['8.1', '8.2', '8.3', '8.4'] + php-version: ['8.2', '8.3', '8.4'] steps: - uses: actions/checkout@v4 @@ -35,7 +35,7 @@ jobs: run: composer validate --no-check-all - name: Install Composer dependencies - run: composer install --no-progress --prefer-dist --optimize-autoloader + run: composer install --no-progress --prefer-dist --optimize-autoloader -vv env: ACF_PRO_KEY: ${{ secrets.ACF_PRO_KEY }} COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} From 37be26d4126b6976ff83837d6bec73453a896fe6 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Tue, 1 Jul 2025 09:29:13 -0400 Subject: [PATCH 08/14] Skip composer install for CI workflow --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca05283b..96af305e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,11 +34,11 @@ jobs: - name: Check Composer lock file is up to date run: composer validate --no-check-all - - name: Install Composer dependencies - run: composer install --no-progress --prefer-dist --optimize-autoloader -vv - env: - ACF_PRO_KEY: ${{ secrets.ACF_PRO_KEY }} - COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} + # - name: Install Composer dependencies + # run: composer install --no-progress --prefer-dist --optimize-autoloader -vv + # env: + # ACF_PRO_KEY: ${{ secrets.ACF_PRO_KEY }} + # COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} - name: Run tests run: composer security From ba1c89dacf15a97559460d7fbe49df4125fde90e Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Tue, 1 Jul 2025 10:04:43 -0400 Subject: [PATCH 09/14] Explicitly enable phpcs under setup-php --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96af305e..662fd641 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} + tools: phpcs - name: Cache Composer dependencies id: composer-cache From b47388e3498e14f4828b9a6fae8c8545cbd5ca84 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Tue, 1 Jul 2025 10:10:03 -0400 Subject: [PATCH 10/14] Re-enable composer install, no private plugins --- .github/workflows/ci.yml | 10 +++++----- composer.json | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 662fd641..18c12c52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,11 +35,11 @@ jobs: - name: Check Composer lock file is up to date run: composer validate --no-check-all - # - name: Install Composer dependencies - # run: composer install --no-progress --prefer-dist --optimize-autoloader -vv - # env: - # ACF_PRO_KEY: ${{ secrets.ACF_PRO_KEY }} - # COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} + - name: Install Composer dependencies + run: composer install --no-progress --prefer-dist --optimize-autoloader -vv + env: + ACF_PRO_KEY: ${{ secrets.ACF_PRO_KEY }} + COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} - name: Run tests run: composer security diff --git a/composer.json b/composer.json index 2d272327..88c58d34 100644 --- a/composer.json +++ b/composer.json @@ -57,6 +57,10 @@ "type": "composer", "url": "https://connect.advancedcustomfields.com" }, + { + "type": "vcs", + "url": "https://github.com/mitlibraries/acf-location-field" + }, { "type": "vcs", "url": "https://github.com/mitlibraries/dynamic-menu-manager" @@ -76,7 +80,6 @@ "connectthink/wp-scss": "^2.4@beta", "cweagans/composer-patches": "^1.7", "google/apiclient": "^2.12", - "mitlibraries/dynamic-menu-manager": "^1.0", "oscarotero/env": "^2.1", "pantheon-systems/pantheon-mu-plugin": "*", "pantheon-upstreams/upstream-configuration": "dev-main", From 3fb58ab3dcacbe71dd8bb48e9d052bda5509b316 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Tue, 1 Jul 2025 10:56:34 -0400 Subject: [PATCH 11/14] Update composer.lock, security advisories --- composer.lock | 117 ++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 62 deletions(-) diff --git a/composer.lock b/composer.lock index 8dda729e..d5f979c9 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": "0393eba1f8f804f04b2afb59b7037a78", + "content-hash": "79a470127c1b8389e4d2680a6dbbd99c", "packages": [ { "name": "ConnectThink/WP-SCSS", @@ -849,36 +849,6 @@ ], "time": "2025-03-27T12:30:47+00:00" }, - { - "name": "mitlibraries/dynamic-menu-manager", - "version": "1.0.4", - "source": { - "type": "git", - "url": "git@github.com:MITLibraries/dynamic-menu-manager.git", - "reference": "7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/MITLibraries/dynamic-menu-manager/zipball/7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7", - "reference": "7d1e555d4454d5fc21c8cb96f6cd7e03f55c11f7", - "shasum": "" - }, - "type": "wordpress-plugin", - "license": [ - "GPL-2.0-only" - ], - "authors": [ - { - "name": "Duogeek" - } - ], - "description": "Add different wordpress menu in different pages", - "support": { - "source": "https://github.com/MITLibraries/dynamic-menu-manager/tree/1.0.4", - "issues": "https://github.com/MITLibraries/dynamic-menu-manager/issues" - }, - "time": "2022-12-06T20:59:34+00:00" - }, { "name": "monolog/monolog", "version": "3.9.0", @@ -3450,12 +3420,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "59be420c5cdc0c3c9cdae31804d32fefb515a918" + "reference": "d4ca0cc4c49ba3437778e201d35844715d9b1bd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/59be420c5cdc0c3c9cdae31804d32fefb515a918", - "reference": "59be420c5cdc0c3c9cdae31804d32fefb515a918", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/d4ca0cc4c49ba3437778e201d35844715d9b1bd9", + "reference": "d4ca0cc4c49ba3437778e201d35844715d9b1bd9", "shasum": "" }, "conflict": { @@ -3497,7 +3467,10 @@ "athlon1600/php-proxy-app": "<=3", "athlon1600/youtube-downloader": "<=4", "austintoddj/canvas": "<=3.4.2", - "auth0/wordpress": "<=4.6", + "auth0/auth0-php": ">=8.0.0.0-beta1,<8.14", + "auth0/login": "<7.17", + "auth0/symfony": "<5.4", + "auth0/wordpress": "<5.3", "automad/automad": "<2.0.0.0-alpha5", "automattic/jetpack": "<9.8", "awesome-support/awesome-support": "<=6.0.7", @@ -3512,16 +3485,17 @@ "bagisto/bagisto": "<2.1", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", - "barryvdh/laravel-translation-manager": "<0.6.2", + "barryvdh/laravel-translation-manager": "<0.6.8", "barzahlen/barzahlen-php": "<2.0.1", "baserproject/basercms": "<=5.1.1", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bbpress/bbpress": "<2.6.5", + "bcit-ci/codeigniter": "<3.1.3", "bcosca/fatfree": "<3.7.2", "bedita/bedita": "<4", "bednee/cooluri": "<1.0.30", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<=3.1.4", + "billz/raspap-webgui": "<3.3.6", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "blueimp/jquery-file-upload": "==6.4.4", "bmarshall511/wordpress_zero_spam": "<5.2.13", @@ -3552,13 +3526,14 @@ "centreon/centreon": "<22.10.15", "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "chriskacerguis/codeigniter-restserver": "<=2.7.1", + "chrome-php/chrome": "<1.14", "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3", "ckeditor/ckeditor": "<4.25", - "clickstorm/cs-seo": ">=6,<6.7|>=7,<7.4|>=8,<8.3|>=9,<9.2", + "clickstorm/cs-seo": ">=6,<6.8|>=7,<7.5|>=8,<8.4|>=9,<9.3", "co-stack/fal_sftp": "<0.2.6", "cockpit-hq/cockpit": "<2.7|==2.7", "codeception/codeception": "<3.1.3|>=4,<4.1.22", - "codeigniter/framework": "<3.1.9", + "codeigniter/framework": "<3.1.10", "codeigniter4/framework": "<4.5.8", "codeigniter4/shield": "<1.0.0.0-beta8", "codiad/codiad": "<=2.8.4", @@ -3577,6 +3552,7 @@ "contao/managed-edition": "<=1.5", "corveda/phpsandbox": "<1.3.5", "cosenary/instagram": "<=2.3", + "couleurcitron/tarteaucitron-wp": "<0.3", "craftcms/cms": "<4.15.3|>=5,<5.7.5", "croogo/croogo": "<4", "cuyz/valinor": "<0.12", @@ -3612,9 +3588,12 @@ "dolibarr/dolibarr": "<19.0.2|==21.0.0.0-beta", "dompdf/dompdf": "<2.0.4", "doublethreedigital/guest-entries": "<3.1.2", + "drupal/admin_audit_trail": "<1.0.5", "drupal/ai": "<1.0.5", "drupal/alogin": "<2.0.6", "drupal/cache_utility": "<1.2.1", + "drupal/commerce_alphabank_redirect": "<1.0.3", + "drupal/commerce_eurobank_redirect": "<2.1.1", "drupal/config_split": "<1.10|>=2,<2.0.2", "drupal/core": ">=6,<6.38|>=7,<7.102|>=8,<10.3.14|>=10.4,<10.4.5|>=11,<11.0.13|>=11.1,<11.1.5", "drupal/core-recommended": ">=7,<7.102|>=8,<10.2.11|>=10.3,<10.3.9|>=11,<11.0.8", @@ -3623,11 +3602,13 @@ "drupal/gdpr": "<3.0.1|>=3.1,<3.1.2", "drupal/google_tag": "<1.8|>=2,<2.0.8", "drupal/ignition": "<1.0.4", + "drupal/lightgallery": "<1.6", "drupal/link_field_display_mode_formatter": "<1.6", "drupal/matomo": "<1.24", "drupal/oauth2_client": "<4.1.3", "drupal/oauth2_server": "<2.1", "drupal/obfuscate": "<2.0.1", + "drupal/quick_node_block": "<2", "drupal/rapidoc_elements_field_formatter": "<1.0.1", "drupal/spamspan": "<3.2.1", "drupal/tfa": "<1.10", @@ -3640,6 +3621,7 @@ "elefant/cms": "<2.0.7", "elgg/elgg": "<3.3.24|>=4,<4.0.5", "elijaa/phpmemcacheadmin": "<=1.3", + "elmsln/haxcms": "<11", "encore/laravel-admin": "<=1.8.19", "endroid/qr-code-bundle": "<3.4.2", "enhavo/enhavo-app": "<=0.13.1", @@ -3654,8 +3636,8 @@ "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1-dev", "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1-dev|>=5.4,<5.4.11.1-dev|>=2017.12,<2017.12.0.1-dev", "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", - "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26|>=3.3,<3.3.39", - "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.38|>=3.3,<3.3.39", + "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1|>=5.3.0.0-beta1,<5.3.5", "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12", "ezsystems/ezplatform-http-cache": "<2.3.16", "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.35", @@ -3715,11 +3697,11 @@ "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", "georgringer/news": "<1.3.3", - "geshi/geshi": "<1.0.8.11-dev", + "geshi/geshi": "<=1.0.9.1", "getformwork/formwork": "<1.13.1|>=2.0.0.0-beta1,<2.0.0.0-beta4", "getgrav/grav": "<1.7.46", - "getkirby/cms": "<=3.6.6.5|>=3.7,<=3.7.5.4|>=3.8,<=3.8.4.3|>=3.9,<=3.9.8.1|>=3.10,<=3.10.1|>=4,<=4.3", - "getkirby/kirby": "<=2.5.12", + "getkirby/cms": "<3.9.8.3-dev|>=3.10,<3.10.1.2-dev|>=4,<4.7.1", + "getkirby/kirby": "<3.9.8.3-dev|>=3.10,<3.10.1.2-dev|>=4,<4.7.1", "getkirby/panel": "<2.5.14", "getkirby/starterkit": "<=3.7.0.2", "gilacms/gila": "<=1.15.4", @@ -3737,6 +3719,7 @@ "guzzlehttp/oauth-subscriber": "<0.8.1", "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5", "haffner/jh_captcha": "<=2.1.3|>=3,<=3.0.2", + "handcraftedinthealps/goodby-csv": "<1.4.3", "harvesthq/chosen": "<1.8.7", "helloxz/imgurl": "<=2.31", "hhxsv5/laravel-s": "<3.7.36", @@ -3746,9 +3729,10 @@ "hov/jobfair": "<1.0.13|>=2,<2.0.2", "httpsoft/http-message": "<1.0.12", "hyn/multi-tenant": ">=5.6,<5.7.2", - "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6,<4.6.14", + "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6,<4.6.21", + "ibexa/admin-ui-assets": ">=4.6.0.0-alpha1,<4.6.21", "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.6|>=4.6,<4.6.2", - "ibexa/fieldtype-richtext": ">=4.6,<4.6.19", + "ibexa/fieldtype-richtext": ">=4.6,<4.6.21", "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", "ibexa/http-cache": ">=4.6,<4.6.14", "ibexa/post-install": "<1.0.16|>=4.6,<4.6.14", @@ -3765,7 +3749,7 @@ "imdbphp/imdbphp": "<=5.1.1", "impresscms/impresscms": "<=1.4.5", "impresspages/impresspages": "<1.0.13", - "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3", + "in2code/femanager": "<5.5.5|>=6,<6.4.1|>=7,<7.4.2|>=8,<8.2.2", "in2code/ipandlanguageredirect": "<5.1.2", "in2code/lux": "<17.6.1|>=18,<24.0.2", "in2code/powermail": "<7.5.1|>=8,<8.5.1|>=9,<10.9.1|>=11,<12.4.1", @@ -3798,7 +3782,7 @@ "joyqi/hyper-down": "<=2.4.27", "jsdecena/laracom": "<2.0.9", "jsmitty12/phpwhois": "<5.1", - "juzaweb/cms": "<=3.4", + "juzaweb/cms": "<=3.4.2", "jweiland/events2": "<8.3.8|>=9,<9.0.6", "jweiland/kk-downloader": "<1.2.2", "kazist/phpwhois": "<=4.2.6", @@ -3844,11 +3828,12 @@ "livewire/volt": "<1.7", "lms/routes": "<2.1.1", "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", + "lomkit/laravel-rest-api": "<2.13", "luracast/restler": "<3.1", "luyadev/yii-helpers": "<1.2.1", "macropay-solutions/laravel-crud-wizard-free": "<3.4.17", "maestroerror/php-heic-to-jpg": "<1.0.5", - "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch12|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch10|>=2.4.7.0-beta1,<2.4.7.0-patch5|>=2.4.8.0-beta1,<2.4.8.0-beta2", + "magento/community-edition": "<2.4.5.0-patch13|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch11|>=2.4.7.0-beta1,<2.4.7.0-patch6|>=2.4.8.0-beta1,<2.4.8.0-patch1", "magento/core": "<=1.9.4.5", "magento/magento1ce": "<1.9.4.3-dev", "magento/magento1ee": ">=1,<1.14.4.3-dev", @@ -3861,7 +3846,7 @@ "marcwillmann/turn": "<0.3.3", "matomo/matomo": "<1.11", "matyhtf/framework": "<3.0.6", - "mautic/core": "<5.2.3", + "mautic/core": "<5.2.6|>=6.0.0.0-alpha,<6.0.2", "mautic/core-lib": ">=1.0.0.0-beta,<4.4.13|>=5.0.0.0-alpha,<5.1.1", "maximebf/debugbar": "<1.19", "mdanter/ecc": "<2", @@ -3918,6 +3903,7 @@ "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", "nilsteampassnet/teampass": "<3.1.3.1-dev", + "nitsan/ns-backup": "<13.0.1", "nonfiction/nterchange": "<4.1.1", "notrinos/notrinos-erp": "<=0.7", "noumo/easyii": "<=0.9", @@ -3950,7 +3936,7 @@ "oro/customer-portal": ">=4.1,<=4.1.13|>=4.2,<=4.2.10|>=5,<=5.0.11|>=5.1,<=5.1.3", "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<=5.0.12|>=5.1,<=5.1.3", "oveleon/contao-cookiebar": "<1.16.3|>=2,<2.1.3", - "oxid-esales/oxideshop-ce": "<4.5", + "oxid-esales/oxideshop-ce": "<=7.0.5", "oxid-esales/paymorrow-module": ">=1,<1.0.2|>=2,<2.0.1", "packbackbooks/lti-1-3-php-library": "<5", "padraic/humbug_get_contents": "<1.1.2", @@ -3982,6 +3968,7 @@ "phpmyadmin/phpmyadmin": "<5.2.2", "phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5|>=3.2.10,<=4.0.1", "phpoffice/common": "<0.2.9", + "phpoffice/math": "<=0.2", "phpoffice/phpexcel": "<=1.8.2", "phpoffice/phpspreadsheet": "<1.29.9|>=2,<2.1.8|>=2.2,<2.3.7|>=3,<3.9", "phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36", @@ -4022,7 +4009,7 @@ "processwire/processwire": "<=3.0.229", "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7", "propel/propel1": ">=1,<=1.7.1", - "pterodactyl/panel": "<1.11.8", + "pterodactyl/panel": "<=1.11.10", "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2", "ptrofimov/beanstalk_console": "<1.7.14", "pubnub/pubnub": "<6.1", @@ -4042,11 +4029,13 @@ "really-simple-plugins/complianz-gdpr": "<6.4.2", "redaxo/source": "<5.18.3", "remdex/livehelperchat": "<4.29", + "renolit/reint-downloadmanager": "<4.0.2|>=5,<5.0.1", "reportico-web/reportico": "<=8.1", "rhukster/dom-sanitizer": "<1.0.7", "rmccue/requests": ">=1.6,<1.8", "robrichards/xmlseclibs": ">=1,<3.0.4", "roots/soil": "<4.1", + "roundcube/roundcubemail": "<1.5.10|>=1.6,<1.6.11", "rudloff/alltube": "<3.0.3", "rudloff/rtmpdump-bin": "<=2.3.1", "s-cart/core": "<6.9", @@ -4059,8 +4048,8 @@ "serluck/phpwhois": "<=4.2.6", "sfroemken/url_redirect": "<=1.2.1", "sheng/yiicms": "<1.2.1", - "shopware/core": "<6.6.10.3-dev|>=6.7.0.0-RC1-dev,<6.7.0.0-RC2-dev", - "shopware/platform": "<6.6.10.3-dev|>=6.7.0.0-RC1-dev,<6.7.0.0-RC2-dev", + "shopware/core": "<6.5.8.18-dev|>=6.6,<6.6.10.3-dev|>=6.7.0.0-RC1-dev,<6.7.0.0-RC2-dev", + "shopware/platform": "<6.5.8.18-dev|>=6.6,<6.6.10.3-dev|>=6.7.0.0-RC1-dev,<6.7.0.0-RC2-dev", "shopware/production": "<=6.3.5.2", "shopware/shopware": "<=5.7.17", "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev", @@ -4096,7 +4085,7 @@ "simplesamlphp/xml-security": "==1.6.11", "simplito/elliptic-php": "<1.0.6", "sitegeist/fluid-components": "<3.5", - "sjbr/sr-feuser-register": "<2.6.2", + "sjbr/sr-feuser-register": "<2.6.2|>=5.1,<12.5", "sjbr/sr-freecap": "<2.4.6|>=2.5,<2.5.3", "sjbr/static-info-tables": "<2.3.1", "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1", @@ -4114,8 +4103,8 @@ "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", "ssddanbrown/bookstack": "<24.05.1", - "starcitizentools/citizen-skin": ">=2.6.3,<2.31", - "starcitizentools/tabber-neue": ">=1.9.1,<2.7.2", + "starcitizentools/citizen-skin": ">=2.4.2,<3.3.1", + "starcitizentools/tabber-neue": ">=1.9.1,<2.7.2|>=3,<3.1.1", "statamic/cms": "<=5.16", "stormpath/sdk": "<9.9.99", "studio-42/elfinder": "<=2.1.64", @@ -4123,7 +4112,7 @@ "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", "sulu/form-bundle": ">=2,<2.5.3", - "sulu/sulu": "<1.6.44|>=2,<2.5.21|>=2.6,<2.6.5", + "sulu/sulu": "<1.6.44|>=2,<2.5.25|>=2.6,<2.6.9|>=3.0.0.0-alpha1,<3.0.0.0-alpha3", "sumocoders/framework-user-bundle": "<1.4", "superbig/craft-audit": "<3.0.2", "svewap/a21glossary": "<=0.4.10", @@ -4170,6 +4159,8 @@ "symfony/translation": ">=2,<2.0.17", "symfony/twig-bridge": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", "symfony/ux-autocomplete": "<2.11.2", + "symfony/ux-live-component": "<2.25.1", + "symfony/ux-twig-component": "<2.25.1", "symfony/validator": "<5.4.43|>=6,<6.4.11|>=7,<7.1.4", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", @@ -4207,10 +4198,10 @@ "twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2", "twig/twig": "<3.11.2|>=3.12,<3.14.1|>=3.16,<3.19", "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2", - "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<10.4.46|>=11,<11.5.40|>=12,<12.4.21|>=13,<13.3.1", + "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<10.4.46|>=11,<11.5.40|>=12,<=12.4.30|>=13,<=13.4.11", "typo3/cms-belog": ">=10,<=10.4.47|>=11,<=11.5.41|>=12,<=12.4.24|>=13,<=13.4.2", "typo3/cms-beuser": ">=10,<=10.4.47|>=11,<=11.5.41|>=12,<=12.4.24|>=13,<=13.4.2", - "typo3/cms-core": "<=8.7.56|>=9,<=9.5.48|>=10,<=10.4.47|>=11,<=11.5.41|>=12,<=12.4.24|>=13,<=13.4.2", + "typo3/cms-core": "<=8.7.56|>=9,<=9.5.50|>=10,<=10.4.49|>=11,<=11.5.43|>=12,<=12.4.30|>=13,<=13.4.11", "typo3/cms-dashboard": ">=10,<=10.4.47|>=11,<=11.5.41|>=12,<=12.4.24|>=13,<=13.4.2", "typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1", "typo3/cms-extensionmanager": ">=10,<=10.4.47|>=11,<=11.5.41|>=12,<=12.4.24|>=13,<=13.4.2", @@ -4223,6 +4214,8 @@ "typo3/cms-lowlevel": ">=11,<=11.5.41", "typo3/cms-rte-ckeditor": ">=9.5,<9.5.42|>=10,<10.4.39|>=11,<11.5.30", "typo3/cms-scheduler": ">=11,<=11.5.41", + "typo3/cms-setup": ">=9,<=9.5.50|>=10,<=10.4.49|>=11,<=11.5.43|>=12,<=12.4.30|>=13,<=13.4.11", + "typo3/cms-webhooks": ">=12,<=12.4.30|>=13,<=13.4.11", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", "typo3/html-sanitizer": ">=1,<=1.5.2|>=2,<=2.1.3", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", @@ -4294,7 +4287,7 @@ "yiisoft/yii2-elasticsearch": "<2.0.5", "yiisoft/yii2-gii": "<=2.2.4", "yiisoft/yii2-jui": "<2.0.4", - "yiisoft/yii2-redis": "<2.0.8", + "yiisoft/yii2-redis": "<2.0.20", "yikesinc/yikes-inc-easy-mailchimp-extender": "<6.8.6", "yoast-seo-for-typo3/yoast_seo": "<7.2.3", "yourls/yourls": "<=1.8.2", @@ -4373,7 +4366,7 @@ "type": "tidelift" } ], - "time": "2025-05-08T20:06:04+00:00" + "time": "2025-06-27T21:05:09+00:00" }, { "name": "squizlabs/php_codesniffer", From 1141f2e2517a1ad560f08200f958f468addb5e32 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Tue, 1 Jul 2025 16:42:22 -0400 Subject: [PATCH 12/14] Convert wp-scss to mitlibraries source --- composer.json | 4 ++-- composer.lock | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 88c58d34..4b796b47 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,7 @@ }, { "type": "vcs", - "url": "https://github.com/matt-bernhardt/WP-SCSS" + "url": "https://github.com/mitlibraries/wp-scss" }, { "type": "path", @@ -77,7 +77,7 @@ "require": { "php": ">=7.4", "composer/installers": "^2.2", - "connectthink/wp-scss": "^2.4@beta", + "connectthink/wp-scss": "2.4.1-beta1", "cweagans/composer-patches": "^1.7", "google/apiclient": "^2.12", "oscarotero/env": "^2.1", diff --git a/composer.lock b/composer.lock index d5f979c9..51ca7d9c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "79a470127c1b8389e4d2680a6dbbd99c", + "content-hash": "46b8ed0f05daccbf30e12646b710afb6", "packages": [ { "name": "ConnectThink/WP-SCSS", - "version": "2.4.1-beta2", + "version": "2.4.1-beta1", "source": { "type": "git", - "url": "https://github.com/matt-bernhardt/WP-SCSS.git", - "reference": "40eb06df723be4832b2658c2f3046eeb5cce4b6a" + "url": "https://github.com/MITLibraries/wp-scss.git", + "reference": "ff756776fb252b56d3bacc3762fc425b90110be1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matt-bernhardt/WP-SCSS/zipball/40eb06df723be4832b2658c2f3046eeb5cce4b6a", - "reference": "40eb06df723be4832b2658c2f3046eeb5cce4b6a", + "url": "https://api.github.com/repos/MITLibraries/wp-scss/zipball/ff756776fb252b56d3bacc3762fc425b90110be1", + "reference": "ff756776fb252b56d3bacc3762fc425b90110be1", "shasum": "" }, "type": "wordpress-plugin", @@ -27,9 +27,10 @@ "wordpress" ], "support": { - "source": "https://github.com/matt-bernhardt/WP-SCSS/tree/2.4.1-beta2" + "source": "https://github.com/MITLibraries/wp-scss/tree/2.4.1-beta1", + "issues": "https://github.com/MITLibraries/wp-scss/issues" }, - "time": "2022-10-18T23:27:41+00:00" + "time": "2025-07-01T16:07:29+00:00" }, { "name": "composer/installers", From cdd09b3a34c901b1061b7e85e116ed581f89c5af Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Tue, 1 Jul 2025 17:16:49 -0400 Subject: [PATCH 13/14] Update indirect dependencies --- composer.lock | 137 +++++++++++++++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 53 deletions(-) diff --git a/composer.lock b/composer.lock index 51ca7d9c..6f54881e 100644 --- a/composer.lock +++ b/composer.lock @@ -360,16 +360,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.396.0", + "version": "v0.401.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "ceb2e432e4326c6775d24f62d554395a1a9ad3dd" + "reference": "8366037e450b62ffc1c5489459f207640acca2b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/ceb2e432e4326c6775d24f62d554395a1a9ad3dd", - "reference": "ceb2e432e4326c6775d24f62d554395a1a9ad3dd", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/8366037e450b62ffc1c5489459f207640acca2b4", + "reference": "8366037e450b62ffc1c5489459f207640acca2b4", "shasum": "" }, "require": { @@ -398,9 +398,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.396.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.401.0" }, - "time": "2025-02-24T01:10:27+00:00" + "time": "2025-06-04T17:28:44+00:00" }, { "name": "google/auth", @@ -1253,16 +1253,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.43", + "version": "3.0.46", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "709ec107af3cb2f385b9617be72af8cf62441d02" + "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02", - "reference": "709ec107af3cb2f385b9617be72af8cf62441d02", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6", + "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6", "shasum": "" }, "require": { @@ -1343,7 +1343,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.43" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.46" }, "funding": [ { @@ -1359,7 +1359,7 @@ "type": "tidelift" } ], - "time": "2024-12-14T21:12:59+00:00" + "time": "2025-06-26T16:29:55+00:00" }, { "name": "psr/cache", @@ -2153,16 +2153,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", "shasum": "" }, "require": { @@ -2175,7 +2175,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -2200,7 +2200,7 @@ "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.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" }, "funding": [ { @@ -2216,7 +2216,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3173,28 +3173,28 @@ "packages-dev": [ { "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v1.0.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/composer-installer.git", - "reference": "4be43904336affa5c2f70744a348312336afd0da" + "reference": "6e0fa428497bf560152ee73ffbb8af5c6a56b0dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da", - "reference": "4be43904336affa5c2f70744a348312336afd0da", + "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/6e0fa428497bf560152ee73ffbb8af5c6a56b0dd", + "reference": "6e0fa428497bf560152ee73ffbb8af5c6a56b0dd", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0 || ^2.0", + "composer-plugin-api": "^2.2", "php": ">=5.4", "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" }, "require-dev": { - "composer/composer": "*", + "composer/composer": "^2.2", "ext-json": "*", "ext-zip": "*", - "php-parallel-lint/php-parallel-lint": "^1.3.1", + "php-parallel-lint/php-parallel-lint": "^1.4.0", "phpcompatibility/php-compatibility": "^9.0", "yoast/phpunit-polyfills": "^1.0" }, @@ -3214,9 +3214,9 @@ "authors": [ { "name": "Franck Nijhof", - "email": "franck.nijhof@dealerdirect.com", - "homepage": "http://www.frenck.nl", - "role": "Developer / IT Manager" + "email": "opensource@frenck.dev", + "homepage": "https://frenck.dev", + "role": "Open source developer" }, { "name": "Contributors", @@ -3224,7 +3224,6 @@ } ], "description": "PHP_CodeSniffer Standards Composer Installer Plugin", - "homepage": "http://www.dealerdirect.com", "keywords": [ "PHPCodeSniffer", "PHP_CodeSniffer", @@ -3245,35 +3244,54 @@ ], "support": { "issues": "https://github.com/PHPCSStandards/composer-installer/issues", + "security": "https://github.com/PHPCSStandards/composer-installer/security/policy", "source": "https://github.com/PHPCSStandards/composer-installer" }, - "time": "2023-01-05T11:28:13+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" + } + ], + "time": "2025-06-27T17:24:01+00:00" }, { "name": "phpcsstandards/phpcsextra", - "version": "1.2.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHPCSExtra.git", - "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489" + "reference": "fa4b8d051e278072928e32d817456a7fdb57b6ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", - "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/fa4b8d051e278072928e32d817456a7fdb57b6ca", + "reference": "fa4b8d051e278072928e32d817456a7fdb57b6ca", "shasum": "" }, "require": { "php": ">=5.4", - "phpcsstandards/phpcsutils": "^1.0.9", - "squizlabs/php_codesniffer": "^3.8.0" + "phpcsstandards/phpcsutils": "^1.1.0", + "squizlabs/php_codesniffer": "^3.13.0 || ^4.0" }, "require-dev": { "php-parallel-lint/php-console-highlighter": "^1.0", - "php-parallel-lint/php-parallel-lint": "^1.3.2", + "php-parallel-lint/php-parallel-lint": "^1.4.0", "phpcsstandards/phpcsdevcs": "^1.1.6", "phpcsstandards/phpcsdevtools": "^1.2.1", - "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "type": "phpcodesniffer-standard", "extra": { @@ -3323,35 +3341,39 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2023-12-08T16:49:07+00:00" + "time": "2025-06-14T07:40:39+00:00" }, { "name": "phpcsstandards/phpcsutils", - "version": "1.0.12", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHPCSUtils.git", - "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c" + "reference": "65355670ac17c34cd235cf9d3ceae1b9252c4dad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/87b233b00daf83fb70f40c9a28692be017ea7c6c", - "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/65355670ac17c34cd235cf9d3ceae1b9252c4dad", + "reference": "65355670ac17c34cd235cf9d3ceae1b9252c4dad", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0", "php": ">=5.4", - "squizlabs/php_codesniffer": "^3.10.0 || 4.0.x-dev@dev" + "squizlabs/php_codesniffer": "^3.13.0 || ^4.0" }, "require-dev": { "ext-filter": "*", "php-parallel-lint/php-console-highlighter": "^1.0", - "php-parallel-lint/php-parallel-lint": "^1.3.2", + "php-parallel-lint/php-parallel-lint": "^1.4.0", "phpcsstandards/phpcsdevcs": "^1.1.6", - "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0" + "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0 || ^3.0.0" }, "type": "phpcodesniffer-standard", "extra": { @@ -3388,6 +3410,7 @@ "phpcodesniffer-standard", "phpcs", "phpcs3", + "phpcs4", "standards", "static analysis", "tokens", @@ -3411,9 +3434,13 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2024-05-20T13:34:27+00:00" + "time": "2025-06-12T04:32:33+00:00" }, { "name": "roave/security-advisories", @@ -4371,16 +4398,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.3", + "version": "3.13.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" + "reference": "5b5e3821314f947dd040c70f7992a64eac89025c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c", + "reference": "5b5e3821314f947dd040c70f7992a64eac89025c", "shasum": "" }, "require": { @@ -4445,9 +4472,13 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2024-09-18T10:38:58+00:00" + "time": "2025-06-17T22:17:01+00:00" }, { "name": "wp-coding-standards/wpcs", From 5cc807efa720ba727e6d1267ecae049b7a11c272 Mon Sep 17 00:00:00 2001 From: Matthew Bernhardt Date: Wed, 2 Jul 2025 10:29:40 -0400 Subject: [PATCH 14/14] Add private plugin back --- composer.json | 1 + composer.lock | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4b796b47..b3558d74 100644 --- a/composer.json +++ b/composer.json @@ -80,6 +80,7 @@ "connectthink/wp-scss": "2.4.1-beta1", "cweagans/composer-patches": "^1.7", "google/apiclient": "^2.12", + "mitlibraries/acf-location-field": "^1.0", "oscarotero/env": "^2.1", "pantheon-systems/pantheon-mu-plugin": "*", "pantheon-upstreams/upstream-configuration": "dev-main", diff --git a/composer.lock b/composer.lock index 6f54881e..2969ee2c 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": "46b8ed0f05daccbf30e12646b710afb6", + "content-hash": "2844f2364a3ff684773a722554c9a328", "packages": [ { "name": "ConnectThink/WP-SCSS", @@ -850,6 +850,36 @@ ], "time": "2025-03-27T12:30:47+00:00" }, + { + "name": "mitlibraries/acf-location-field", + "version": "1.0.0", + "source": { + "type": "git", + "url": "git@github.com:MITLibraries/acf-location-field.git", + "reference": "8f6857fe8331bd0ca608116392c5cee135297fca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MITLibraries/acf-location-field/zipball/8f6857fe8331bd0ca608116392c5cee135297fca", + "reference": "8f6857fe8331bd0ca608116392c5cee135297fca", + "shasum": "" + }, + "type": "wordpress-plugin", + "license": [ + "GPL-2.0-only" + ], + "authors": [ + { + "name": "Elliot Condon" + } + ], + "description": "Adds a 'Google Maps' field type for the Advanced Custom Fields WordPress plugin", + "support": { + "source": "https://github.com/MITLibraries/acf-location-field/tree/1.0.0", + "issues": "https://github.com/MITLibraries/acf-location-field/issues" + }, + "time": "2022-12-06T20:22:05+00:00" + }, { "name": "monolog/monolog", "version": "3.9.0",