From 4114cdace86a78d66868db25bc0da2b79a414216 Mon Sep 17 00:00:00 2001
From: "Olivier Paroz (oparoz)" <github@oparoz.com>
Date: Sun, 23 Apr 2017 18:36:18 +0200
Subject: [PATCH] Minor config changes

Signed-off-by: Olivier Paroz (oparoz) <github@oparoz.com>
---
 .scrutinizer.yml           | 6 +++---
 .travis.yml                | 3 +--
 lib/Controller/Preview.php | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 7df8670a..e6e568ef 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -15,9 +15,9 @@ filter:
         - 'tests/*'
         - 'build/*'
         - 'documentation/*'
-        - 'controller/configapicontroller.php'
-        - 'controller/filesapicontroller.php'
-        - 'controller/previewapicontroller.php'
+        - 'lib/Controller/ConfigApiController.php'
+        - 'lib/Controller/FilesApiController.php'
+        - 'lib/Controller/PreviewApiController.php'
 
 tools:
     sensiolabs_security_checker: true
diff --git a/.travis.yml b/.travis.yml
index 33cf1d7c..c82368ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,6 @@ before_cache:
 
 before_install:
   # Disable opcache on PHP 7.0 as it crashes too easily
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ]; then sed -i '/opcache.so/d' ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;"
   - php --modules
 
   # Setup Selenium
@@ -108,7 +107,7 @@ script:
   - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then php vendor/bin/codecept run unit,integration,api; fi;"
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' != 'mysql' ]; then php vendor/bin/codecept run unit,integration,api; fi;"
 
-  # PHP 5.6 ONLY: Unit, integration and api tests with code coverage
+  # PHP 7.0 ONLY: Unit, integration and api tests with code coverage
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' = 'mysql' ]; then php vendor/bin/codecept run unit,integration,api --coverage --coverage-xml --coverage-html; fi;"
   # We can't use phpdbg only as it doesn't work with the webdriver and we can't use it for some tests only as we can't merge html reports
   # - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' = 'mysql' ]; then phpenv config-rm xdebug.ini; phpdbg -qrr vendor/bin/codecept run unit,integration,api --coverage --coverage-xml --coverage-html; fi;"
diff --git a/lib/Controller/Preview.php b/lib/Controller/Preview.php
index 60f88ddf..06f4cbcd 100644
--- a/lib/Controller/Preview.php
+++ b/lib/Controller/Preview.php
@@ -181,7 +181,7 @@ trait Preview {
 	 *
 	 * @param $status
 	 *
-	 * @return array<null,int>
+	 * @return array<null|int>
 	 */
 	private function getErrorData($status = Http::STATUS_INTERNAL_SERVER_ERROR) {
 		return [null, $status];