Laravel のバージョンを 5.8 に更新 (#443)

* Target Laravel 5.8 * Update composer.json * Update `RegisterController` password validation rule and associated lang file * Update UserFactory password in line with #4794 The new password is of 8 characters, as required by #4794 * Update VerificationController.php * add dynamo to stubs * tweak wording * Modify RedirectIfAuthenticated middleware to accept multiple guards * add env variable for mysql ssl cert * Add beanstalk queue block_for config key This functionality was added in laravel/framework 9aa1706. * Hint for lenient log stacks * adjust name of configuration value * Use same version as framework * Use $_SERVER instead of $_ENV for phpunit. Laravel 5.8 limits dotenv to only rely on $_SERVER and not $_ENV. See laravel/framework#27462 * change default redis configuration structure * update client * update config file * [5.8] use bigIncrements by default All new migrations will be using bigIncrements laravel/framework#26472 * Revert "[5.8] Modify RedirectIfAuthenticated middleware to accept multiple guards" * revert to old redis config * add postmark token * Add Arr and Str aliases by default * add postmark * update env variable stubs * set default region * add bucket to env example * Use correct env name for AWS region from env.example * comment * comment out options * check if extension loaded * Ignore SQLite journals * Prefix redis database connection by default to mitigate multiple sites on the same server potentially sharing the same queued jobs * Use Str class instead of helper function * Additional underscore on redis database prefix * Additional underscore on cache prefix * Remove underscore as cache prefixes automatically have a colon appended to them * Update UserFactory.php * Fix phpdoc to order by syntax convention (#5005) Reorder the `@var` phpdoc syntax by convention, see http://docs.phpdoc.org/references/phpdoc/tags/var.html * Update database config relating to Url addition. * formatting * Add ends_with validation message * Fix type hint for case of trusting all proxies (string) (#5025) * Add DYNAMODB_ENDPOINT to the cache config (#5034) This adds the DYNAMODB_ENDPOINT environment variable to the dynamodb store of the cache cofig. Its usage is implemented in the framework as laravel/framework#28600 * Added support for new redis URL property in config/database.php (#5037) Regarding laravel/framework#28612 * use generic default db config * Update .gitignore (#5046) * Move TrustProxies to highest priority - fixes maintenance mode ip whitelist if behind proxy e.g. Cloudflare (#5055) * update deprecated pusher option (#5058) * Using environment variable to set redis prefix (#5062) It was the only redis setting that wasn't overridable by an environment variable. It can help if you have multiple instances using the same `APP_NAME`, e.g. a staging instance * Remove Stripe config settings These now ship with a dedicated config file for Cashier. * formatting * Update composer.lock * Revert "[5.8] use bigIncrements by default" This reverts commit 6c5798e. * Update laravel/telescope
gomasy · Sep 17, 2019 · 3348893 · 3348893
1 parent e367efe
commit 3348893
Show file tree

Hide file tree

Showing 23 changed files with 224 additions and 675 deletions.
diff --git a/.env.example b/.env.example
@@ -9,9 +9,9 @@ LOG_CHANNEL=stack
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -30,6 +30,11 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 /storage/*.key
 /vendor
 .env
+.env.backup
 .php_cs.cache
 .phpunit.result.cache
 Homestead.json

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -94,7 +94,7 @@ protected function validator(array $data): object
         return \Validator::make($data, [
             'name' => [ 'required', 'string', 'max:255' ],
             'email' => [ 'required', 'string', 'email', 'max:255', 'unique:users' ],
-            'password' => [ 'required', 'string', 'min:6', 'confirmed' ],
+            'password' => [ 'required', 'string', 'min:8', 'confirmed' ],
             'agreement' => [ 'required' ],
         ]);
     }

diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
@@ -3,7 +3,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use Illuminate\Routing\Controller;
+use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\VerifiesEmails;
 
 class VerificationController extends Controller

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -14,11 +14,11 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
     ];
 
     /**

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -10,7 +10,7 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array|string
      */
     protected $proxies;
 

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        // 'App\Model' => 'App\Policies\ModelPolicy',
     ];
 
     /**

diff --git a/composer.json b/composer.json
@@ -14,19 +14,19 @@
         "google/cloud-vision": "^0.24.0",
         "google/recaptcha": "^1.2",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.7.*",
+        "laravel/framework": "5.8.*",
         "laravel/tinker": "^1.0"
     },
     "require-dev": {
         "beyondcode/laravel-dump-server": "^1.0",
         "filp/whoops": "^2.0",
         "friendsofphp/php-cs-fixer": "^2.11",
         "fzaninotto/faker": "^1.4",
-        "laravel/telescope": "^1.0",
+        "laravel/telescope": "^2.0",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
         "php-coveralls/php-coveralls": "^2.0",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.5"
     },
     "config": {
         "optimize-autoloader": true,