FDR-399: Switch to regex

discoverygarden · Feb 1, 2024 · 1f7da32 · 1f7da32
1 parent f9d3647
commit 1f7da32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Form/SelectCslForm.php b/src/Form/SelectCslForm.php
@@ -136,7 +136,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ];
 
       // Log error message.
-      $this->logger->error($csl);
+      $this->logger->error(json_encode($csl));
 
       return $form;
     }
@@ -225,7 +225,7 @@ public function getDefaultCitation($csl_name) {
     try {
       // Method call to render citation.
       $rendered = $this->renderCitation($csl_name);
-      return $rendered['data'];
+      return $rendered['data'] ?? NULL;
     }
     catch (\Throwable $e) {
       return $e->getMessage();

diff --git a/src/Normalizer/NormalizerBase.php b/src/Normalizer/NormalizerBase.php
@@ -89,7 +89,7 @@ protected function getNameParts(string $name): array {
         $firstName = trim(preg_replace('#' . preg_quote($lastName, '#') . '#', '', $name));
       }
 
-      if (empty($firstName) && empty($lastName)) {
+      if (empty($firstName) || empty($lastName)) {
         throw new \Exception('Name is not formatted properly');
       }