Skip to content

Commit

Permalink
feat: Laravel v11 Support (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
LastDragon-ru authored Mar 28, 2024
2 parents a4957b2 + 4c05b89 commit b64a306
Show file tree
Hide file tree
Showing 90 changed files with 822 additions and 531 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ jobs:
# Laravel v10 doesn't support PHP 8.0
- php: 8.0
laravel: ^10.0.0
# Laravel v11 doesn't support PHP 8.1
- php: 8.1
laravel: ^11.0.0

steps:
# Required to avoid converting LF into CRLF on Windows or some tests will fail.
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ jobs:
- name: Install PHP
if: ${{ !inputs.dry-run }}
uses: ./.github/actions/php
with:
working-directory: dev

- name: Release
id: release
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ The set provides best practices to make development more fun and classes/service
| | `^8.0.0` | `1.1.2 ⋯ 0.12.0` |
| | `>=8.0.0` | `0.11.0 ⋯ 0.4.0` |
| | `>=7.4.0` | `0.3.0 ⋯ 0.1.0` |
| Laravel | `^10.34.0` | `HEAD` |
| Laravel | `^11.0.0` | `HEAD` |
| | `^10.34.0` | `HEAD` |
| | `^10.0.0` | `6.1.0 ⋯ 2.1.0` |
| | `^9.21.0` | `5.6.0 ⋯ 5.0.0-beta.1` |
| | `^9.0.0` | `5.0.0-beta.0 ⋯ 0.12.0` |
Expand Down
1 change: 1 addition & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ EOT
if test -f "/project/composer.json"; then
(cd /project && composer install)
(cd /project && composer bin all install)
(cd /project/dev && composer install)
fi
SHELL

Expand Down
1 change: 0 additions & 1 deletion composer-dependency-analyser.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
->enableAnalysisOfUnusedDevDependencies()
->ignoreErrorsOnPackage('symfony/deprecation-contracts', [ErrorType::UNUSED_DEPENDENCY])
->ignoreErrorsOnPackage('symfony/polyfill-php83', [ErrorType::UNUSED_DEPENDENCY])
->ignoreErrorsOnPackage('symfony/var-dumper', [ErrorType::UNUSED_DEPENDENCY])
->ignoreErrorsOnPackage('bamarni/composer-bin-plugin', [ErrorType::UNUSED_DEPENDENCY])
->ignoreErrorsOnPackage('laravel/scout', [ErrorType::DEV_DEPENDENCY_IN_PROD])
->ignoreUnknownClasses([
Expand Down
66 changes: 32 additions & 34 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,55 +45,54 @@
"doctrine/sql-formatter": "^1.1",
"guzzlehttp/psr7": "^1.9.1|^2.4.5",
"http-interop/http-factory-guzzle": "^1.0.0",
"illuminate/collections": "^10.34.0",
"illuminate/console": "^10.34.0",
"illuminate/container": "^10.34.0",
"illuminate/contracts": "^10.34.0",
"illuminate/database": "^10.34.0",
"illuminate/filesystem": "^10.34.0",
"illuminate/http": "^10.34.0",
"illuminate/macroable": "^10.34.0",
"illuminate/pagination": "^10.34.0",
"illuminate/process": "^10.34.0",
"illuminate/routing": "^10.34.0",
"illuminate/support": "^10.34.0",
"illuminate/testing": "^10.34.0",
"illuminate/translation": "^10.34.0",
"illuminate/validation": "^10.34.0",
"illuminate/collections": "^10.34.0|^11.0.0",
"illuminate/console": "^10.34.0|^11.0.0",
"illuminate/container": "^10.34.0|^11.0.0",
"illuminate/contracts": "^10.34.0|^11.0.0",
"illuminate/database": "^10.34.0|^11.0.0",
"illuminate/filesystem": "^10.34.0|^11.0.0",
"illuminate/http": "^10.34.0|^11.0.0",
"illuminate/macroable": "^10.34.0|^11.0.0",
"illuminate/pagination": "^10.34.0|^11.0.0",
"illuminate/process": "^10.34.0|^11.0.0",
"illuminate/routing": "^10.34.0|^11.0.0",
"illuminate/support": "^10.34.0|^11.0.0",
"illuminate/testing": "^10.34.0|^11.0.0",
"illuminate/translation": "^10.34.0|^11.0.0",
"illuminate/validation": "^10.34.0|^11.0.0",
"league/commonmark": "^2.4",
"mockery/mockery": "^1.6.2",
"nikic/php-parser": "^4.18|^5.0",
"nuwave/lighthouse": "^6.5.0",
"opis/json-schema": "^2.3.0",
"phpdocumentor/type-resolver": "^1.7",
"phpstan/phpdoc-parser": "^1.25",
"phpunit/phpunit": "^10.1.0",
"phpunit/phpunit": "^10.1.0|^11.0.0",
"psr/http-message": "^1.0.0|^2.0.0",
"sebastian/comparator": "^5.0",
"sebastian/exporter": "^5.0",
"symfony/console": "^6.3.0",
"sebastian/comparator": "^5.0|^6.0.0",
"sebastian/exporter": "^5.0|^6.0.0",
"symfony/console": "^6.3.0|^7.0.0",
"symfony/deprecation-contracts": "^3.0.0",
"symfony/filesystem": "^6.3.0",
"symfony/finder": "^6.3.0",
"symfony/http-foundation": "^6.3.0",
"symfony/http-kernel": "^6.3.0",
"symfony/mime": "^6.3.0",
"symfony/filesystem": "^6.3.0|^7.0.0",
"symfony/finder": "^6.3.0|^7.0.0",
"symfony/http-foundation": "^6.3.0|^7.0.0",
"symfony/http-kernel": "^6.3.0|^7.0.0",
"symfony/mime": "^6.3.0|^7.0.0",
"symfony/polyfill-php83": "^1.28",
"symfony/property-access": "^6.3.0",
"symfony/property-info": "^6.3.9",
"symfony/psr-http-message-bridge": "^2.0.0|^6.4.0",
"symfony/serializer": "^6.3.3",
"symfony/property-access": "^6.3.0|^7.0.0",
"symfony/property-info": "^6.3.9|^7.0.0",
"symfony/psr-http-message-bridge": "^2.0.0|^6.4.0|^7.0.0",
"symfony/serializer": "^6.3.3|^7.0.0",
"webonyx/graphql-php": "^15.4.0"
},
"require-dev": {
"ext-pdo_sqlite": "*",
"bamarni/composer-bin-plugin": "^1.8",
"composer/class-map-generator": "^1.0",
"fakerphp/faker": "^1.21.0",
"illuminate/cache": "^10.34.0",
"illuminate/cache": "^10.34.0|^11.0.0",
"laravel/scout": "^9.8.0|^10.0.0",
"orchestra/testbench": "^8.0.0",
"symfony/var-dumper": "^6.3.0"
"orchestra/testbench": "^8.0.0|^9.0.0"
},
"autoload": {
"exclude-from-classmap": [
Expand Down Expand Up @@ -137,7 +136,6 @@
},
"autoload-dev": {
"exclude-from-classmap": [
"dev/**.php",
"packages/core/docs/",
"packages/documentator/docs/",
"packages/eloquent/docs/",
Expand All @@ -151,7 +149,6 @@
],
"psr-4": {
"LastDragon_ru\\LaraASP\\Core\\Docs\\": "packages/core/docs",
"LastDragon_ru\\LaraASP\\Dev\\App\\": "dev/App",
"LastDragon_ru\\LaraASP\\Documentator\\Docs\\": "packages/documentator/docs",
"LastDragon_ru\\LaraASP\\Eloquent\\Docs\\": "packages/eloquent/docs",
"LastDragon_ru\\LaraASP\\Formatter\\Docs\\": "packages/formatter/docs",
Expand Down Expand Up @@ -225,7 +222,7 @@
"npm run markdownlint"
],
"composer-unused": [
"./vendor-bin/composer-unused/vendor/bin/composer-unused unused"
"./vendor-bin/composer-unused/vendor/bin/composer-unused unused --output-format=default"
],
"composer-require-checker": [
"./vendor-bin/composer-require-checker/vendor/bin/composer-require-checker check"
Expand All @@ -246,6 +243,7 @@
"npm run markdownlint -- --fix || npm run markdownlint -- --fix"
]
},
"prefer-stable": true,
"config": {
"sort-packages": true,
"optimize-autoloader": true,
Expand Down
64 changes: 64 additions & 0 deletions dev/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
APP_NAME=LaraASP
APP_ENV=local
APP_KEY=base64:vjuzpuX3q/BsAhgxTZkbw2Y+qLwWad7feTmClcW0b50=
APP_DEBUG=true
APP_TIMEZONE=UTC
APP_URL=http://localhost

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US

APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database

BCRYPT_ROUNDS=12

LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=sqlite
# DB_HOST=127.0.0.1
# DB_PORT=3306
# DB_DATABASE=laravel
# DB_USERNAME=root
# DB_PASSWORD=

SESSION_DRIVER=database
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

BROADCAST_CONNECTION=log
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database

CACHE_STORE=database
CACHE_PREFIX=

MEMCACHED_HOST=127.0.0.1

REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=log
MAIL_HOST=127.0.0.1
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="[email protected]"
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false

VITE_APP_NAME="${APP_NAME}"
64 changes: 64 additions & 0 deletions dev/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_TIMEZONE=UTC
APP_URL=http://localhost

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US

APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database

BCRYPT_ROUNDS=12

LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=sqlite
# DB_HOST=127.0.0.1
# DB_PORT=3306
# DB_DATABASE=laravel
# DB_USERNAME=root
# DB_PASSWORD=

SESSION_DRIVER=database
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

BROADCAST_CONNECTION=log
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database

CACHE_STORE=database
CACHE_PREFIX=

MEMCACHED_HOST=127.0.0.1

REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=log
MAIL_HOST=127.0.0.1
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="[email protected]"
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false

VITE_APP_NAME="${APP_NAME}"
11 changes: 11 additions & 0 deletions dev/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
* text=auto eol=lf

*.blade.php diff=html
*.css diff=css
*.html diff=html
*.md diff=markdown
*.php diff=php

/.github export-ignore
CHANGELOG.md export-ignore
.styleci.yml export-ignore
19 changes: 19 additions & 0 deletions dev/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/.phpunit.cache
/node_modules
/public/build
/public/hot
/public/storage
/storage/*.key
/vendor
.env.backup
.env.production
.phpunit.result.cache
Homestead.json
Homestead.yaml
auth.json
npm-debug.log
yarn-error.log
/.fleet
/.idea
/.vscode
composer.lock
46 changes: 0 additions & 46 deletions dev/App/App.php

This file was deleted.

Loading

0 comments on commit b64a306

Please sign in to comment.