From 516ddcd76d07f1f9973f5dea89a9c4dbdb2b430c Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Tue, 23 Jan 2018 13:49:51 -0500 Subject: [PATCH] Update builds to remove PHP 7 support --- .gitlab-ci.yml | 5 ----- .travis.yml | 4 ---- src/ConnectionManager.php | 2 +- tests/index.php | 3 --- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ec4944..eecc367 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,6 @@ variables: POSTGRES_USER: test POSTGRES_PASSWORD: test -test:7: - image: php:7 - script: - - phpunit -c build --no-coverage - test:7.1: image: php:7.1 script: diff --git a/.travis.yml b/.travis.yml index cdca97d..47984a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,8 @@ sudo: false language: php php: - - 7 - 7.1 - 7.2 - - hhvm - nightly before_script: @@ -27,6 +25,4 @@ after_script: matrix: allow_failures: - - php: 7 - php: nightly - - php: hhvm diff --git a/src/ConnectionManager.php b/src/ConnectionManager.php index c7d1f94..389f740 100644 --- a/src/ConnectionManager.php +++ b/src/ConnectionManager.php @@ -106,7 +106,7 @@ final class ConnectionManager { { return $this->connections[$name]; } - elseif (empty($name) && ! empty($this->connections)) // Otherwise, return the last one + else if (empty($name) && ! empty($this->connections)) // Otherwise, return the last one { return end($this->connections); } diff --git a/tests/index.php b/tests/index.php index a3c361e..be4767b 100644 --- a/tests/index.php +++ b/tests/index.php @@ -35,7 +35,6 @@ namespace Query\Tests { { $class = \get_class($this); - echo '
';
 			echo 'Ran test suite: ' . $class . '
'; if (method_exists($class, 'setupBeforeClass')) { @@ -49,8 +48,6 @@ namespace Query\Tests { { $class = \get_class($this); - echo '
'; - if (method_exists($class, 'tearDownAfterClass')) { $class::tearDownAfterClass(); }