Merge pull request #4 from Nutickets/laravel-11-upstream-merge

Laravel 11 upstream merge

Author: joshralph93

.devcontainer/devcontainer.json

@@ -0,0 +1,101 @@
+// https://aka.ms/devcontainer.json
+{
+    "name": "Existing Docker Compose (Extend)",
+    "dockerComposeFile": [
+        "../docker-compose.yml"
+    ],
+    "features": {
+        "ghcr.io/devcontainers/features/sshd:1": {
+            "version": "latest"
+        }
+    },
+    "service": "laravel.test",
+    "workspaceFolder": "/var/www/html",
+    "customizations": {
+        "vscode": {
+            "settings": {},
+            "extensions": [
+                "aaron-bond.better-comments",
+                "adrianwilczynski.alpine-js-intellisense",
+                "amiralizadeh9480.laravel-extra-intellisense",
+                "austenc.laravel-blade-spacer",
+                "beyondcode.tinkerwell",
+                "bmewburn.vscode-intelephense-client",
+                "bradlc.vscode-tailwindcss",
+                "christian-kohler.npm-intellisense",
+                "christian-kohler.path-intellisense",
+                "cierra.livewire-vscode",
+                "codingyu.laravel-goto-view",
+                "davidanson.vscode-markdownlint",
+                "davidbwaters.macos-modern-theme",
+                "eamodio.gitlens",
+                "editorconfig.editorconfig",
+                "ericcheng.codesongclear",
+                "faelv.composer-companion",
+                "file-icons.file-icons",
+                "foxundermoon.shell-format",
+                "georgykurian.laravel-ide-helper",
+                "github.codespaces",
+                "GitHub.copilot-chat",
+                "GitHub.copilot-nightly",
+                "github.vscode-github-actions",
+                "github.vscode-pull-request-github",
+                "Gruntfuggly.activitusbar",
+                "heissenbergerlab.php-array-from-json",
+                "heybourn.headwind",
+                "huibizhang.codesnap-plus",
+                "irongeek.vscode-env",
+                "kencocaceo.customvscodeuicss",
+                "m4ns0ur.base64",
+                "maciejdems.add-to-gitignore",
+                "mahmoudshahin.laravel-routes",
+                "markis.code-coverage",
+                "martybegood.single-editor-tabs",
+                "mechatroner.rainbow-csv",
+                "mehedidracula.php-namespace-resolver",
+                "mhutchie.git-graph",
+                "mikestead.dotenv",
+                "mohamedbenhida.laravel-intellisense",
+                "mrmlnc.vscode-duplicate",
+                "naoray.laravel-goto-components",
+                "oderwat.indent-rainbow",
+                "pcbowers.alpine-intellisense",
+                "recca0120.vscode-phpunit",
+                "redhat.vscode-yaml",
+                "rifi2k.format-html-in-php",
+                "shevaua.phpcs",
+                "shufo.vscode-blade-formatter",
+                "sperovita.alpinejs-syntax-highlight",
+                "streetsidesoftware.code-spell-checker",
+                "syler.ignore",
+                "teabyii.ayu",
+                "usernamehw.errorlens",
+                "vincaslt.highlight-matching-tag",
+                "WakaTime.vscode-wakatime",
+                "withfig.fig",
+                "wongjn.php-sniffer",
+                "xdebug.php-debug",
+                "codecov.codecov"
+            ]
+        }
+    },
+    "remoteUser": "sail",
+    "postCreateCommand": "sudo chown -R 1000:1000 /var/www/html",
+    "forwardPorts": [
+        5432,
+        6379
+    ],
+    "portsAttributes": {
+        "5432": {
+            "label": "Postgres"
+        },
+        "6379": {
+            "label": "Redis"
+        }
+    },
+    "mounts": [
+        "source=${localEnv:HOME}/.wakatime.cfg,target=/home/sail/.wakatime.cfg,type=bind,consistency=delegated"
+    ]
+    // "runServices": [],
+    // "shutdownAction": "none",
+}

.editorconfig

@@ -0,0 +1,19 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+indent_size = 2
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[.blackfire.yaml]
+indent_size = 4

.github/workflows/laravel.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1]
+        php: [8.4, 8.3, 8.2]
 
     name: PHP ${{ matrix.php }}
 
@@ -42,9 +42,9 @@ jobs:
 
     - uses: harmon758/postgresql-action@v1
       with:
-        postgresql version: '11'
+        postgresql version: '15'
         postgresql db: 'testing'
-        postgresql user: 'homestead'
+        postgresql user: 'forge'
         postgresql password: 'secret'
 
     - name: Remove Nova on a pull request
@@ -56,7 +56,7 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
+        composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}"
         composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
 
     - name: Execute Integration and Feature tests via PHPUnit

.gitignore

@@ -1,6 +1,6 @@
+.idea
+.phpunit.result.cache
+/.phpunit*
 /build
 /vendor
 composer.lock
-.phpunit.result.cache
-phpunit.xml
-.idea

.vscode/extensions.json

@@ -0,0 +1,69 @@
+{
+    "recommendations": [
+        "aaron-bond.better-comments",
+        "adrianwilczynski.alpine-js-intellisense",
+        "amiralizadeh9480.laravel-extra-intellisense",
+        "austenc.laravel-blade-spacer",
+        "beyondcode.tinkerwell",
+        "bmewburn.vscode-intelephense-client",
+        "bradlc.vscode-tailwindcss",
+        "christian-kohler.npm-intellisense",
+        "christian-kohler.path-intellisense",
+        "cierra.livewire-vscode",
+        "codingyu.laravel-goto-view",
+        "davidanson.vscode-markdownlint",
+        "davidbwaters.macos-modern-theme",
+        "eamodio.gitlens",
+        "editorconfig.editorconfig",
+        "ericcheng.codesongclear",
+        "faelv.composer-companion",
+        "file-icons.file-icons",
+        "foxundermoon.shell-format",
+        "georgykurian.laravel-ide-helper",
+        "github.codespaces",
+        "GitHub.copilot-chat",
+        "GitHub.copilot-nightly",
+        "github.vscode-github-actions",
+        "github.vscode-pull-request-github",
+        "Gruntfuggly.activitusbar",
+        "heissenbergerlab.php-array-from-json",
+        "heybourn.headwind",
+        "huibizhang.codesnap-plus",
+        "irongeek.vscode-env",
+        "kencocaceo.customvscodeuicss",
+        "m4ns0ur.base64",
+        "maciejdems.add-to-gitignore",
+        "mahmoudshahin.laravel-routes",
+        "markis.code-coverage",
+        "martybegood.single-editor-tabs",
+        "mechatroner.rainbow-csv",
+        "mehedidracula.php-namespace-resolver",
+        "mhutchie.git-graph",
+        "mikestead.dotenv",
+        "mohamedbenhida.laravel-intellisense",
+        "mrmlnc.vscode-duplicate",
+        "naoray.laravel-goto-components",
+        "oderwat.indent-rainbow",
+        "pcbowers.alpine-intellisense",
+        "recca0120.vscode-phpunit",
+        "redhat.vscode-yaml",
+        "rifi2k.format-html-in-php",
+        "shevaua.phpcs",
+        "shufo.vscode-blade-formatter",
+        "sperovita.alpinejs-syntax-highlight",
+        "streetsidesoftware.code-spell-checker",
+        "syler.ignore",
+        "teabyii.ayu",
+        "usernamehw.errorlens",
+        "vincaslt.highlight-matching-tag",
+        "WakaTime.vscode-wakatime",
+        "withfig.fig",
+        "wongjn.php-sniffer",
+        "xdebug.php-debug",
+        "codecov.codecov"
+    ],
+    "unwantedRecommendations": [
+        "ikappas.phpcs",
+        "linyang95.phpmd"
+    ]
+}