Skip to content

Commit a48239b

Browse files
committed
update travis and readme
1 parent 4a38821 commit a48239b

5 files changed

Lines changed: 37 additions & 46 deletions

File tree

.travis.yml

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#This Travis config template file was taken from https://github.com/FriendsOfCake/travis
12
language: php
23

34
php:
@@ -10,48 +11,30 @@ sudo: false
1011
env:
1112
matrix:
1213
- DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
13-
- DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
14+
- DB=pgsql db_dsn='postgres://travis@127.0.0.1/cakephp_test'
1415
- DB=sqlite db_dsn='sqlite:///:memory:'
16+
1517
global:
1618
- DEFAULT=1
1719

1820
matrix:
19-
allow_failures:
20-
- php: hhvm
21-
22-
- php: hhvm-nightly
23-
2421
fast_finish: true
2522

2623
include:
27-
- php: 5.4
28-
env: PHPCS=1 DEFAULT=0
29-
30-
- php: 5.4
31-
env: COVERALLS=1 DEFAULT=0
32-
33-
- php: hhvm
34-
env: HHVM=1 DB=sqlite db_class='Cake\Database\Driver\Sqlite' db_dsn='sqlite::memory:'
35-
36-
- php: hhvm
37-
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=''
24+
- php: 5.4
25+
env: PHPCS=1 DEFAULT=0
3826

39-
- php: hhvm-nightly
40-
env: HHVM=1 DB=sqlite db_class='Cake\Database\Driver\Sqlite' db_dsn='sqlite::memory:'
27+
- php: 5.4
28+
env: COVERALLS=1 DEFAULT=0 DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
4129

42-
- php: hhvm-nightly
43-
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=''
44-
45-
before_script:
30+
install:
4631
- composer self-update
47-
- composer install --prefer-source --no-interaction --dev
32+
- composer install --prefer-dist --no-interaction --dev
4833

34+
before_script:
4935
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
50-
5136
- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
52-
53-
- sh -c "if [ '$PHPCS' = '1' ]; then composer require squizlabs/php_codesniffer; fi"
54-
37+
- sh -c "if [ '$PHPCS' = '1' ]; then composer require cakephp/cakephp-codesniffer:dev-master; fi"
5538
- sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
5639
- sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
5740

@@ -61,7 +44,7 @@ before_script:
6144

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

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ This plugin adds functionnalities to use Twitter Bootstrap in CakePHP projects.
1414

1515
## Requirements ##
1616

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

2120
## Installation ##
2221

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
],
2121
"support": {
2222
"issues": "https://github.com/cake17/cakephp-bootstrap/issues",
23-
"source": "https://github.com/cake17/cakephp-bootstrap"
23+
"source": "https://github.com/cake17/cakephp-bootstrap",
24+
"wiki": "http://getbootstrap.com"
2425
},
2526
"require": {
2627
"php": ">=5.4.16",
@@ -39,8 +40,8 @@
3940
},
4041
"suggest": {
4142
"twbs/bootstrap": "Bootstrap framework",
42-
"phpunit/phpunit": "*",
43-
"cakephp/cakephp-codesniffer": "dev-master"
43+
"phpunit/phpunit": "To launch Unit Tests",
44+
"cakephp/cakephp-codesniffer": "To check your code with CakePHP Standards"
4445
},
4546
"extra": {
4647
"installer-name": "Bootstrap"

phpunit.xml.dist

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<phpunit backupGlobals="false"
2-
backupStaticAttributes="false"
3-
bootstrap="./tests/bootstrap.php"
4-
colors="true"
5-
convertErrorsToExceptions="true"
6-
convertNoticesToExceptions="true"
7-
convertWarningsToExceptions="true"
8-
processIsolation="false"
9-
stopOnError="false"
10-
stopOnFailure="false"
11-
stopOnIncomplete="false"
12-
stopOnSkipped="false"
13-
syntaxCheck="false">
2+
backupStaticAttributes="false"
3+
bootstrap="./tests/bootstrap.php"
4+
colors="true"
5+
convertErrorsToExceptions="true"
6+
convertNoticesToExceptions="true"
7+
convertWarningsToExceptions="true"
8+
processIsolation="false"
9+
stopOnError="false"
10+
stopOnFailure="false"
11+
stopOnIncomplete="false"
12+
stopOnSkipped="false"
13+
syntaxCheck="false">
1414

1515
<testsuites>
1616
<testsuite name="Bootstrap">

webroot/css/bootstrap/bootstrap-multiselect.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Css for Bootstrap Multiselect
3+
*
4+
* @author cake17
5+
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
6+
* @link http://cake17.github.io/
7+
*
8+
*/
19
.multiselect-container {
210
position:absolute;list-style-type:none;margin:0;padding:0
311
}

0 commit comments

Comments
 (0)