Merge branch 'release/2.6.1'

seboettg · Dec 7, 2023 · 32a86ca · 32a86ca
2 parents cae62a2 + a89b0c6
commit 32a86ca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/Rendering/Name/EtAl.php b/src/Rendering/Name/EtAl.php
@@ -31,7 +31,7 @@ class EtAl implements Rendering
 {
     use FormattingTrait;
 
-    private $term;
+    private $term = 'et-al';
 
     public function __construct(SimpleXMLElement $node)
     {

diff --git a/src/Rendering/Name/Name.php b/src/Rendering/Name/Name.php
@@ -212,7 +212,7 @@ private function getNamesString($name, $rank)
         //contains nbsp prefixed by normal space or followed by normal space?
         $text = htmlentities($text);
         if (strpos($text, " &nbsp;") !== false || strpos($text, "&nbsp; ") !== false) {
-            $text = preg_replace("/[\s]+/", "", $text); //remove normal spaces
+            $text = preg_replace("/\s+/", "", $text); //remove normal spaces
             return preg_replace("/&nbsp;+/", " ", $text);
         }
         $text = html_entity_decode(preg_replace("/[\s]+/", " ", $text));

diff --git a/src/Root/Info.php b/src/Root/Info.php
@@ -34,6 +34,8 @@ class Info
      */
     private $links;
 
+    private $misc = [];
+
     public function __construct(SimpleXMLElement $node)
     {
         $this->authors = [];
@@ -95,4 +97,15 @@ public function getLinks()
     {
         return $this->links;
     }
+
+    public function __get(string $name) 
+    {
+      return $this->misc[$name] ?? NULL;
+    }
+
+    public function __set(string $name, $value) : void 
+    {
+      $this->misc[$name][] = $value;
+    }
+
 }
diff --git a/src/StyleSheet.php b/src/StyleSheet.php
@@ -49,7 +49,7 @@ public static function loadStyleSheet(string $styleName): string
     public static function loadLocales(string $langKey): string
     {
         $localesPath = self::vendorPath()."/citation-style-language/locales";
-        $localeFile = "$localesPath/locales-${langKey}.xml";
+        $localeFile = "$localesPath/locales-{$langKey}.xml";
         if (file_exists($localeFile)) {
             return self::readFileContentsOrThrowException($localeFile);
         } else {