Merge pull request #1655 from CachetHQ/sync

Sync with laravel

config/cache.php

@@ -53,14 +53,16 @@ return [
 
         'file' => [
             'driver' => 'file',
-            'path'   => storage_path().'/framework/cache',
+            'path'   => storage_path('framework/cache'),
         ],
 
         'memcached' => [
             'driver'  => 'memcached',
             'servers' => [
                 [
-                    'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
+                    'host'   => '127.0.0.1',
+                    'port'   => 11211,
+                    'weight' => 100,
                 ],
             ],
         ],

config/database.php

@@ -57,7 +57,7 @@ return [
 
         'sqlite' => [
             'driver'   => 'sqlite',
-            'database' => env('DB_HOST', storage_path().'/database.sqlite'),
+            'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix'   => env('DB_PREFIX', null),
         ],
 

config/filesystems.php

@@ -54,14 +54,13 @@ return [
 
         'local' => [
             'driver' => 'local',
-            'root'   => storage_path().'/app',
+            '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 @@ return [
             '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',
-        ],
-
     ],
 
 ];

config/mail.php

@@ -20,7 +20,8 @@ return [
     | 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"
     |
     */
 

config/services.php

@@ -42,4 +42,8 @@ return [
         'region' => 'us-east-1',
     ],
 
+    'sparkpost' => [
+        'secret' => env('SPARKPOST_SECRET'),
+    ],
+
 ];

config/view.php

@@ -22,9 +22,7 @@ return [
     |
     */
 
-    'paths' => [
-        realpath(base_path('resources/views')),
-    ],
+    'paths' => [realpath(base_path('resources/views'))],
 
     /*
     |--------------------------------------------------------------------------
@@ -37,6 +35,6 @@ return [
     |
     */
 
-    'compiled' => realpath(storage_path().'/framework/views'),
+    'compiled' => realpath(storage_path('framework/views')),
 
 ];

database/factories/ModelFactory.php

@@ -75,7 +75,7 @@ $factory->define(MetricPoint::class, function ($faker) {
 
 $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(Subscription::class, function ($faker) {
 $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),

phpunit.xml.dist

@@ -30,7 +30,7 @@
         <env name="APP_URL" value="http://localhost"/>
         <env name="APP_KEY" value="GCvcgDKMRIN498g52zfVEd9CxDs6PR7q"/>
         <env name="DB_DRIVER" value="sqlite"/>
-        <env name="DB_HOST" value=":memory:"/>
+        <env name="DB_DATABASE" value=":memory:"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="MAIL_DRIVER" value="log"/>

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}]
 </IfModule>

resources/lang/en/validation.php

@@ -45,9 +45,11 @@ return [
     '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 @@ return [
     ],
     '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.',

storage/framework/.gitignore

@@ -1,6 +1,8 @@
 config.php
 routes.php
 compiled.php
+schedule-*
+services.php
 services.json
 events.scanned.php
 routes.scanned.php