diff --git a/.env.example b/.env.example index 4597106..2bae355 100644 --- a/.env.example +++ b/.env.example @@ -21,6 +21,7 @@ DB_PASSWORD=secret BROADCAST_DRIVER=log CACHE_DRIVER=file +FILESYSTEM_DRIVER=local QUEUE_CONNECTION=sync SESSION_DRIVER=file SESSION_LIFETIME=120 @@ -45,6 +46,7 @@ AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_DEFAULT_REGION=us-east-1 AWS_BUCKET= +AWS_USE_PATH_STYLE_ENDPOINT=false PUSHER_APP_ID= PUSHER_APP_KEY= diff --git a/.laravel-commit b/.laravel-commit index bd61a54..bc58df5 100644 --- a/.laravel-commit +++ b/.laravel-commit @@ -1 +1 @@ -a6ffdbdf416d60c38443725807a260a84dca5045 +82b5135652f3172c6d4febf1a4da967a49345a79 diff --git a/artisan b/artisan index 5c23e2e..67a3329 100755 --- a/artisan +++ b/artisan @@ -11,7 +11,7 @@ define('LARAVEL_START', microtime(true)); | Composer provides a convenient, automatically generated class loader | for our application. We just need to utilize it! We'll require it | into the script here so that we do not have to worry about the -| loading of any our classes "manually". Feels great to relax. +| loading of any of our classes manually. It's great to relax. | */ diff --git a/composer.json b/composer.json index 4d949f4..67437d9 100644 --- a/composer.json +++ b/composer.json @@ -12,10 +12,10 @@ "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "intervention/image": "^2.5", - "laravel/framework": "^8.12", + "laravel/framework": "^8.40", "laravel/helpers": "^1.2", "laravel/tinker": "^2.5", - "laravel/ui": "^2.1", + "laravel/ui": "^3.3.0", "phpoffice/phpspreadsheet": "^1.14", "radic/blade-extensions": "^7.4.0", "spatie/laravel-newsletter": "^4.8" @@ -45,6 +45,9 @@ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi" ], + "post-update-cmd": [ + "@php artisan vendor:publish --tag=laravel-assets --ansi" + ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], diff --git a/composer.lock b/composer.lock index 20cd626..de8fef2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8dbcc3207112cd20e029f426723066fd", + "content-hash": "876106703b8b0372028480b0c264c324", "packages": [ { "name": "asm89/stack-cors", @@ -1598,16 +1598,16 @@ }, { "name": "laravel/framework", - "version": "v8.52.0", + "version": "v8.53.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "8fe9877d52e25f8aed36c51734e5a8510be967e6" + "reference": "4b2e3e7317da82dd9f5b88d477abd93444748b43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/8fe9877d52e25f8aed36c51734e5a8510be967e6", - "reference": "8fe9877d52e25f8aed36c51734e5a8510be967e6", + "url": "https://api.github.com/repos/laravel/framework/zipball/4b2e3e7317da82dd9f5b88d477abd93444748b43", + "reference": "4b2e3e7317da82dd9f5b88d477abd93444748b43", "shasum": "" }, "require": { @@ -1680,7 +1680,7 @@ "illuminate/view": "self.version" }, "require-dev": { - "aws/aws-sdk-php": "^3.155", + "aws/aws-sdk-php": "^3.186.4", "doctrine/dbal": "^2.6|^3.0", "filp/whoops": "^2.8", "guzzlehttp/guzzle": "^6.5.5|^7.0.1", @@ -1693,7 +1693,7 @@ "symfony/cache": "^5.1.4" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.186.4).", "brianium/paratest": "Required to run tests in parallel (^6.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6|^3.0).", "ext-ftp": "Required to use the Flysystem FTP driver.", @@ -1762,7 +1762,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-07-27T13:03:29+00:00" + "time": "2021-08-03T14:36:33+00:00" }, { "name": "laravel/helpers", @@ -1890,30 +1890,30 @@ }, { "name": "laravel/ui", - "version": "v2.3.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "2ccaa3b821ea8ac7e05393b946d0578bdb46099b" + "reference": "07d725813350c695c779382cbd6dac0ab8665537" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/2ccaa3b821ea8ac7e05393b946d0578bdb46099b", - "reference": "2ccaa3b821ea8ac7e05393b946d0578bdb46099b", + "url": "https://api.github.com/repos/laravel/ui/zipball/07d725813350c695c779382cbd6dac0ab8665537", + "reference": "07d725813350c695c779382cbd6dac0ab8665537", "shasum": "" }, "require": { - "illuminate/console": "^7.0|^8.0", - "illuminate/filesystem": "^7.0|^8.0", - "illuminate/support": "^7.0|^8.0", - "php": "^7.2.5" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^8.0|^9.0" + "illuminate/console": "^8.42", + "illuminate/filesystem": "^8.42", + "illuminate/support": "^8.42", + "illuminate/validation": "^8.42", + "php": "^7.3|^8.0" }, "type": "library", "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + }, "laravel": { "providers": [ "Laravel\\Ui\\UiServiceProvider" @@ -1942,23 +1942,22 @@ "ui" ], "support": { - "issues": "https://github.com/laravel/ui/issues", - "source": "https://github.com/laravel/ui/tree/v2.3.0" + "source": "https://github.com/laravel/ui/tree/v3.3.0" }, - "time": "2020-09-09T12:07:59+00:00" + "time": "2021-05-25T16:45:33+00:00" }, { "name": "league/commonmark", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "167142baf9a6b946f99ad9325b06028606f8238e" + "reference": "0d57f20aa03129ee7ef5f690e634884315d4238c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/167142baf9a6b946f99ad9325b06028606f8238e", - "reference": "167142baf9a6b946f99ad9325b06028606f8238e", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/0d57f20aa03129ee7ef5f690e634884315d4238c", + "reference": "0d57f20aa03129ee7ef5f690e634884315d4238c", "shasum": "" }, "require": { @@ -2056,7 +2055,7 @@ "type": "tidelift" } ], - "time": "2021-07-24T20:12:58+00:00" + "time": "2021-07-31T19:15:22+00:00" }, { "name": "league/config", @@ -3772,16 +3771,16 @@ }, { "name": "ramsey/collection", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1" + "reference": "ab2237657ad99667a5143e32ba2683c8029563d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1", - "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1", + "url": "https://api.github.com/repos/ramsey/collection/zipball/ab2237657ad99667a5143e32ba2683c8029563d4", + "reference": "ab2237657ad99667a5143e32ba2683c8029563d4", "shasum": "" }, "require": { @@ -3833,7 +3832,7 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.1.3" + "source": "https://github.com/ramsey/collection/tree/1.1.4" }, "funding": [ { @@ -3845,7 +3844,7 @@ "type": "tidelift" } ], - "time": "2021-01-21T17:40:04+00:00" + "time": "2021-07-30T00:58:27+00:00" }, { "name": "ramsey/uuid", @@ -6979,16 +6978,16 @@ }, { "name": "laravel/sail", - "version": "v1.8.6", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "51ecfe0f048f8f8e6c5617e02a1f67ca22817c98" + "reference": "3e1aa8679b10ae9210eebfbc2ee5f3600f356702" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/51ecfe0f048f8f8e6c5617e02a1f67ca22817c98", - "reference": "51ecfe0f048f8f8e6c5617e02a1f67ca22817c98", + "url": "https://api.github.com/repos/laravel/sail/zipball/3e1aa8679b10ae9210eebfbc2ee5f3600f356702", + "reference": "3e1aa8679b10ae9210eebfbc2ee5f3600f356702", "shasum": "" }, "require": { @@ -7035,7 +7034,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2021-07-15T07:35:41+00:00" + "time": "2021-08-03T18:51:44+00:00" }, { "name": "mockery/mockery", @@ -7911,16 +7910,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.7", + "version": "9.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5" + "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0dc8b6999c937616df4fb046792004b33fd31c5", - "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/191768ccd5c85513b4068bdbe99bb6390c7d54fb", + "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb", "shasum": "" }, "require": { @@ -7932,7 +7931,7 @@ "ext-xml": "*", "ext-xmlwriter": "*", "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.1", + "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", @@ -7998,7 +7997,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.7" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.8" }, "funding": [ { @@ -8010,7 +8009,7 @@ "type": "github" } ], - "time": "2021-07-19T06:14:47+00:00" + "time": "2021-07-31T15:17:34+00:00" }, { "name": "sebastian/cli-parser", @@ -8865,7 +8864,6 @@ "type": "github" } ], - "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { diff --git a/config/app.php b/config/app.php index 6805ed2..3f41fa1 100644 --- a/config/app.php +++ b/config/app.php @@ -222,6 +222,7 @@ return [ 'Notification' => Illuminate\Support\Facades\Notification::class, 'Password' => Illuminate\Support\Facades\Password::class, 'Queue' => Illuminate\Support\Facades\Queue::class, + 'RateLimiter' => Illuminate\Support\Facades\RateLimiter::class, 'Redirect' => Illuminate\Support\Facades\Redirect::class, // 'Redis' => Illuminate\Support\Facades\Redis::class, 'Request' => Illuminate\Support\Facades\Request::class, diff --git a/config/cache.php b/config/cache.php index ec088fc..69f866b 100644 --- a/config/cache.php +++ b/config/cache.php @@ -27,7 +27,7 @@ return [ | same cache driver to group types of items stored in your caches. | | Supported drivers: "apc", "array", "database", "file", - | "memcached", "redis", "dynamodb", "null" + | "memcached", "redis", "dynamodb", "octane", "null" | */ @@ -88,6 +88,10 @@ return [ 'endpoint' => env('DYNAMODB_ENDPOINT'), ], + 'octane' => [ + 'driver' => 'octane', + ], + ], /* diff --git a/config/filesystems.php b/config/filesystems.php index 10c9d9b..760ef97 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -50,6 +50,7 @@ return [ 'bucket' => env('AWS_BUCKET'), 'url' => env('AWS_URL'), 'endpoint' => env('AWS_ENDPOINT'), + 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false), ], ], diff --git a/config/session.php b/config/session.php index bbfe3a0..85bb039 100644 --- a/config/session.php +++ b/config/session.php @@ -164,7 +164,7 @@ return [ | | By setting this option to true, session cookies will only be sent back | to the server if the browser has a HTTPS connection. This will keep - | the cookie from being sent to you if it can not be done securely. + | the cookie from being sent to you when it can't be done securely. | */ diff --git a/readme.md b/readme.md index 0f6f66b..632b30b 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ A Hypothetical website template for bootstrapping new projects. * Written and maintained by Kevin MacMartin -* Based on Laravel 8.5.16 +* Based on Laravel 8.5.23 ## Setup diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 49e3388..6100f80 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -31,6 +31,7 @@ return [ ], 'boolean' => 'The :attribute field must be true or false.', 'confirmed' => 'The :attribute confirmation does not match.', + 'current_password' => 'The password is incorrect.', 'date' => 'The :attribute is not a valid date.', 'date_equals' => 'The :attribute must be a date equal to :date.', 'date_format' => 'The :attribute does not match the format :format.', @@ -116,10 +117,10 @@ return [ ], 'starts_with' => 'The :attribute must start with one of the following: :values.', 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid zone.', + 'timezone' => 'The :attribute must be a valid timezone.', 'unique' => 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', - 'url' => 'The :attribute format is invalid.', + 'url' => 'The :attribute must be a valid URL.', 'uuid' => 'The :attribute must be a valid UUID.', /*