Make each entry type a different function

Author: Patrick-Beuks

src/Gitonomy/Git/Tree.php

@@ -49,16 +49,16 @@ protected function initialize()
 
         $this->entries = [];
         $this->entriesByType = [
-            TreeType::BLOB->value   => [],
-            TreeType::TREE->value   => [],
-            TreeType::COMMIT->value => [],
+            'blob'   => [],
+            'tree'   => [],
+            'commit' => [],
         ];
 
         foreach ($parser->entries as $entry) {
             list($mode, $type, $hash, $name) = $entry;
-            if ($type == TreeType::BLOB->value) {
+            if ($type == 'blob') {
                 $treeEntry = [$mode, $this->repository->getBlob($hash)];
-            } elseif ($type == TreeType::TREE->value) {
+            } elseif ($type == 'tree') {
                 $treeEntry = [$mode, $this->repository->getTree($hash)];
             } else {
                 $treeEntry = [$mode, new CommitReference($hash)];
@@ -71,13 +71,43 @@ protected function initialize()
     }
 
     /**
-     * @return array An associative array name => $object
+     * @return array<string, array{string, CommitReference|Tree|Blob}> An associative array name => $object
      */
-    public function getEntries(?TreeType $type = null)
+    public function getEntries(): array
     {
         $this->initialize();
 
-        return $type ? $this->entriesByType[$type->value] : $this->entries;
+        return $this->entries;
+    }
+
+    /**
+     * @return array<string, array{string, CommitReference}> An associative array of name => [mode, commit reference]
+     */
+    public function getCommitReferenceEntries(): array
+    {
+        $this->initialize();
+
+        return $this->entriesByType['commit'];
+    }
+
+    /**
+     * @return array<string, array{string, Tree}> An associative array of name => [mode, tree]
+     */
+    public function getTreeEntries(): array
+    {
+        $this->initialize();
+
+        return $this->entriesByType['tree'];
+    }
+
+    /**
+     * @return array<string, array{string, Blob}> An associative array of name => [mode, blob]
+     */
+    public function getBlobEntries(): array
+    {
+        $this->initialize();
+
+        return $this->entriesByType['blob'];
     }
 
     public function getEntry($name)

src/Gitonomy/Git/TreeType.php

@@ -14,7 +14,6 @@
 
 use Gitonomy\Git\Blob;
 use Gitonomy\Git\CommitReference;
-use Gitonomy\Git\TreeType;
 
 class TreeTest extends AbstractTest
 {
@@ -39,21 +38,39 @@ public function testGetEntries($repository)
     /**
      * @dataProvider provideFooBar
      */
-    public function testGetEntriesByType($repository)
+    public function testGetCommitReferenceEntries($repository)
     {
         $tree = $repository->getCommit(self::NO_MESSAGE_COMMIT)->getTree();
 
-        $blobs = $tree->getEntries(TreeType::BLOB);
+        $commits = $tree->getCommitReferenceEntries();
 
-        $this->assertNotEmpty($blobs['README.md'], 'README.md is present');
-        $this->assertTrue($blobs['README.md'][1] instanceof Blob, 'README.md is a blob');
+        $this->assertNotEmpty($commits['barbaz'], 'barbaz is present');
+        $this->assertTrue($commits['barbaz'][1] instanceof CommitReference, 'barbaz is a Commit');
+    }
+
+    /**
+     * @dataProvider provideFooBar
+     */
+    public function testGetTreeEntries($repository)
+    {
+        $tree = $repository->getCommit(self::NO_MESSAGE_COMMIT)->getTree();
+
+        $trees = $tree->getTreeEntries();
 
-        $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
+     */
+    public function testGetBlobEntries($repository)
+    {
+        $tree = $repository->getCommit(self::NO_MESSAGE_COMMIT)->getTree();
+
+        $blobs = $tree->getBlobEntries();
+
+        $this->assertNotEmpty($blobs['README.md'], 'README.md is present');
+        $this->assertTrue($blobs['README.md'][1] instanceof Blob, 'README.md is a blob');
     }
 
     /**