Commit b4386c6

committed

Bump to phpstan 2.0

1 parent ceb2130 commit b4386c6Copy full SHA for b4386c6

File tree

+11

-12

lines changed

+11

-12

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"require": {`
`25`	`25`	`"php": "^8.1",`
`26`	`26`	`"codeigniter4/framework": "^4.4",`
`27`		`- "phpstan/phpstan": "^1.10"`
	`27`	`+ "phpstan/phpstan": "^2.0"`
`28`	`28`	`},`
`29`	`29`	`"require-dev": {`
`30`	`30`	`"codeigniter/coding-standard": "^1.7",`
`@@ -33,11 +33,11 @@`
`33`	`33`	`"nexusphp/cs-config": "^3.12",`
`34`	`34`	`"php-parallel-lint/php-parallel-lint": "^1.3",`
`35`	`35`	`"phpstan/extension-installer": "^1.3",`
`36`		`- "phpstan/phpstan-deprecation-rules": "^1.1",`
`37`		`- "phpstan/phpstan-phpunit": "^1.3",`
`38`		`- "phpstan/phpstan-strict-rules": "^1.5",`
	`36`	`+ "phpstan/phpstan-deprecation-rules": "^2.0",`
	`37`	`+ "phpstan/phpstan-phpunit": "^2.0",`
	`38`	`+ "phpstan/phpstan-strict-rules": "^2.0",`
`39`	`39`	`"phpunit/phpunit": "^10.2 \|\| ^11.4",`
`40`		`- "rector/rector": "^1.0.0"`
	`40`	`+ "rector/rector": "^2.0"`
`41`	`41`	`},`
`42`	`42`	`"conflict": {`
`43`	`43`	`"codeigniter/framework": "*"`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,12 @@ public function check(Type $type, string $function): Type`
`63`	`63`	`return $traverse($type);`
`64`	`64`	`}`
`65`	`65`
`66`		`- if ($type->isClassStringType()->yes()) {`
	`66`	`+ if ($type->isClassString()->yes()) {`
`67`	`67`	`return $type->getClassStringObjectType();`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`foreach ($type->getConstantStrings() as $constantStringType) {`
`71`		`- if ($constantStringType->isClassStringType()->yes()) {`
	`71`	`+ if ($constantStringType->isClassString()->yes()) {`
`72`	`72`	`return $constantStringType->getClassStringObjectType();`
`73`	`73`	`}`
`74`	`74`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,12 @@ private function getTypeFromFindAll(MethodCall $methodCall, Scope $scope): Type`
`104`	`104`	`{`
`105`	`105`	`$classReflection = $this->getClassReflection($methodCall, $scope);`
`106`	`106`
`107`		`- return AccessoryArrayListType::intersectWith(`
	`107`	`+ return TypeCombinator::intersect(`
`108`	`108`	`new ArrayType(`
`109`	`109`	`new IntegerType(),`
`110`	`110`	`$this->modelFetchedReturnTypeHelper->getFetchedReturnType($classReflection, $methodCall, $scope)`
`111`		`- )`
	`111`	`+ ),`
	`112`	`+ new AccessoryArrayListType()`
`112`	`113`	`);`
`113`	`114`	`}`
`114`	`115`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ function bar(null\|int\|string $id): void`
`35`	`35`	`{`
`36`	`36`	`$model = model(UserModel::class);`
`37`	`37`
`38`		`- assertType('list<CodeIgniter\Shield\Entities\User>\|CodeIgniter\Shield\Entities\User\|null', $model->find($id));`
	`38`	`+ assertType('CodeIgniter\Shield\Entities\User\|list<CodeIgniter\Shield\Entities\User>\|null', $model->find($id));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`function foo(): void`

Lines changed: 0 additions & 2 deletions

Comments

(0)