Merge pull request #29 from jtojnar/ci-fix

Fix CI

Author: hrach

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+ - package-ecosystem: composer
+ directory: "/"
+ schedule:
+ interval: monthly
+ open-pull-requests-limit: 20

.github/workflows/build.yml

@@ -17,16 +17,10 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- php-version: [ '7.1', '7.2', '7.3', '7.4', '8.0' ]
+ php-version: [ '8.1', '8.2' ]
  deps: [ 'lowest', 'newest' ]
  exclude:
- - php-version: '7.2'
- deps: lowest
- - php-version: '7.3'
- deps: lowest
- - php-version: '7.4'
- deps: lowest
- - php-version: '8.0'
+ - php-version: '8.1'
  deps: lowest
 
  runs-on: ubuntu-latest

composer.json

@@ -6,13 +6,13 @@
 "MIT"
 ],
 "require": {
-"php": "~7.1 || ~8.0",
-"phpstan/phpstan": "^1.0"
+"php": "~8.1",
+"phpstan/phpstan": "^1.10"
 },
 "require-dev": {
 "phpstan/extension-installer": "^1.1",
 "phpstan/phpstan-deprecation-rules": "^1.0",
-"nextras/orm": "~4.0 || ~5.0@dev",
+"nextras/orm": "~5.0@dev",
 "nette/tester": "^2.3.1"
 },
 "autoload": {
@@ -35,6 +35,12 @@
 }
 },
 "scripts": {
+"phpstan": "phpstan analyze",
 "tests": "tester ./tests/test.php && phpstan analyze"
+},
+"config": {
+"allow-plugins": {
+"phpstan/extension-installer": true
+}
 }
 }

extension.neon

@@ -1,20 +1,4 @@
 services:
--
-class: Nextras\OrmPhpStan\Types\CollectionReturnTypeExtension
-tags:
-- phpstan.broker.dynamicMethodReturnTypeExtension
--
-class: Nextras\OrmPhpStan\Types\MapperMethodReturnTypeExtension
-tags:
-- phpstan.broker.dynamicMethodReturnTypeExtension
--
-class: Nextras\OrmPhpStan\Types\RelationshipReturnTypeExtension
-tags:
-- phpstan.broker.dynamicMethodReturnTypeExtension
--
-class: Nextras\OrmPhpStan\Types\RepositoryReturnTypeExtension
-tags:
-- phpstan.broker.dynamicMethodReturnTypeExtension
 -
 class: Nextras\OrmPhpStan\Reflection\EntityRelationshipPropertyReflectionExtension
 tags:
@@ -27,5 +11,3 @@ services:
 class: Nextras\OrmPhpStan\Rules\SetValueMethodRule
 tags:
 - phpstan.rules.rule
-
-- Nextras\OrmPhpStan\Types\Helpers\RepositoryEntityTypeHelper(@currentPhpVersionSimpleDirectParser)

src/Rules/SetValueMethodRule.php

@@ -6,13 +6,12 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
-use PHPStan\Broker\Broker;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
-use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\VerbosityLevel;
 
+
 /**
  * @phpstan-implements Rule<MethodCall>
  */
@@ -60,53 +59,59 @@ public function processNode(Node $node, Scope $scope): array
 
 $valueType = $scope->getType($args[1]->value);
 $varType = $scope->getType($node->var);
-if (!$varType instanceof TypeWithClassName) {
+$classNames = $varType->getObjectClassNames();
+if (count($classNames) < 1) {
 return [];
 }
 
 $firstValue = $args[0]->value;
 if (!$firstValue instanceof Node\Scalar\String_) {
 return [];
 }
-
 $fieldName = $firstValue->value;
-$class = $this->reflectionProvider->getClass($varType->getClassName());
-$interfaces = array_map(function (ClassReflection $interface) {
-return $interface->getName();
-}, $class->getInterfaces());
-if (!in_array(IEntity::class, $interfaces, true)) {
-return [];
-}
-
-if (!$class->hasProperty($fieldName)) {
-return [sprintf(
-'Entity %s has no $%s property.',
-$varType->getClassName(),
-$fieldName
-)];
-}
-
-$property = $class->getProperty($fieldName, $scope);
-$propertyType = $property->getWritableType();
-
-if (!$propertyType->accepts($valueType, true)->yes()) {
-return [sprintf(
-'Entity %s: property $%s (%s) does not accept %s.',
-$varType->getClassName(),
-$fieldName,
-$propertyType->describe(VerbosityLevel::typeOnly()),
-$valueType->describe(VerbosityLevel::typeOnly())
-)];
-}
 
-if (!$property->isWritable() && $methodName !== 'setReadOnlyValue') {
-return [sprintf(
-'Entity %s: property $%s is read-only.',
-$varType->getClassName(),
-$fieldName
-)];
+$errors = [];
+foreach ($classNames as $className) {
+$class = $this->reflectionProvider->getClass($className);
+$interfaces = array_map(function (ClassReflection $interface) {
+return $interface->getName();
+}, $class->getInterfaces());
+if (!in_array(IEntity::class, $interfaces, true)) {
+continue;
+}
+
+if (!$class->hasProperty($fieldName)) {
+$errors[] = sprintf(
+'Entity %s has no $%s property.',
+$className,
+$fieldName
+);
+continue;
+}
+
+$property = $class->getProperty($fieldName, $scope);
+$propertyType = $property->getWritableType();
+
+if (!$propertyType->accepts($valueType, true)->yes()) {
+$errors[] = sprintf(
+'Entity %s: property $%s (%s) does not accept %s.',
+$className,
+$fieldName,
+$propertyType->describe(VerbosityLevel::typeOnly()),
+$valueType->describe(VerbosityLevel::typeOnly())
+);
+continue;
+}
+
+if (!$property->isWritable() && $methodName !== 'setReadOnlyValue') {
+$errors[] = sprintf(
+'Entity %s: property $%s is read-only.',
+$className,
+$fieldName
+);
+}
 }
 
-return [];
+return $errors;
 }
 }