Skip to content

Commit

Permalink
Merge pull request #31 from BRACKETS-by-TRIAD/laravel-7
Browse files Browse the repository at this point in the history
Laravel 7 support
  • Loading branch information
RichardDominik authored Mar 16, 2020
2 parents e8da381 + 4a0f19b commit e841336
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
24 changes: 15 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,36 @@
{
"name": "Pavol Perdík",
"email": "[email protected]",
"homepage": "https://www.brackets.sk/en",
"homepage": "https://www.brackets.sk",
"role": "Developer"
},
{
"name": "David Běhal",
"email": "[email protected]",
"homepage": "https://www.brackets.sk/en",
"homepage": "https://www.brackets.sk",
"role": "Developer"
},
{
"name": "Richard Dominik",
"email": "[email protected]",
"homepage": "https://www.brackets.sk",
"role": "Developer"
}
],
"require": {
"php": "^7.2",
"illuminate/container": "~6.0",
"illuminate/contracts": "~6.0",
"illuminate/database": "~6.0",
"illuminate/support": "~6.0",
"illuminate/console": "~6.0",
"php": "^7.2.5",
"illuminate/container": "^6.0|^7.0",
"illuminate/contracts": "^6.0|^7.0",
"illuminate/database": "^6.0|^7.0",
"illuminate/support": "^6.0|^7.0",
"illuminate/console": "^6.0|^7.0",
"brackets/admin-ui": "^4.0",
"brackets/admin-listing": "^3.0",
"brackets/translatable": "^2.0"
},
"require-dev": {
"orchestra/testbench": "~4.0",
"phpunit/phpunit": "~8.0",
"phpunit/phpunit": "^8.5",
"doctrine/dbal": "~2.5.13|^2.6",
"mockery/mockery": "^1.0"
},
Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ protected function getEnvironmentSetUp($app)
'driver' => 'pgsql',
'host' => 'testing',
'port' => '5432',
'database' => 'homestead',
'username' => 'homestead',
'password' => 'secret',
'database' => env('DB_DATABASE', 'laravel'),
'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', 'bestsecret'),
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
Expand Down

0 comments on commit e841336

Please sign in to comment.