Greatly trimming up phing tasks, travis config, and killing server af…

…ter tests. Addresses #469
guzzle · Nov 21, 2013 · 5ad7211 · 5ad7211
1 parent 0d41a57
commit 5ad7211
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 263 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,18 +14,9 @@ before_script:
   - sh -c "cd pecl_http-1.7.6 && phpize && ./configure && make && sudo make install" > /dev/null
   - echo "extension=http.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
   - pecl install uri_template-beta
-  - pear config-set auto_discover 1
-  - pear install pear.phing.info/phing
-  - pear install pear.phpunit.de/phploc
-  - pear install pear/PHP_CodeSniffer
-  - pear install pear.pdepend.org/PHP_Depend
-  - pear install bartlett.laurent-laville.org/PHP_CompatInfo
-  - pear install pear/PEAR_PackageFileManager2 pear/PEAR_PackageFileManager2_Plugins pear/XML_Serializer-beta
-  - pear install VersionControl_Git-alpha
   - phpenv rehash
   - composer install --dev
-  - cp phing/build.properties.travis phing/build.properties
   - echo 'Ensuring the correct version of node is running'
   - ~/.nvm/nvm.sh install v0.6.14
 
-script: phing travisci
+script: vendor/bin/phpunit
diff --git a/build.xml b/build.xml
@@ -10,24 +10,14 @@
     <property name="repo.dir" value="${project.basedir}" />
 
     <import file="${dir.imports}/dependencies.xml"/>
-    <import file="${dir.imports}/test.xml"/>
     <import file="${dir.imports}/deploy.xml"/>
-    <!-- <import file="${dir.imports}/metrics.xml"/> -->
-
-    <target name="test" description="Run unit tests" depends="test-init">
-        <trycatch>
-            <try>
-                <exec passthru="true" command="vendor/bin/phpunit" checkReturn="true" />
-            </try>
-            <finally>
-                <testserver cmd="${cmd.testserver}" action="stop" />
-            </finally>
-        </trycatch>
+
+    <target name="composer-lint" description="lint-check composer.json only">
+        <composerlint dir="${project.basedir}/src" file="{$project.basedir}/composer.json" />
     </target>
 
-    <target name="test-init" depends="install-dependencies" description="Initialize test dependencies">
-        <testserver cmd="${cmd.testserver}" action="start" />
-        <copy file="phpunit.xml.dist" tofile="phpunit.xml" overwrite="false" />
+    <target name="test" description="Run unit tests">
+        <exec passthru="true" command="vendor/bin/phpunit" checkReturn="true" />
     </target>
 
     <target name="build-init" description="Initialize local phing properties">
@@ -39,7 +29,7 @@
         <delete dir="${project.basedir}/build/pearwork"/>
     </target>
 
-    <target name="prepare" depends="clean,test-init,build-init">
+    <target name="prepare" depends="clean,build-init">
         <mkdir dir="${dir.output}"/>
         <mkdir dir="${dir.output}/logs" />
     </target>

diff --git a/phing/build.properties.travis b/phing/build.properties.travis
diff --git a/phing/imports/dependencies.xml b/phing/imports/dependencies.xml
@@ -9,47 +9,9 @@
     Our custom tasks
     -->
     <taskdef name="composerlint" classname="phing.tasks.ComposerLintTask" />
-    <taskdef name="testserver" classname="phing.tasks.NodeServerTask" />
     <taskdef name="guzzlesubsplit" classname="phing.tasks.GuzzleSubSplitTask" />
     <taskdef name="guzzlepear" classname="phing.tasks.GuzzlePearPharPackageTask" />
 
-    <!--
-    Handle locating composer (global) or composer.phar, and
-    if necessary, installing composer.phar locally.
-    -->
-    <target name="install-composer" description="Installs composer locally if it can't be found in build.properties or global install.">
-        <if>
-            <contains string="${cmd.composer}" substring="composer" />
-            <then>
-                <echo>Using composer at ${cmd.composer}</echo>
-            </then>
-        <else>
-            <exec command="which composer" outputProperty="cmd.composer" />
-            <if>
-                <contains string="${cmd.composer}" substring="composer" />
-                <then>
-                    <echo>Using composer at ${cmd.composer}</echo>
-                </then>
-
-                <elseif>
-                    <available file="${project.basedir}/composer.phar" />
-                    <then>
-                        <echo>Composer is installed locally</echo>
-                        <property name="cmd.composer" value="${php.interpreter} ${project.basedir}/composer.phar" override="true"/>
-                    </then>
-                </elseif>
-
-                <else>
-                    <echo message="Installing composer locally" />
-                    <exec command="curl -s http://getcomposer.org/installer | php" passthru="true" />
-                    <property name="cmd.composer" value="${php.interpreter} ${project.basedir}/composer.phar" override="true"/>
-                </else>
-            </if>
-        </else>
-        </if>
-        <echo message="cmd.composer is ${cmd.composer}"/>
-    </target>
-
     <target name="find-git">
         <if>
             <contains string="${cmd.git}" substring="git" />
@@ -63,14 +25,6 @@
         </if>
     </target>
 
-    <target name="install-dependencies" depends="install-composer">
-        <exec command="${cmd.composer} install --dev" passthru="true" />
-    </target>
-
-    <target name="update-dependencies" depends="install-composer">
-        <exec command="${cmd.composer} update --dev" passthru="true" />
-    </target>
-
     <target name="clean-dependencies">
         <delete dir="${project.basedir}/vendor"/>
         <delete file="${project.basedir}/composer.lock" />

diff --git a/phing/imports/metrics.xml b/phing/imports/metrics.xml
diff --git a/phing/imports/test.xml b/phing/imports/test.xml
diff --git a/phing/tasks/NodeServerTask.php b/phing/tasks/NodeServerTask.php
diff --git a/tests/Guzzle/Tests/Http/Server.php b/tests/Guzzle/Tests/Http/Server.php
@@ -49,6 +49,16 @@ public function __construct($port = null)
         $this->client = new Client($this->getUrl());
     }
 
+    public function __destruct()
+    {
+        try {
+            $this->stop();
+        } catch (\Exception $e) {
+            // Can't throw exceptions in destructor
+            echo "\n{$e}\n";
+        }
+    }
+
     /**
      * Flush the received requests from the server
      * @throws RuntimeException