Fixes test

JBZoo · Jul 12, 2020 · d0cfb47 · d0cfb47
1 parent 9d7f50e
commit d0cfb47
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/src/Collection.php b/src/Collection.php
@@ -175,12 +175,4 @@ public function getByName(string $packageName): Package
 
         throw new Exception("Package \"{$packageName} ({$packageAlias})\" not found in collection");
     }
-
-    /**
-     * @return Package[]
-     */
-    public function getAll(): array
-    {
-        return $this->collection;
-    }
 }
diff --git a/src/Helper.php b/src/Helper.php
@@ -27,6 +27,7 @@ class Helper
 
     /**
      * @return string|null
+     * @codeCoverageIgnore
      * @phan-suppress PhanUnusedVariableCaughtException
      */
     public static function getGitVersion(): ?string

diff --git a/src/Package.php b/src/Package.php
@@ -187,14 +187,6 @@ public function isMain(): bool
         return $this->isTag(self::MAIN);
     }
 
-    /**
-     * @return bool
-     */
-    public function isSuggest(): bool
-    {
-        return $this->isTag(self::SUGGEST);
-    }
-
     /**
      * @param bool $addVersion
      * @return string

diff --git a/tests/GraphBuildTest.php b/tests/GraphBuildTest.php
@@ -15,6 +15,11 @@
 
 namespace JBZoo\PHPUnit;
 
+use JBZoo\ComposerGraph\Collection;
+use JBZoo\ComposerGraph\ComposerGraph;
+
+use function JBZoo\Data\json;
+
 /**
  * Class GraphBuildTest
  *
@@ -739,7 +744,7 @@ public function testJBZooToolboxNoDev()
 
     public function testRealProject()
     {
-        isSame(implode("\n", [
+        $excepted = implode("\n", [
             'graph LR;',
             '    amphp__byte_stream-->amphp__amp;',
             '    codedungeon__phpunit_result_printer-->2bj__phanybar;',
@@ -1132,10 +1137,29 @@ public function testRealProject()
             '        webmozart__path_util("webmozart/path-util");',
             '        zendframework__zend_httphandlerrunner(["zendframework/zend-httphandlerrunner"]);',
             '    end',
-        ]), $this->buildGraph([
+        ]);
+
+        isSame($excepted, $this->buildGraph([
             'show-dev'      => null,
             'show-suggests' => null,
         ], __FUNCTION__));
+
+        $composerJson = json(PROJECT_ROOT . '/tests/fixtures/testJBZooToolbox/composer.json');
+        $composerLock = json(PROJECT_ROOT . '/tests/fixtures/testJBZooToolbox/composer.lock');
+
+        $collection = new Collection($composerJson, $composerLock);
+
+        $result = (new ComposerGraph($collection, [
+            'php'          => false,
+            'ext'          => false,
+            'dev'          => true,
+            'suggest'      => true,
+            'link-version' => false,
+            'lib-version'  => false,
+            'format'       => ComposerGraph::FORMAT_MERMAID,
+        ]))->build();
+
+        isSame($excepted, $result);
     }
 
     public function testRealProjectMinimal()