From e34723685346ac5c9d4756a55c1f638e94dd2a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 18 Dec 2014 15:35:59 +0100
Subject: [PATCH] Remove php 5.3 and build.xml

---
 .travis.yml | 30 ++++++------------------------
 build.xml   | 15 ---------------
 2 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 build.xml

diff --git a/.travis.yml b/.travis.yml
index ef4228d1..5beca946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,11 @@
-# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
 
-# list any PHP version you want to test against
 php:
-  # using major version aliases
-
-  # aliased to a recent 5.3.x version
-  - 5.3
-  # aliased to a recent 5.4.x version
   - 5.4
-  # aliased to a recent 5.5.x version
   - 5.5
+  - 5.6
+  - hhvm
 
-# optionally specify a list of environments, for example to test different RDBMS
-#env:
-#  - DB=mysql
-#  - DB=pgsql
 env:
   global:
     - CORE_BRANCH=master
@@ -30,26 +20,18 @@ before_install:
   - wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh
   - bash ./before_install.sh documents $CORE_BRANCH $DB
 
-# execute any number of scripts before the test run, custom env's are available as variables
-#before_script:
-#  - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS hello_world_test;" -U postgres; fi
-#  - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi
-#  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi
-
-# omitting "script:" will default to phpunit
-
 script:
   # Test lint
   - cd ../core/apps/documents
-  - sh -c "if [ '$DB' = 'sqlite' ]; then ant test; fi"
+  - find . -name \*.php -exec php -l "{}" \;
 
   # Run phpunit tests
   - cd tests
   - phpunit --configuration phpunit.xml
 
   # Create coverage report
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover clover.xml
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi"
   
 matrix:
   include:
@@ -61,4 +43,4 @@ matrix:
       env: DB=oracle
   allow_failures:
     - php: hhvm
-  fast_finish: true
\ No newline at end of file
+  fast_finish: true
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 77a5d7d9..00000000
--- a/build.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project name="owncloud-documents" basedir="." default="test">
-
-	<!-- test - Tests if the code syntax is correct and executes phpunit tests -->
-	<target name="test">
-		<apply executable="php" failonerror="true">
-			<arg value="-l" />
-			<fileset dir=".">
-				<include name="**/*.php" />
-				<exclude name="**/l10n/**" />
-			</fileset>
-		</apply>
-
-	</target>
-
-</project>