Fix GPG signed commits breaks parsing of commit messages

Author: Stig Lindqvist

src/Gitonomy/Git/Parser/LogParser.php

@@ -43,6 +43,10 @@ protected function doParse()
             $this->consume('committer ');
             list($commit['committerName'], $commit['committerEmail'], $commit['committerDate']) = $this->consumeNameEmailDate();
             $commit['committerDate'] = $this->parseDate($commit['committerDate']);
+
+            // will consume an GPG signed commit if there is one
+            $this->consumeGPGSignature();
+
             $this->consumeNewLine();
             $this->consumeNewLine();
 

src/Gitonomy/Git/Parser/ParserBase.php

@@ -119,4 +119,19 @@ protected function consumeNewLine()
     {
         return $this->consume("\n");
     }
+
+    /**
+     * @return string
+     */
+    protected function consumeGPGSignature() {
+        $expected = "\ngpgsig ";
+        $length = strlen($expected);
+        $actual = substr($this->content, $this->cursor, $length);
+        if($actual != $expected) {
+            return '';
+        }
+        $this->cursor += $length;
+
+        return $this->consumeTo("\n\n");
+    }
 }

tests/Gitonomy/Git/Tests/AbstractTest.php

@@ -24,6 +24,7 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase
     const INITIAL_COMMIT = '74acd054c8ec873ae6be044041d3a85a4f890ba5';
     const MERGE_COMMIT = '2f5b9d0a4e6e7173d7816e417805709c708674f8';
     const ENCODING_COMMIT = '779420b9b936f18a0b6579e1499a85b14270802e';
+    const SIGNED_COMMIT = 'e1a83f16ed61ae3807e5652c7ef894692c813513';
 
     /**
      * Local clone of remote URL. Avoids network call on each test.

tests/Gitonomy/Git/Tests/PushReferenceTest.php

@@ -55,6 +55,19 @@ public function testLog($repository)
         $this->assertEquals('add a long file', $log[0]->getShortMessage(), 'First commit is correct');
     }
 
+    /**
+     * This test ensures that GPG signed requests does not break the reading of commit logs.
+     *
+     * @dataProvider provideFoobar
+     */
+    public function testSignedLog($repository)
+    {
+        $ref = new PushReference($repository, 'foo', self::INITIAL_COMMIT, self::SIGNED_COMMIT);
+        $log = $ref->getLog()->getCommits();
+        $this->assertEquals(16, count($log), '16 commits in log');
+        $this->assertEquals('signed commit', $log[0]->getShortMessage(), 'Last commit is correct');
+    }
+
     /**
      * @dataProvider provideFoobar
      */