Add optional entry type option for tree entries

Author: Patrick-Beuks

src/Gitonomy/Git/Tree.php

@@ -24,6 +24,7 @@ class Tree
     protected $hash;
     protected $isInitialized = false;
     protected $entries;
+    protected $entriesByType;
 
     public function __construct(Repository $repository, $hash)
     {
@@ -47,16 +48,23 @@ protected function initialize()
         $parser->parse($output);
 
         $this->entries = [];
+        $this->entriesByType = [
+            TreeType::BLOB->value => [],
+            TreeType::TREE->value => [],
+            TreeType::COMMIT->value => [],
+        ];
 
         foreach ($parser->entries as $entry) {
             list($mode, $type, $hash, $name) = $entry;
-            if ($type == 'blob') {
-                $this->entries[$name] = [$mode, $this->repository->getBlob($hash)];
-            } elseif ($type == 'tree') {
-                $this->entries[$name] = [$mode, $this->repository->getTree($hash)];
+            if ($type == TreeType::BLOB->value) {
+                $treeEntry = [$mode, $this->repository->getBlob($hash)];
+            } elseif ($type == TreeType::TREE->value) {
+                $treeEntry = [$mode, $this->repository->getTree($hash)];
             } else {
-                $this->entries[$name] = [$mode, new CommitReference($hash)];
+                $treeEntry = [$mode, new CommitReference($hash)];
             }
+            $this->entries[$name] = $treeEntry;
+            $this->entriesByType[$type][$name] = $treeEntry;
         }
 
         $this->isInitialized = true;
@@ -65,11 +73,11 @@ protected function initialize()
     /**
      * @return array An associative array name => $object
      */
-    public function getEntries()
+    public function getEntries(?TreeType $type = null)
     {
         $this->initialize();
 
-        return $this->entries;
+        return $type ? $this->entriesByType[$type->value] : $this->entries;
     }
 
     public function getEntry($name)

src/Gitonomy/Git/TreeType.php

@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of Gitonomy.
+ *
+ * (c) Alexandre Salomé <[email protected]>
+ * (c) Julien DIDIER <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Gitonomy\Git;
+
+enum TreeType: string
+{
+    case BLOB = 'blob';
+    case TREE = 'tree';
+    case COMMIT = 'commit';
+}

tests/Gitonomy/Git/Tests/TreeTest.php

@@ -13,6 +13,8 @@
 namespace Gitonomy\Git\Tests;
 
 use Gitonomy\Git\Blob;
+use Gitonomy\Git\CommitReference;
+use Gitonomy\Git\TreeType;
 
 class TreeTest extends AbstractTest
 {
@@ -21,7 +23,7 @@ class TreeTest extends AbstractTest
     /**
      * @dataProvider provideFooBar
      */
-    public function testCase($repository)
+    public function testGetEntries($repository)
     {
         $tree = $repository->getCommit(self::LONGFILE_COMMIT)->getTree();
 
@@ -34,6 +36,26 @@ public function testCase($repository)
         $this->assertTrue($entries['README.md'][1] instanceof Blob, 'README.md is a Blob');
     }
 
+    /**
+     * @dataProvider provideFooBar
+     */
+    public function testGetEntriesByType($repository)
+    {
+        $tree = $repository->getCommit(self::NO_MESSAGE_COMMIT)->getTree();
+
+        $blobs = $tree->getEntries(TreeType::BLOB);
+
+        $this->assertNotEmpty($blobs['README.md'], 'README.md is present');
+        $this->assertTrue($blobs['README.md'][1] instanceof Blob, 'README.md is a blob');
+
+        $trees = $tree->getEntries(TreeType::TREE);
+        $this->assertEmpty($trees);
+
+        $commits = $tree->getEntries(TreeType::COMMIT);
+        $this->assertNotEmpty($commits['barbaz'], 'barbaz is present');
+        $this->assertTrue($commits['barbaz'][1] instanceof CommitReference, 'barbaz is a Commit');
+    }
+
     /**
      * @dataProvider provideFooBar
      */