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

Dev (#6) (#7) #8

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ before_script:
- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
- sudo echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
- ssh-keyscan -H -t rsa,dsa github.com >> ~/.ssh/known_hosts
- sudo git clone -b BRANCH https://github.com/astroanu/collejo-tests.git tests
- sudo git clone -b $BRANCH https://github.com/astroanu/collejo-tests.git tests
- sudo git rev-parse HEAD
- sudo cp tests/phpunit.xml.sample phpunit.xml
- sudo cp tests/env.travis.sample .env
- rm -R database
- sudo git clone -b BRANCH https://github.com/astroanu/collejo-db-fatories.git database
- sudo git clone -b $BRANCH https://github.com/astroanu/collejo-db-fatories.git database
- sudo git rev-parse HEAD
- sudo chmod -R 755 database
- composer install
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/app.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

$app = new Collejo\App\Foundation\Application(
realpath(__DIR__ . '/../')
realpath(__DIR__.'/../')
);

$app->singleton(
Expand Down
3 changes: 1 addition & 2 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
*/

'providers' => [

],

/*
Expand All @@ -138,7 +138,6 @@

'aliases' => [


],

];
14 changes: 7 additions & 7 deletions config/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

'defaults' => [
'guard' => 'web',
'guard' => 'web',
'passwords' => 'users',
],

Expand All @@ -37,12 +37,12 @@

'guards' => [
'web' => [
'driver' => 'session',
'driver' => 'session',
'provider' => 'users',
],

'api' => [
'driver' => 'token',
'driver' => 'token',
'provider' => 'users',
],
],
Expand All @@ -67,7 +67,7 @@
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => Collejo\App\Models\User::class,
'model' => Collejo\App\Models\User::class,
],

// 'users' => [
Expand Down Expand Up @@ -98,9 +98,9 @@
'passwords' => [
'users' => [
'provider' => 'users',
'email' => 'auth.emails.password',
'table' => 'password_resets',
'expire' => 60,
'email' => 'auth.emails.password',
'table' => 'password_resets',
'expire' => 60,
],
],

Expand Down
10 changes: 5 additions & 5 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
'connections' => [

'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_KEY'),
'secret' => env('PUSHER_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'driver' => 'pusher',
'key' => env('PUSHER_KEY'),
'secret' => env('PUSHER_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
],
],

'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

Expand Down
14 changes: 7 additions & 7 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@
],

'database' => [
'driver' => 'database',
'table' => 'cache',
'driver' => 'database',
'table' => 'cache',
'connection' => null,
],

'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache'),
'path' => storage_path('framework/cache'),
],

'memcached' => [
'driver' => 'memcached',
'driver' => 'memcached',
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'weight' => 100,
],
],
],

'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

Expand Down
Loading