Merge branch 'dev' into resultfeed-urls

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>
 

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": "*",
@@ -51,7 +70,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,7 +86,7 @@
         "laminas/laminas-text": "2.11.0",
         "laminas/laminas-validator": "2.55.0",
         "laminas/laminas-view": "2.27.0",
-        "league/commonmark": "2.5.3",
+        "league/commonmark": "2.6.0",
         "league/oauth2-client": "^2.7",
         "league/oauth2-server": "8.5.4",
         "lm-commons/lmc-rbac-mvc": "3.4.0",

config/vufind/markdown.ini

@@ -1,6 +1,6 @@
 ; This file could be used to define configuration of markdown to HTML converter.
 ; More detailed configuration documentation could be found here:
-; https://commonmark.thephpleague.com/2.5/configuration/
+; https://commonmark.thephpleague.com/2.6/configuration/
 [Markdown]
 ; How to handle HTML input. Options are: strip, allow, escape. Defaults to strip
 ;html_input = allow
@@ -18,27 +18,27 @@
 ;max_nesting_level = 10
 
 ; Which extension you want to activate. List of extension names separated by comma.
-; Available extensions as of league/commonmark version 2.5:
+; Available extensions as of league/commonmark version 2.6:
 ;   Attributes, Autolink, DefaultAttributes, DescriptionList, DisallowedRawHtml,
 ;   ExternalLink, Footnote, FrontMatter, HeadingPermalink, Mention, SmartPunct,
 ;   Strikethrough, Table, TableOfContents, TaskList.
-; More about extensions: https://commonmark.thephpleague.com/2.5/extensions/overview/
+; More about extensions: https://commonmark.thephpleague.com/2.6/extensions/overview/
 ; Some of them could have a configuration, see sections below.
 ; Note: FrontMatter does enable to inject the title other then main heading. Just add
 ; something like this at the very beginning of your markdown file:
 ;---
 ;title: "Some specific title"
 ;---
 ; See more about FrontMatter extension here:
-; https://commonmark.thephpleague.com/2.5/extensions/front-matter/
+; https://commonmark.thephpleague.com/2.6/extensions/front-matter/
 ;
 ; You can also use own extensions, just address it using fully qualified class name
 ; like 'VuFindLocalModule\Markdown\ExampleExtension'. If your extension is
 ; configurable you need to add configuration section identified also by fully
 ; qualified name. For example: '[VuFindLocalModule\Markdown\ExampleExtension]', and
 ; with 'config_key' with value of configuration key, in which your extension expects
 ; its configuration. More about custom extension configuration:
-; https://commonmark.thephpleague.com/2.5/customization/configuration/
+; https://commonmark.thephpleague.com/2.6/customization/configuration/
 extensions = Autolink,DisallowedRawHtml,Strikethrough,Table,TaskList
 
 ; CommonMarkCore extension is always enabled by default
@@ -57,13 +57,13 @@ extensions = Autolink,DisallowedRawHtml,Strikethrough,Table,TaskList
 ;unordered_list_markers[] = "*"
 ;unordered_list_markers[] = "+"
 
-; See https://commonmark.thephpleague.com/2.5/extensions/default-attributes/
+; See https://commonmark.thephpleague.com/2.6/extensions/default-attributes/
 [DefaultAttributes]
 ; Example configuration:
 ;League\CommonMark\Extension\Table\Table[class] = 'table'
 ;League\CommonMark\Extension\CommonMark\Node\Inline\Link[target] = '_blank'
 
-; See https://commonmark.thephpleague.com/2.5/extensions/disallowed-raw-html/
+; See https://commonmark.thephpleague.com/2.6/extensions/disallowed-raw-html/
 [DisallowedRawHtml]
 ; Default configuration, to enable any tag, just comment out the appropriate line
 disallowed_tags[] = "title"
@@ -76,7 +76,7 @@ disallowed_tags[] = "noframes"
 disallowed_tags[] = "script"
 disallowed_tags[] = "plaintext"
 
-; See https://commonmark.thephpleague.com/2.5/extensions/external-links/
+; See https://commonmark.thephpleague.com/2.6/extensions/external-links/
 [ExternalLink]
 ; This should be always set, if you want to use this extension. You can use regular
 ; expressions to match group of hosts
@@ -87,7 +87,7 @@ internal_hosts[] = www.example.com
 ;noopener = external
 ;noreferrer = external
 
-; See https://commonmark.thephpleague.com/2.5/extensions/footnotes/
+; See https://commonmark.thephpleague.com/2.6/extensions/footnotes/
 [Footnote]
 ;backref_class = footnote-backref
 ;backref_symbol = '↩'
@@ -98,7 +98,7 @@ internal_hosts[] = www.example.com
 ;footnote_class = footnote
 ;footnote_id_prefix = 'fn:'
 
-; See https://commonmark.thephpleague.com/2.5/extensions/heading-permalinks/
+; See https://commonmark.thephpleague.com/2.6/extensions/heading-permalinks/
 [HeadingPermalink]
 ; There is also 'slug_normalizer' options, which should be set to an object
 ; implementing League\CommonMark\Normalizer\TextNormalizerInterface
@@ -117,21 +117,21 @@ internal_hosts[] = www.example.com
 ;heading_class = 'heading'
 ;insert = 'none'
 
-; See https://commonmark.thephpleague.com/2.5/extensions/mentions/
+; See https://commonmark.thephpleague.com/2.6/extensions/mentions/
 [Mention]
 ; This is an example of configuration, see more details in original documentation
 ;github_handle[prefix] = '@'
 ;github_handle[pattern] = '/^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)/'
 ;github_handle[generator] = 'https://github.com/%s'
 
-; See https://commonmark.thephpleague.com/2.5/extensions/smart-punctuation/
+; See https://commonmark.thephpleague.com/2.6/extensions/smart-punctuation/
 [SmartPunct]
 ;double_quote_opener = '“'
 ;double_quote_closer = '”'
 ;single_quote_opener = '‘'
 ;single_quote_closer = '’'
 
-; See https://commonmark.thephpleague.com/2.5/extensions/table-of-contents/
+; See https://commonmark.thephpleague.com/2.6/extensions/table-of-contents/
 [TableOfContents]
 ;html_class = table-of-contents
 ;position = top
@@ -141,7 +141,7 @@ internal_hosts[] = www.example.com
 ;normalize = relative
 ;placeholder =
 
-; See https://commonmark.thephpleague.com/2.5/extensions/tables/
+; See https://commonmark.thephpleague.com/2.6/extensions/tables/
 [Table]
 ;wrap[enabled] = true
 ;wrap[tag] = 'div'
@@ -153,3 +153,4 @@ internal_hosts[] = www.example.com
 ;alignment_attributes[left] = 'align:left'
 ;alignment_attributes[center] = 'align:center'
 ;alignment_attributes[right] = 'align:right'
+;max_autocompleted_cells = 10000

module/VuFind/Module.php

@@ -52,27 +52,6 @@ public function getConfig()
         return include __DIR__ . '/config/module.config.php';
     }
 
-    /**
-     * Get autoloader configuration
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        return [
-            'Laminas\Loader\ClassMapAutoloader' => [
-                'classes' => [
-                    'minSO' => __DIR__ . '/src/VuFind/Search/minSO.php',
-                ],
-            ],
-            'Laminas\Loader\StandardAutoloader' => [
-                'namespaces' => [
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
-                ],
-            ],
-        ];
-    }
-
     /**
      * Bootstrap the module
      *

module/VuFind/tests/bootstrap.php

@@ -35,20 +35,6 @@
 // Composer autoloading
 if (file_exists('vendor/autoload.php')) {
     include 'vendor/autoload.php';
-    $loader = new Composer\Autoload\ClassLoader();
-    $loader->addClassMap(['minSO' => __DIR__ . '/../src/VuFind/Search/minSO.php']);
-    $loader->add('VuFindTest', __DIR__ . '/unit-tests/src');
-    $loader->add('VuFindTest', __DIR__ . '/../src');
-    // Dynamically discover all module src directories:
-    $modules = opendir(__DIR__ . '/../..');
-    while ($mod = readdir($modules)) {
-        $mod = trim($mod, '.'); // ignore . and ..
-        $dir = empty($mod) ? false : realpath(__DIR__ . "/../../{$mod}/src");
-        if (!empty($dir) && is_dir($dir . '/' . $mod)) {
-            $loader->add($mod, $dir);
-        }
-    }
-    $loader->register();
 }
 
 // Make sure local config dir exists:

module/VuFind/tests/unit-tests/src/VuFindTest/Service/MarkdownFactoryTest.php

@@ -191,6 +191,7 @@ public function testConfig(): void
                         'class' => 'right',
                     ],
                 ],
+                'max_autocompleted_cells' => 10000,
             ],
             'example' => [
                 'example' => 'example',

module/VuFindAdmin/Module.php

@@ -49,20 +49,4 @@ public function getConfig()
     {
         return include __DIR__ . '/config/module.config.php';
     }
-
-    /**
-     * Get autoloader configuration
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        return [
-            'Laminas\Loader\StandardAutoloader' => [
-                'namespaces' => [
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
-                ],
-            ],
-        ];
-    }
 }

module/VuFindApi/Module.php

@@ -49,20 +49,4 @@ public function getConfig()
     {
         return include __DIR__ . '/config/module.config.php';
     }
-
-    /**
-     * Get autoloader configuration
-     *
-     * @return array
-     */
-    public function getAutoloaderConfig()
-    {
-        return [
-            'Laminas\Loader\StandardAutoloader' => [
-                'namespaces' => [
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
-                ],
-            ],
-        ];
-    }
 }