Merge branch '2.8' into 2.9

WhiteSymmetry · May 2, 2014 · b1848b8 · b1848b8
2 parents bb79e51 + 79ff629
commit b1848b8
Show file tree

Hide file tree

Showing 25 changed files with 410 additions and 155 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: php
 
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
 php:
   - 5.4
   - 5.5
+  - 5.6
 
-before_script:
-  - pyrus set auto_discover 1
-  - pyrus install --force phpunit/DbUnit
-  - phpenv rehash
-
-script: phpunit --configuration phpunit.xml --coverage-text
+script: bin/phpunit --configuration phpunit.xml --coverage-text
diff --git a/CHANGELOG b/CHANGELOG
@@ -24,7 +24,12 @@ Version 2.9.0-dev 2014-
 - updated bundled TinyMCE to version 4.0.20 (Thorsten)
 - dropped support for ext/mysql (Thorsten)
 
-Version 2.8.9 - 2014-
+Version 2.8.10 - 2014-05-
+-
+
+Version 2.8.9 - 2014-04-28
+- updated Thai translation
+- fixed some minor bugs (Thorsten)
 
 Version 2.8.8 - 2014-03-18
 - improved API security (Thorsten)

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
     grunt.initConfig({
         // Metadata.
         meta: {
-            version: '2.9'
+            version: '2.9.0-dev'
         },
         banner: '/*! phpMyFAQ v<%= meta.version %> - http://www.phpmyfaq.de - Copyright (c) 2001 - 2014 Thorsten Rinne and phpMyFAQ Team */\n',
         // Task configuration.

diff --git a/bin/phpunit b/bin/phpunit
@@ -1 +1 @@
-../vendor/phpunit/phpunit/composer/bin/phpunit
+../vendor/phpunit/phpunit/phpunit
diff --git a/composer.json b/composer.json
@@ -64,9 +64,12 @@
         "bin-dir": "bin"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
+        "phpunit/phpunit": "4.0.*",
         "phpunit/dbunit": "1.3.*"
     },
+    "config": {
+        "bin-dir": "bin"
+    },
     "minimum-stability": "stable",
     "scripts": {
         "post-install-cmd": [
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../vendor/phpunit/phpunit/composer/bin/phpunit
		../vendor/phpunit/phpunit/phpunit