Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 11 migration (storm) #173

Open
wants to merge 114 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
51146b8
Laravel 10 changes
bennothommo Apr 3, 2024
0a6b24e
Laravel 10 changes
wverhoogt Apr 3, 2024
83f796e
apply latest changes done by @bennothommo to fix code analysis
mjauvin Apr 3, 2024
416c6b3
restore initial larastan package
mjauvin Apr 3, 2024
4c7a7af
adjust $fillable signature
mjauvin Apr 3, 2024
d58d314
adjust store() method return type
mjauvin Apr 3, 2024
3c4013c
fix getCache() return type
mjauvin Apr 3, 2024
f5e4b94
remove invalid getValue() call
mjauvin Apr 3, 2024
00513c9
migrate phpunit xml config
mjauvin Apr 3, 2024
3a86f6c
update dependencies for laravel 11
mjauvin Apr 3, 2024
ea41b89
allign with new Authenticatable contract
mjauvin Apr 3, 2024
3f5e612
match symfony SignalableCommandInterface signature
mjauvin Apr 3, 2024
9f9dc7a
match new builder paginate signature
mjauvin Apr 3, 2024
da18666
update CacheManager signature
mjauvin Apr 3, 2024
b18d3e5
fix assetic/framework dependency
mjauvin Apr 3, 2024
98b0e6a
fix mockery dependency
mjauvin Apr 3, 2024
7aee659
replace setMethods() with add/onlyMethods()
mjauvin Apr 3, 2024
79e2747
fix deprecation errors
mjauvin Apr 3, 2024
7b588e2
we need to extend TestCase now
mjauvin Apr 3, 2024
374f00f
call parent constructor
mjauvin Apr 3, 2024
16d43fa
return class instance
mjauvin Apr 3, 2024
3970819
Remove argument removed in Laravel 11
mjauvin Apr 3, 2024
148ea7c
PDO driver classes removed in Laravel 11
mjauvin Apr 3, 2024
d888de7
try to make EventTest work
mjauvin Apr 3, 2024
5bddeb6
remove upload test artifact
mjauvin Apr 3, 2024
88f1639
update php test versions
mjauvin Apr 3, 2024
cccf1b6
add comment about deprecated $dates property; remove doctrine/dbal
mjauvin Apr 4, 2024
ec6d8a6
remove unnecessary override of Illuminate\Cache\CacheManager
mjauvin Apr 4, 2024
388fe35
no need to add dates to cast, this is handled in HasAttribute trait
mjauvin Apr 4, 2024
f71ad1e
ignore phpstan error on abstract base class
mjauvin Apr 4, 2024
60f676f
remove ignore rule
mjauvin Apr 4, 2024
8dcf119
restore migration behavior
mjauvin Apr 5, 2024
f6bd0be
add MariaDb Connection and associated classes
mjauvin Apr 5, 2024
e9915c9
try to appease code quality
mjauvin Apr 5, 2024
0a35475
fix phpstan ignore rules; fix overriden Grammars
mjauvin Apr 5, 2024
9a6233d
downgrade larastan
mjauvin Apr 5, 2024
5dca01e
simplify phpstan baseline rules
mjauvin Apr 6, 2024
f136a78
simplify phpstan baseline rules
mjauvin Apr 6, 2024
d4f7389
major simplifications to phpstan baseline rules
mjauvin Apr 6, 2024
158573e
ignore src/Scaffold/GeneratorCommand.php
mjauvin Apr 6, 2024
eb13302
only use spaces in phpstan.neon
mjauvin Apr 6, 2024
7d66813
no need to wrap in Fluent
mjauvin Apr 6, 2024
58d5b83
add test for Blueprint::change() method
mjauvin Apr 6, 2024
0124828
add test for Blueprint change() command for SqlServer & Postgres
mjauvin Apr 6, 2024
fad6c26
remove extra white space
mjauvin Apr 6, 2024
0ed6f64
add compileChange override
mjauvin Apr 6, 2024
157451c
add SQLite Blueprint change() unit test
mjauvin Apr 6, 2024
8a7f0a3
be safe and properly instantiate a new ColumnDefinition object
mjauvin Apr 6, 2024
6d8bd9d
only use previous modifiers if not set in current Blueprint
mjauvin Apr 7, 2024
7555534
only test change() Blueprint method
mjauvin Apr 7, 2024
5dc7fc9
only test change() Blueprint method
mjauvin Apr 7, 2024
63427a3
use new GrammarTestCase to simplify tests
mjauvin Apr 7, 2024
a18f40b
extend Illuminate\Database\Connection
mjauvin Apr 8, 2024
a98c60c
fix MariaDbConnection parent
mjauvin Apr 8, 2024
2fb435d
make sure we have a column definition
mjauvin Apr 9, 2024
a4f0f49
hasAttribute() has been added in Eloquent HasAttributes trait
mjauvin Apr 9, 2024
73aefbe
remove single quotes from value before processing it
mjauvin Apr 9, 2024
a97f655
add back doctrine functionality
mjauvin Apr 10, 2024
742eec9
Update composer.json
LukeTowers Apr 15, 2024
713f258
Update composer.json
LukeTowers Apr 15, 2024
a9e164e
Update composer.json
LukeTowers Apr 15, 2024
f21710e
Update composer.json
LukeTowers Apr 15, 2024
04882b5
fix composer dependencies
mjauvin Apr 15, 2024
478df3d
revert Connection trait into a class
mjauvin Apr 15, 2024
e960492
add abstract getDoctrineDriver() method
mjauvin Apr 15, 2024
0373d45
mark Database/Connections/Connection class deprecated
mjauvin Apr 15, 2024
74c69c3
Merge branch 'develop' into wip-laravel-11
mjauvin Apr 15, 2024
ad2468a
try to remove exclusions and disableSchemaScan config
mjauvin Apr 15, 2024
051946f
ignore undefined tags() method
mjauvin Apr 15, 2024
5da0cfd
disable schema scan in phpstan.neon
mjauvin Apr 15, 2024
dcf642d
try another variation to appease phpstan
mjauvin Apr 15, 2024
0653451
use $total value if provided
mjauvin Apr 15, 2024
8140a94
restore formatting
mjauvin Apr 15, 2024
2eecd05
remove unused overriden CacheManager
mjauvin Apr 15, 2024
56dc539
default value for total should be null
mjauvin Apr 15, 2024
08b9211
restore previous cache file name
mjauvin Apr 15, 2024
8afe96f
add missing name attribute
mjauvin Apr 15, 2024
31d2c27
add missing typeVarChar() method
mjauvin Apr 15, 2024
72531cc
freeze twig to 3.8.x until we figure out the breakage in 3.9.x
mjauvin Apr 16, 2024
48883f6
ignore twig for now
mjauvin Apr 16, 2024
eacaea2
pass the relation instead of fetching it each time
mjauvin Apr 19, 2024
c09c144
Merge branch 'develop' into tst
mjauvin May 14, 2024
36cae48
fix phpstan
mjauvin May 14, 2024
9f21f52
Merge branch 'develop' into wip-laravel-11
mjauvin May 16, 2024
83a5fbf
use latest symfony process
mjauvin May 17, 2024
d740fda
.github/workflows/code-analysis.yaml
mjauvin May 17, 2024
e6bc192
Merge branch 'develop' into wip-laravel-11
mjauvin May 17, 2024
bbddad7
Revert ".github/workflows/code-analysis.yaml"
mjauvin May 17, 2024
41c8b9b
add ignore rule for tags method on Cache Repository
mjauvin May 17, 2024
f710dba
try clearing phpstan cache in case it exists
mjauvin May 17, 2024
65fe80d
test commit
mjauvin May 17, 2024
d7c9f9a
Revert "test commit"
mjauvin May 17, 2024
a269f28
registerEloquentFactory() has been removed from Laravel
mjauvin Jun 18, 2024
ec4f8c9
merge latest develop changes
mjauvin Jul 3, 2024
0e4dc33
remove extra phpstan ignore rules
mjauvin Jul 3, 2024
6e9eaa3
silence invalid phpstan warning
mjauvin Jul 3, 2024
9bd2080
remove other ignore rules
mjauvin Jul 3, 2024
b3fabc6
follow Laravel method signature
mjauvin Sep 3, 2024
3ca2c68
fix typo
mjauvin Sep 3, 2024
99ddfa2
use newer twig
mjauvin Sep 15, 2024
659cdb5
use latest 3.14+ twig, they fixed their shit
mjauvin Sep 15, 2024
91164e8
force twig 3.x
mjauvin Sep 15, 2024
3fff08e
use static return type to broaden the extension possibilities
mjauvin Oct 7, 2024
852c309
Merge branch 'develop' into wip-laravel-11
mjauvin Oct 7, 2024
e3d0472
Merge branch 'develop' into wip-laravel-11
mjauvin Oct 21, 2024
3ffb684
add GrammarTestCase
mjauvin Oct 21, 2024
c3aa137
fix phpstan
mjauvin Oct 21, 2024
e06e4b4
fix translator tests
mjauvin Oct 21, 2024
545aaf2
add method used in parent SQLiteGrammar
mjauvin Oct 21, 2024
549cf4c
fix logic bug in laravel sqlite grammar
mjauvin Oct 22, 2024
9161946
remove extra whitespaces
mjauvin Oct 22, 2024
1c9acc9
Revert "remove extra whitespaces"
mjauvin Oct 23, 2024
bcd83bb
logic is good, revert the change
mjauvin Oct 23, 2024
6ea5a16
Merge branch 'develop' into wip-laravel-11
mjauvin Nov 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/code-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,21 @@ jobs:
- name: Checkout changes
uses: actions/checkout@v4

- name: Setup extension cache
id: extcache
uses: shivammathur/cache-extensions@v1
with:
php-version: '8.2'
extensions: ${{ env.extensions }}
key: ${{ env.key }}

- name: Cache extensions
uses: actions/cache@v2
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ steps.extcache.outputs.key }}
restore-keys: ${{ steps.extcache.outputs.key }}

- name: Install PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -33,5 +48,8 @@ jobs:
- name: Install Composer dependencies
run: composer install --no-interaction --no-progress --no-scripts

- name: Clear phpstan cache
run: ./vendor/bin/phpstan clear-result-cache

- name: Analyse code
run: ./vendor/bin/phpstan analyse --memory-limit=2G --no-progress
2 changes: 0 additions & 2 deletions .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
pull_request:
push:
branches:
- 1.0
- 1.1
- develop

concurrency:
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Tests
on:
push:
branches:
- "1.0"
- "1.1"
- develop
pull_request:

Expand All @@ -15,10 +13,10 @@ concurrency:
jobs:
unitTests:
strategy:
max-parallel: 6
max-parallel: 4
matrix:
operatingSystem: [ubuntu-latest, windows-latest]
phpVersion: ['8.0', '8.1', '8.2', '8.3']
phpVersion: ['8.2', '8.3']
fail-fast: false
runs-on: ${{ matrix.operatingSystem }}
name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}
Expand All @@ -45,11 +43,3 @@ jobs:

- name: Run tests
run: ./vendor/bin/phpunit ./tests

- name: Upload test artifacts on failure
uses: actions/upload-artifact@v4
if: ${{ failure() }}
with:
name: ResizerTest-${{ matrix.operatingSystem }}-PHP${{ matrix.phpVersion }}
path: tests/artifacts/ResizerTest/
if-no-files-found: error
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ composer.lock
# Editor files
.idea
.vscode
*.code-workspace

# Other files
.DS_Store
Expand All @@ -18,6 +19,5 @@ php_errors.log

#phpunit
tests/.phpunit.result.cache
.phpunit.result.cache
tests/tmp
tests/artifacts/*
29 changes: 15 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
],
"require": {
"php": "^8.0.2",
"php": "^8.2",
"ext-ctype": "*",
"ext-curl": "*",
"ext-dom": "*",
Expand All @@ -35,31 +35,32 @@
"ext-pdo": "*",
"ext-zip": "*",

"assetic/framework": "~3.0",
"doctrine/dbal": "^2.6",
"assetic/framework": "^3.1",
"doctrine/dbal": "^3.0",
"enshrined/svg-sanitize": "~0.16",
"laravel/framework": "^9.1",
"laravel/tinker": "^2.7",
"laravel/framework": "^11.0",
"laravel/tinker": "^2.8.1",
"league/csv": "~9.1",
"nesbot/carbon": "^2.0",
"nikic/php-parser": "^4.10",
"scssphp/scssphp": "~1.0",
"symfony/console": ">=6.0.9 <6.3.0",
"symfony/yaml": "^6.0",
"twig/twig": "^3.14",
"symfony/console": "^6.4|^7.0",
"symfony/process": "^7.1",
"symfony/yaml": "^6.4|^7.0",
"twig/twig": "^3",
"wikimedia/less.php": "~3.0",
"wikimedia/minify": "~2.2",
"winter/laravel-config-writer": "^1.0.1"
},
"require-dev": {
"phpunit/phpunit": "^9.5.8",
mjauvin marked this conversation as resolved.
Show resolved Hide resolved
"mockery/mockery": "^1.4.4",
"phpunit/phpunit": "^10.5|^11.0",
"squizlabs/php_codesniffer": "^3.2",
"php-parallel-lint/php-parallel-lint": "^1.0",
"meyfa/phpunit-assert-gd": "^3.0.0",
"dms/phpunit-arraysubset-asserts": "^0.5.0",
"larastan/larastan": "^2.8.1",
"orchestra/testbench": "^7.1.0"
"meyfa/phpunit-assert-gd": "^4.0",
"mockery/mockery": "^1.6|^2.0",
"dms/phpunit-arraysubset-asserts": "^0.5",
"orchestra/testbench": "^9.0",
"larastan/larastan": "^2.8.1"
},
"suggest": {
"ext-pdo_dblib": "Required to use MS SQL Server databases",
Expand Down
Loading
Loading