From 792dcfbf204a40c36b66f61e9748bb334d6d3a67 Mon Sep 17 00:00:00 2001
From: talonos <talonos@users.noreply.github.com>
Date: Thu, 18 Feb 2016 19:50:09 +0000
Subject: [PATCH] 1.0.0.rc1 update

---
 README.md          | 10 +++----
 composer.json      |  4 +--
 default.travis.yml | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 default.travis.yml

diff --git a/README.md b/README.md
index 0cdd3c7..79d6457 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-# mChat-Extension
-phpBB 3.1.x mChat Extension with board3 portal edits
-
-[![Build Status](https://travis-ci.org/talonos/Mchat-Extension-board3.svg?branch=master)](https://travis-ci.org/talonos/Mchat-Extension-board3)
+# mChat Extension for phpBB 3.1
 
+[![Build Status](https://travis-ci.org/dmzx/mChat-Extension.svg?branch=master)](https://travis-ci.org/dmzx/mChat-Extension)
 
 ## Install
 
@@ -11,12 +9,12 @@ phpBB 3.1.x mChat Extension with board3 portal edits
 3. In the `ext` directory of your phpBB board, create a new directory named `dmzx` (if it does not already exist).
 4. Copy the `mchat` folder to `/ext/dmzx/` (if done correctly, you'll have the main extension class at (your forum root)/ext/dmzx/mchat/composer.json).
 5. Navigate in the ACP to `Customise -> Manage extensions`.
-6. Look for `mChat Extension` under the Disabled Extensions list, and click its `Enable` link.
+6. Look for `mChat Extension for phpBB 3.1` under the Disabled Extensions list, and click its `Enable` link.
 
 ## Uninstall
 
 1. Navigate in the ACP to `Customise -> Extension Management -> Extensions`.
-2. Look for `mChat Extension` under the Enabled Extensions list, and click its `Disable` link.
+2. Look for `mChat Extension for phpBB 3.1` under the Enabled Extensions list, and click its `Disable` link.
 3. To permanently uninstall, click `Delete Data` and then delete the `/ext/dmzx/mchat` folder.
 
 ## License
diff --git a/composer.json b/composer.json
index d943eb3..21ecf2e 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "mChat Extension for phpbb 3.1.x",
 	"homepage": "http://www.dmzx-web.net",
-	"version": "0.3.4",
+	"version": "1.0.0-RC1",
 	"time": "2015-03-10",
 	"keywords": ["phpbb", "extension", "mchat"],
 	"license": "GPL-2.0",
@@ -32,7 +32,7 @@
 		"phpbb/epv": "dev-master"
 	},
 	"extra": {
-		"display-name": "mChat Extension",
+		"display-name": "mChat Extension for phpBB 3.1",
 		"soft-require": {
 			"phpbb/phpbb": "3.1.*"
 			},
diff --git a/default.travis.yml b/default.travis.yml
new file mode 100644
index 0000000..fed516c
--- /dev/null
+++ b/default.travis.yml
@@ -0,0 +1,68 @@
+sudo: required
+
+language: php
+
+matrix:
+  include:
+    - php: 5.3.3
+      env: DB=mysqli
+    - php: 5.3
+      env: DB=mysqli # MyISAM
+    - php: 5.4
+      env: DB=mysqli
+    - php: 5.4
+      env: DB=mysql
+    - php: 5.4
+      env: DB=mariadb
+    - php: 5.4
+      env: DB=postgres
+    - php: 5.4
+      env: DB=sqlite3
+    - php: 5.4
+      env: DB=mysqli;SLOWTESTS=1
+    - php: 5.5
+      env: DB=mysqli
+    - php: 5.6
+      env: DB=mysqli
+    - php: hhvm
+      env: DB=mysqli
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+
+env:
+  global:
+    - EXTNAME="dmzx/mChat-Extension"  # CHANGE name of the extension HERE
+    - SNIFF="1"            # Should we run code sniffer on your code?
+    - IMAGE_ICC="0"        # Should we run icc profile sniffer on your images?
+    - EPV="0"              # Should we run EPV (Extension Pre Validator) on your code?
+    - PHPBB_BRANCH="develop-ascraeus"
+
+branches:
+  only:
+    - master
+    - develop
+    - /^develop-.*$/
+
+before_install:
+  - sudo mkdir travis
+  - git clone "https://github.com/nickvergessen/phpbb-ext-acme-demo.git"
+  - sudo cp phpbb-ext-acme-demo/phpunit.xml.dist ./
+  - sudo cp phpbb-ext-acme-demo/travis/prepare-phpbb.sh travis
+  - sudo rm -rf phpbb-ext-acme-demo
+
+install:
+  - composer install --no-interaction --prefer-source
+  - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
+  - cd ../../phpBB3
+  - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
+  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
+
+before_script:
+  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
+
+script:
+  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
+  - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
+  - phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php
+  - sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.3.3' ] && [ '$DB' = 'mysqli' ]; then phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"