Update Travis PHP 5.3 to 5.6 and remove last FIX, to fix unexplained …

…and not reproducible Travis unit test errors…
Twenga · Jan 29, 2017 · 9f823a5 · 9f823a5
1 parent 84d3f74
commit 9f823a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@
 
 language: php
 php:
-  - 5.3
+  - 5.6
 
 before_script:
   - cp conf/twgit-dist.sh conf/twgit.sh

diff --git a/inc/common.inc.sh b/inc/common.inc.sh
@@ -742,7 +742,7 @@ function assert_clean_stable_branch_and_checkout () {
 
 ##
 # S'assure que la branche existe dans le dépôt distant.
-# 
+#
 # @param string $1 nom complet de la branche
 # @testedby TwgitCommonAssertsTest
 #
@@ -1292,7 +1292,7 @@ function displayQuotedEnum () {
     if [ -z "$trimmed_list" ]; then
         echo
     else
-        local quoted_list="'<b>${trimmed_list// /</b>\', \'<b>}</b>'"
+        local quoted_list="'<b>${trimmed_list// /</b>', '<b>}</b>'"
         echo $quoted_list
     fi
 }