Merge branch 'dev' into blender-2

Author: maccabeelevine

.eslintrc.js

@@ -41,57 +41,57 @@ module.exports = {
     // jsdoc rules
 
     // Recommended
-    "jsdoc/check-access": 1,
-    "jsdoc/check-alignment": 1,
-    "jsdoc/check-param-names": 1,
-    "jsdoc/check-property-names": 1,
-    "jsdoc/check-tag-names": 1,
-    "jsdoc/check-types": 1,
-    "jsdoc/check-values": 1,
-    "jsdoc/empty-tags": 1,
-    "jsdoc/implements-on-classes": 1,
-    "jsdoc/multiline-blocks": 1,
-    "jsdoc/no-multi-asterisks": 1,
-    "jsdoc/no-undefined-types": 1,
-    "jsdoc/require-jsdoc": 1,
-    "jsdoc/require-param": 1,
-    "jsdoc/require-param-description": 1,
-    "jsdoc/require-param-name": 1,
-    "jsdoc/require-param-type": 1,
-    "jsdoc/require-property": 1,
-    "jsdoc/require-property-description": 1,
-    "jsdoc/require-property-name": 1,
-    "jsdoc/require-property-type": 1,
-    "jsdoc/require-returns": 1,
-    "jsdoc/require-returns-check": 1,
-    "jsdoc/require-returns-description": 1,
-    "jsdoc/require-returns-type": 1,
-    "jsdoc/require-yields": 1,
-    "jsdoc/require-yields-check": 1,
-    "jsdoc/tag-lines": 1,
-    "jsdoc/valid-types": 1
+    "jsdoc/check-access": "error",
+    "jsdoc/check-alignment": "error",
+    "jsdoc/check-param-names": "error",
+    "jsdoc/check-property-names": "error",
+    "jsdoc/check-tag-names": "error",
+    "jsdoc/check-types": "error",
+    "jsdoc/check-values": "error",
+    "jsdoc/empty-tags": "error",
+    "jsdoc/implements-on-classes": "error",
+    "jsdoc/multiline-blocks": "error",
+    "jsdoc/no-multi-asterisks": "error",
+    "jsdoc/no-undefined-types": "error",
+    "jsdoc/require-jsdoc": "error",
+    "jsdoc/require-param": "error",
+    "jsdoc/require-param-description": "error",
+    "jsdoc/require-param-name": "error",
+    "jsdoc/require-param-type": "error",
+    "jsdoc/require-property": "error",
+    "jsdoc/require-property-description": "error",
+    "jsdoc/require-property-name": "error",
+    "jsdoc/require-property-type": "error",
+    "jsdoc/require-returns": "error",
+    "jsdoc/require-returns-check": "error",
+    "jsdoc/require-returns-description": "error",
+    "jsdoc/require-returns-type": "error",
+    "jsdoc/require-yields": "error",
+    "jsdoc/require-yields-check": "error",
+    "jsdoc/tag-lines": "error",
+    "jsdoc/valid-types": "error"
     // Disabled
-    //"jsdoc/check-examples": 1,
-    //"jsdoc/check-indentation": 1,
-    //"jsdoc/check-line-alignment": 1,
-    //"jsdoc/check-template-names": 1,
-    //"jsdoc/check-syntax": 1,
-    //"jsdoc/informative-docs": 1,
-    //"jsdoc/match-description": 1,
-    //"jsdoc/no-bad-blocks": 1,
-    //"jsdoc/no-blank-block-descriptions": 1,
-    //"jsdoc/no-defaults": 1,
-    //"jsdoc/no-missing-syntax": 1,
-    //"jsdoc/no-restricted-syntax": 1,
-    //"jsdoc/no-types": 1,
-    //"jsdoc/require-asterisk-prefix": 1,
-    //"jsdoc/require-description": 1,
-    //"jsdoc/require-description-complete-sentence": 1,
-    //"jsdoc/require-example": 1,
-    //"jsdoc/require-file-overview": 1,
-    //"jsdoc/require-hyphen-before-param-description": 1,
-    //"jsdoc/require-template": 1,
-    //"jsdoc/require-throws": 1,
-    //"jsdoc/sort-tags": 1,
+    //"jsdoc/check-examples": "error",
+    //"jsdoc/check-indentation": "error",
+    //"jsdoc/check-line-alignment": "error",
+    //"jsdoc/check-template-names": "error",
+    //"jsdoc/check-syntax": "error",
+    //"jsdoc/informative-docs": "error",
+    //"jsdoc/match-description": "error",
+    //"jsdoc/no-bad-blocks": "error",
+    //"jsdoc/no-blank-block-descriptions": "error",
+    //"jsdoc/no-defaults": "error",
+    //"jsdoc/no-missing-syntax": "error",
+    //"jsdoc/no-restricted-syntax": "error",
+    //"jsdoc/no-types": "error",
+    //"jsdoc/require-asterisk-prefix": "error",
+    //"jsdoc/require-description": "error",
+    //"jsdoc/require-description-complete-sentence": "error",
+    //"jsdoc/require-example": "error",
+    //"jsdoc/require-file-overview": "error",
+    //"jsdoc/require-hyphen-before-param-description": "error",
+    //"jsdoc/require-template": "error",
+    //"jsdoc/require-throws": "error",
+    //"jsdoc/sort-tags": "error",
   }
 };

CONTRIBUTING.md

@@ -2,10 +2,11 @@
 
 ## Prerequisites
 
- - [Community Code of Conduct](https://github.com/vufind-org/vufind/blob/dev/CODE_OF_CONDUCT.md)
+ - [Community Code of Conduct](https://github.com/vufind-org/vufind/blob/dev/CODE_OF_CONDUCT.md) - Community standards for successful collaboration.
  - [Coding Standards](https://vufind.org/wiki/development:coding_standards) - How to conform to VuFind®'s style.
  - [Recommended Tools](https://vufind.org/wiki/development:recommended_tools) - Suggestions for successful VuFind® development.
- - [Making Pull Requests](https://vufind.org/wiki/development:making_pull_requests)
+ - [Making Pull Requests](https://vufind.org/wiki/development:making_pull_requests) - How to contribute code to the project.
+ - [Reviewing Pull Requests](https://vufind.org/wiki/development:reviewing_pull_requests) - How to help review and improve others' contributions.
 
 ## About VuFind®
 
@@ -15,6 +16,7 @@
  - [Testing](https://vufind.org/wiki/development:testing) - Notes on testing VuFind®.
  - [Troubleshooting](https://vufind.org/wiki/development:troubleshooting) - Notes on troubleshooting and debugging VuFind®.
  - [APIs](https://vufind.org/wiki/development:apis) - APIs that VuFind® provides for searching and other functionality.
+ - [Built-in Development Tools](https://vufind.org/wiki/development:devtools) - Notes about useful utilities built into VuFind®.
 
 ## VuFind® Planning
  - [Community Call](https://vufind.org/wiki/community_call) - A regular meeting (free, online and open to all) for discussion, planning and information sharing.

Vagrantfile

@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://app.vagrantup.com/boxes/search
-  config.vm.box = "ubuntu/jammy64"
+  config.vm.box = "hashicorp-education/ubuntu-24-04"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -24,11 +24,6 @@ Vagrant.configure("2") do |config|
     vb.memory = "2048"
   end
 
-  # With Docker provider we need to use a Docker-friendly box.
-  config.vm.provider "docker" do |d, override|
-    override.vm.box = "tknerr/baseimage-ubuntu-22.04"
-  end
-
   # Network configuration to forward ports.
   config.vm.network :forwarded_port, guest: 80, host: 4567
   config.vm.network :forwarded_port, guest: 8983, host: 4568

build.xml

@@ -77,7 +77,7 @@
   <property name="marc_bib_dir" value="${srcdir}/tests/data" /><!-- directory containing MARC bib records for test environment -->
   <property name="marc_authority_dir" value="${marc_bib_dir}/authority" /><!-- directory containing MARC authority records for test environment -->
 
-  <property name="version" value="10.2.1" />
+  <property name="version" value="11.0.0" />
 
   <property name="mysqlconnectionargs" value="-h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser}" />
   <!-- Add password if not empty -->

composer.json

@@ -69,14 +69,14 @@
         "laminas/laminas-escaper": "2.14.0",
         "laminas/laminas-eventmanager": "3.15.0",
         "laminas/laminas-feed": "2.25.0",
-        "laminas/laminas-form": "3.22.0",
+        "laminas/laminas-form": "3.23.0",
         "laminas/laminas-http": "2.22.0",
         "laminas/laminas-i18n": "2.31.0",
         "laminas/laminas-modulemanager": "2.19.0",
         "laminas/laminas-mvc": "3.8.0",
         "laminas/laminas-mvc-i18n": "1.9.0",
         "laminas/laminas-mvc-plugin-flashmessenger": "1.11.0",
-        "laminas/laminas-paginator": "2.21.0",
+        "laminas/laminas-paginator": "2.22.0",
         "laminas/laminas-psr7bridge": "1.12.0",
         "laminas/laminas-recaptcha": "3.8.0",
         "laminas/laminas-serializer": "2.18.0",
@@ -90,6 +90,7 @@
         "league/oauth1-client": "1.11.0",
         "league/oauth2-client": "^2.7",
         "league/oauth2-server": "^9.2",
+        "lm-commons/lmc-rbac": "2.1.1",
         "lm-commons/lmc-rbac-mvc": "4.1.1",
         "matthiasmullie/minify": "1.3.75",
         "monolog/monolog": "^3.9",
@@ -103,8 +104,8 @@
         "serialssolutions/summon": "1.3.1",
         "slm/locale": "1.2.0",
         "steverhoades/oauth2-openid-connect-server": "3.0.1",
-        "stripe/stripe-php": "v18.0.0",
-        "swagger-api/swagger-ui": "5.29.5",
+        "stripe/stripe-php": "v18.2.0",
+        "swagger-api/swagger-ui": "5.30.2",
         "symfony/console": "6.4.25",
         "symfony/mailer": "7.3.5",
         "symfony/rate-limiter": "^7.3",
@@ -125,15 +126,15 @@
         "behat/mink": "1.12.0",
         "behat/mink-selenium2-driver": "1.7.0",
         "dmore/chrome-mink-driver": "2.10.0",
-        "friendsofphp/php-cs-fixer": "3.89.0",
+        "friendsofphp/php-cs-fixer": "3.89.2",
         "phpmd/phpmd": "2.15.0",
-        "phpstan/phpstan": "2.1.31",
+        "phpstan/phpstan": "2.1.32",
         "phpunit/php-code-coverage": "^11",
         "phpunit/phpcov": "^10",
-        "phpunit/phpunit": "11.5.42",
+        "phpunit/phpunit": "11.5.43",
         "pietercolpaert/hardf": "0.5.0",
-        "rector/rector": "2.2.6",
-        "squizlabs/php_codesniffer": "4.0.0"
+        "rector/rector": "2.2.7",
+        "squizlabs/php_codesniffer": "4.0.1"
     },
     "suggest": {
         "apereo/phpcas": "Allows CAS authentication to be used. Note that this functionality is deprecated."