From 9f41277980d62c5a03c0e937672f9361bf4021dc Mon Sep 17 00:00:00 2001 From: Don Richards Date: Tue, 31 Jan 2023 12:28:22 -0500 Subject: [PATCH 1/4] Make a change that tolerates php 7 --- .gitattributes | 16 ++++++++-------- composer.json | 6 ++++-- composer.lock | 52 +++++++++++++++++++++++++------------------------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.gitattributes b/.gitattributes index a37894e8e..76ea8feeb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,24 +19,24 @@ *.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html -*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php -*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php +*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php -*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php +*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff --git a/composer.json b/composer.json index 37dbac2dc..78b1b9848 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "drupal/matomo": "^1.19", "drupal/pdf": "^1.1", "drupal/rest_oai_pmh": "^2.0@beta", - "drupal/search_api_solr": "^4.2", + "drupal/search_api_solr": "*", "drupal/taxonomy_manager": "^2.0", "drupal/transliterate_filenames": "^2.0", "drupal/twig_tweak": "^3.2", @@ -54,7 +54,9 @@ "islandora/islandora": "^2", "islandora/openseadragon": "^2", "library/pdf.js": "^2.4", - "mjordan/islandora_workbench_integration": "^1.0" + "maennchen/zipstream-php": "2.2.6", + "mjordan/islandora_workbench_integration": "^1.0", + "symfony/string": "5.4" }, "conflict": { "drupal/drupal": "*", diff --git a/composer.lock b/composer.lock index 1ab5631cf..08144e263 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": "e214ebbfec68444c86970ed7507cf09c", + "content-hash": "36cfce9f786b80e452ec569918f80d1d", "packages": [ { "name": "asm89/stack-cors", @@ -6183,23 +6183,23 @@ }, { "name": "maennchen/zipstream-php", - "version": "v2.4.0", + "version": "2.2.6", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3" + "reference": "30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3", - "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f", + "reference": "30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f", "shasum": "" }, "require": { - "ext-mbstring": "*", "myclabs/php-enum": "^1.5", - "php": "^8.0", - "psr/http-message": "^1.0" + "php": "^7.4 || ^8.0", + "psr/http-message": "^1.0", + "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { "ext-zip": "*", @@ -6208,7 +6208,7 @@ "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.4", "phpunit/phpunit": "^8.5.8 || ^9.4.2", - "vimeo/psalm": "^5.0" + "vimeo/psalm": "^4.1" }, "type": "library", "autoload": { @@ -6245,7 +6245,7 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/v2.4.0" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.2.6" }, "funding": [ { @@ -6257,7 +6257,7 @@ "type": "open_collective" } ], - "time": "2022-12-08T12:29:14+00:00" + "time": "2022-11-25T18:57:19+00:00" }, { "name": "masterminds/html5", @@ -10517,34 +10517,34 @@ }, { "name": "symfony/string", - "version": "v6.2.2", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "863219fd713fa41cbcd285a79723f94672faff4d" + "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/863219fd713fa41cbcd285a79723f94672faff4d", - "reference": "863219fd713fa41cbcd285a79723f94672faff4d", + "url": "https://api.github.com/repos/symfony/string/zipball/9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", + "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": ">=3.0" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.0|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -10583,7 +10583,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.2" + "source": "https://github.com/symfony/string/tree/v5.4.0" }, "funding": [ { @@ -10599,7 +10599,7 @@ "type": "tidelift" } ], - "time": "2022-12-14T16:11:27+00:00" + "time": "2021-11-24T10:02:00+00:00" }, { "name": "symfony/translation", @@ -11813,5 +11813,5 @@ "php": "^7.4 || ^8" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.0.0" } From 7c015fb8ec6a7932407b518ed88db57c4990aea3 Mon Sep 17 00:00:00 2001 From: Don Richards Date: Fri, 3 Feb 2023 16:29:23 -0500 Subject: [PATCH 2/4] Drop the declaration of the dependencies with versions --- composer.json | 4 +--- composer.lock | 62 +++++++++++++++++++++++++-------------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 78b1b9848..5d9cdc1d7 100644 --- a/composer.json +++ b/composer.json @@ -54,9 +54,7 @@ "islandora/islandora": "^2", "islandora/openseadragon": "^2", "library/pdf.js": "^2.4", - "maennchen/zipstream-php": "2.2.6", - "mjordan/islandora_workbench_integration": "^1.0", - "symfony/string": "5.4" + "mjordan/islandora_workbench_integration": "^1.0" }, "conflict": { "drupal/drupal": "*", diff --git a/composer.lock b/composer.lock index 08144e263..18e334d5a 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": "36cfce9f786b80e452ec569918f80d1d", + "content-hash": "1677643491e8d20c4496b64dcdaabbf1", "packages": [ { "name": "asm89/stack-cors", @@ -8626,16 +8626,16 @@ }, { "name": "symfony/finder", - "version": "v5.4.17", + "version": "v5.4.19", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc" + "reference": "6071aebf810ad13fe8200c224f36103abb37cf1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc", - "reference": "40c08632019838dfb3350f18cf5563b8080055fc", + "url": "https://api.github.com/repos/symfony/finder/zipball/6071aebf810ad13fe8200c224f36103abb37cf1f", + "reference": "6071aebf810ad13fe8200c224f36103abb37cf1f", "shasum": "" }, "require": { @@ -8669,7 +8669,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.17" + "source": "https://github.com/symfony/finder/tree/v5.4.19" }, "funding": [ { @@ -8685,7 +8685,7 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-01-14T19:14:44+00:00" }, { "name": "symfony/http-client-contracts", @@ -8835,16 +8835,16 @@ }, { "name": "symfony/http-kernel", - "version": "v4.4.49", + "version": "v4.4.50", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4" + "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4e36db8103062c62b3882b1bd297b02de6b021c4", - "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa6df6c045f034aa13ac752fc234bb300b9488ef", + "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef", "shasum": "" }, "require": { @@ -8919,7 +8919,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.49" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.50" }, "funding": [ { @@ -8935,7 +8935,7 @@ "type": "tidelift" } ], - "time": "2022-11-28T17:58:43+00:00" + "time": "2023-02-01T08:01:31+00:00" }, { "name": "symfony/mime", @@ -10517,16 +10517,16 @@ }, { "name": "symfony/string", - "version": "v5.4.0", + "version": "v5.4.19", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d" + "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", - "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", + "url": "https://api.github.com/repos/symfony/string/zipball/0a01071610fd861cc160dfb7e2682ceec66064cb", + "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb", "shasum": "" }, "require": { @@ -10583,7 +10583,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.0" + "source": "https://github.com/symfony/string/tree/v5.4.19" }, "funding": [ { @@ -10599,7 +10599,7 @@ "type": "tidelift" } ], - "time": "2021-11-24T10:02:00+00:00" + "time": "2023-01-01T08:32:19+00:00" }, { "name": "symfony/translation", @@ -10876,16 +10876,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.17", + "version": "v5.4.19", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ad74890513d07060255df2575703daf971de92c7" + "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7", - "reference": "ad74890513d07060255df2575703daf971de92c7", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", + "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", "shasum": "" }, "require": { @@ -10945,7 +10945,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.17" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.19" }, "funding": [ { @@ -10961,7 +10961,7 @@ "type": "tidelift" } ], - "time": "2022-12-22T10:31:03+00:00" + "time": "2023-01-16T10:52:33+00:00" }, { "name": "symfony/yaml", @@ -11506,16 +11506,16 @@ }, { "name": "doctrine/persistence", - "version": "3.1.3", + "version": "3.1.4", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "920da294b4bb0bb527f2a91ed60c18213435880f" + "reference": "8bf8ab15960787f1a49d405f6eb8c787b4841119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/920da294b4bb0bb527f2a91ed60c18213435880f", - "reference": "920da294b4bb0bb527f2a91ed60c18213435880f", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/8bf8ab15960787f1a49d405f6eb8c787b4841119", + "reference": "8bf8ab15960787f1a49d405f6eb8c787b4841119", "shasum": "" }, "require": { @@ -11584,7 +11584,7 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/3.1.3" + "source": "https://github.com/doctrine/persistence/tree/3.1.4" }, "funding": [ { @@ -11600,7 +11600,7 @@ "type": "tidelift" } ], - "time": "2023-01-19T13:39:42+00:00" + "time": "2023-02-03T11:13:07+00:00" }, { "name": "drupal/config_inspector", From e2d59e6175341787248ee8667c84e708473aa53d Mon Sep 17 00:00:00 2001 From: Don Richards Date: Wed, 8 Feb 2023 10:42:51 -0500 Subject: [PATCH 3/4] Switch solr back and drop php8 support --- composer.json | 4 ++-- composer.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 5d9cdc1d7..a8c7d3f93 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ } ], "require": { - "php": "^7.4 || ^8", + "php": "^7.4", "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", "drupal/admin_toolbar": "^3.1", @@ -42,7 +42,7 @@ "drupal/matomo": "^1.19", "drupal/pdf": "^1.1", "drupal/rest_oai_pmh": "^2.0@beta", - "drupal/search_api_solr": "*", + "drupal/search_api_solr": "^4.2", "drupal/taxonomy_manager": "^2.0", "drupal/transliterate_filenames": "^2.0", "drupal/twig_tweak": "^3.2", diff --git a/composer.lock b/composer.lock index 18e334d5a..22edb65e8 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": "1677643491e8d20c4496b64dcdaabbf1", + "content-hash": "749df37689a15fdbdaf095ccd96f5f73", "packages": [ { "name": "asm89/stack-cors", @@ -11810,7 +11810,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.4 || ^8" + "php": "^7.4" }, "platform-dev": [], "plugin-api-version": "2.0.0" From 747f309a263c77fcfe60e8bbce891360c8e2afe5 Mon Sep 17 00:00:00 2001 From: Don Richards Date: Wed, 8 Feb 2023 11:10:23 -0500 Subject: [PATCH 4/4] Switch tests back to 7.4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 235db812d..c7ff7b95f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ 8.1 ] # 8.2 may not be possible until we upgrade to D10. https://www.drupal.org/docs/system-requirements/php-requirements + php-versions: [ 7.4 ] # 8.2 may not be possible until we upgrade to D10. https://www.drupal.org/docs/system-requirements/php-requirements name: PHP ${{ matrix.php-versions }}