update dependencies,

.github/workflows/main.yml → .github/workflows/php.yml

@@ -23,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["8.0"]
+        php-version: ["8.3"]
         operating-system: ["ubuntu-latest"]
       fail-fast: false
 
@@ -80,11 +80,11 @@ jobs:
     runs-on: "${{ matrix.operating-system }}"
     strategy:
       matrix:
-        php-version: ["8.1"]
+        php-version: ["8.3"]
         operating-system: ["ubuntu-latest"]
         composer-args: [ "" ]
         include:
-          - php-version: "8.0"
+          - php-version: "8.1"
             operating-system: "ubuntu-latest"
             composer-args: "--ignore-platform-reqs"
       fail-fast: false
@@ -136,15 +136,15 @@ jobs:
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"'
 
       - name: "Tests"
-        run: "vendor/bin/phpunit"
+        run: "vendor/bin/phpunit tests"
 
   static-analysis:
     name: "Static analysis"
     runs-on: "${{ matrix.operating-system }}"
 
     strategy:
       matrix:
-        php-version: ["8.1"]
+        php-version: ["8.3"]
         operating-system: ["ubuntu-latest"]
       fail-fast: false
 
@@ -200,7 +200,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["8.1"]
+        php-version: ["8.3"]
         operating-system: ["ubuntu-latest"]
       fail-fast: false
 

Makefile

@@ -18,7 +18,7 @@ phpstan: vendor
 	vendor/bin/phpstan analyse -l max -c phpstan.neon src
 
 tests: vendor
-	vendor/bin/phpunit
+	vendor/bin/phpunit tests
 
 coverage: vendor
-	vendor/bin/phpunit --coverage-clover=coverage.xml
+	vendor/bin/phpunit tests --coverage-clover=coverage.xml

composer.json

@@ -21,13 +21,13 @@
     }
   },
   "require": {
-    "php": "^8.0",
-    "nette/utils": "^3.0",
-    "nette/php-generator": "^3.0",
+    "php": "^8.1",
+    "nette/utils": "^3.1",
+    "nette/php-generator": "^4.0",
     "doctrine/inflector": "^2.0"
   },
   "require-dev": {
-    "contributte/qa": "^0.1",
+    "contributte/qa": "^0.3",
     "phpunit/phpunit": ">=9.0",
     "phpstan/phpstan-deprecation-rules": "^1.0",
     "phpstan/phpstan-strict-rules": "^1.0"

phpunit.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/bootstrap.php" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <source>
     <include>
       <directory suffix=".php">src/</directory>
     </include>
-  </coverage>
+  </source>
 </phpunit>

ruleset.xml

@@ -8,13 +8,11 @@
     <rule ref="Generic.WhiteSpace.ScopeIndent">
     <properties>
         <property name="indent" value="4"/>
-        <property name="tabIndent" value="true"/>
     </properties>
 </rule>
     <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
         <properties>
             <property name="allowFullyQualifiedGlobalClasses" value="true"/>
-            <property name="tabIndent" value="true"/>
         </properties>
     </rule>
     <rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>

src/Generator/Generator.php

@@ -79,7 +79,7 @@ public function generateEntity(string $table): void
 		$phpDocProperties = [];
 
 		if (!$this->config->rewrite && class_exists($fqnClassName)) {
-			$this->cloneEntityFromExistingEntity($entity, ClassType::from($fqnClassName));
+			$this->cloneEntityFromExistingEntity($entity, ClassType::from($fqnClassName)); //@phpstan-ignore-line
 			$phpDocProperties = Helper::getPhpDocComments($entity->getComment() ?? '');
 		}
 
@@ -98,7 +98,7 @@ public function generateEntity(string $table): void
 			$this->validateColumnName($table, $column);
 			$this->generateColumnConstant($entity, $column);
 
-			if (isset($entity->properties[$column->getField()]) || in_array($column->getField(), $phpDocProperties, true)) {
+			if ($entity->hasProperty($column->getField()) || in_array($column->getField(), $phpDocProperties, true)) {
 				continue;
 			}
 
@@ -107,7 +107,7 @@ public function generateEntity(string $table): void
 		}
 
 		if ($this->config->generateMapping) {
-			if (isset($entity->properties['mapping'])) {
+			if ($entity->hasProperty('mapping')) {
 				$mapping += $entity->getProperty('mapping')->getValue();
 			}
 
@@ -167,7 +167,7 @@ protected function generateColumn(ClassType $entity, Column $column): void
 		if ($this->config->generateSetters) {
 			$setter = $entity->addMethod('set' . $this->inflector->classify($column->getField()));
 			$setter->setVisibility($this->config->setterVisibility);
-			$setter->addParameter('value')->setTypeHint($type)->setNullable($column->isNullable());
+			$setter->addParameter('value')->setType($type)->setNullable($column->isNullable());
 			$setter->addBody(str_replace('__FIELD__', $column->getField(), $this->config->setterBody));
 			$setter->setReturnType('self');
 		}
@@ -218,8 +218,9 @@ private function cloneEntityFromExistingEntity(ClassType $entity, ClassType $fro
 		$entity->setProperties($from->getProperties());
 		$entity->setComment($from->getComment());
 		$entity->setMethods($from->getMethods());
+		$methods = $entity->getMethods();
 
-		foreach ($entity->methods as $method) {
+		foreach ($methods as $method) {
 			$fqnClassName = '\\' . $this->config->namespace . '\\' . $entity->getName();
 			$body = $this->getMethodBody($fqnClassName, $method->getName());
 			$method->setBody($body);

tests/Generator/GeneratorTest.php

@@ -126,8 +126,7 @@ public function testGenerate_WithoutParameters_ShouldGenerateEntitiesForWholeTab
 		$this->config->path = __DIR__ . '/../TestEntities';
 
 		$this->repository->expects($this->once())->method('getTables')->willReturn(['table1', 'table2']);
-		$this->repository->expects($this->exactly(2))->method('getTableColumns')
-			->withConsecutive(['table1'], ['table2'])->willReturn($this->tableColumns);
+		$this->repository->expects($this->exactly(2))->method('getTableColumns')->willReturn($this->tableColumns);
 		$this->generator->generate();
 
 		$entityFile = $this->config->path . '/Table1Entity.php';