Skip to content

Commit

Permalink
Merge pull request #3 from stephanaspi/cake3
Browse files Browse the repository at this point in the history
change database config from "login" to "username"
  • Loading branch information
frankfoerster committed Apr 29, 2016
2 parents f1a12b9 + 0b74dfc commit dbbc552
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
language: php

php:
- 5.4
- 5.5
- 5.6

Expand All @@ -16,10 +15,10 @@ matrix:
fast_finish: true

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

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

install:
Expand Down
4 changes: 2 additions & 2 deletions example/config/Environment/environment.live.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'Datasources.default' => [
'host' => 'localhost',
'login' => 'username',
'username' => 'username',
'password' => 'secret',
'database' => 'myapp_live',
'prefix' => '',
Expand All @@ -19,7 +19,7 @@

'Datasources.test' => [
'host' => 'localhost',
'login' => 'username',
'username' => 'username',
'password' => 'secret',
'database' => 'myapp_test',
'prefix' => '',
Expand Down
4 changes: 2 additions & 2 deletions example/config/Environment/environment.local.php.default
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $configure = [

'Datasources.default' => [
'host' => 'localhost',
'login' => 'username',
'username' => 'username',
'password' => 'secret',
'database' => 'myapp',
'prefix' => '',
Expand All @@ -25,7 +25,7 @@ $configure = [

'Datasources.test' => [
'host' => 'localhost',
'login' => 'username',
'username' => 'username',
'password' => 'secret',
'database' => 'myapp_test',
'prefix' => '',
Expand Down
4 changes: 2 additions & 2 deletions example/config/Environment/environment.staging.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'Datasources.default' => [
'host' => 'localhost',
'login' => 'username',
'username' => 'username',
'password' => 'secret',
'database' => 'myapp_staging',
'prefix' => '',
Expand All @@ -19,7 +19,7 @@

'Datasources.test' => [
'host' => 'localhost',
'login' => 'username',
'username' => 'username',
'password' => 'secret',
'database' => 'myapp_staging_test',
'prefix' => '',
Expand Down

0 comments on commit dbbc552

Please sign in to comment.