Merge branch 'dev' into t/enhance-default-record

.eslintrc.js

@@ -1,6 +1,9 @@
 module.exports = {
   plugins: ["no-jquery"],
-  ignorePatterns: ["themes/**/vendor/**"],
+  ignorePatterns: [
+    "themes/**/vendor/**",
+    "themes/**/node_modules/**"
+  ],
   extends: ["eslint:recommended", "plugin:no-jquery/deprecated"],
   env: {
     "browser": true,

.github/workflows/ci.yaml

@@ -11,15 +11,16 @@ jobs:
       VUFIND_LOCAL_DIR: $GITHUB_WORKSPACE/local
     strategy:
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
-        # We run most tests on all platforms, but we only run Javascript-related tests in 8.1.
-        # Since the results should be the same on all platforms, we don't need to repeat them.
+        php-version: ['8.1', '8.2', '8.3']
+        # We run PHP-based tests on all platforms (qa-php), but we only include PHP AND
+        # Javascript-related tests (qa-console) once. Since the JS results should be the
+        # same on all platforms, we don't need to repeat them.
         include:
-          - php-version: 8.0
-            phing_tasks: "qa-php"
           - php-version: 8.1
-            phing_tasks: "qa-console"
+            phing_tasks: "qa-php"
           - php-version: 8.2
+            phing_tasks: "qa-console"
+          - php-version: 8.3
             phing_tasks: "qa-php"
 
     steps:
@@ -32,7 +33,7 @@ jobs:
           ini-values: error_reporting=E_ALL
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Disable Solr installation
         run: touch solr/.disableAutomaticInstall
@@ -41,11 +42,11 @@ jobs:
         if: ${{ matrix.phing_tasks == 'qa-console' }}
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '20'
 
       - name: Cache NPM dependencies
         if: ${{ matrix.phing_tasks == 'qa-console' }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: npm-${{ hashFiles('package-lock.json') }}
@@ -69,26 +70,33 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Cache php-cs-fixer data
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .php_cs_cache
           key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: Cache phpstan data
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .phpstan_cache
           key: "php-${{ matrix.php-version }}-phpstan-${{ github.sha }}"
           restore-keys: "php-${{ matrix.php-version }}-phpstan-"
 
+      - name: Cache PHP_CodeSniffer data
+        uses: actions/cache@v4
+        with:
+          path: tests/phpcs.cache.json
+          key: "php-${{ matrix.php-version }}-phpcs-${{ github.sha }}"
+          restore-keys: "php-${{ matrix.php-version }}-phpcs-"
+
       - name: Install composer dependencies
         run: composer install
 

.gitignore

@@ -12,6 +12,7 @@
 /downloads
 /Gruntfile.local.js
 /solr/vendor
+/themes/minktest
 /vendor
 ChangeLog
 TAGS
@@ -20,10 +21,11 @@ env.bat
 env.sh
 import/solrmarc.log*
 lessphp_*.list
-module/VuFind/tests/.phpunit.result.cache
+module/VuFind/tests/.phpunit*
 node_modules
 package-lock.json
 public/swagger-ui
+tests/phpcs.cache.json
 local/DirLocations.ini
 local/config/vufind/*.ini
 local/config/vufind/*.json

Gruntfile.js

@@ -87,6 +87,9 @@ module.exports = function(grunt) {
     },
     'check:scss': {
       'dart-sass': {
+        options: {
+          quietDeps: true
+        }
       }
     },
 

composer.json

@@ -10,7 +10,7 @@
     "license": "GPL-2.0",
     "config": {
         "platform": {
-            "php": "8.0"
+            "php": "8.1"
         },
         "process-timeout": 0,
         "allow-plugins": {
@@ -25,89 +25,92 @@
         "ext-sodium": "*"
     },
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "ahand/mobileesp": "dev-master",
         "apereo/phpcas": "1.6.1",
+        "browscap/browscap-php": "^7.2",
         "cap60552/php-sip2": "1.0.0",
-        "colinmollenhour/credis": "1.15.0",
+        "colinmollenhour/credis": "1.16.0",
         "composer/package-versions-deprecated": "1.11.99.5",
         "composer/semver": "3.4.0",
-        "endroid/qr-code": "4.8.2",
-        "laminas/laminas-cache": "3.10.1",
+        "endroid/qr-code": "5.0.7",
+        "guzzlehttp/guzzle": "7.8.1",
+        "laminas/laminas-cache": "3.12.1",
         "laminas/laminas-cache-storage-adapter-blackhole": "^2.0",
         "laminas/laminas-cache-storage-adapter-filesystem": "^2.0",
         "laminas/laminas-cache-storage-adapter-memcached": "^2.0",
         "laminas/laminas-cache-storage-adapter-memory": "^2.0",
-        "laminas/laminas-captcha": "2.16.0",
-        "laminas/laminas-code": "4.7.1",
+        "laminas/laminas-captcha": "2.17.0",
+        "laminas/laminas-code": "4.13.0",
         "laminas/laminas-config": "3.9.0",
-        "laminas/laminas-crypt": "3.10.0",
-        "laminas/laminas-db": "2.18.0",
-        "laminas/laminas-diactoros": "2.25.2",
-        "laminas/laminas-dom": "2.13.0",
-        "laminas/laminas-escaper": "2.12.0",
-        "laminas/laminas-eventmanager": "3.10.0",
-        "laminas/laminas-feed": "2.20.0",
-        "laminas/laminas-filter": "2.31.0",
-        "laminas/laminas-form": "3.9.0",
-        "laminas/laminas-http": "2.18.0",
-        "laminas/laminas-i18n": "2.22.1",
-        "laminas/laminas-loader": "2.9.0",
-        "laminas/laminas-log": "2.16.1",
-        "laminas/laminas-mail": "2.22.0",
-        "laminas/laminas-modulemanager": "2.14.0",
-        "laminas/laminas-mvc": "3.6.1",
-        "laminas/laminas-mvc-i18n": "1.7.0",
-        "laminas/laminas-mvc-plugin-flashmessenger": "1.9.0",
-        "laminas/laminas-paginator": "2.17.0",
-        "laminas/laminas-paginator-adapter-laminasdb": "1.3.0",
-        "laminas/laminas-psr7bridge": "1.9.0",
-        "laminas/laminas-recaptcha": "3.6.0",
+        "laminas/laminas-crypt": "3.11.0",
+        "laminas/laminas-db": "2.19.0",
+        "laminas/laminas-diactoros": "3.3.1",
+        "laminas/laminas-dom": "2.14.0",
+        "laminas/laminas-escaper": "2.13.0",
+        "laminas/laminas-eventmanager": "3.13.0",
+        "laminas/laminas-feed": "2.22.0",
+        "laminas/laminas-filter": "2.34.0",
+        "laminas/laminas-form": "3.19.2",
+        "laminas/laminas-http": "2.19.0",
+        "laminas/laminas-i18n": "2.26.0",
+        "laminas/laminas-loader": "2.10.0",
+        "laminas/laminas-log": "2.17.0",
+        "laminas/laminas-mail": "2.25.1",
+        "laminas/laminas-modulemanager": "2.15.0",
+        "laminas/laminas-mvc": "3.7.0",
+        "laminas/laminas-mvc-i18n": "1.8.0",
+        "laminas/laminas-mvc-plugin-flashmessenger": "1.10.1",
+        "laminas/laminas-paginator": "2.18.1",
+        "laminas/laminas-paginator-adapter-laminasdb": "1.4.0",
+        "laminas/laminas-psr7bridge": "1.11.0",
+        "laminas/laminas-recaptcha": "3.7.0",
         "laminas/laminas-serializer": "2.17.0",
-        "laminas/laminas-servicemanager": "3.20.0",
-        "laminas/laminas-session": "2.16.0",
-        "laminas/laminas-stdlib": "3.16.1",
-        "laminas/laminas-text": "2.10.0",
-        "laminas/laminas-validator": "2.30.1",
+        "laminas/laminas-servicemanager": "3.22.1",
+        "laminas/laminas-session": "2.20.0",
+        "laminas/laminas-stdlib": "3.19.0",
+        "laminas/laminas-text": "2.11.0",
+        "laminas/laminas-validator": "2.50.0",
         "laminas/laminas-view": "2.27.0",
-        "league/commonmark": "2.4.1",
+        "league/commonmark": "2.4.2",
         "league/oauth2-server": "8.5.4",
         "lm-commons/lmc-rbac-mvc": "3.3.2",
-        "matthiasmullie/minify": "1.3.71",
-        "ocramius/proxy-manager": "2.14.1",
+        "matthiasmullie/minify": "1.3.73",
         "pear/archive_tar": "^1.4",
-        "pear/http_request2": "2.5.1",
+        "pear/http_request2": "2.6.0",
         "phing/phing": "2.17.4",
         "ppito/laminas-whoops": "2.2.0",
-        "scssphp/scssphp": "1.11.1",
+        "scssphp/scssphp": "1.12.1",
         "serialssolutions/summon": "1.3.1",
         "slm/locale": "1.1.0",
         "steverhoades/oauth2-openid-connect-server": "2.6.1",
-        "swagger-api/swagger-ui": "5.9.0",
-        "symfony/console": "5.4.28",
-        "symfony/yaml": "5.4.23",
-        "vstelmakh/url-highlight": "3.0.2",
+        "swagger-api/swagger-ui": "5.11.10",
+        "symfony/console": "6.4.4",
+        "symfony/yaml": "6.4.3",
+        "vstelmakh/url-highlight": "3.0.3",
         "vufind-org/vufindcode": "1.2",
         "vufind-org/vufinddate": "1.2.0",
-        "vufind-org/vufindharvest": "5.2.0",
-        "vufind-org/vufindhttp": "3.2.0",
-        "vufind-org/vufind-marc": "1.0.2",
+        "vufind-org/vufindharvest": "5.3.0",
+        "vufind-org/vufindhttp": "3.3.0",
+        "vufind-org/vufind-marc": "1.1.0",
         "webfontkit/open-sans": "^1.0",
+        "webmozart/glob": "^4.7",
         "wikimedia/composer-merge-plugin": "2.1.0",
-        "yajra/laravel-pdo-via-oci8": "3.4.0"
+        "yajra/laravel-pdo-via-oci8": "3.4.2"
     },
     "require-dev": {
-        "behat/mink": "1.10.0",
-        "behat/mink-selenium2-driver": "1.6.0",
+        "behat/mink": "1.11.0",
+        "behat/mink-selenium2-driver": "1.7.0",
         "dmore/chrome-mink-driver": "2.9.2",
-        "firebase/php-jwt": "6.8.1",
-        "friendsofphp/php-cs-fixer": "3.26.1",
-        "phpmd/phpmd": "2.13.0",
-        "phpstan/phpstan": "1.10.34",
-        "phpunit/php-code-coverage": "9.2.28",
-        "phpunit/phpcov": "^8.2",
-        "phpunit/phpunit": "9.6.12",
-        "squizlabs/php_codesniffer": "3.7.2"
+        "firebase/php-jwt": "6.10.0",
+        "friendsofphp/php-cs-fixer": "3.51.0",
+        "phpmd/phpmd": "2.15.0",
+        "phpstan/phpstan": "1.10.59",
+        "phpunit/php-code-coverage": "10.1.11",
+        "phpunit/phpcov": "^9.0",
+        "phpunit/phpunit": "10.5.11",
+        "pietercolpaert/hardf": "0.4.0",
+        "squizlabs/php_codesniffer": "3.9.0"
     },
     "extra": {
         "merge-plugin": {
@@ -124,11 +127,15 @@
         }
     },
     "scripts": {
+        "fix": "phing fix-php",
         "phing-install-dependencies": ["phing patch-dependencies", "phing installsolr installswaggerui"],
         "post-install-cmd": "@phing-install-dependencies",
         "post-update-cmd": "@phing-install-dependencies",
         "qa": "phing qa-console -Ddefaultconfigs=true",
-        "install-npm-dependencies": "npm install && phing copynodemodules",
-        "update-npm-dependencies": "npm update && phing copynodemodules"
+        "show-outdated": "composer show -oD --ignore-platform-req=ext-oci8",
+        "update-npm-dependencies": [
+            "npm update",
+            "cd themes/bootstrap3 && npm run updateDeps"
+        ]
     }
 }