Skip to content

Commit

Permalink
📦️ update Laravel v9.0.2 (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
QWp6t committed Apr 5, 2022
1 parent 4279d27 commit 363075a
Show file tree
Hide file tree
Showing 97 changed files with 1,562 additions and 1,086 deletions.
20 changes: 10 additions & 10 deletions bin/acorn
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<?php

(static function () {
if (! is_file($autoload_path = dirname(__DIR__, 4) . '/vendor/autoload.php')) {
$autoload_path = dirname(__DIR__) . '/vendor/autoload.php';
}
require_once $autoload_path;
if (! is_file($autoload_path = dirname(__DIR__, 4) . '/vendor/autoload.php')) {
$autoload_path = dirname(__DIR__) . '/vendor/autoload.php';
}
require_once $autoload_path;

$composer_path = (new Roots\Acorn\Filesystem\Filesystem)->closest(dirname($autoload_path, 2), 'composer.json');
$composer_path = (new Roots\Acorn\Filesystem\Filesystem)->closest(dirname($autoload_path, 2), 'composer.json');

$root_path = dirname($composer_path);
$root_path = dirname($composer_path);

$composer = json_decode(file_get_contents($composer_path), true);
$composer = json_decode(file_get_contents($composer_path), true);

define('WP_USE_THEMES', false);
require_once "{$root_path}/{$composer['extra']['wordpress-install-dir']}/wp-blog-header.php";
define('WP_USE_THEMES', false);
require_once "{$root_path}/{$composer['extra']['wordpress-install-dir']}/wp-blog-header.php";

Roots\Acorn\Bootloader::getInstance()->boot();
Roots\Acorn\Bootloader::getInstance()->boot();
})();
34 changes: 17 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,26 @@
}
},
"require": {
"php": "^7.3|^8.0",
"php": "^8.0",
"ext-json": "*",
"ext-mbstring": "*",
"illuminate/cache": "^8.70",
"illuminate/config": "^8.70",
"illuminate/console": "^8.70",
"illuminate/container": "^8.70",
"illuminate/contracts": "^8.70",
"illuminate/events": "^8.70",
"illuminate/filesystem": "^8.70",
"illuminate/http": "^8.70",
"illuminate/log": "^8.70",
"illuminate/support": "^8.70",
"illuminate/view": "^8.70",
"league/flysystem": "^1.1",
"ramsey/uuid": "^4.1",
"illuminate/cache": "^9.0",
"illuminate/config": "^9.0",
"illuminate/console": "^9.0",
"illuminate/container": "^9.0",
"illuminate/contracts": "^9.0",
"illuminate/events": "^9.0",
"illuminate/filesystem": "^9.0",
"illuminate/http": "^9.0",
"illuminate/log": "^9.0",
"illuminate/support": "^9.0",
"illuminate/view": "^9.0",
"league/flysystem": "^3.0",
"ramsey/uuid": "^4.2.2",
"roots/support": "^1.0",
"symfony/error-handler": "^5.2",
"symfony/var-dumper": "^5.2",
"vlucas/phpdotenv": "^5.2"
"symfony/error-handler": "^6.0",
"symfony/var-dumper": "^6.0",
"vlucas/phpdotenv": "^5.4.1"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
Expand Down
50 changes: 6 additions & 44 deletions config/app.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

use Illuminate\Support\Facades\Facade;

use function Roots\env;

return [
Expand Down Expand Up @@ -137,7 +139,7 @@
'providers' => [

/*
* Laravel Framework Service Providers...
* Framework Service Providers...
*/
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
Expand Down Expand Up @@ -185,48 +187,8 @@
|
*/

'aliases' => [

'App' => Illuminate\Support\Facades\App::class,
'Arr' => Illuminate\Support\Arr::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => Illuminate\Support\Facades\Cache::class,
'Config' => Illuminate\Support\Facades\Config::class,
'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => Illuminate\Support\Facades\Crypt::class,
'Date' => Illuminate\Support\Facades\Date::class,
'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class,
'Http' => Illuminate\Support\Facades\Http::class,
'Js' => Illuminate\Support\Js::class,
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,
'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,
'Response' => Illuminate\Support\Facades\Response::class,
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'Str' => Illuminate\Support\Str::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,

],
'aliases' => Facade::defaultAliases()->merge([
// ...
])->toArray(),

];
3 changes: 3 additions & 0 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
'cluster' => env('PUSHER_APP_CLUSTER'),
'useTLS' => true,
],
'client_options' => [
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
],
],

'ably' => [
Expand Down
8 changes: 4 additions & 4 deletions config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
'charset' => 'utf8',
'prefix' => '',
'prefix_indexes' => true,
'schema' => 'public',
'search_path' => 'public',
'sslmode' => 'prefer',
],

Expand Down Expand Up @@ -141,21 +141,21 @@

'options' => [
'cluster' => env('REDIS_CLUSTER', 'redis'),
'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'acorn'), '_') . '_database_'),
'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'application'), '_').'_database_'),
],

'default' => [
'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_DB', '0'),
],

'cache' => [
'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_CACHE_DB', '1'),
],
Expand Down
23 changes: 7 additions & 16 deletions config/filesystems.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
|
*/

'default' => env('FILESYSTEM_DRIVER', 'local'),
'default' => env('FILESYSTEM_DISK', 'local'),

/*
|--------------------------------------------------------------------------
Expand All @@ -32,22 +32,13 @@

'local' => [
'driver' => 'local',
'root' => WP_CONTENT_DIR,
'url' => content_url(),
'visibility' => 'public',
],

'wordpress' => [
'driver' => 'local',
'root' => ABSPATH,
'url' => site_url(),
'visibility' => 'public',
'root' => storage_path('app'),
],

'theme' => [
'public' => [
'driver' => 'local',
'root' => get_theme_file_path(),
'url' => get_theme_file_uri(),
'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage',
'visibility' => 'public',
],

Expand All @@ -70,13 +61,13 @@
|--------------------------------------------------------------------------
|
| Here you may configure the symbolic links that will be created when the
| `storage:link` wp-cli command is executed. The array keys should be
| `storage:link` Acorn command is executed. The array keys should be
| the locations of the links and the values should be their targets.
|
*/

'links' => [
// public_path('storage') => storage_path('app/public'),
public_path('storage') => storage_path('app/public'),
],

];
6 changes: 3 additions & 3 deletions config/hashing.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
*/

'argon' => [
'memory' => 1024,
'threads' => 2,
'time' => 2,
'memory' => 65536,
'threads' => 1,
'time' => 4,
],

];
11 changes: 6 additions & 5 deletions config/logging.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,32 +56,33 @@

'single' => [
'driver' => 'single',
'path' => storage_path('logs/acorn.log'),
'path' => storage_path('logs/application.log'),
'level' => env('LOG_LEVEL', 'debug'),
],

'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/acorn.log'),
'path' => storage_path('logs/application.log'),
'level' => env('LOG_LEVEL', 'debug'),
'days' => 14,
],

'slack' => [
'driver' => 'slack',
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Acorn Log',
'username' => 'Application Log',
'emoji' => ':boom:',
'level' => env('LOG_LEVEL', 'critical'),
],

'papertrail' => [
'driver' => 'monolog',
'level' => env('LOG_LEVEL', 'debug'),
'handler' => SyslogUdpHandler::class,
'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
'handler_with' => [
'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'),
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
],
],

Expand Down Expand Up @@ -111,7 +112,7 @@
],

'emergency' => [
'path' => storage_path('logs/acorn.log'),
'path' => storage_path('logs/application.log'),
],
],

Expand Down
11 changes: 5 additions & 6 deletions config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
| their respective settings. Several examples have been configured for
| you and you are free to add your own as your application requires.
|
| Laravel supports a variety of mail "transport" drivers to be used while
| sending an e-mail. You will specify which one you are using for your
| mailers below. You are free to add additional mailers as required.
| The framework supports a variety of mail "transport" drivers to be used
| while sending an e-mail. You will specify which one you are using for
| your mailers below. You are free to add additional mailers as required.
|
| Supported: "smtp", "sendmail", "mailgun", "ses",
| "postmark", "log", "array", "failover"
Expand All @@ -42,7 +42,6 @@
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
'timeout' => null,
'auth_mode' => null,
],

'ses' => [
Expand All @@ -59,7 +58,7 @@

'sendmail' => [
'transport' => 'sendmail',
'path' => '/usr/sbin/sendmail -bs',
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
],

'log' => [
Expand Down Expand Up @@ -103,7 +102,7 @@
|
| If you are using Markdown based email rendering, you may configure your
| theme and component paths here, allowing you to customize the design
| of the emails. Or, you may simply stick with the Laravel defaults!
| of the emails. Or, you may simply stick with the framework defaults!
|
*/

Expand Down
8 changes: 4 additions & 4 deletions config/queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
| Default Queue Connection Name
|--------------------------------------------------------------------------
|
| Laravel's queue API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for every one. Here you may define a default connection.
| The framework's queue API supports an assortment of back-ends via a
| single API, giving you convenient access to each back-end using the
| same syntax for every one. Here you may define a default connection.
|
*/

Expand All @@ -22,7 +22,7 @@
|
| Here you may configure the connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Laravel. You are free to add more.
| for each back-end shipped with the framework. You are free to add more.
|
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
|
Expand Down
14 changes: 14 additions & 0 deletions config/sanctum.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@
env('APP_URL') ? ','.parse_url(env('APP_URL'), PHP_URL_HOST) : ''
))),

/*
|--------------------------------------------------------------------------
| Sanctum Guards
|--------------------------------------------------------------------------
|
| This array contains the authentication guards that will be checked when
| Sanctum is trying to authenticate a request. If none of these guards
| are able to authenticate the request, Sanctum will use the bearer
| token that's present on an incoming request for authentication.
|
*/

'guard' => ['web'],

/*
|--------------------------------------------------------------------------
| Expiration Minutes
Expand Down

0 comments on commit 363075a

Please sign in to comment.