Merge pull request #381 from wayofdev/feat/laravel-11

Author: lotyp

.env.example

@@ -32,14 +32,14 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=pgsql
-DB_HOST=127.0.0.1
+DB_HOST=database
 DB_PORT=5432
 DB_DATABASE=wod
 DB_USERNAME=wod
 DB_PASSWORD=password
 DB_FORWARD_PORT=5444
 
-CACHE_DRIVER=file
+CACHE_STORE=file
 FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.6.0"
+    ".": "1.7.0"
 }

.github/workflows/deploy-release.yml

@@ -7,9 +7,11 @@ on:  # yamllint disable-line rule:truthy
 
 name: 🚀 Deploy to production
 
+concurrency: production
+
 jobs:
   deployment:
-    runs-on: "ubuntu-22.04"
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       matrix:

.github/workflows/deploy-staging.yml

@@ -7,6 +7,8 @@ on:  # yamllint disable-line rule:truthy
 
 name: 🚀 Deploy to staging
 
+concurrency: staging
+
 jobs:
   deployment:
     runs-on: ${{ matrix.os }}

CHANGELOG.md

@@ -167,19 +167,23 @@ lint-yaml: ## Lints yaml files inside project
 .PHONY: lint-yaml
 
 lint-php: ## Lints php files inside project using php-cs-fixer
-	$(APP_COMPOSER) run-script cs:fix
+	$(APP_COMPOSER) cs:fix
 .PHONY: lint-php
 
 lint-diff: ## Shows diff of php-cs-fixer
-	$(APP_COMPOSER) run-script cs:diff
+	$(APP_COMPOSER) cs:diff
 .PHONY: lint-diff
 
 lint-stan:
-	$(APP_COMPOSER) run-script stan
+	$(APP_COMPOSER) stan
 .PHONY: lint-stan
 
+lint-stan-baseline: ## Runs phpstan to update its baseline
+	$(APP_COMPOSER) stan:baseline
+.PHONY: lint-stan-baseline
+
 lint-deps:
-	$(APP_COMPOSER) run-script deptrac
+	$(APP_COMPOSER) deptrac
 .PHONY: lint-deps
 
 test: ## Run project php-unit and pest tests

Makefile

@@ -63,6 +63,7 @@
         "test": "php vendor/bin/pest",
         "test:cc": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage-clover coverage.xml",
         "stan": "php vendor/bin/phpstan analyse --memory-limit=2G",
+        "stan:baseline": "php vendor/bin/phpstan analyse --generate-baseline --memory-limit=2G --allow-empty-baseline",
         "deptrac": "php vendor/bin/deptrac analyse --config-file=deptrac.yaml -v --cache-file=.build/.deptrac.cache",
         "deptrac:ci": "php vendor/bin/deptrac analyse --config-file=deptrac.yaml -v --cache-file=.build/.deptrac.cache --formatter github-actions",
         "deptrac:gv": "php vendor/bin/deptrac analyse --config-file=deptrac.yaml -v --cache-file=.build/.deptrac.cache --formatter graphviz-image --output ../assets/deptrac.svg"

app/composer.json

@@ -9,10 +9,9 @@
     /*
      * Application Name
      *
-     * This value is the name of your application. This value is used when the
+     * This value is the name of your application, which will be used when the
      * framework needs to place the application's name in a notification or
-     * any other location as required by the application or its packages.
-     *
+     * other UI elements where an application name needs to be displayed.
      */
     'name' => env('APP_NAME', 'Laravel'),
 
@@ -22,7 +21,6 @@
      * This value determines the "environment" your application is currently
      * running in. This may determine how you prefer to configure various
      * services the application utilizes. Set this in your ".env" file.
-     *
      */
     'env' => env('APP_ENV', 'production'),
 
@@ -32,7 +30,6 @@
      * When your application is in debug mode, detailed error messages with
      * stack traces will be shown on every error that occurs within your
      * application. If disabled, a simple generic error page is shown.
-     *
      */
     'debug' => (bool) env('APP_DEBUG', false),
 
@@ -41,62 +38,46 @@
      *
      * This URL is used by the console to properly generate URLs when using
      * the Artisan command line tool. You should set this to the root of
-     * your application so that it is used when running Artisan tasks.
-     *
+     * the application so that it's available within Artisan commands.
      */
     'url' => env('APP_URL', 'http://localhost'),
+    'frontend_url' => env('FRONTEND_URL', 'http://localhost:3000'),
     'asset_url' => env('ASSET_URL'),
 
     /*
      * Application Timezone
      *
      * Here you may specify the default timezone for your application, which
-     * will be used by the PHP date and date-time functions. We have gone
-     * ahead and set this to a sensible default for you out of the box.
-     *
+     * will be used by the PHP date and date-time functions. The timezone
+     * is set to "UTC" by default as it is suitable for most use cases.
      */
     'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     /*
      * Application Locale Configuration
      *
      * The application locale determines the default locale that will be used
-     * by the translation service provider. You are free to set this value
-     * to any of the locales which will be supported by the application.
-     *
-     */
-    'locale' => 'en',
-
-    /*
-     * Application Fallback Locale
-     *
-     * The fallback locale determines the locale to use when the current one
-     * is not available. You may change the value to correspond to any of
-     * the language folders that are provided through your application.
-     *
+     * by Laravel's translation / localization methods. This option can be
+     * set to any locale for which you plan to have translation strings.
      */
-    'fallback_locale' => 'en',
-
-    /*
-     * Faker Locale
-     *
-     * This locale will be used by the Faker PHP library when generating fake
-     * data for your database seeds. For example, this will be used to get
-     * localized telephone numbers, street address information and more.
-     *
-     */
-    'faker_locale' => 'en_US',
+    'locale' => env('APP_LOCALE', 'en'),
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
+    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
 
     /*
      * Encryption Key
      *
-     * This key is used by the Illuminate encrypter service and should be set
-     * to a random, 32 character string, otherwise these encrypted strings
-     * will not be safe. Please do this before deploying an application!
-     *
+     * This key is utilized by Laravel's encryption services and should be set
+     * to a random, 32 character string to ensure that all encrypted values
+     * are secure. You should do this prior to deploying the application.
      */
-    'key' => env('APP_KEY'),
     'cipher' => 'AES-256-CBC',
+    'key' => env('APP_KEY'),
+    'previous_keys' => [
+        ...array_filter(
+            explode(',', env('APP_PREVIOUS_KEYS', ''))
+        ),
+    ],
 
     /*
      * Maintenance Mode Driver
@@ -106,11 +87,10 @@
      * allow maintenance mode to be controlled across multiple machines.
      *
      * Supported drivers: "file", "cache"
-     *
      */
     'maintenance' => [
-        'driver' => 'file',
-        // 'store'  => 'redis',
+        'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
+        'store' => env('APP_MAINTENANCE_STORE', 'database'),
     ],
 
     /*
@@ -119,7 +99,6 @@
      * The service providers listed here will be automatically loaded on the
      * request to your application. Feel free to add your own services to
      * this array to grant expanded functionality to your applications.
-     *
      */
     'providers' => ServiceProvider::defaultProviders()->merge([
         /*

app/composer.lock

@@ -6,28 +6,27 @@
     /*
      * Authentication Defaults
      *
-     * This option controls the default authentication "guard" and password
-     * reset options for your application. You may change these defaults
+     * This option defines the default authentication "guard" and password
+     * reset "broker" for your application. You may change these values
      * as required, but they're a perfect start for most applications.
      */
     'defaults' => [
-        'guard' => 'web',
-        'passwords' => 'users',
+        'guard' => env('AUTH_GUARD', 'web'),
+        'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
     ],
 
     /*
      * Authentication Guards
      *
      * Next, you may define every authentication guard for your application.
      * Of course, a great default configuration has been defined for you
-     * here which uses session storage and the Eloquent user provider.
+     * which utilizes session storage plus the Eloquent user provider.
      *
-     * All authentication drivers have a user provider. This defines how the
+     * All authentication guards have a user provider, which defines how the
      * users are actually retrieved out of your database or other storage
-     * mechanisms used by this application to persist your user's data.
+     * system used by the application. Typically, Eloquent is utilized.
      *
      * Supported: "session"
-     *
      */
     'guards' => [
         'web' => [
@@ -39,21 +38,20 @@
     /*
      * User Providers
      *
-     * All authentication drivers have a user provider. This defines how the
+     * All authentication guards have a user provider, which defines how the
      * users are actually retrieved out of your database or other storage
-     * mechanisms used by this application to persist your user's data.
+     * system used by the application. Typically, Eloquent is utilized.
      *
      * If you have multiple user tables or models you may configure multiple
-     * sources which represent each model / table. These sources may then
+     * providers to represent the model / table. These providers may then
      * be assigned to any extra authentication guards you have defined.
      *
      * Supported: "database", "eloquent"
-     *
      */
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => Domain\User\Models\User::class,
+            'model' => env('AUTH_MODEL', Domain\User\Models\User::class),
         ],
 
         // 'users' => [
@@ -65,9 +63,9 @@
     /*
      * Resetting Passwords
      *
-     * You may specify multiple password reset configurations if you have more
-     * than one user table or model in the application, and you want to have
-     * separate password reset settings based on the specific user types.
+     * These configuration options specify the behavior of Laravel's password
+     * reset functionality, including the table utilized for token storage
+     * and the user provider that is invoked to actually retrieve users.
      *
      * The expiry time is the number of minutes that each reset token will be
      * considered valid. This security feature keeps tokens short-lived so
@@ -76,12 +74,11 @@
      * The throttle setting is the number of seconds a user must wait before
      * generating more password reset tokens. This prevents the user from
      * quickly generating a very large amount of password reset tokens.
-     *
      */
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'table' => 'password_reset_tokens',
+            'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
             'expire' => 60,
             'throttle' => 60,
         ],
@@ -91,9 +88,8 @@
      * Password Confirmation Timeout
      *
      * Here you may define the amount of seconds before a password confirmation
-     * times out and the user is prompted to re-enter their password via the
+     * window expires and users are asked to re-enter their password via the
      * confirmation screen. By default, the timeout lasts for three hours.
-     *
      */
-    'password_timeout' => 10800,
+    'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
 ];