From 2caeafc03b8195da69b0c4e1d9df90b5983c543e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Nov 2017 18:32:37 +0100 Subject: [PATCH] NEW Compatibility with PHP 7.2 --- .travis.yml | 3 +-- test/phpunit/AllTests.php | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 532030658bf..10a2b6e8347 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,6 @@ matrix: fast_finish: true allow_failures: - php: hhvm - - php: '7.2' - php: nightly # We exclude some combinations not usefull to save Travis CPU exclude: @@ -73,7 +72,7 @@ matrix: env: DB=postgresql - php: '7.0' env: DB=postgresql - - php: '7.2' + - php: '7.1' env: DB=postgresql - php: hhvm env: DB=postgresql diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 115394fbbbe..71b57fb82c7 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -202,8 +202,8 @@ class AllTests $suite->addTestSuite('RestAPIUserTest'); // Test only with php7.2 or less - if ((float) phpversion() < 7.3) - { + //if ((float) phpversion() < 7.3) + //{ require_once dirname(__FILE__).'/WebservicesProductsTest.php'; $suite->addTestSuite('WebservicesProductsTest'); require_once dirname(__FILE__).'/WebservicesInvoicesTest.php'; @@ -216,7 +216,7 @@ class AllTests $suite->addTestSuite('WebservicesThirdpartyTest'); require_once dirname(__FILE__).'/WebservicesUserTest.php'; $suite->addTestSuite('WebservicesUserTest'); - } + //} require_once dirname(__FILE__).'/ExportTest.php'; $suite->addTestSuite('ExportTest');