Merge branch 'dev' into doctrine

vufind-org · Jan 6, 2025 · f0f0d35 · f0f0d35
2 parents fe77e78 + 9c2b1f7
commit f0f0d35
Show file tree

Hide file tree

Showing 132 changed files with 2,373 additions and 1,075 deletions.
diff --git a/build.xml b/build.xml
@@ -830,6 +830,9 @@ return [
             <exec executable="psql" checkreturn="true">
               <arg line="-c &quot;GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};&quot; ${pgsqlrootuser}" />
             </exec>
+            <exec executable="psql" checkreturn="true">
+              <arg line="-c &quot;ALTER DATABASE ${vufinddb} OWNER TO ${vufinddbuser};&quot; ${pgsqlrootuser}" />
+            </exec>
           </then>
           <else>
             <exec executable="sudo">
@@ -849,6 +852,9 @@ return [
             <exec executable="sudo" checkreturn="true">
               <arg line="su -c &quot;psql -c 'GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};'&quot; ${pgsqlrootuser}" />
             </exec>
+            <exec executable="sudo" checkreturn="true">
+              <arg line="su -c &quot;psql -c 'ALTER DATABASE ${vufinddb} OWNER TO ${vufinddbuser};'&quot; ${pgsqlrootuser}" />
+            </exec>
           </else>
         </if>
 

diff --git a/composer.json b/composer.json
@@ -18,6 +18,25 @@
             "wikimedia/composer-merge-plugin": true
         }
     },
+    "autoload": {
+        "psr-4": {
+            "VuFind\\": "module/VuFind/src/VuFind",
+            "VuFindAdmin\\": "module/VuFindAdmin/src/VuFindAdmin",
+            "VuFindApi\\": "module/VuFindApi/src/VuFindApi",
+            "VuFindConsole\\": "module/VuFindConsole/src/VuFindConsole",
+            "VuFindDevTools\\": "module/VuFindDevTools/src/VuFindDevTools",
+            "VuFindSearch\\": "module/VuFindSearch/src/VuFindSearch",
+            "VuFindTheme\\": "module/VuFindTheme/src/VuFindTheme"
+        },
+        "psr-0": {
+            "minSO": "module/VuFind/src/VuFind/Search"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "VuFindTest\\": ["module/VuFind/src/VuFindTest", "module/VuFind/tests/unit-tests/src/VuFindTest"]
+        }
+    },
     "provide": {
         "ext-memcached": "*",
         "ext-oci8": "*",
@@ -53,7 +72,6 @@
         "laminas/laminas-form": "3.21.0",
         "laminas/laminas-http": "2.20.0",
         "laminas/laminas-i18n": "2.29.0",
-        "laminas/laminas-loader": "2.11.0",
         "laminas/laminas-log": "2.17.0",
         "laminas/laminas-modulemanager": "2.16.0",
         "laminas/laminas-mvc": "3.8.0",
@@ -68,9 +86,10 @@
         "laminas/laminas-session": "2.21.0",
         "laminas/laminas-stdlib": "3.19.0",
         "laminas/laminas-text": "2.11.0",
-        "laminas/laminas-validator": "2.55.0",
+        "laminas/laminas-validator": "2.64.2",
         "laminas/laminas-view": "2.27.0",
-        "league/commonmark": "2.5.3",
+        "laminas/laminas-translator": "^1",
+        "league/commonmark": "2.6.0",
         "league/oauth2-client": "^2.7",
         "league/oauth2-server": "8.5.4",
         "lm-commons/lmc-rbac-mvc": "3.4.0",