rpicms

commit 5ff35d00edf46369015097a6c49f8e4bea0dcdd3
parent d4e911657cdb3109904292399c3f1ea97572606d
Author: Marcel Radzio <marcel@radzio-sh.de>
Date:   Tue, 13 Oct 2015 06:30:32 +0200

Merge remote-tracking branch 'refs/remotes/origin/develop'

Conflicts:
	README.md

Diffstat:
M
.travis.yml
 | 
17
+++++++++++++++++
M
README.md
 | 
4
++++
M
phpunit_mysqli.xml
 | 
11
+++++++++++
M
tests/mysqliLoadedTest.php
 | 
13
+++++++++++++

4 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.6
   - 7.0
+  - hhvm
 #RequireDB
 env:
   - DB=mysqli
@@ -10,10 +11,26 @@ env:
 matrix:
   allow_failures:
     - php: 7.0
+    - php: hhvm
 #Create Database
 before_script:
   - wget https://phar.phpunit.de/phpunit.phar
   - chmod +x phpunit.phar
   - mysql -e 'create database RPICMS;'
+  - composer require codeclimate/php-test-reporter --dev
 #RunTests
 script: php phpunit.phar --configuration phpunit_$DB.xml --verbose
+#after scripts
+after_script:
+  - CODECLIMATE_REPO_TOKEN=ade1bcb53e705341208c7c5138a92b8bdf6babd489e6d43054e86ea097cb42b2 php ./vendor/bin/test-reporter
+#Webhook for Gitter
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/2352a1a1d808a3b834cf
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always
+addons:
+    code_climate:
+        repo_token: ade1bcb53e705341208c7c5138a92b8bdf6babd489e6d43054e86ea097cb42b2
diff --git a/README.md b/README.md
@@ -2,7 +2,11 @@ RPICMS
 ======
 
 [![Code Climate](https://codeclimate.com/github/RpicmsTeam/RPICMS/badges/gpa.svg)](https://codeclimate.com/github/RpicmsTeam/RPICMS) 
+<<<<<<< HEAD
 [![Build Status](https://travis-ci.org/RpicmsTeam/RPICMS.svg?branch=master)](https://travis-ci.org/RpicmsTeam/RPICMS)
+=======
+[![Build Status](https://travis-ci.org/RpicmsTeam/RPICMS.svg?branch=develop)](https://travis-ci.org/RpicmsTeam/RPICMS)
+>>>>>>> refs/remotes/origin/develop
 Chats
 -----
 [![Join the chat at https://gitter.im/RpicmsTeam/RPICMS](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/RpicmsTeam/RPICMS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
diff --git a/phpunit_mysqli.xml b/phpunit_mysqli.xml
@@ -10,4 +10,15 @@
       <file>tests/mysqliLoadedTest.php</file>
       <file>tests/mysqliMakeDB.php</file>
     </testsuite>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./tests</directory>
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>
diff --git a/tests/mysqliLoadedTest.php b/tests/mysqliLoadedTest.php
@@ -21,5 +21,18 @@ class mysqliLoadedTest extends PHPUnit_Framework_TestCase
         $this->markTestSkipped($mysqli->connect_error());
       }
     }
+
+    /**
+     * @depends testForMysqli
+     * @depends testDBConnection
+     */
+     public function testCreateTestingTables()
+     {
+       $mysqli = new mysqli("localhost","root","","RPICMS");
+
+
+
+
+     }
 }
 ?>