Fixes

JBZoo · Jul 3, 2020 · b8f7634 · b8f7634
1 parent f028def
commit b8f7634
Show file tree

Hide file tree

Showing 5 changed files with 238 additions and 1,849 deletions.
diff --git a/Makefile b/Makefile
@@ -27,3 +27,24 @@ test-all: ##@Project Run all project tests at once
 	@make test
 	@-make report-merge-coverage
 	@make codestyle
+
+
+test-real:
+	@php `pwd`/jbzoo-composer-graph build                                   \
+        --composer-json=`pwd`/tests/fixtures/testRealProject/composer.json  \
+        --composer-lock=`pwd`/tests/fixtures/testRealProject/composer.lock  \
+        --output=$(PATH_BUILD)/manual-test.html                             \
+        --link-version=false                                                \
+        --lib-version=false                                                 \
+        --no-php                                                            \
+        --no-ext                                                            \
+        -vvv
+	@php `pwd`/jbzoo-composer-graph build                                   \
+        --composer-json=`pwd`/tests/fixtures/testRealProject/composer.json  \
+        --composer-lock=`pwd`/tests/fixtures/testRealProject/composer.lock  \
+        --output=$(PATH_BUILD)/manual-test-platform.html                    \
+        --link-version=false                                                \
+        --lib-version=false                                                 \
+        --no-php                                                            \
+        --no-dev                                                            \
+        -vvv
diff --git a/src/ComposerGraph.php b/src/ComposerGraph.php
@@ -118,7 +118,8 @@ public function build(): string
 
         $htmlPath = $this->params->get('output-path');
         file_put_contents($htmlPath, $this->graphWrapper->renderHtml([
-            'title' => $main->getName() . ' - Graph of Dependencies',
+            'version' => '8.5.2',
+            'title'   => $main->getName() . ' - Graph of Dependencies',
         ]));
 
         return $htmlPath;
@@ -207,12 +208,18 @@ private function addLink(Package $source, Package $target, string $version, Grap
             $sourceNode = $this->createNode($source);
             $targetNode = $this->createNode($target);
 
-            $arrow = $source->isMain() && $target->isDirectPackage() ? Link::THICK : Link::DOTTED;
             if (!$this->params->get('link-version')) {
                 $version = '';
             }
 
-            $graph->addLink(new Link($sourceNode, $targetNode, $version, $arrow));
+            if ($source->isMain() && $target->isDirectPackage()) {
+                $graph->addLink(new Link($sourceNode, $targetNode, $version, Link::THICK));
+            } elseif ($source->isMain() && $target->isDirectPackageDev()) {
+                $graph->addLink(new Link($sourceNode, $targetNode, $version, Link::ARROW));
+            } else {
+                $graph->addLink(new Link($sourceNode, $targetNode, $version, Link::DOTTED));
+            }
+
             $createdLinks[$pattern] = true;
             return true;
         }

diff --git a/tests/GraphBuildTest.php b/tests/GraphBuildTest.php
@@ -187,7 +187,7 @@ public function testComplex()
             '    end',
             '    subgraph "Required Dev"',
             '        b639e1b42e0f7a49ac0e6eec145977b3("jbzoo/event@3.0.x-dev");',
-            '        a21583cedf3174136523a39c2b1c715b-. "3.0.x-dev" .-> b639e1b42e0f7a49ac0e6eec145977b3;',
+            '        a21583cedf3174136523a39c2b1c715b-->|"3.0.x-dev"|b639e1b42e0f7a49ac0e6eec145977b3;',
             '    end',
             '    subgraph "PHP Platform"',
             '        4d48b207cdf39d7efea6cb77e287a47d("ext-json");',

diff --git a/tests/fixtures/testRealProject/composer.json b/tests/fixtures/testRealProject/composer.json
@@ -18,7 +18,11 @@
     "require-dev"       : {
         "jbzoo/phpunit"             : "4.0.x-dev",
         "jbzoo/codestyle"           : "2.0.x-dev",
-        "roave/security-advisories" : "dev-master"
+        "jbzoo/composer-graph"      : "1.0.x-dev",
+        "roave/security-advisories" : "dev-master",
+
+        "guzzlehttp/guzzle"         : "^6.4.1",
+        "rmccue/requests"           : "^1.7.0"
     },
 
     "minimum-stability" : "dev",