Skip to content

Commit

Permalink
update travis and readme
Browse files Browse the repository at this point in the history
  • Loading branch information
cake17 committed Dec 29, 2014
1 parent 4a38821 commit a48239b
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 46 deletions.
41 changes: 12 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#This Travis config template file was taken from https://github.com/FriendsOfCake/travis
language: php

php:
Expand All @@ -10,48 +11,30 @@ sudo: false
env:
matrix:
- DB=mysql db_dsn='mysql://[email protected]/cakephp_test'
- DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
- DB=pgsql db_dsn='postgres://travis@127.0.0.1/cakephp_test'
- DB=sqlite db_dsn='sqlite:///:memory:'

global:
- DEFAULT=1

matrix:
allow_failures:
- php: hhvm

- php: hhvm-nightly

fast_finish: true

include:
- php: 5.4
env: PHPCS=1 DEFAULT=0

- php: 5.4
env: COVERALLS=1 DEFAULT=0

- php: hhvm
env: HHVM=1 DB=sqlite db_class='Cake\Database\Driver\Sqlite' db_dsn='sqlite::memory:'

- php: hhvm
env: HHVM=1 DB=mysql db_class='Cake\Database\Driver\Mysql' db_dsn='mysql:host=0.0.0.0;dbname=cakephp_test' db_database='cakephp_test' db_login='travis' db_password=''
- php: 5.4
env: PHPCS=1 DEFAULT=0

- php: hhvm-nightly
env: HHVM=1 DB=sqlite db_class='Cake\Database\Driver\Sqlite' db_dsn='sqlite::memory:'
- php: 5.4
env: COVERALLS=1 DEFAULT=0 DB=mysql db_dsn='mysql://[email protected]/cakephp_test'

- php: hhvm-nightly
env: HHVM=1 DB=mysql db_class='Cake\Database\Driver\Mysql' db_dsn='mysql:host=0.0.0.0;dbname=cakephp_test' db_database='cakephp_test' db_login='travis' db_password=''

before_script:
install:
- composer self-update
- composer install --prefer-source --no-interaction --dev
- composer install --prefer-dist --no-interaction --dev

before_script:
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"

- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"

- sh -c "if [ '$PHPCS' = '1' ]; then composer require squizlabs/php_codesniffer; fi"

- sh -c "if [ '$PHPCS' = '1' ]; then composer require cakephp/cakephp-codesniffer:dev-master; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"

Expand All @@ -61,7 +44,7 @@ before_script:

script:
- sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=psr2 --ignore=tests/bootstrap.php ./src ./tests ; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ This plugin adds functionnalities to use Twitter Bootstrap in CakePHP projects.

## Requirements ##

- PHP 5.4.16
- PHP >= 5.4.16
- [CakePHP 3.x](http://book.cakephp.org/3.0/en/index.html)
- [Bootstrap Twitter 3.2.x](http://getbootstrap.com)

## Installation ##

Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
],
"support": {
"issues": "https://github.com/cake17/cakephp-bootstrap/issues",
"source": "https://github.com/cake17/cakephp-bootstrap"
"source": "https://github.com/cake17/cakephp-bootstrap",
"wiki": "http://getbootstrap.com"
},
"require": {
"php": ">=5.4.16",
Expand All @@ -39,8 +40,8 @@
},
"suggest": {
"twbs/bootstrap": "Bootstrap framework",
"phpunit/phpunit": "*",
"cakephp/cakephp-codesniffer": "dev-master"
"phpunit/phpunit": "To launch Unit Tests",
"cakephp/cakephp-codesniffer": "To check your code with CakePHP Standards"
},
"extra": {
"installer-name": "Bootstrap"
Expand Down
24 changes: 12 additions & 12 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="./tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
syntaxCheck="false">
backupStaticAttributes="false"
bootstrap="./tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
syntaxCheck="false">

<testsuites>
<testsuite name="Bootstrap">
Expand Down
8 changes: 8 additions & 0 deletions webroot/css/bootstrap/bootstrap-multiselect.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* Css for Bootstrap Multiselect
*
* @author cake17
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
* @link http://cake17.github.io/
*
*/
.multiselect-container {
position:absolute;list-style-type:none;margin:0;padding:0
}
Expand Down

0 comments on commit a48239b

Please sign in to comment.