Merge pull request #80 from TwistPHP/add-coveralls-support

Add coveralls support
TwistPHP · Mar 15, 2016 · 13bc8fb · 13bc8fb
2 parents f4d2631 + 0acc244
commit 13bc8fb
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,9 @@ php:
   - 5.3
   - 5.4
   - 5.5
+    env GULP=ON
   - 5.6
+    env COVERALLS=ON
   - 7.0
   - hhvm
   - nightly
@@ -24,26 +26,24 @@ before_install:
    - mysql -V
    - mysql -e "CREATE DATABASE IF NOT EXISTS travis_ci_twist_test;"
    - mysql -e "SHOW DATABASES"
-   - npm install
+   - if [ "$GULP" = 'ON' ]; then npm install; fi;
 
-install: php ./tests/install.php
+install:
+  - if [ "$COVERALLS" = 'ON' ]; then composer require satooshi/php-coveralls '~1.0'; fi;
+  - php ./tests/install.php
 
 before_script:
+   - mkdir -p ./build/logs
    - mysql -e "USE travis_ci_twist_test; SHOW TABLES;"
-   - ls -lah ./tests
    - sed -i 's/Twist::ServeRoutes(false);/echo "TwistPHP Framework Loaded!\n\n";/g' ./tests/index.php
 
 script:
-   - phpunit ./tests/Database.php
-   - phpunit ./tests/Settings.php
-   - phpunit ./tests/Cache.php
-   - phpunit ./tests/Session.php
-   - phpunit ./tests/Views.php
-   - phpunit ./tests/User.php
-   - phpunit ./tests/Curl.php
-   - phpunit ./tests/Routes.php
-   - gulp test
+   - phpunit
+   - if [ "$GULP" = 'ON' ]; then gulp test; fi;
 
 notifications:
   on_success: never
-  on_failure: always
+  on_failure: always
+
+after_success:
+   - if [ "$COVERALLS" = 'ON' ]; then ./vendor/bin/coveralls -v; fi;
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # [TwistPHP](https://twistphp.com/) ![TwistPHP logo](http://static.twistphp.com/logo/square/32.png)
 
-[![Master build status](https://img.shields.io/travis/TwistPHP/TwistPHP/master.svg?label=master%20build)](https://travis-ci.org/TwistPHP/TwistPHP) [![Development build status](https://img.shields.io/travis/TwistPHP/TwistPHP/development.svg?label=development%20build)](https://travis-ci.org/TwistPHP/TwistPHP) [![Join the chat at https://gitter.im/TwistPHP/TwistPHP](https://img.shields.io/gitter/room/TwistPHP/TwistPHP.svg)](https://gitter.im/TwistPHP/TwistPHP) ![Licence](https://img.shields.io/badge/Licence-GPLv3-brightgreen.svg)
+[![Master build status](https://img.shields.io/travis/TwistPHP/TwistPHP/master.svg?label=master%20build)](https://travis-ci.org/TwistPHP/TwistPHP) [![Development build status](https://img.shields.io/travis/TwistPHP/TwistPHP/development.svg?label=development%20build)](https://travis-ci.org/TwistPHP/TwistPHP) [![Coveralls](https://img.shields.io/coveralls/TwistPHP/TwistPHP.svg)](https://coveralls.io/github/TwistPHP/TwistPHP) [![Join the chat at https://gitter.im/TwistPHP/TwistPHP](https://img.shields.io/gitter/room/TwistPHP/TwistPHP.svg)](https://gitter.im/TwistPHP/TwistPHP) ![Licence](https://img.shields.io/badge/Licence-GPLv3-brightgreen.svg)
 
 ## A fresh, new open source PHP MVC micro framework
 

diff --git a/dist/twist/Twist.php b/dist/twist/Twist.php
@@ -59,7 +59,7 @@ public static function version($strVersionPart = null){
 			$arrVersion = array(
 				'major' => 3,
 				'minor' => 0,
-				'patch' => 2,
+				'patch' => 3,
 				'pre-release' => 'dev'//pre-release can be set to 'dev'
 			);
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="./tests/index.php">
+    <php>
+        <ini name="error_reporting" value="E_ALL" />
+    </php>
+
+    <testsuites>
+        <testsuite name="PHP Coveralls component test suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./dist/twist</directory>
+            <exclude>
+                <file>./dist/twist/framework.php</file>
+                <directory>./dist/twist/Config</directory>
+                <file>./dist/twist/Core/boot.php</file>
+                <directory>./docs</directory>
+                <directory>./src</directory>
+                <directory>./tests</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    </logging>
+</phpunit>
diff --git a/tests/Settings.php → tests/Core/Models/SettingsModel.Test.php b/tests/Settings.php → tests/Core/Models/SettingsModel.Test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
 class Settings extends \PHPUnit_Framework_TestCase{
 
 	public function testGet(){

diff --git a/tests/User.php → tests/Core/Models/UserModel.Test.php b/tests/User.php → tests/Core/Models/UserModel.Test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
 class User extends \PHPUnit_Framework_TestCase{
 
 	public function testCreate(){

diff --git a/tests/Cache.php → tests/Core/Utilities/Cache.Test.php b/tests/Cache.php → tests/Core/Utilities/Cache.Test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
 class Cache extends \PHPUnit_Framework_TestCase{
 
 	public function testReadWrite(){

diff --git a/tests/Curl.php → tests/Core/Utilities/Curl.Test.php b/tests/Curl.php → tests/Core/Utilities/Curl.Test.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
-class Routes extends \PHPUnit_Framework_TestCase{
+class Curl extends \PHPUnit_Framework_TestCase{
 
 	public function testGetRequest(){
 

diff --git a/tests/Database.php → tests/Core/Utilities/Database.Test.php b/tests/Database.php → tests/Core/Utilities/Database.Test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
 class Database extends \PHPUnit_Framework_TestCase{
 
 	public function testQuery(){

diff --git a/tests/Routes.php → tests/Core/Utilities/Routes.Test.php b/tests/Routes.php → tests/Core/Utilities/Routes.Test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
 class Routes extends \PHPUnit_Framework_TestCase{
 
 	public function testViewRequest(){

diff --git a/tests/Session.php → tests/Core/Utilities/Session.Test.php b/tests/Session.php → tests/Core/Utilities/Session.Test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
 class Session extends \PHPUnit_Framework_TestCase{
 
 	public function testReadWrite(){

diff --git a/tests/Views.php → tests/Core/Utilities/Views.Test.php b/tests/Views.php → tests/Core/Utilities/Views.Test.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once sprintf('%s/index.php',dirname(__FILE__));
-
 class Views extends \PHPUnit_Framework_TestCase{
 
 	public function testReplaceTag(){