Compare revisions

Brian Canini · Michael Lee · 494cd703 · 494cd703 · 494cd703 · 494cd703
--- a/composer.json
+++ b/composer.json
@@ -191,7 +191,8 @@
        },
        "patches": {
            "drupal/core": {
-                "set viewmode to string": "patches/set_viewmode_to_string.patch"
+                "set viewmode to string": "patches/set_viewmode_to_string.patch",
+                "Newsletter Article Nav": "patches/newsletter-nav.patch"
            },
            "drupal/addtocalendar": {
                "UTC Time Adjustment": "patches/utc-time-adjustment.patch"

--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "2652cef31741e490849f11f6e69fd142",
+    "content-hash": "d05921a814ace27a18d6c7584c7e8e29",
    "packages": [
        {
            "name": "algolia/places",
@@ -14371,5 +14371,5 @@
    "platform-overrides": {
        "php": "8.3"
    },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.2.0"
 }
--- a/patches/newsletter-nav.patch
+++ b/patches/newsletter-nav.patch
+diff --git a/core/modules/book/templates/book-navigation.html.twig b/core/modules/book/templates/book-navigation.html.twig
+index 0f129802f8..be4900c849 100644
+--- a/core/modules/book/templates/book-navigation.html.twig
+++ b/core/modules/book/templates/book-navigation.html.twig
+@@ -31,27 +31,22 @@
+  */
+ #}
+ {% if tree or has_links %}
+-  <nav role="navigation" aria-labelledby="book-label-{{ book_id }}">
+  <nav role="navigation" aria-label="newsletter articles pager">
+     {{ tree }}
+     {% if has_links %}
+-      <h2>{{ 'Book traversal links for'|t }} {{ book_title }}</h2>
+-      <ul>
+
+       {% if prev_url %}
+-        <li>
+-          <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}"><b>{{ '‹'|t }}</b> {{ prev_title }}</a>
+-        </li>
+-      {% endif %}
+-      {% if parent_url %}
+-        <li>
+-          <a href="{{ parent_url }}" title="{{ 'Go to parent page'|t }}">{{ 'Up'|t }}</a>
+-        </li>
+
+          <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}" class="prevbtn"><i class="fa-solid fa-angle-left"></i> {{ prev_title }}</a>
+
+       {% endif %}
+
+       {% if next_url %}
+-        <li>
+-          <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}">{{ next_title }} <b>{{ '›'|t }}</b></a>
+-        </li>
+
+          <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}" class="nextbtn">{{ next_title }} <i class="fa-solid fa-angle-right"></i></a>
+
+       {% endif %}
+-    </ul>
+
+     {% endif %}
+   </nav>
+ {% endif %}
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -2,24 +2,6 @@
 // autoload.php @generated by Composer
-if (PHP_VERSION_ID < 50600) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, $err);
-        } elseif (!headers_sent()) {
-            echo $err;
-        }
-    }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
-}
 require_once __DIR__ . '/composer/autoload_real.php';
 return ComposerAutoloaderInit5c689ffcd54b9e495ed983fdce09b530::getLoader();
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,37 +42,35 @@
 */
 class ClassLoader
 {
-    /** @var \Closure(string):void */
+    /** @var ?string */
-    private static $includeFile;
-    /** @var string|null */
    private $vendorDir;
    // PSR-4
    /**
-     * @var array<string, array<string, int>>
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
     */
    private $prefixLengthsPsr4 = array();
    /**
-     * @var array<string, list<string>>
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
     */
    private $prefixDirsPsr4 = array();
    /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
     */
    private $fallbackDirsPsr4 = array();
    // PSR-0
    /**
-     * List of PSR-0 prefixes
+     * @var array[]
-     *
+     * @psalm-var array<string, array<string, string[]>>
-     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
-     *
-     * @var array<string, array<string, list<string>>>
     */
    private $prefixesPsr0 = array();
    /**
-     * @var list<string>
+     * @var array[]
+     * @psalm-var array<string, string>
     */
    private $fallbackDirsPsr0 = array();
@@ -80,7 +78,8 @@ class ClassLoader
    private $useIncludePath = false;
    /**
-     * @var array<string, string>
+     * @var string[]
+     * @psalm-var array<string, string>
     */
    private $classMap = array();
@@ -88,29 +87,29 @@ class ClassLoader
    private $classMapAuthoritative = false;
    /**
-     * @var array<string, bool>
+     * @var bool[]
+     * @psalm-var array<string, bool>
     */
    private $missingClasses = array();
-    /** @var string|null */
+    /** @var ?string */
    private $apcuPrefix;
    /**
-     * @var array<string, self>
+     * @var self[]
     */
    private static $registeredLoaders = array();
    /**
-     * @param string|null $vendorDir
+     * @param ?string $vendorDir
     */
    public function __construct($vendorDir = null)
    {
        $this->vendorDir = $vendorDir;
-        self::initializeIncludeClosure();
    }
    /**
-     * @return array<string, list<string>>
+     * @return string[]
     */
    public function getPrefixes()
    {
@@ -122,7 +121,8 @@ public function getPrefixes()
    }
    /**
-     * @return array<string, list<string>>
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
     */
    public function getPrefixesPsr4()
    {
@@ -130,7 +130,8 @@ public function getPrefixesPsr4()
    }
    /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
     */
    public function getFallbackDirs()
    {
@@ -138,7 +139,8 @@ public function getFallbackDirs()
    }
    /**
-     * @return list<string>
+     * @return array[]
+     * @psalm-return array<string, string>
     */
    public function getFallbackDirsPsr4()
    {
@@ -146,7 +148,8 @@ public function getFallbackDirsPsr4()
    }
    /**
-     * @return array<string, string> Array of classname => path
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
     */
    public function getClassMap()
    {
@@ -154,7 +157,8 @@ public function getClassMap()
    }
    /**
-     * @param array<string, string> $classMap Class to filename map
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
     *
     * @return void
     */
@@ -171,25 +175,24 @@ public function addClassMap(array $classMap)
     * Registers a set of PSR-0 directories for a given prefix, either
     * appending or prepending to the ones previously set for this prefix.
     *
-     * @param string              $prefix  The prefix
+     * @param string          $prefix  The prefix
-     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param bool            $prepend Whether to prepend the directories
     *
     * @return void
     */
    public function add($prefix, $paths, $prepend = false)
    {
-        $paths = (array) $paths;
        if (!$prefix) {
            if ($prepend) {
                $this->fallbackDirsPsr0 = array_merge(
-                    $paths,
+                    (array) $paths,
                    $this->fallbackDirsPsr0
                );
            } else {
                $this->fallbackDirsPsr0 = array_merge(
                    $this->fallbackDirsPsr0,
-                    $paths
+                    (array) $paths
                );
            }
@@ -198,19 +201,19 @@ public function add($prefix, $paths, $prepend = false)
        $first = $prefix[0];
        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = $paths;
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
            return;
        }
        if ($prepend) {
            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                $this->prefixesPsr0[$first][$prefix]
            );
        } else {
            $this->prefixesPsr0[$first][$prefix] = array_merge(
                $this->prefixesPsr0[$first][$prefix],
-                $paths
+                (array) $paths
            );
        }
    }
@@ -219,9 +222,9 @@ public function add($prefix, $paths, $prepend = false)
     * Registers a set of PSR-4 directories for a given namespace, either
     * appending or prepending to the ones previously set for this namespace.
     *
-     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool                $prepend Whether to prepend the directories
+     * @param bool            $prepend Whether to prepend the directories
     *
     * @throws \InvalidArgumentException
     *
@@ -229,18 +232,17 @@ public function add($prefix, $paths, $prepend = false)
     */
    public function addPsr4($prefix, $paths, $prepend = false)
    {
-        $paths = (array) $paths;
        if (!$prefix) {
            // Register directories for the root namespace.
            if ($prepend) {
                $this->fallbackDirsPsr4 = array_merge(
-                    $paths,
+                    (array) $paths,
                    $this->fallbackDirsPsr4
                );
            } else {
                $this->fallbackDirsPsr4 = array_merge(
                    $this->fallbackDirsPsr4,
-                    $paths
+                    (array) $paths
                );
            }
        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -250,18 +252,18 @@ public function addPsr4($prefix, $paths, $prepend = false)
                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
            }
            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = $paths;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
        } elseif ($prepend) {
            // Prepend directories for an already registered namespace.
            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $paths,
+                (array) $paths,
                $this->prefixDirsPsr4[$prefix]
            );
        } else {
            // Append directories for an already registered namespace.
            $this->prefixDirsPsr4[$prefix] = array_merge(
                $this->prefixDirsPsr4[$prefix],
-                $paths
+                (array) $paths
            );
        }
    }
@@ -270,8 +272,8 @@ public function addPsr4($prefix, $paths, $prepend = false)
     * Registers a set of PSR-0 directories for a given prefix,
     * replacing any others previously set for this prefix.
     *
-     * @param string              $prefix The prefix
+     * @param string          $prefix The prefix
-     * @param list<string>|string $paths  The PSR-0 base directories
+     * @param string[]|string $paths  The PSR-0 base directories
     *
     * @return void
     */
@@ -288,8 +290,8 @@ public function set($prefix, $paths)
     * Registers a set of PSR-4 directories for a given namespace,
     * replacing any others previously set for this namespace.
     *
-     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param list<string>|string $paths  The PSR-4 base directories
+     * @param string[]|string $paths  The PSR-4 base directories
     *
     * @throws \InvalidArgumentException
     *
@@ -423,8 +425,7 @@ public function unregister()
    public function loadClass($class)
    {
        if ($file = $this->findFile($class)) {
-            $includeFile = self::$includeFile;
+            includeFile($file);
-            $includeFile($file);
            return true;
        }
@@ -475,9 +476,9 @@ public function findFile($class)
    }
    /**
-     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
     *
-     * @return array<string, self>
+     * @return self[]
     */
    public static function getRegisteredLoaders()
    {
@@ -554,26 +555,18 @@ private function findFileWithExtension($class, $ext)
        return false;
    }
+}
-    /**
+/**
-     * @return void
+ * Scope isolated include.
-     */
+ *
-    private static function initializeIncludeClosure()
+ * Prevents access to $this/self from included files.
-    {
+ *
-        if (self::$includeFile !== null) {
+ * @param  string $file
-            return;
+ * @return void
-        }
+ * @private
+ */
-        /**
+function includeFile($file)
-         * Scope isolated include.
+{
-         *
+    include $file;
-         * Prevents access to $this/self from included files.
-         *
-         * @param  string $file
-         * @return void
-         */
-        self::$includeFile = \Closure::bind(static function($file) {
-            include $file;
-        }, null, null);
-    }
 }
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -21,14 +21,12 @@
 * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
 *
 * To require its presence, you can require `composer-runtime-api ^2.0`
- *
- * @final
 */
 class InstalledVersions
 {
    /**
     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
     */
    private static $installed;
@@ -39,7 +37,7 @@ class InstalledVersions
    /**
     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
     */
    private static $installedByVendor = array();
@@ -98,7 +96,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
    {
        foreach (self::getInstalled() as $installed) {
            if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
            }
        }
@@ -119,7 +117,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
     */
    public static function satisfies(VersionParser $parser, $packageName, $constraint)
    {
-        $constraint = $parser->parseConstraints((string) $constraint);
+        $constraint = $parser->parseConstraints($constraint);
        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
        return $provided->matches($constraint);
@@ -243,7 +241,7 @@ public static function getInstallPath($packageName)
    /**
     * @return array
-     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
     */
    public static function getRootPackage()
    {
@@ -257,7 +255,7 @@ public static function getRootPackage()
     *
     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
     * @return array[]
-     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
     */
    public static function getRawData()
    {
@@ -280,7 +278,7 @@ public static function getRawData()
     * Returns the raw data of all installed.php which are currently loaded for custom implementations
     *
     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
     */
    public static function getAllRawData()
    {
@@ -303,7 +301,7 @@ public static function getAllRawData()
     * @param  array[] $data A vendor/composer/installed.php data set
     * @return void
     *
-     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
     */
    public static function reload($data)
    {
@@ -313,7 +311,7 @@ public static function reload($data)
    /**
     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
     */
    private static function getInstalled()
    {
@@ -328,9 +326,7 @@ private static function getInstalled()
                if (isset(self::$installedByVendor[$vendorDir])) {
                    $installed[] = self::$installedByVendor[$vendorDir];
                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-                    $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                        self::$installed = $installed[count($installed) - 1];
                    }
@@ -342,17 +338,12 @@ private static function getInstalled()
            // only require the installed.php file if this file is loaded from its dumped location,
            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
            if (substr(__DIR__, -8, 1) !== 'C') {
-                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                self::$installed = require __DIR__ . '/installed.php';
-                $required = require __DIR__ . '/installed.php';
-                self::$installed = $required;
            } else {
                self::$installed = array();
            }
        }
+        $installed[] = self::$installed;
-        if (self::$installed !== array()) {
-            $installed[] = self::$installed;
-        }
        return $installed;
    }

--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -2,7 +2,7 @@
 // autoload_classmap.php @generated by Composer
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 return array(

--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -2,30 +2,30 @@
 // autoload_files.php @generated by Composer
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 return array(
    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
    '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
+    '89efb1254ef2d1c5d80096acd12c4098' => $vendorDir . '/twig/twig/src/Resources/core.php',
+    'ffecb95d45175fd40f75be8a23b34f90' => $vendorDir . '/twig/twig/src/Resources/debug.php',
+    'c7baa00073ee9c61edf148c51917cfb4' => $vendorDir . '/twig/twig/src/Resources/escaper.php',
+    'f844ccf1d25df8663951193c3fc307c8' => $vendorDir . '/twig/twig/src/Resources/string_loader.php',
    '662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
    '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
    'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
    '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
+    '6a47392539ca2329373e0d33e1dba053' => $vendorDir . '/symfony/polyfill-intl-icu/bootstrap.php',
    '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
    'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
-    '89efb1254ef2d1c5d80096acd12c4098' => $vendorDir . '/twig/twig/src/Resources/core.php',
-    'ffecb95d45175fd40f75be8a23b34f90' => $vendorDir . '/twig/twig/src/Resources/debug.php',
-    'c7baa00073ee9c61edf148c51917cfb4' => $vendorDir . '/twig/twig/src/Resources/escaper.php',
-    'f844ccf1d25df8663951193c3fc307c8' => $vendorDir . '/twig/twig/src/Resources/string_loader.php',
    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
    'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
    '2f69d3914119f042cca9e44442d5ce95' => $baseDir . '/web/core/includes/bootstrap.inc',
-    '6a47392539ca2329373e0d33e1dba053' => $vendorDir . '/symfony/polyfill-intl-icu/bootstrap.php',
    '23c18046f52bef3eea034657bafda50f' => $vendorDir . '/symfony/polyfill-php81/bootstrap.php',
    '334983c1b64a31de3c73827b7a6a1e88' => $vendorDir . '/simplesamlphp/simplesamlphp/src/_autoload_modules.php',
    '801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',

--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 // autoload_namespaces.php @generated by Composer
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 return array(

--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 // autoload_psr4.php @generated by Composer
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 return array(

--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -25,30 +25,60 @@ public static function getLoader()
        require __DIR__ . '/platform_check.php';
        spl_autoload_register(array('ComposerAutoloaderInit5c689ffcd54b9e495ed983fdce09b530', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
        spl_autoload_unregister(array('ComposerAutoloaderInit5c689ffcd54b9e495ed983fdce09b530', 'loadClassLoader'));
        $includePaths = require __DIR__ . '/include_paths.php';
        $includePaths[] = get_include_path();
        set_include_path(implode(PATH_SEPARATOR, $includePaths));
-        require __DIR__ . '/autoload_static.php';
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        call_user_func(\Composer\Autoload\ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530::getInitializer($loader));
+        if ($useStaticLoader) {
+            require __DIR__ . '/autoload_static.php';
-        $loader->register(true);
+            call_user_func(\Composer\Autoload\ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530::$files;
+            $map = require __DIR__ . '/autoload_psr4.php';
-        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            foreach ($map as $namespace => $path) {
-            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $loader->setPsr4($namespace, $path);
-                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+            }
-                require $file;
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
            }
-        }, null, null);
+        }
-        foreach ($filesToLoad as $fileIdentifier => $file) {
-            $requireFile($fileIdentifier, $file);
+        $loader->register(true);
+        if ($useStaticLoader) {
+            $includeFiles = Composer\Autoload\ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530::$files;
+        } else {
+            $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequire5c689ffcd54b9e495ed983fdce09b530($fileIdentifier, $file);
        }
        return $loader;
    }
 }
+/**
+ * @param string $fileIdentifier
+ * @param string $file
+ * @return void
+ */
+function composerRequire5c689ffcd54b9e495ed983fdce09b530($fileIdentifier, $file)
+{
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+        require $file;
+    }
+}
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -8,25 +8,25 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
 {
    public static $files = array (
        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
        '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
        'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
+        '89efb1254ef2d1c5d80096acd12c4098' => __DIR__ . '/..' . '/twig/twig/src/Resources/core.php',
+        'ffecb95d45175fd40f75be8a23b34f90' => __DIR__ . '/..' . '/twig/twig/src/Resources/debug.php',
+        'c7baa00073ee9c61edf148c51917cfb4' => __DIR__ . '/..' . '/twig/twig/src/Resources/escaper.php',
+        'f844ccf1d25df8663951193c3fc307c8' => __DIR__ . '/..' . '/twig/twig/src/Resources/string_loader.php',
        '662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php',
        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
        '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
        'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
        '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
+        '6a47392539ca2329373e0d33e1dba053' => __DIR__ . '/..' . '/symfony/polyfill-intl-icu/bootstrap.php',
        '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
        'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
-        '89efb1254ef2d1c5d80096acd12c4098' => __DIR__ . '/..' . '/twig/twig/src/Resources/core.php',
-        'ffecb95d45175fd40f75be8a23b34f90' => __DIR__ . '/..' . '/twig/twig/src/Resources/debug.php',
-        'c7baa00073ee9c61edf148c51917cfb4' => __DIR__ . '/..' . '/twig/twig/src/Resources/escaper.php',
-        'f844ccf1d25df8663951193c3fc307c8' => __DIR__ . '/..' . '/twig/twig/src/Resources/string_loader.php',
        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
        'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
        '2f69d3914119f042cca9e44442d5ce95' => __DIR__ . '/../..' . '/web/core/includes/bootstrap.inc',
-        '6a47392539ca2329373e0d33e1dba053' => __DIR__ . '/..' . '/symfony/polyfill-intl-icu/bootstrap.php',
        '23c18046f52bef3eea034657bafda50f' => __DIR__ . '/..' . '/symfony/polyfill-php81/bootstrap.php',
        '334983c1b64a31de3c73827b7a6a1e88' => __DIR__ . '/..' . '/simplesamlphp/simplesamlphp/src/_autoload_modules.php',
        '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',

--- a/vendor/composer/include_paths.php
+++ b/vendor/composer/include_paths.php
@@ -2,7 +2,7 @@
 // include_paths.php @generated by Composer
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 return array(

--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2392,7 +2392,8 @@
                    }
                },
                "patches_applied": {
-                    "set viewmode to string": "patches/set_viewmode_to_string.patch"
+                    "set viewmode to string": "patches/set_viewmode_to_string.patch",
+                    "Newsletter Article Nav": "patches/newsletter-nav.patch"
                }
            },
            "installation-source": "dist",

--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
--- a/web/core/PATCHES.txt
+++ b/web/core/PATCHES.txt
@@ -5,3 +5,7 @@ set viewmode to string
 Source: patches/set_viewmode_to_string.patch
+Newsletter Article Nav
+Source: patches/newsletter-nav.patch
--- a/web/core/modules/book/templates/book-navigation.html.twig
+++ b/web/core/modules/book/templates/book-navigation.html.twig
@@ -31,27 +31,22 @@
 */
 #}
 {% if tree or has_links %}
-  <nav role="navigation" aria-labelledby="book-label-{{ book_id }}">
+  <nav role="navigation" aria-label="newsletter articles pager">
    {{ tree }}
    {% if has_links %}
-      <h2>{{ 'Book traversal links for'|t }} {{ book_title }}</h2>
-      <ul>
      {% if prev_url %}
-        <li>
-          <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}"><b>{{ '‹'|t }}</b> {{ prev_title }}</a>
+          <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}" class="prevbtn"><i class="fa-solid fa-angle-left"></i> {{ prev_title }}</a>
-        </li>
-      {% endif %}
-      {% if parent_url %}
-        <li>
-          <a href="{{ parent_url }}" title="{{ 'Go to parent page'|t }}">{{ 'Up'|t }}</a>
-        </li>
      {% endif %}
      {% if next_url %}
-        <li>
-          <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}">{{ next_title }} <b>{{ '›'|t }}</b></a>
+          <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}" class="nextbtn">{{ next_title }} <i class="fa-solid fa-angle-right"></i></a>
-        </li>
      {% endif %}
-    </ul>
    {% endif %}
  </nav>
 {% endif %}
No results found