Skip to content
This repository has been archived by the owner on May 29, 2020. It is now read-only.

Commit

Permalink
Merge b38c16d into 4d91c2b
Browse files Browse the repository at this point in the history
  • Loading branch information
ceeram committed May 27, 2015
2 parents 4d91c2b + b38c16d commit a615f25
Show file tree
Hide file tree
Showing 21 changed files with 1,134 additions and 931 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/composer.lock
/phpunit.xml
/vendor
52 changes: 32 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,51 @@
#This Travis config template file was taken from https://github.com/FriendsOfCake/travis
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6

env:
global:
- REPO_NAME=Authenticate
- PLUGIN_NAME=Authenticate
- REQUIRE=""
sudo: false

env:
matrix:
- DB=mysql CAKE_VERSION=2.6
- DB=mysql CAKE_VERSION=2.7
- DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
- DB=pgsql db_dsn='postgres://travis@127.0.0.1/cakephp_test'
- DB=sqlite db_dsn='sqlite:///:memory:'

global:
- DEFAULT=1

matrix:
fast_finish: true

include:
- php: 5.4
env:
- DB=mysql CAKE_VERSION=2.6 COVERALLS=1
- php: 5.4
env:
- DB=mysql CAKE_VERSION=2.6 PHPCS=1
- php: 5.4
env: PHPCS=1 DEFAULT=0

- php: 5.4
env: COVERALLS=1 DEFAULT=0 DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'

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

before_script:
- git clone -b master https://github.com/FriendsOfCake/travis.git --depth 1 ../travis
- ../travis/before_script.sh
- 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 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"

script:
- ../travis/script.sh
- phpenv rehash
- set +H

after_success:
- ../travis/after_success.sh
script:
- sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; 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"

notifications:
email: false
98 changes: 0 additions & 98 deletions Controller/Component/Auth/CookieAuthenticate.php

This file was deleted.

88 changes: 0 additions & 88 deletions Controller/Component/Auth/MultiColumnAuthenticate.php

This file was deleted.

0 comments on commit a615f25

Please sign in to comment.