Merge pull request #113 from moufmouf/mysql8

Adding Travis tests for MySQL 8

Author: moufmouf

.travis.yml

@@ -12,6 +12,11 @@ matrix:
       env: PREFER_LOWEST="" DB=mysql COVERALLS=true
     - php: 7.1
       env: PREFER_LOWEST="--prefer-lowest" DB=mysql
+    - php: 7.1
+      env: PREFER_LOWEST="" DB=mysql8
+      sudo: required
+      services:
+      - docker
     - php: 7.1
       env: PREFER_LOWEST="" DB=mariadb
       addons:
@@ -63,7 +68,15 @@ before_script:
 - if [ -z "$NO_WEAKREF" ] ; then pecl install weakref-beta; fi
 script:
 # Let's run the Oracle script only when the password is available (it is not available in forks unfortunately)
-- if [ "$DB" != "oracle" ] ; then ./vendor/bin/phpunit $PHPUNITFILE; else docker run -v $(pwd):/app -v $(pwd)/tests/Fixtures/oracle-startup.sql:/docker-entrypoint-initdb.d/oracle-startup.sql moufmouf/oracle-xe-php vendor/bin/phpunit $PHPUNITFILE; fi
+- |
+  if [ "$DB" == "oracle" ] ; then
+    docker run -v $(pwd):/app -v $(pwd)/tests/Fixtures/oracle-startup.sql:/docker-entrypoint-initdb.d/oracle-startup.sql moufmouf/oracle-xe-php vendor/bin/phpunit $PHPUNITFILE;
+  elif [ "$DB" == "mysql8" ] ; then
+    sudo /etc/init.d/mysql stop;
+    tests/phpunit-mysql8.sh
+  else
+    ./vendor/bin/phpunit $PHPUNITFILE;
+  fi
 - composer phpstan
 - composer require-checker
 after_script:

phpunit.mariadb.xml

@@ -34,8 +34,4 @@
     		</exclude>
   		</whitelist>
 	</filter>
-    <logging>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
 </phpunit>

phpunit.mysql8.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="TDBM Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <php>
+        <!-- "Real" test database -->
+        <var name="db_host" value="127.0.0.1" />
+        <var name="db_username" value="root" />
+        <var name="db_password" value="" />
+        <var name="db_name" value="tdbm_testcase" />
+        <var name="db_port" value="3306"/>
+        <var name="db_driver" value="pdo_mysql"/>
+    </php>
+    
+    <filter>
+  		<whitelist processUncoveredFilesFromWhitelist="true">
+    		<directory suffix=".php">src/</directory>
+    		<exclude>
+                <directory suffix=".php">src/Test</directory>
+    		</exclude>
+  		</whitelist>
+	</filter>
+</phpunit>

tests/TDBMServiceTest.php

@@ -757,7 +757,7 @@ public function testFindObjectsFromSqlHierarchyUp()
             'users',
             'login LIKE :login OR login LIKE :login2',
             array('login' => 'robert.marley', 'login2' => 'bill.shakespeare'),
-            null,
+            'users.login DESC',
             null,
             TDBMObject::class
         );

tests/phpunit-mysql8.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Use this file to start a MySQL8 database using Docker and then run the test suite on the MySQL8 database.
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+cd ..
+
+docker run --rm --name mysql8-tdbm-test -p 3306:3306 -p 33060:33060 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -d mysql:8 mysqld --default-authentication-plugin=mysql_native_password
+
+# Let's wait for MySQL 8 to start
+sleep 20
+
+vendor/bin/phpunit -c phpunit.mysql8.xml
+RESULT_CODE=$?
+
+docker stop mysql8-tdbm-test
+
+exit $RESULT_CODE