Dev (#6)

* change travis yml * Apply fixes from StyleCI (#5)
CodeBreez · Mar 8, 2018 · cf83e05 · cf83e05
1 parent 80fba76
commit cf83e05
Show file tree

Hide file tree

Showing 16 changed files with 277 additions and 280 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -1,7 +1,7 @@
 <?php
 
 $app = new Collejo\App\Foundation\Application(
-    realpath(__DIR__ . '/../')
+    realpath(__DIR__.'/../')
 );
 
 $app->singleton(

diff --git a/config/app.php b/config/app.php
@@ -122,7 +122,7 @@
     */
 
     'providers' => [
-        
+
     ],
 
     /*
@@ -138,7 +138,6 @@
 
     'aliases' => [
 
-
     ],
 
 ];
diff --git a/config/auth.php b/config/auth.php
@@ -14,7 +14,7 @@
     */
 
     'defaults' => [
-        'guard' => 'web',
+        'guard'     => 'web',
         'passwords' => 'users',
     ],
 
@@ -37,12 +37,12 @@
 
     'guards' => [
         'web' => [
-            'driver' => 'session',
+            'driver'   => 'session',
             'provider' => 'users',
         ],
 
         'api' => [
-            'driver' => 'token',
+            'driver'   => 'token',
             'provider' => 'users',
         ],
     ],
@@ -67,7 +67,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => Collejo\App\Models\User::class,
+            'model'  => Collejo\App\Models\User::class,
         ],
 
         // 'users' => [
@@ -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,
         ],
     ],
 

diff --git a/config/broadcasting.php b/config/broadcasting.php
@@ -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',
         ],
 

diff --git a/config/cache.php b/config/cache.php
@@ -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',
         ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,7 @@ @@
         */
         'providers' => [
         ],
         /*
@@ Expand All / @@ -138,7 +138,6 @@ @@
         'aliases' => [
         ],
     ];