PASSBOLT-1797

passbolt · Jan 20, 2017 · 187c115 · 187c115
1 parent 27c1cbc
commit 187c115
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 58 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,63 +12,63 @@ services:
 matrix:
   include:
 
-#    # PHP 5.5 / MYSQL 5.5
-#    - php: 5.5
-#      env: DB=mysql MYSQL_VERSION=5.5
-#      dist: trusty
-#      sudo: required
-#      addons: &php5_addon
-#        apt:
-#          packages:
-#            - *common_pkg
-#            - php5-memcached
-#            - php5-common
-#            - php5-curl
-#            - php5-mcrypt
-#            - php5-mysql
-#      # Mysql 5.5 requires extra operations to be installed.
-#      before_install: &before_install_mysql55
-#        - sudo service mysql stop
-#        - sudo rm -fr /var/lib/mysql
-#        - sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5
-#        - sudo service mysql restart
-#
-#    # PHP 5.5 / MYSQL 5.6
-#    - php: 5.5
-#      env: DB=mysql MYSQL_VERSION=5.6
-#      dist: trusty
-#      sudo: required
-#      addons: *php5_addon
-#
-#    # PHP 5.6 / MYSQL 5.5
-#    - php: 5.6
-#      env: DB=mysql MYSQL_VERSION=5.5
-#      dist: trusty
-#      sudo: required
-#      addons: *php5_addon
-#      before_install: *before_install_mysql55
-#
-#    # PHP 5.6 / MYSQL 5.6
-#    - php: 5.6
-#      env: DB=mysql MYSQL_VERSION=5.6
-#      dist: trusty
-#      sudo: required
-#      addons: *php5_addon
-#
-#    # PHP 5.6 / MYSQL 5.7
-#    - php: 5.6
-#      env: DB=mysql MYSQL_VERSION=5.7
-#      dist: trusty
-#      sudo: required
-#      addons: *php5_addon
-#      # Mysql 5.7 requires extra operations to be installed.
-#      before_install: &before_install_mysql57
-#        - echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
-#        - wget http://dev.mysql.com/get/mysql-apt-config_0.7.3-1_all.deb
-#        - sudo dpkg --install mysql-apt-config_0.7.3-1_all.deb
-#        - sudo apt-get update -q
-#        - sudo apt-get install -q -y -o Dpkg::Options::=--force-confnew mysql-server
-#        - sudo mysql_upgrade
+    # PHP 5.5 / MYSQL 5.5
+    - php: 5.5
+      env: DB=mysql MYSQL_VERSION=5.5
+      dist: trusty
+      sudo: required
+      addons: &php5_addon
+        apt:
+          packages:
+            - *common_pkg
+            - php5-memcached
+            - php5-common
+            - php5-curl
+            - php5-mcrypt
+            - php5-mysql
+      # Mysql 5.5 requires extra operations to be installed.
+      before_install: &before_install_mysql55
+        - sudo service mysql stop
+        - sudo rm -fr /var/lib/mysql
+        - sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5
+        - sudo service mysql restart
+
+    # PHP 5.5 / MYSQL 5.6
+    - php: 5.5
+      env: DB=mysql MYSQL_VERSION=5.6
+      dist: trusty
+      sudo: required
+      addons: *php5_addon
+
+    # PHP 5.6 / MYSQL 5.5
+    - php: 5.6
+      env: DB=mysql MYSQL_VERSION=5.5
+      dist: trusty
+      sudo: required
+      addons: *php5_addon
+      before_install: *before_install_mysql55
+
+    # PHP 5.6 / MYSQL 5.6
+    - php: 5.6
+      env: DB=mysql MYSQL_VERSION=5.6
+      dist: trusty
+      sudo: required
+      addons: *php5_addon
+
+    # PHP 5.6 / MYSQL 5.7
+    - php: 5.6
+      env: DB=mysql MYSQL_VERSION=5.7
+      dist: trusty
+      sudo: required
+      addons: *php5_addon
+      # Mysql 5.7 requires extra operations to be installed.
+      before_install: &before_install_mysql57
+        - echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
+        - wget http://dev.mysql.com/get/mysql-apt-config_0.7.3-1_all.deb
+        - sudo dpkg --install mysql-apt-config_0.7.3-1_all.deb
+        - sudo apt-get update -q
+        - sudo apt-get install -q -y -o Dpkg::Options::=--force-confnew mysql-server
+        - sudo mysql_upgrade
 
     # PHP 7 / MYSQL 5.6
     - php: 7

diff --git a/app/Test/Case/Model/UserTest.php b/app/Test/Case/Model/UserTest.php
@@ -156,7 +156,7 @@ public function testGetAnonymous() {
 	 */
 	public function testSetActive() {
 		// Try to get a user that doesn't exist
-		$user = User::setActive(CakeString::UUID());
+		$user = User::setActive(CakeText::UUID());
 		$this->assertEquals($user, false, 'User::setActive should return false');
 	}