Merge pull request #57 from jawira/improve-ordering

Improve ordering

README.md

@@ -16,6 +16,7 @@ Phing visualizer
 [![PDS Skeleton](https://img.shields.io/badge/pds-skeleton-blue.svg)](https://github.com/php-pds/skeleton)
 [![License](https://poser.pugx.org/jawira/phing-visualizer/license)](https://packagist.org/packages/jawira/phing-visualizer)
 [![Issues](https://img.shields.io/github/issues/jawira/phing-visualizer.svg?label=HuBoard&color=694DC2)](https://huboard.com/jawira/phing-visualizer)
+[![HitCount](http://hits.dwyl.io/jawira/phing-visualizer.svg)](http://hits.dwyl.io/jawira/phing-visualizer)
 
 With **phing-visualizer** You can go from this:
 

build.xml

@@ -51,8 +51,8 @@
     <target name="phive:install" description="Install PHPStan">
         <exec executable="phive" checkreturn="true" passthru="true">
             <arg value="install"/>
-            <!--<arg value="&#45;&#45;trust-gpg-keys"/>-->
-            <!--<arg value="4AA394086372C20A,8E730BA25823D8B5,2420BAE0A3BE25C6,4AA394086372C20A"/>-->
+            <arg value="--trust-gpg-keys"/>
+            <arg value="4AA394086372C20A,8E730BA25823D8B5,2420BAE0A3BE25C6,4AA394086372C20A"/>
         </exec>
     </target>
 

resources/puml/dummy.puml

@@ -7,6 +7,14 @@ skinparam UseCaseBorderColor #333333
 skinparam UseCaseBorderThickness 2
 skinparam UseCaseFontColor Black
 
+(init)-[#5D9CEC]->(composer) : depend:1
+(tests)-[#5D9CEC]->(composer) : depend:1
+(tests)-[#EC87C0]->(phpunit) : call:1
+(tests)-[#EC87C0]->(behat) : call:2
+(notifying)-[#5D9CEC]->(composer) : depend:1
+(notifying)-[#EC87C0]->(emailing) : call:1
+(notifying)-[#EC87C0]->(irc) : call:2
+
 (init)
 (composer)
 (tests)
@@ -16,12 +24,4 @@ skinparam UseCaseFontColor Black
 (phpunit)
 (behat)
 
-(init)-[#5D9CEC]->(composer) : depend:1
-(tests)-[#EC87C0]->(phpunit) : call:1
-(tests)-[#EC87C0]->(behat) : call:2
-(tests)-[#5D9CEC]->(composer) : depend:1
-(notifying)-[#EC87C0]->(emailing) : call:1
-(notifying)-[#EC87C0]->(irc) : call:2
-(notifying)-[#5D9CEC]->(composer) : depend:1
-
 @enduml

resources/puml/gist-alphabraga.puml

@@ -7,6 +7,17 @@ skinparam UseCaseBorderColor #333333
 skinparam UseCaseBorderThickness 2
 skinparam UseCaseFontColor Black
 
+(build)-[#EC87C0]->(start) : call:1
+(build)-[#EC87C0]->(clean) : call:2
+(build)-[#EC87C0]->(structure) : call:3
+(build)-[#EC87C0]->(composer) : call:4
+(build)-[#EC87C0]->(phpunit) : call:5
+(build)-[#EC87C0]->(metrics) : call:6
+(build)-[#EC87C0]->(phpdoc) : call:7
+(build)-[#EC87C0]->(copylogs) : call:8
+(build)-[#EC87C0]->(makedist) : call:9
+(build)-[#EC87C0]->(deploy) : call:10
+
 (build)
 (start)
 (clean)
@@ -19,15 +30,4 @@ skinparam UseCaseFontColor Black
 (copylogs)
 (deploy)
 
-(build)-[#EC87C0]->(start) : call:1
-(build)-[#EC87C0]->(clean) : call:2
-(build)-[#EC87C0]->(structure) : call:3
-(build)-[#EC87C0]->(composer) : call:4
-(build)-[#EC87C0]->(phpunit) : call:5
-(build)-[#EC87C0]->(metrics) : call:6
-(build)-[#EC87C0]->(phpdoc) : call:7
-(build)-[#EC87C0]->(copylogs) : call:8
-(build)-[#EC87C0]->(makedist) : call:9
-(build)-[#EC87C0]->(deploy) : call:10
-
 @enduml

resources/puml/gist-kbariotis.puml

@@ -7,10 +7,10 @@ skinparam UseCaseBorderColor #333333
 skinparam UseCaseBorderThickness 2
 skinparam UseCaseFontColor Black
 
+(build)-[#5D9CEC]->(test) : depend:1
+
 (welcome)
 (test)
 (build)
 
-(build)-[#5D9CEC]->(test) : depend:1
-
 @enduml

resources/puml/gist-mapserver2007.puml

@@ -7,15 +7,15 @@ skinparam UseCaseBorderColor #333333
 skinparam UseCaseBorderThickness 2
 skinparam UseCaseFontColor Black
 
+(main)-[#5D9CEC]->(init) : depend:1
+(main)-[#5D9CEC]->(phpmd) : depend:2
+(main)-[#5D9CEC]->(phpcpd) : depend:3
+(main)-[#5D9CEC]->(test) : depend:4
+
 (main)
 (init)
 (test)
 (phpmd)
 (phpcpd)
 
-(main)-[#5D9CEC]->(init) : depend:1
-(main)-[#5D9CEC]->(phpmd) : depend:2
-(main)-[#5D9CEC]->(phpcpd) : depend:3
-(main)-[#5D9CEC]->(test) : depend:4
-
 @enduml

resources/puml/gist-nfabre.puml

@@ -7,7 +7,7 @@ skinparam UseCaseBorderColor #333333
 skinparam UseCaseBorderThickness 2
 skinparam UseCaseFontColor Black
 
-(work)
 
+(work)
 
 @enduml

resources/puml/phing-doc.puml

@@ -7,11 +7,11 @@ skinparam UseCaseBorderColor #333333
 skinparam UseCaseBorderThickness 2
 skinparam UseCaseFontColor Black
 
+(build)-[#5D9CEC]->(prepare) : depend:1
+(dist)-[#5D9CEC]->(build) : depend:1
+
 (prepare)
 (build)
 (dist)
 
-(build)-[#5D9CEC]->(prepare) : depend:1
-(dist)-[#5D9CEC]->(build) : depend:1
-
 @enduml

resources/xslt/calls.xsl

@@ -5,8 +5,16 @@
                 extension-element-prefixes="str">
   <xsl:output method="text" version="2.0" encoding="UTF-8" indent="no"/>
   <xsl:template match="/project">
-<!--Printing dependencies and calls-->
+
+
+    <!--Printing dependencies and calls-->
     <xsl:for-each select="./target">
+      <xsl:if test="@depends">
+        <xsl:call-template name="print-depends">
+          <xsl:with-param name="from" select="@name"/>
+          <xsl:with-param name="depends" select="@depends"/>
+        </xsl:call-template>
+      </xsl:if>
       <xsl:variable name="current-target" select="@name"/>
       <xsl:for-each select=".//phingcall | .//foreach | .//runtarget">
         <xsl:text>(</xsl:text>
@@ -20,12 +28,6 @@
         <xsl:value-of select="position()"/>
         <xsl:text>&#10;</xsl:text>
       </xsl:for-each>
-      <xsl:if test="@depends">
-        <xsl:call-template name="print-depends">
-          <xsl:with-param name="from" select="@name"/>
-          <xsl:with-param name="depends" select="@depends"/>
-        </xsl:call-template>
-      </xsl:if>
     </xsl:for-each>
   </xsl:template>
 

src/Diagram.php

@@ -190,7 +190,7 @@ protected function generatePuml(): string
     {
         $puml = '';
 
-        foreach ([self::XSL_HEADER, self::XSL_TARGETS, self::XSL_CALLS, self::XSL_FOOTER] as $xslFile) {
+        foreach ([self::XSL_HEADER, self::XSL_CALLS, self::XSL_TARGETS, self::XSL_FOOTER] as $xslFile) {
             $puml .= $this->transformToPuml($xslFile);
         }