Merge branch 'release-11.0' into pull-request/fix-accessibility-for-record-tabs-in-v11

Author: demiankatz

composer.json

@@ -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",

composer.lock

@@ -696,7 +696,7 @@ Holdings at Other Libraries = "Exemplare in anderen Bibliotheken"
 holdings_details_from = "Bestandsangaben von %%location%%"
 Holdings_notes = "Anmerkungen"
 Holds = "Bestellungen"
-Holds and Recalls = "Bestellungen/Vormerkungen"
+Holds and Recalls = "Bestellungen und Vormerkungen"
 Home = "Home"
 home_browse_by_facet = "Stöbern %%facet%%"
 HTML Full Text = "HTML Volltext"

languages/de.ini

@@ -0,0 +1 @@
+UPDATE audit_event SET data = JSON_UNQUOTE(data);

module/VuFind/sql/migrations/mysql/11.0.1/001-fix-auditevent-data.sql

@@ -0,0 +1 @@
+UPDATE audit_event SET data = (data #>> '{}')::json;

module/VuFind/sql/migrations/pgsql/11.0.1/001-fix-auditevent-data.sql

@@ -494,17 +494,6 @@ protected function upgradeConfig(string $newVersion): void
                 . ' please review your config.ini.'
             );
         }
-        if (isset($newConfig['GoogleAnalytics']['apiKey'])) {
-            if (
-                !isset($newConfig['GoogleAnalytics']['universal'])
-                || !$newConfig['GoogleAnalytics']['universal']
-            ) {
-                $this->addWarning(
-                    'The [GoogleAnalytics] universal setting is off. See config.ini '
-                    . 'for important information on how to upgrade your Analytics.'
-                );
-            }
-        }
 
         // Upgrade CAPTCHA Options
         $legacySettingsMap = [

module/VuFind/src/VuFind/Config/Upgrade.php

@@ -157,10 +157,10 @@ class AuditEvent implements AuditEventEntityInterface
     /**
      * Additional data (JSON).
      *
-     * @var ?string
+     * @var ?array
      */
     #[ORM\Column(name: 'data', type: 'json', nullable: true)]
-    protected ?string $data = null;
+    protected ?array $data = null;
 
     /**
      * Constructor
@@ -417,21 +417,21 @@ public function setMessage(?string $message): static
     /**
      * Get additional data.
      *
-     * @return ?string
+     * @return ?array
      */
-    public function getData(): ?string
+    public function getData(): ?array
     {
         return $this->data;
     }
 
     /**
      * Set additional data.
      *
-     * @param ?string $data Data
+     * @param ?array $data Data
      *
      * @return static
      */
-    public function setData(?string $data): static
+    public function setData(?array $data): static
     {
         $this->data = $data;
         return $this;

module/VuFind/src/VuFind/Db/Entity/AuditEvent.php

@@ -214,16 +214,16 @@ public function setMessage(?string $message): static;
     /**
      * Get additional data.
      *
-     * @return ?string
+     * @return ?array
      */
-    public function getData(): ?string;
+    public function getData(): ?array;
 
     /**
      * Set additional data.
      *
-     * @param ?string $data Data
+     * @param ?array $data Data
      *
      * @return static
      */
-    public function setData(?string $data): static;
+    public function setData(?array $data): static;
 }

module/VuFind/src/VuFind/Db/Entity/AuditEventEntityInterface.php

@@ -72,6 +72,8 @@ public function getMigrationsFromDir(string $path): array
     /**
      * Give an array of migration subdirectories appropriate for the requested old version.
      *
+     * The subdirectories are returned in the order they should be processed.
+     *
      * @param string $oldVersion Version we are migrating from
      * @param string $basePath   Migration file base path
      *
@@ -85,16 +87,29 @@ public function getMigrationSubdirectoriesMatchingVersion(string $oldVersion, st
         }
 
         // Find version-appropriate subdirectories in the migration directory:
-        return array_values(
-            array_filter(
-                glob("$basePath/*"),
-                function ($path) use ($oldVersion) {
-                    $parts = explode('/', $path);
-                    $version = array_pop($parts);
-                    return preg_match('/^\d/', $version) && Comparator::greaterThanOrEqualTo($version, $oldVersion);
-                }
-            )
+        $directories = array_filter(
+            glob("$basePath/*"),
+            function ($path) use ($oldVersion) {
+                $parts = explode(DIRECTORY_SEPARATOR, $path);
+                $version = array_pop($parts);
+                return preg_match('/^\d/', $version) && Comparator::greaterThanOrEqualTo($version, $oldVersion);
+            }
+        );
+
+        usort(
+            $directories,
+            function ($a, $b): int {
+                $aParts = explode(DIRECTORY_SEPARATOR, $a);
+                $bParts = explode(DIRECTORY_SEPARATOR, $b);
+                $aVersion = end($aParts);
+                $bVersion = end($bParts);
+                return $aVersion === $bVersion
+                    ? $a <=> $b
+                    : (Comparator::greaterThan($aVersion, $bVersion) ? 1 : -1);
+            }
         );
+
+        return $directories;
     }
 
     /**

module/VuFind/src/VuFind/Db/Migration/MigrationLoader.php

@@ -173,7 +173,6 @@ public function getMigrations(string $oldVersion): array
         foreach ($subDirectories as $next) {
             $matches = array_merge($matches, $this->getNeededMigrationsFromDir($next));
         }
-        natsort($matches);
         return array_values($matches);
     }