Master synchronization

bestmomo · Dec 17, 2014 · 538a2f8 · 538a2f8
1 parent 7e6bcd1
commit 538a2f8
Show file tree

Hide file tree

Showing 29 changed files with 112 additions and 110 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,11 @@
 APP_ENV=local
 APP_DEBUG=true
 APP_KEY=SomeRandomString
-DB_USERNAME=homestead
-DB_PASSWORD=homestead
+
+DB_HOST=localhost
+DB_DATABASE=laravel_base
+DB_USERNAME=root
+DB_PASSWORD=
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
diff --git a/composer.json b/composer.json
@@ -9,17 +9,22 @@
 		"illuminate/html": "~5.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~4.0"
+		"phpunit/phpunit": "~4.0",
+		"phpspec/phpspec": "~2.1"
 	},
 	"autoload": {
 		"classmap": [
-			"resources/database",
-			"tests/TestCase.php"
+			"database"
 		],
 		"psr-4": {
 			"App\\": "app/"
 		}
 	},
+	"autoload-dev": {
+		 "classmap": [
+		 	"tests/TestCase.php"
+		 ]
+	},
 	"scripts": {
 		"post-install-cmd": [
 			"php artisan clear-compiled",

diff --git a/resources/config/app.php → config/app.php b/resources/config/app.php → config/app.php
@@ -13,7 +13,7 @@
 	|
 	*/
 
-	'debug' => (bool) getenv('APP_DEBUG') ?: false,
+	'debug' => env('APP_DEBUG'),
 
 	/*
 	|--------------------------------------------------------------------------
@@ -78,7 +78,7 @@
 	|
 	*/
 
-	'key' => 'YourSecretKey!!!',
+	'key' => env('APP_KEY') ?: 'YourSecretKey!!!',
 
 	'cipher' => MCRYPT_RIJNDAEL_128,
 
@@ -200,8 +200,8 @@
 		'Validator' => 'Illuminate\Support\Facades\Validator',
 		'View'      => 'Illuminate\Support\Facades\View',
 
-		'HTML' 			=> 'Illuminate\Html\HtmlFacade',
-    'Form' 			=> 'Illuminate\Html\FormFacade',
+		'HTML' 		=> 'Illuminate\Html\HtmlFacade',
+    	'Form' 		=> 'Illuminate\Html\FormFacade',
 
 	],
 

diff --git a/resources/config/auth.php → config/auth.php b/resources/config/auth.php → config/auth.php
diff --git a/config/cache.php b/config/cache.php
@@ -0,0 +1,77 @@
+<?php
+
+return [
+
+	/*
+	|--------------------------------------------------------------------------
+	| Default Cache Store
+	|--------------------------------------------------------------------------
+	|
+	| This option controls the default cache connection that gets used while
+	| using this caching library. This connection is used when another is
+	| not explicitly specified when executing a given caching function.
+	|
+	*/
+
+	'default' => env('CACHE_DRIVER') ?: 'file',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Cache Stores
+	|--------------------------------------------------------------------------
+	|
+	| Here you may define all of the cache "stores" for your application as
+	| well as their drivers. You may even define multiple stores for the
+	| same cache driver to group types of items stored in your caches.
+	|
+	*/
+
+	'stores' => [
+
+		'apc' => [
+			'driver' => 'apc'
+		],
+
+		'array' => [
+			'driver' => 'array'
+		],
+
+		'database' => [
+			'driver' => 'database',
+			'table'  => 'cache',
+			'connection' => null,
+		],
+
+		'file' => [
+			'driver' => 'file',
+			'path'   => storage_path().'/framework/cache',
+		],
+
+		'memcached' => [
+			'driver'  => 'memcached',
+			'servers' => [
+				'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100
+			],
+		],
+
+		'redis' => [
+			'driver' => 'redis',
+			'connection' => 'default',
+		],
+
+	],
+
+	/*
+	|--------------------------------------------------------------------------
+	| Cache Key Prefix
+	|--------------------------------------------------------------------------
+	|
+	| When utilizing a RAM based store such as APC or Memcached, there might
+	| be other applications utilizing the same cache. So, we'll specify a
+	| value to get prefixed to all our keys so we can avoid collisions.
+	|
+	*/
+
+	'prefix' => 'laravel',
+
+];
diff --git a/resources/config/compile.php → config/compile.php b/resources/config/compile.php → config/compile.php
diff --git a/resources/config/database.php → config/database.php b/resources/config/database.php → config/database.php
@@ -54,32 +54,32 @@
 
 		'mysql' => [
 			'driver'    => 'mysql',
-			'host'      => 'localhost',
-			'database'  => 'laravel_base',
-			'username'  => 'root',
-			'password'  => '',
+			'host'      => env('DB_HOST') ?: 'localhost',
+			'database'  => env('DB_DATABASE') ?: 'laravel_base',
+			'username'  => env('DB_USERNAME') ?: 'root',
+			'password'  => env('DB_PASSWORD') ?: '',
 			'charset'   => 'utf8',
 			'collation' => 'utf8_unicode_ci',
 			'prefix'    => '',
 		],
 
 		'pgsql' => [
 			'driver'   => 'pgsql',
-			'host'     => 'localhost',
-			'database' => 'forge',
-			'username' => 'forge',
-			'password' => '',
+			'host' 	   => env('DB_HOST') ?: 'localhost',
+			'database' => env('DB_DATABASE') ?: 'forge',
+			'username' => env('DB_USERNAME') ?: 'forge',
+			'password' => env('DB_PASSWORD') ?: '',
 			'charset'  => 'utf8',
 			'prefix'   => '',
 			'schema'   => 'public',
 		],
 
 		'sqlsrv' => [
 			'driver'   => 'sqlsrv',
-			'host'     => 'localhost',
-			'database' => 'database',
-			'username' => 'root',
-			'password' => '',
+			'host' 	   => env('DB_HOST') ?: 'localhost',
+			'database' => env('DB_DATABASE') ?: 'forge',
+			'username' => env('DB_USERNAME') ?: 'forge',
+			'password' => env('DB_PASSWORD') ?: '',
 			'prefix'   => '',
 		],
 

diff --git a/resources/config/filesystems.php → config/filesystems.php b/resources/config/filesystems.php → config/filesystems.php
diff --git a/resources/config/mail.php → config/mail.php b/resources/config/mail.php → config/mail.php
diff --git a/resources/config/medias.php → config/medias.php b/resources/config/medias.php → config/medias.php
diff --git a/resources/config/queue.php → config/queue.php b/resources/config/queue.php → config/queue.php
@@ -15,7 +15,7 @@
 	|
 	*/
 
-	'default' => getenv('QUEUE_DRIVER') ?: 'sync',
+	'default' => env('QUEUE_DRIVER') ?: 'sync',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -61,6 +61,7 @@
 		'redis' => [
 			'driver' => 'redis',
 			'queue'  => 'default',
+			'expire' => 60,
 		],
 
 	],

diff --git a/resources/config/services.php → config/services.php b/resources/config/services.php → config/services.php
diff --git a/resources/config/session.php → config/session.php b/resources/config/session.php → config/session.php
@@ -16,7 +16,7 @@
 	|
 	*/
 
-	'driver' => getenv('SESSION_DRIVER') ?: 'file',
+	'driver' => env('SESSION_DRIVER') ?: 'file',
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/resources/config/view.php → config/view.php b/resources/config/view.php → config/view.php
diff --git a/resources/config/workbench.php → config/workbench.php b/resources/config/workbench.php → config/workbench.php
diff --git a/resources/database/.gitignore → database/.gitignore b/resources/database/.gitignore → database/.gitignore
diff --git a/resources/database/migrations/.gitkeep → database/migrations/.gitkeep b/resources/database/migrations/.gitkeep → database/migrations/.gitkeep
diff --git a/.../2014_10_12_000000_create_users_table.php → .../2014_10_12_000000_create_users_table.php b/.../2014_10_12_000000_create_users_table.php → .../2014_10_12_000000_create_users_table.php
diff --git a/...2_100000_create_password_resets_table.php → ...2_100000_create_password_resets_table.php b/...2_100000_create_password_resets_table.php → ...2_100000_create_password_resets_table.php
diff --git a/.../2014_10_21_105844_create_roles_table.php → .../2014_10_21_105844_create_roles_table.php b/.../2014_10_21_105844_create_roles_table.php → .../2014_10_21_105844_create_roles_table.php
diff --git a/...2014_10_21_110325_create_foreign_keys.php → ...2014_10_21_110325_create_foreign_keys.php b/...2014_10_21_110325_create_foreign_keys.php → ...2014_10_21_110325_create_foreign_keys.php
diff --git a/...014_10_24_205441_create_contact_table.php → ...014_10_24_205441_create_contact_table.php b/...014_10_24_205441_create_contact_table.php → ...014_10_24_205441_create_contact_table.php
diff --git a/.../2014_10_26_172107_create_posts_table.php → .../2014_10_26_172107_create_posts_table.php b/.../2014_10_26_172107_create_posts_table.php → .../2014_10_26_172107_create_posts_table.php
diff --git a/...s/2014_10_26_172631_create_tags_table.php → ...s/2014_10_26_172631_create_tags_table.php b/...s/2014_10_26_172631_create_tags_table.php → ...s/2014_10_26_172631_create_tags_table.php
diff --git a/...14_10_26_172904_create_post_tag_table.php → ...14_10_26_172904_create_post_tag_table.php b/...14_10_26_172904_create_post_tag_table.php → ...14_10_26_172904_create_post_tag_table.php
diff --git a/...14_10_26_222018_create_comments_table.php → ...14_10_26_222018_create_comments_table.php b/...14_10_26_222018_create_comments_table.php → ...14_10_26_222018_create_comments_table.php
diff --git a/resources/database/seeds/.gitkeep → database/seeds/.gitkeep b/resources/database/seeds/.gitkeep → database/seeds/.gitkeep
diff --git a/resources/database/seeds/DatabaseSeeder.php → database/seeds/DatabaseSeeder.php b/resources/database/seeds/DatabaseSeeder.php → database/seeds/DatabaseSeeder.php
diff --git a/resources/config/cache.php b/resources/config/cache.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
     	|
     	*/
-    	'driver' => getenv('SESSION_DRIVER') ?: 'file',
+    	'driver' => env('SESSION_DRIVER') ?: 'file',
     	/*
     	|--------------------------------------------------------------------------
@@ Expand Down @@