From 4be539c5420c43974030f6c0fa805ef527e43233 Mon Sep 17 00:00:00 2001
From: Michael Roterman <michael@wtfz.net>
Date: Fri, 28 Feb 2014 13:49:56 +0100
Subject: [PATCH 1/3] Updating gitignore

---
 .gitignore       |  3 +++
 build/phpdox.xml | 32 ++++++++++++++++++++++++++++++++
 build/phpmd.xml  |  0
 phpdox.xml       |  9 ---------
 4 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 build/phpdox.xml
 create mode 100644 build/phpmd.xml
 delete mode 100644 phpdox.xml

diff --git a/.gitignore b/.gitignore
index b0e719e9..e154788b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 /bin
 /docs
+/build/*
+!/build/phpmd.xml
+!/build/phpdox.xml
 /vendor/
 /composer.lock
 /*.php
diff --git a/build/phpdox.xml b/build/phpdox.xml
new file mode 100644
index 00000000..eaa24143
--- /dev/null
+++ b/build/phpdox.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpdox xmlns="http://phpdox.net/config">
+    <project name="php-tmdb-api" source="${basedir}/lib" workdir="${basedir}/docs/xml">
+        <collector backend="parser" />
+
+        <generator output="${basedir}/build/api">
+            <enrich base="${basedir}/build">
+                <source type="build" />
+
+                <source type="git">
+                    <git binary="/usr/bin/git" />
+                    <history enabled="true" limit="25" cache="${phpDox.project.workdir}/gitlog.xml" />
+                </source>
+
+                <source type="phploc">
+                    <file name="logs/phploc.xml" />
+                </source>
+
+                <source type="checkstyle">
+                    <file name="logs/checkstyle.xml" />
+                </source>
+
+                <source type="pmd">
+                    <file name="logs/pmd.xml" />
+                </source>
+
+            </enrich>
+
+            <build engine="html" output="html"/>
+        </generator>
+    </project>
+</phpdox>
diff --git a/build/phpmd.xml b/build/phpmd.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/phpdox.xml b/phpdox.xml
deleted file mode 100644
index 1ddf5fed..00000000
--- a/phpdox.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpdox xmlns="http://phpdox.net/config">
-      <project name="php-tmdb-api" source="${basedir}/lib" workdir="${basedir}/docs/xml">
-              <collector backend="parser" />
-                  <generator output="${basedir}/docs">
-                            <build engine="html" output="html"/>
-                  </generator>
-       </project>
-</phpdox>

From 8c3ae4ae494f2fe8216e2a69292829984b6da1a3 Mon Sep 17 00:00:00 2001
From: Michael Roterman <michael@wtfz.net>
Date: Fri, 28 Feb 2014 13:50:03 +0100
Subject: [PATCH 2/3] Adding build related files and modified phpunit coverage

---
 build.xml        | 127 +++++++++++++++++++++++++++++++++++++++++++++++
 build/phpdox.xml |  10 ++--
 build/phpmd.xml  |  13 +++++
 phpunit.xml.dist |   5 +-
 4 files changed, 150 insertions(+), 5 deletions(-)
 create mode 100644 build.xml

diff --git a/build.xml b/build.xml
new file mode 100644
index 00000000..b85793a3
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="php-tmdb-api" default="build">
+    <target name="build"
+            depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpdox"/>
+
+    <target name="build-parallel"
+            depends="prepare,lint,tools-parallel,phpunit"/>
+
+    <target name="tools-parallel" description="Run tools in parallel">
+        <parallel threadCount="2">
+            <sequential>
+                <antcall target="pdepend"/>
+                <antcall target="phpmd-ci"/>
+            </sequential>
+            <antcall target="phpcpd"/>
+            <antcall target="phpcs-ci"/>
+            <antcall target="phploc"/>
+            <!--
+            <antcall target="phpdox"/>
+            -->
+        </parallel>
+    </target>
+
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/build/api"/>
+        <delete dir="${basedir}/build/coverage"/>
+        <delete dir="${basedir}/build/logs"/>
+        <delete dir="${basedir}/build/pdepend"/>
+    </target>
+
+    <target name="prepare" depends="clean" description="Prepare for build">
+        <mkdir dir="${basedir}/build/api"/>
+        <mkdir dir="${basedir}/build/coverage"/>
+        <mkdir dir="${basedir}/build/logs"/>
+        <mkdir dir="${basedir}/build/pdepend"/>
+        <mkdir dir="${basedir}/build/phpdox"/>
+    </target>
+
+    <target name="lint" description="Perform syntax check of sourcecode files">
+        <apply executable="php" failonerror="true">
+            <arg value="-l" />
+
+            <fileset dir="${basedir}/lib">
+                <include name="**/*.php" />
+                <modified />
+            </fileset>
+
+            <fileset dir="${basedir}/test">
+                <include name="**/*.php" />
+                <modified />
+            </fileset>
+        </apply>
+    </target>
+
+    <target name="phploc" description="Measure project size using PHPLOC">
+        <exec executable="phploc">
+            <arg value="--log-xml" />
+            <arg value="${basedir}/build/logs/phploc.xml" />
+            <arg path="${basedir}/lib" />
+        </exec>
+    </target>
+
+    <target name="pdepend" description="Calculate software metrics using PHP_Depend">
+        <exec executable="pdepend">
+            <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}/lib" />
+        </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}/lib" />
+            <arg value="text" />
+            <arg value="${basedir}/build/phpmd.xml" />
+        </exec>
+    </target>
+
+    <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}/lib" />
+            <arg value="xml" />
+            <arg value="${basedir}/build/phpmd.xml" />
+            <arg value="--reportfile" />
+            <arg value="${basedir}/build/logs/pmd.xml" />
+        </exec>
+    </target>
+
+    <target name="phpcs"
+            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}/lib" />
+        </exec>
+    </target>
+
+    <target name="phpcs-ci" 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 path="${basedir}/lib" />
+        </exec>
+    </target>
+
+    <target name="phpcpd" description="Find duplicate code using PHPCPD">
+        <exec executable="phpcpd">
+            <arg value="--log-pmd" />
+            <arg value="${basedir}/build/logs/pmd-cpd.xml" />
+            <arg path="${basedir}/lib" />
+        </exec>
+    </target>
+
+    <target name="phpdox" description="Generate API documentation using phpDox">
+        <exec executable="phpdox">
+            <arg value="-f" />
+            <arg path="${basedir}/build/phpdox.xml" />
+        </exec>
+    </target>
+
+    <target name="phpunit" description="Run unit tests with PHPUnit">
+        <exec executable="phpunit" failonerror="true"/>
+    </target>
+</project>
diff --git a/build/phpdox.xml b/build/phpdox.xml
index eaa24143..a86602dc 100644
--- a/build/phpdox.xml
+++ b/build/phpdox.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpdox xmlns="http://phpdox.net/config">
-    <project name="php-tmdb-api" source="${basedir}/lib" workdir="${basedir}/docs/xml">
+    <project name="php-tmdb-api" source="${basedir}/../lib" workdir="${basedir}/phpdox">
         <collector backend="parser" />
 
-        <generator output="${basedir}/build/api">
-            <enrich base="${basedir}/build">
+        <generator output="${basedir}/api">
+            <enrich base="${basedir}">
                 <source type="build" />
 
                 <source type="git">
-                    <git binary="/usr/bin/git" />
                     <history enabled="true" limit="25" cache="${phpDox.project.workdir}/gitlog.xml" />
                 </source>
 
@@ -24,6 +23,9 @@
                     <file name="logs/pmd.xml" />
                 </source>
 
+                <source type="phpunit">
+                    <coverage path="coverage/xml" />
+                </source>
             </enrich>
 
             <build engine="html" output="html"/>
diff --git a/build/phpmd.xml b/build/phpmd.xml
index e69de29b..6921081f 100644
--- a/build/phpmd.xml
+++ b/build/phpmd.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<ruleset name="Symfony2 ruleset" xmlns="http://pmd.sf.net/ruleset/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>
+        Custom ruleset.
+    </description>
+
+    <rule ref="rulesets/design.xml" />
+    <rule ref="rulesets/unusedcode.xml" />
+    <rule ref="rulesets/codesize.xml" />
+    <rule ref="rulesets/naming.xml" />
+
+</ruleset>
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 122309f9..19f79649 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -30,7 +30,10 @@
     </filter>
 
     <logging>
-        <log type="coverage-html" target="phpunit/coverage" charset="UTF-8"
+        <log type="coverage-html" target="build/coverage" charset="UTF-8"
+             yui="true" highlight="true"
+             lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="build/coverage/xml/index.xml" charset="UTF-8"
              yui="true" highlight="true"
              lowUpperBound="35" highLowerBound="70"/>
     </logging>

From 2c2a12e4e6345ba3c1e607629f754b5179bbf414 Mon Sep 17 00:00:00 2001
From: Michael Roterman <michael@wtfz.net>
Date: Fri, 28 Feb 2014 22:44:56 +0100
Subject: [PATCH 3/3] Adding a seperate build script to compile api docs and
 run coverage and other metrics.

---
 .gitignore        |  2 ++
 build.xml         | 14 +++++++-------
 build/phpunit.xml | 40 ++++++++++++++++++++++++++++++++++++++++
 phpunit.xml.dist  |  9 ---------
 4 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 build/phpunit.xml

diff --git a/.gitignore b/.gitignore
index e154788b..1a5e850a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /bin
 /docs
 /build/*
+!/build/phpunit.xml
 !/build/phpmd.xml
 !/build/phpdox.xml
 /vendor/
@@ -10,3 +11,4 @@
 /apikey.php
 /phpunit
 /public_html
+/cache.properties
diff --git a/build.xml b/build.xml
index b85793a3..3942b6ff 100644
--- a/build.xml
+++ b/build.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="php-tmdb-api" default="build">
+<project name="php-tmdb-api" default="build-parallel">
     <target name="build"
             depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpdox"/>
 
     <target name="build-parallel"
-            depends="prepare,lint,tools-parallel,phpunit"/>
+            depends="prepare,lint,tools-parallel,phpunit,phpdox"/>
 
     <target name="tools-parallel" description="Run tools in parallel">
         <parallel threadCount="2">
@@ -13,12 +13,9 @@
                 <antcall target="pdepend"/>
                 <antcall target="phpmd-ci"/>
             </sequential>
+            <antcall target="phploc"/>
             <antcall target="phpcpd"/>
             <antcall target="phpcs-ci"/>
-            <antcall target="phploc"/>
-            <!--
-            <antcall target="phpdox"/>
-            -->
         </parallel>
     </target>
 
@@ -122,6 +119,9 @@
     </target>
 
     <target name="phpunit" description="Run unit tests with PHPUnit">
-        <exec executable="phpunit" failonerror="true"/>
+        <exec executable="phpunit" failonerror="true">
+            <arg value="-c" />
+            <arg path="${basedir}/build/phpunit.xml" />
+        </exec>
     </target>
 </project>
diff --git a/build/phpunit.xml b/build/phpunit.xml
new file mode 100644
index 00000000..60217598
--- /dev/null
+++ b/build/phpunit.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="../test/bootstrap.php"
+        >
+    <testsuites>
+        <testsuite name="php-tmdb-api Test Suite">
+            <directory>../test/Tmdb/</directory>
+        </testsuite>
+    </testsuites>
+
+    <groups>
+        <exclude>
+            <group>functional</group>
+        </exclude>
+    </groups>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">../lib/Tmdb/</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-html" target="coverage" charset="UTF-8"
+             yui="true" highlight="true"
+             lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="coverage/xml/index.xml" charset="UTF-8"
+             yui="true" highlight="true"
+             lowUpperBound="35" highLowerBound="70"/>
+    </logging>
+</phpunit>
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 19f79649..819f8286 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -28,13 +28,4 @@
             <directory suffix=".php">./lib/Tmdb/</directory>
         </whitelist>
     </filter>
-
-    <logging>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8"
-             yui="true" highlight="true"
-             lowUpperBound="35" highLowerBound="70"/>
-        <log type="coverage-clover" target="build/coverage/xml/index.xml" charset="UTF-8"
-             yui="true" highlight="true"
-             lowUpperBound="35" highLowerBound="70"/>
-    </logging>
 </phpunit>
\ No newline at end of file