Merge pull request #255 from Krinkle/tests

Require PHP 5.6+, Upgrade PHPUnit
perftools · Jan 7, 2019 · ec97dd8 · ec97dd8
2 parents 9b4bb8d + 9979a51
commit ec97dd8
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 28 deletions.
diff --git a/.stickler.yml b/.stickler.yml
@@ -1,6 +1,7 @@
 linters:
   phpcs:
     standard: PSR2
+    exclude: 'Squiz.Classes.ValidClassName,PSR1.Classes.ClassDeclaration'
   csslint:
     ignore: 'ids,known-properties'
 files:

diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,21 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
+  - 7.2
+  - 7.1
   - 7.0
+  - 5.6
 
 matrix:
   include:
-    - php: 5.5
+    - php: 7.2
       env: COVERAGE=1
 
 services:
   - mongodb
 
-before_script:
-  - bash .travis/install.sh
+install:
+  - .travis/install.sh
 
 script:
-  - bash .travis/run.sh
+  - .travis/run.sh
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -1,11 +1,16 @@
-#!/bin/bash
-pecl install mongodb || true
-echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+#!/bin/bash -e
+
+if [[ "$TRAVIS_PHP_VERSION" == "7.2" ]]; then
+	# installed, but not enabled?
+	echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+else
+	pecl install mongodb || true
+fi
 
 git clone https://github.com/tideways/php-profiler-extension.git
 cd php-profiler-extension
 
-if [[ "$TRAVIS_PHP_VERSION" == "5.5" ]] || [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then
+if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then
     git checkout 4.x
     echo "extension=tideways.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
     echo "tideways.auto_prepend_library=0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
@@ -15,7 +20,7 @@ else
 fi
 
 phpize && ./configure && make && make install && cd ..
-
 phpenv rehash
-composer install --prefer-dist --dev
+
+composer install --prefer-dist
 chmod -R 0777 cache/
diff --git a/.travis/run.sh b/.travis/run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 if [[ "$COVERAGE" == "1" ]]; then
   echo;
   echo "Running unit tests with code-coverage";

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ System Requirements
 
 XHGui has the following requirements:
 
- * PHP version 5.5 or later.
+ * PHP version 5.6 or later.
  * [MongoDB Extension](http://pecl.php.net/package/mongodb) MongoDB PHP driver.
    XHGui requires verison 1.3.0 or later.
  * [MongoDB](http://www.mongodb.org/) MongoDB Itself. XHGui requires version 2.2.0 or later.

diff --git a/composer.json b/composer.json
@@ -8,16 +8,16 @@
         }
     },
     "require": {
-        "php": ">=5.5.0",
+        "php": ">=5.6.0",
         "slim/slim": "^2.6.3",
         "slim/views": "^0.1.0",
         "twig/twig": "~1.17",
         "pimple/pimple": "^1.0.2",
         "perftools/xhgui-collector": "^1.4.0"
     },
     "require-dev": {
-        "alcaeus/mongo-php-adapter": "^1.0",
-        "phpunit/phpunit": "4.*|5.*",
+        "alcaeus/mongo-php-adapter": "^1.1",
+        "phpunit/phpunit": "^5.7.27 | ^6.5.13",
         "ext-dom": "*"
     },
     "scripts": {

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ConfigTest extends PHPUnit_Framework_TestCase
+class ConfigTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/Controller/ImportTest.php b/tests/Controller/ImportTest.php
@@ -1,7 +1,7 @@
 <?php
 use Slim\Environment;
 
-class Controller_ImportTest extends PHPUnit_Framework_TestCase
+class Controller_ImportTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/Controller/RunTest.php b/tests/Controller/RunTest.php
@@ -1,7 +1,7 @@
 <?php
 use Slim\Environment;
 
-class Controller_RunTest extends PHPUnit_Framework_TestCase
+class Controller_RunTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/Controller/WatchTest.php b/tests/Controller/WatchTest.php
@@ -1,7 +1,7 @@
 <?php
 use Slim\Environment;
 
-class Controller_WatchTest extends PHPUnit_Framework_TestCase
+class Controller_WatchTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/Db/MapperTest.php b/tests/Db/MapperTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Db_MapperTest extends PHPUnit_Framework_TestCase
+class Db_MapperTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/ProfileTest.php b/tests/ProfileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ProfileTest extends PHPUnit_Framework_TestCase
+class ProfileTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/ProfilesTest.php b/tests/ProfilesTest.php
@@ -1,5 +1,5 @@
 <?php
-class ProfilesTest extends PHPUnit_Framework_TestCase
+class ProfilesTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/Saver/FileTest.php b/tests/Saver/FileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Saver_FileTest extends PHPUnit_Framework_TestCase
+class Saver_FileTest extends PHPUnit\Framework\TestCase
 {
     public function testSave()
     {

diff --git a/tests/Saver/MongoTest.php b/tests/Saver/MongoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Saver_MongoTest extends PHPunit_Framework_TestCase
+class Saver_MongoTest extends PHPUnit\Framework\TestCase
 {
     public function testSave()
     {

diff --git a/tests/Twig/ExtensionTest.php b/tests/Twig/ExtensionTest.php
@@ -2,7 +2,7 @@
 use Slim\Slim;
 use Slim\Environment;
 
-class Xhgui_Twig_ExtensionTest extends PHPUnit_Framework_TestCase
+class Xhgui_Twig_ExtensionTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {

diff --git a/tests/WatchFunctionsTest.php b/tests/WatchFunctionsTest.php
@@ -1,5 +1,5 @@
 <?php
-class WatchFunctionsTest extends PHPUnit_Framework_TestCase
+class WatchFunctionsTest extends PHPUnit\Framework\TestCase
 {
     public function setUp()
     {