From 1641e1fdc5bece23478c375dddb9b5361131c0f5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 11 Nov 2015 09:21:48 +0100
Subject: [PATCH 1/3] [ticket/660] Update .travis.yml

B3P-660
---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8045f91c..3b1fc65f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
+# Opt into fully virtualized infrastructure
+sudo: required
+
 language: php
 
 matrix:
   include:
-    - php: 5.3
-      env: DB=mysqli # MyISAM
+    - php: 5.4
+      env: DB=none;NOTESTS=1
     - php: 5.4
       env: DB=mysqli
     - php: 5.4
@@ -58,7 +61,7 @@ before_script:
 script:
   - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
   - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
-  - ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION
+  - sh -c "if [ '$NOTESTS' != '1' ]; then ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION; fi"
   - sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
 
 after_script:

From bdd52ad3c07707252d39b31a1297fae6fc0070ea Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 11 Nov 2015 09:36:56 +0100
Subject: [PATCH 2/3] [ticket/660] Fix tests after recent changes to phpBB

B3P-660
---
 tests/unit/event/listener_test.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/unit/event/listener_test.php b/tests/unit/event/listener_test.php
index 2f3f615c..e4ad96e0 100644
--- a/tests/unit/event/listener_test.php
+++ b/tests/unit/event/listener_test.php
@@ -76,9 +76,12 @@ class listener_test extends \phpbb_template_template_test_case
 		$container = new \phpbb_mock_container_builder();
 
 		$filesystem = new \phpbb\filesystem\filesystem();
-		$router = new \phpbb_mock_router($container, $filesystem, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT, $manager);
-		$router->find_routing_files($manager->all_enabled(false));
-		$router->find(dirname(__FILE__) . '/');
+		$loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
+				new \phpbb\routing\file_locator($filesystem, dirname(__FILE__) . '/')
+		);
+		$routing_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT);
+		$router = new \phpbb_mock_router($container, $routing_locator, $loader, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT);
+		$routes = $router->get_routes();
 		$symfony_request = new \phpbb\symfony_request($request);
 		$routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, $filesystem, $phpbb_root_path, 'php');
 		$this->controller_helper = new mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $routing_helper);

From 6ac3c6caf398630b90709effe002b6cca6c3bb88 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 11 Nov 2015 09:48:06 +0100
Subject: [PATCH 3/3] [ticket/660] Correctly pass $NOTESTS to ext-sniff and icc
 check

B3P-660
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3b1fc65f..9616b1cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,8 +59,8 @@ before_script:
   - chmod +wx build/logs
 
 script:
-  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
-  - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
+  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME $NOTESTS; fi"
+  - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS; fi"
   - sh -c "if [ '$NOTESTS' != '1' ]; then ../board3/Board3-Portal/travis/run-testsuite.sh $DB $TRAVIS_PHP_VERSION; fi"
   - sh -c "if [ '$EPV' != '0' ]; then ../board3/Board3-Portal/travis/run-epv.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"