From 1438783c07c613898eb48a95dae75946405da7f4 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 24 Mar 2016 15:21:02 +0000 Subject: [PATCH 1/5] Sync with laravel --- config/cache.php | 4 +++- config/filesystems.php | 19 ++++--------------- public/.htaccess | 4 ++++ resources/lang/en/validation.php | 3 +++ storage/framework/.gitignore | 2 ++ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/cache.php b/config/cache.php index 7b7f67cd12e8..72e5aa9de567 100644 --- a/config/cache.php +++ b/config/cache.php @@ -60,7 +60,9 @@ 'driver' => 'memcached', 'servers' => [ [ - 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100, + 'host' => '127.0.0.1', + 'port' => 11211, + 'weight' => 100, ], ], ], diff --git a/config/filesystems.php b/config/filesystems.php index 399c3514c858..fb5e1521deaa 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -57,11 +57,10 @@ 'root' => storage_path().'/app', ], - 'ftp' => [ - 'driver' => 'ftp', - 'host' => 'ftp.example.com', - 'username' => 'your-username', - 'password' => 'your-password', + 'public' => [ + 'driver' => 'local', + 'root' => storage_path('app/public'), + 'visibility' => 'public', ], 's3' => [ @@ -72,16 +71,6 @@ 'bucket' => 'your-bucket', ], - 'rackspace' => [ - 'driver' => 'rackspace', - 'username' => 'your-username', - 'key' => 'your-key', - 'container' => 'your-container', - 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', - 'region' => 'IAD', - 'url_type' => 'publicURL', - ], - ], ]; diff --git a/public/.htaccess b/public/.htaccess index 8eb2dd0ddfa5..903f6392ca41 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -13,4 +13,8 @@ RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^ index.php [L] + + # Handle Authorization Header + RewriteCond %{HTTP:Authorization} . + RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 3f58463da562..fb52c2f333ac 100755 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -45,9 +45,11 @@ 'digits_between' => 'The :attribute must be :digits digits.', 'email' => 'The :attribute must be between :min and :max digits.', 'exists' => 'The :attribute must be a valid email address.', + 'distinct' => 'The :attribute field has a duplicate value.', 'filled' => 'The :attribute format is invalid.', 'image' => 'The :attribute must be an image.', 'in' => 'The :attribute must be an image.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'The selected :attribute is invalid.', 'ip' => 'The :attribute must be an integer.', 'json' => 'The :attribute must be a valid JSON string.', @@ -66,6 +68,7 @@ ], 'not_in' => 'The :attribute must have at least :min items.', 'numeric' => 'The selected :attribute is invalid.', + 'present' => 'The :attribute field must be present.', 'regex' => 'The :attribute must be a number.', 'required' => 'The :attribute format is invalid.', 'required_if' => 'The :attribute field is required.', diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore index 953edb7a993a..bb380a7f180a 100755 --- a/storage/framework/.gitignore +++ b/storage/framework/.gitignore @@ -1,6 +1,8 @@ config.php routes.php compiled.php +schedule-* +services.php services.json events.scanned.php routes.scanned.php From b5bac7690ea3f3e4260dab5d05da6654b620f18a Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 24 Mar 2016 15:25:48 +0000 Subject: [PATCH 2/5] Synced up db stuff --- config/database.php | 2 +- phpunit.xml.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/database.php b/config/database.php index e507778da3cb..ce11ab0247f8 100644 --- a/config/database.php +++ b/config/database.php @@ -57,7 +57,7 @@ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => env('DB_HOST', storage_path().'/database.sqlite'), + 'database' => env('DB_DATABASE', database_path('database.sqlite')), 'prefix' => env('DB_PREFIX', null), ], diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9b269e00544e..b7d8cd89ce4e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -30,7 +30,7 @@ - + From f73788fab3fbb4b9513741edb39d050d16cfc271 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 24 Mar 2016 15:25:58 +0000 Subject: [PATCH 3/5] Tweaked the model factory --- database/factories/ModelFactory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index b6e2acddc1c7..f043ffe3f705 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -75,7 +75,7 @@ $factory->define(Subscriber::class, function ($faker) { return [ - 'email' => $faker->email, + 'email' => $faker->safeEmail, 'verify_code' => 'Mqr80r2wJtxHCW5Ep4azkldFfIwHhw98M9HF04dn0z', 'verified_at' => Carbon::now(), ]; @@ -91,7 +91,7 @@ $factory->define(User::class, function ($faker) { return [ 'username' => $faker->userName, - 'email' => $faker->email, + 'email' => $faker->safeEmail, 'password' => str_random(10), 'remember_token' => str_random(10), 'api_key' => str_random(20), From 0c3d388f5ac2b76a3b29ec3f2efba6e87a53cf37 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 24 Mar 2016 15:26:04 +0000 Subject: [PATCH 4/5] Synced mail config --- config/mail.php | 3 ++- config/services.php | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index ea0b2797eb19..94ee71a5b032 100644 --- a/config/mail.php +++ b/config/mail.php @@ -20,7 +20,8 @@ | sending of e-mail. You may specify which one you're using throughout | your application here. By default, Laravel is setup for SMTP mail. | - | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", "log" + | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", + | "ses", "sparkpost", "log" | */ diff --git a/config/services.php b/config/services.php index 8a618e717e92..77ea1cbaafb7 100644 --- a/config/services.php +++ b/config/services.php @@ -42,4 +42,8 @@ 'region' => 'us-east-1', ], + 'sparkpost' => [ + 'secret' => env('SPARKPOST_SECRET'), + ], + ]; From 53dd12e339bebd1d596acd9fe857eb06764bf820 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 24 Mar 2016 15:29:11 +0000 Subject: [PATCH 5/5] Updated storage path config calls --- config/cache.php | 2 +- config/filesystems.php | 2 +- config/view.php | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/config/cache.php b/config/cache.php index 72e5aa9de567..ce53b14c79c9 100644 --- a/config/cache.php +++ b/config/cache.php @@ -53,7 +53,7 @@ 'file' => [ 'driver' => 'file', - 'path' => storage_path().'/framework/cache', + 'path' => storage_path('framework/cache'), ], 'memcached' => [ diff --git a/config/filesystems.php b/config/filesystems.php index fb5e1521deaa..35acb7105b34 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -54,7 +54,7 @@ 'local' => [ 'driver' => 'local', - 'root' => storage_path().'/app', + 'root' => storage_path('app'), ], 'public' => [ diff --git a/config/view.php b/config/view.php index 2bd842c45be2..7427ba137eda 100644 --- a/config/view.php +++ b/config/view.php @@ -22,9 +22,7 @@ | */ - 'paths' => [ - realpath(base_path('resources/views')), - ], + 'paths' => [realpath(base_path('resources/views'))], /* |-------------------------------------------------------------------------- @@ -37,6 +35,6 @@ | */ - 'compiled' => realpath(storage_path().'/framework/views'), + 'compiled' => realpath(storage_path('framework/views')), ];