From 605502abb1412e0377dd4edccadf877efbb57f4a Mon Sep 17 00:00:00 2001
From: Patrick Beuks <code@beuks.net>
Date: Sat, 18 May 2024 11:55:59 +0200
Subject: [PATCH] Fix computed data not assinged to cache

Fix assinging two data types to the same variable

Fix calling of removed functions that would just return null
---
 src/Gitonomy/Git/Commit.php              | 4 ++--
 src/Gitonomy/Git/Parser/CommitParser.php | 4 ++--
 src/Gitonomy/Git/Parser/LogParser.php    | 8 ++++----
 src/Gitonomy/Git/Parser/TagParser.php    | 4 ++--
 src/Gitonomy/Git/Reference/Tag.php       | 4 ++--
 src/Gitonomy/Git/ReferenceBag.php        | 6 +-----
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/Gitonomy/Git/Commit.php b/src/Gitonomy/Git/Commit.php
index 2008f7a3..005dab38 100644
--- a/src/Gitonomy/Git/Commit.php
+++ b/src/Gitonomy/Git/Commit.php
@@ -380,9 +380,9 @@ private function getData($name)
             array_shift($lines);
             array_shift($lines);
 
-            $data['bodyMessage'] = implode("\n", $lines);
+            $this->data['bodyMessage'] = implode("\n", $lines);
 
-            return $data['bodyMessage'];
+            return $this->data['bodyMessage'];
         }
 
         $parser = new Parser\CommitParser();
diff --git a/src/Gitonomy/Git/Parser/CommitParser.php b/src/Gitonomy/Git/Parser/CommitParser.php
index 98234f6d..58b97131 100644
--- a/src/Gitonomy/Git/Parser/CommitParser.php
+++ b/src/Gitonomy/Git/Parser/CommitParser.php
@@ -44,8 +44,8 @@ protected function doParse()
         $this->consumeNewLine();
 
         $this->consume('committer ');
-        list($this->committerName, $this->committerEmail, $this->committerDate) = $this->consumeNameEmailDate();
-        $this->committerDate = $this->parseDate($this->committerDate);
+        list($this->committerName, $this->committerEmail, $committerDate) = $this->consumeNameEmailDate();
+        $this->committerDate = $this->parseDate($committerDate);
 
         // will consume an GPG signed commit if there is one
         $this->consumeGPGSignature();
diff --git a/src/Gitonomy/Git/Parser/LogParser.php b/src/Gitonomy/Git/Parser/LogParser.php
index 4397a460..ad41ce43 100644
--- a/src/Gitonomy/Git/Parser/LogParser.php
+++ b/src/Gitonomy/Git/Parser/LogParser.php
@@ -37,13 +37,13 @@ protected function doParse()
             }
 
             $this->consume('author ');
-            list($commit['authorName'], $commit['authorEmail'], $commit['authorDate']) = $this->consumeNameEmailDate();
-            $commit['authorDate'] = $this->parseDate($commit['authorDate']);
+            list($commit['authorName'], $commit['authorEmail'], $authorDate) = $this->consumeNameEmailDate();
+            $commit['authorDate'] = $this->parseDate($authorDate);
             $this->consumeNewLine();
 
             $this->consume('committer ');
-            list($commit['committerName'], $commit['committerEmail'], $commit['committerDate']) = $this->consumeNameEmailDate();
-            $commit['committerDate'] = $this->parseDate($commit['committerDate']);
+            list($commit['committerName'], $commit['committerEmail'], $committerDate) = $this->consumeNameEmailDate();
+            $commit['committerDate'] = $this->parseDate($committerDate);
 
             // will consume an GPG signed commit if there is one
             $this->consumeGPGSignature();
diff --git a/src/Gitonomy/Git/Parser/TagParser.php b/src/Gitonomy/Git/Parser/TagParser.php
index 659be18a..1a1c084c 100644
--- a/src/Gitonomy/Git/Parser/TagParser.php
+++ b/src/Gitonomy/Git/Parser/TagParser.php
@@ -40,8 +40,8 @@ protected function doParse()
         $this->consumeNewLine();
 
         $this->consume('tagger ');
-        list($this->taggerName, $this->taggerEmail, $this->taggerDate) = $this->consumeNameEmailDate();
-        $this->taggerDate = $this->parseDate($this->taggerDate);
+        list($this->taggerName, $this->taggerEmail, $taggerDate) = $this->consumeNameEmailDate();
+        $this->taggerDate = $this->parseDate($taggerDate);
 
         $this->consumeNewLine();
         $this->consumeNewLine();
diff --git a/src/Gitonomy/Git/Reference/Tag.php b/src/Gitonomy/Git/Reference/Tag.php
index bca6ca49..78c43b25 100644
--- a/src/Gitonomy/Git/Reference/Tag.php
+++ b/src/Gitonomy/Git/Reference/Tag.php
@@ -191,9 +191,9 @@ private function getData($name)
             array_shift($lines);
             array_pop($lines);
 
-            $data['bodyMessage'] = implode("\n", $lines);
+            $this->data['bodyMessage'] = implode("\n", $lines);
 
-            return $data['bodyMessage'];
+            return $this->data['bodyMessage'];
         }
 
         $parser = new TagParser();
diff --git a/src/Gitonomy/Git/ReferenceBag.php b/src/Gitonomy/Git/ReferenceBag.php
index 4b79fc66..adde82c4 100644
--- a/src/Gitonomy/Git/ReferenceBag.php
+++ b/src/Gitonomy/Git/ReferenceBag.php
@@ -354,11 +354,7 @@ protected function initialize()
             $parser = new Parser\ReferenceParser();
             $output = $this->repository->run('show-ref');
         } catch (RuntimeException $e) {
-            $output = $e->getOutput();
-            $error = $e->getErrorOutput();
-            if ($error) {
-                throw new RuntimeException('Error while getting list of references: '.$error);
-            }
+            $output = null;
         }
         $parser->parse($output);