Merge branch 'master' of bitbucket.org:colosa/processmaker

build.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="name-of-project" default="build-phpcs">
+<project name="ProcessMaker Michelangelo" default="build-phpcs">
     <target name="build"
-        depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpdox,phpunit,phpcb"/>
+        depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpdox"/>
 
     <target name="build-simple"
         depends="prepare,phpunit,phpcs-ci,phploc,lint"/>
@@ -47,7 +47,7 @@
   <apply executable="php" failonerror="true">
    <arg value="-l" />
 
-   <fileset dir="${basedir}/workflow/methods/login">
+   <fileset dir="${basedir}/workflow/engine/src">
     <include name="*.php" />
     <modified />
    </fileset>
@@ -59,7 +59,7 @@
   <exec executable="phploc">
    <arg value="--log-csv" />
    <arg value="${basedir}/build/logs/phploc.csv" />
-   <arg path="${basedir}/workflow/engine" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
@@ -68,14 +68,14 @@
    <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
    <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
    <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
  <target name="phpmd"
          description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="phpmd">
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
    <arg value="text" />
    <arg value="codesize" /> <!--  ${basedir}/build/phpmd.xml" /> !-->
   </exec>
@@ -83,9 +83,9 @@
 
  <target name="phpmd-ci" description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
   <exec executable="phpmd">
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
    <arg value="xml" />
-   <arg value="${basedir}/build/phpmd.xml" />
+   <arg value="codesize" /> <!--  ${basedir}/build/phpmd.xml" /> !-->
    <arg value="--reportfile" />
    <arg value="${basedir}/build/logs/pmd.xml" />
   </exec>
@@ -95,8 +95,8 @@
          description="Find coding standard violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="phpcs">
    <arg value="--standard=PSR2" />
-   <arg path="${basedir}/workflow/engine/methods/login" />
+   <arg path="${basedir}/workflow/engine/src" />
-   <arg path="${basedir}/workflow/engine/methods/services" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
@@ -105,21 +105,7 @@
    <arg value="--report=checkstyle" />
    <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
    <arg value="--standard=PSR2" />
-   <arg path="${basedir}/gulliver/system" />
+   <arg path="${basedir}/workflow/engine/src" />
-   <arg path="${basedir}/workflow/engine/methods" />
-   <arg path="${basedir}/workflow/engine/classes" />
-   <arg path="${basedir}/workflow/engine/controllers" />
-  </exec>
- </target>
-
- <target name="phpcs-ci-old" description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">
-  <exec executable="phpcs" output="/dev/null">
-   <arg value="--report=checkstyle" />
-   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-   <arg value="--standard=PSR2" />
-   <arg value="-l" />
-   <arg path="${basedir}/workflow/engine/methods/login" />
-   <arg path="${basedir}/workflow/engine/classes" />
   </exec>
  </target>
 
@@ -127,7 +113,7 @@
   <exec executable="phpcpd">
    <arg value="--log-pmd" />
    <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
@@ -144,7 +130,7 @@
    <arg value="--log" />
    <arg path="${basedir}/build/logs" />
    <arg value="--source" />
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
    <arg value="--output" />
    <arg path="${basedir}/build/code-browser" />
   </exec>

phpdox.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpdox xmlns="http://phpdox.de/config" silent="false">
+    <project name="ProcessMaker Michelangelo" source="${basedir}/workflow/engine/src" workdir="${basedir}/build/phpdox">
+        <!--  Additional configuration for the collecting process (parse of php code, generation of xml data) -->
+        <collector publiconly="false" backend="parser">
+            <include mask="*.php" />
+            <exclude mask="" />
+            <inheritance resolve="true">
+            </inheritance>
+        </collector>
+
+        <generator output="${basedir}/build/docs">
+            <!-- A generation process consists of one or more build tasks and of (optional) enrich sources -->
+
+            <enrich path="${basedir}/build/logs">
+
+                <source type="checkstyle">
+                    <!-- @type - the handler for the enrichment -->
+                    <!--         known types by default are: checkstyle, pmd, clover, phpunit -->
+
+                    <!-- every enrichment source can have additional configuration nodes, most probably need a logfile -->
+                    <!-- <file name="checkstyle.xml" /> -->
+
+                </source>
+
+                <!--
+                <source type="pmd">
+                    <file name="pmd.xml" />
+                </source>
+
+                <source type="clover">
+                    <file name="clover.xml" />
+                </source>
+
+                <source type="phpunit">
+                    <file name="junit.xml" />
+                </source>
+                -->
+
+            </enrich>
+
+
+            <!-- An engine and thus build node can have additional configuration child nodes, please check the documentation for the engine to find out more -->
+
+            <!--  default engine "html" -->
+            <build engine="html" enabled="true" output="html">
+                <template dir="${phpDox.home}/templates/html" />
+                <file extension="html" />
+            </build>
+
+            <!--
+            <build engine="todo" enabled="true" output="todo">
+                <file name="todolist.txt" encoding="utf-8" />
+            </build>
+
+            <build engine="graph" enabled="true" output="graph">
+                <dot executable="/usr/bin/dot" options="" />
+                <file name="graph.png" options="" format="png" />
+            </build>
+
+            -->
+
+        </generator>
+    </project>
+
+</phpdox>