From a38ffc9ff3b7018ccd281482ec7d3e094f0cb265 Mon Sep 17 00:00:00 2001
From: Martin Keckeis <martin.keckeis@thyssenkrupp.com>
Date: Thu, 10 Mar 2016 16:26:09 +0100
Subject: [PATCH 1/2] fixing deps

---
 .scrutinizer.yml    | 11 +++++++++++
 .travis.yml         | 21 +++++++++++----------
 phpunit.xml         |  2 +-
 tests/Bootstrap.php |  5 -----
 travis.phpunit.xml  | 32 --------------------------------
 5 files changed, 23 insertions(+), 48 deletions(-)
 create mode 100644 .scrutinizer.yml
 delete mode 100644 tests/Bootstrap.php
 delete mode 100644 travis.phpunit.xml

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 00000000..34fffede
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,11 @@
+checks:
+    php:
+        code_rating: true
+        duplication: true
+        
+filter:
+    excluded_paths: [tests/*]
+
+tools:
+    external_code_coverage:
+        timeout: 600    # Timeout in seconds.
diff --git a/.travis.yml b/.travis.yml
index c7d5753e..9749e69e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,27 @@
+
 language: php
 
+sudo: false
+
 php:
   - 5.5
   - 5.6
   - 7
   - hhvm
 
-matrix:
-  fast_finish: true
-
-# faster builds on new travis setup not using sudo
-sudo: false
+env:
+  matrix:
+    - DEPENDENCIES="--prefer-lowest --prefer-stable"
+    - DEPENDENCIES=""
 
 before_script:
  - composer self-update
- - composer update --prefer-source -n --verbose
+ - composer update -o --prefer-source $DEPENDENCIES
 
 script:
+ - vendor/bin/phpunit --coverage-clover ./clover.xml
  - vendor/bin/php-cs-fixer fix src --level=psr2 --dry-run -vv
- - mkdir -p build/logs
- - ./vendor/bin/phpunit -c travis.phpunit.xml --coverage-clover build/logs/clover.xml
 
 after_script:
-  - php vendor/bin/coveralls -v
-  
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover ./clover.xml; fi
diff --git a/phpunit.xml b/phpunit.xml
index 0bc42793..0fa618f6 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,5 @@
 <phpunit 
-	bootstrap="./tests/Bootstrap.php" 
+	bootstrap="./vendor/autoload.php" 
 	colors="false"
 	stopOnError="false"
 	stopOnFailure="false"
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
deleted file mode 100644
index 8f4f95c9..00000000
--- a/tests/Bootstrap.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-ini_set('error_reporting', E_ALL);
-ini_set('display_errors', 1);
-
-date_default_timezone_set('UTC');
diff --git a/travis.phpunit.xml b/travis.phpunit.xml
deleted file mode 100644
index c07024c0..00000000
--- a/travis.phpunit.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<phpunit 
-    bootstrap="./tests/Bootstrap.php" 
-    colors="true" 
-    stopOnError="false"
-    stopOnFailure="false"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true" 
-	convertWarningsToExceptions="true"
-	backupGlobals="false"
-    backupStaticAttributes="false" 
-	processIsolation="false" 
-	syntaxCheck="false"
->
-	<testsuites>
-		<testsuite name="ZfcDatagrid component test suite">
-			<directory suffix="Test.php">./tests/</directory>
-		</testsuite>
-	</testsuites>
-
-	<filter>
-		<whitelist>
-			<directory suffix=".php">./src</directory>
-			<exclude>
-				<directory>./build</directory>
-				<directory>./config</directory>
-				<directory>./docs</directory>
-				<directory>./tests</directory>
-				<directory>./view</directory>
-			</exclude>
-		</whitelist>
-	</filter>
-</phpunit>

From 9984ee70cf4d4da77fbaed2a2b4964c706a0fa2e Mon Sep 17 00:00:00 2001
From: Keckeis Martin <martin.keckeis1@gmail.com>
Date: Fri, 11 Mar 2016 08:31:24 +0100
Subject: [PATCH 2/2] higher composer deps

---
 composer.json | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index ccae979b..6ac125bb 100644
--- a/composer.json
+++ b/composer.json
@@ -36,11 +36,12 @@
     },
     
     "require-dev": {
-        "phpunit/PHPUnit": "~4|~5",
-        "satooshi/php-coveralls": "~0.6",
-        "fabpot/php-cs-fixer": "1.10.*",
+        "phpunit/phpunit": "^4.8|^5.2",
+        "fabpot/php-cs-fixer": "^1.11",
         
-        "doctrine/doctrine-orm-module": "~0.9",
+        "doctrine/orm": ">=2.5,<2.7",
+        "doctrine/dbal": ">=2.5,<2.7",
+        "doctrine/doctrine-orm-module": "^0.9",
         
         "zendframework/zend-console": "~2.5",
         "zendframework/zend-db": "~2.5",
@@ -52,9 +53,12 @@
     "suggest" : {
         "ext-intl": "*",
         
-        "doctrine/doctrine-orm-module": "~0.9",
-        "phpoffice/phpexcel": "~1.7",
-        "tecnick.com/tcpdf": "~6.0",
+        "doctrine/orm": ">=2.5,<2.7",
+        "doctrine/dbal": ">=2.5,<2.7",
+        "doctrine/doctrine-orm-module": "^0.9",
+        
+        "phpoffice/phpexcel": "^1.8",
+        "tecnickcom/tcpdf": "^6.2",
 
         "zendframework/zend-text": "~2.5"
     },