Fix issue #2, handling of diffs from svn propedit

Author: ptlis

src/Parse/UnifiedDiffTokenizer.php

@@ -241,29 +241,36 @@ private function getHunkStartTokens($diffLine)
      */
     private function getFilenameTokens(array $diffLineList, $currentLine)
     {
+        $filenameTokens = array();
+
         // Get hunk metadata
         $hunkTokens = $this->getHunkStartTokens($diffLineList[$currentLine+2]);
 
-        // Simple change
-        if (4 == count($hunkTokens)) {
-            $originalFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine]);
-            $newFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine+1]);
+        // In some cases we may have a diff with no contents (e.g. diff of svn propedit)
+        if (count($hunkTokens)) {
+            // Simple change
+            if (4 == count($hunkTokens)) {
+                $originalFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine]);
+                $newFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine + 1]);
 
-        // File deletion
-        } elseif (Token::FILE_DELETION_LINE_COUNT === $hunkTokens[0]->getType()) {
-            $originalFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine]);
-            $newFilename = '';
+            // File deletion
+            } elseif (Token::FILE_DELETION_LINE_COUNT === $hunkTokens[0]->getType()) {
+                $originalFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine]);
+                $newFilename = '';
 
-        // File creation
-        } else {
-            $originalFilename = '';
-            $newFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine+1]);
+            // File creation
+            } else {
+                $originalFilename = '';
+                $newFilename = $this->diffNormalizer->getFilename($diffLineList[$currentLine + 1]);
+            }
+
+            $filenameTokens = array(
+                new Token(Token::ORIGINAL_FILENAME, $originalFilename),
+                new Token(Token::NEW_FILENAME, $newFilename)
+            );
         }
 
-        return array(
-            new Token(Token::ORIGINAL_FILENAME, $originalFilename),
-            new Token(Token::NEW_FILENAME, $newFilename)
-        );
+        return $filenameTokens;
     }
 
     /**

tests/Parse/Svn/DiffParserPropEditTest.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * PHP Version 5.3
+ *
+ * @copyright (c) 2014-2015 brian ridley
+ * @author brian ridley <ptlis@ptlis.net>
+ * @license http://opensource.org/licenses/MIT MIT
+ */
+
+namespace ptlis\DiffParser\Test\Parse\Svn;
+
+use ptlis\DiffParser\File;
+use ptlis\DiffParser\Hunk;
+use ptlis\DiffParser\Line;
+use ptlis\DiffParser\Parse\UnifiedDiffParser;
+use ptlis\DiffParser\Parse\UnifiedDiffTokenizer;
+use ptlis\DiffParser\Parse\SvnDiffNormalizer;
+
+class DiffParserPropEditTest extends \PHPUnit_Framework_TestCase
+{
+    public function testPropEdit()
+    {
+        $parser = new UnifiedDiffParser(
+            new UnifiedDiffTokenizer(
+                new SvnDiffNormalizer()
+            )
+        );
+
+        $data = file(__DIR__ . '/data/diff_propedit', FILE_IGNORE_NEW_LINES);
+
+        $diff = $parser->parse($data);
+
+        $this->assertInstanceOf('ptlis\DiffParser\Changeset', $diff);
+        $this->assertEquals(0, count($diff->getFiles()));
+    }
+}

tests/Parse/Svn/data/diff_propedit

@@ -0,0 +1,12 @@
+Index: branches/7.0/trunk
+===================================================================
+--- branches/7.0/trunk  (revision 115793)
++++ branches/7.0/trunk  (revision 115794)
+
+Property changes on: branches/7.0/trunk
+___________________________________________________________________
+Modified: svn:mergeinfo
+   Merged /branches/7.0/dev/7.3.3-5959:r115410-115793
+   Merged /branches/7.0/dev/7.3.2-5968:r115162-115780
+
+------------------------------------------------------------------------