tests: improvements

Author: dg

.github/workflows/coding-style.yml

@@ -14,7 +14,7 @@ jobs:
                   coverage: none
 
             - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
-            - run: php temp/code-checker/code-checker --strict-types --no-progress
+            - run: php temp/code-checker/code-checker --strict-types --no-progress --ignore "tests/*/fixtures"
 
 
     nette_cs:

tests/PhpGenerator/ClassType.from.74.phpt

@@ -10,7 +10,7 @@ use Nette\PhpGenerator\ClassType;
 
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/fixtures/classes.php74';
+require __DIR__ . '/fixtures/classes.74.php';
 
 $res[] = ClassType::from(new Abc\Class7);
 

tests/PhpGenerator/ClassType.from.80.phpt

@@ -10,7 +10,7 @@ use Nette\PhpGenerator\ClassType;
 
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/fixtures/classes.php80';
+require __DIR__ . '/fixtures/classes.80.php';
 
 $res[] = ClassType::from(new Abc\Class8(null));
 $res[] = ClassType::from(new Abc\Class9);

tests/PhpGenerator/ClassType.from.81.phpt

@@ -10,7 +10,7 @@ use Nette\PhpGenerator\ClassType;
 
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/fixtures/classes.php81';
+require __DIR__ . '/fixtures/classes.81.php';
 
 $res[] = ClassType::from(new Abc\Class11);
 

tests/PhpGenerator/ClassType.from.bodies.phpt

@@ -7,7 +7,7 @@ use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/fixtures/class-body.phpf';
+require __DIR__ . '/fixtures/bodies.php';
 
 
 Assert::exception(function () {

tests/PhpGenerator/ClassType.from.enum.phpt

@@ -10,7 +10,7 @@ use Nette\PhpGenerator\ClassType;
 
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/fixtures/enum.php81';
+require __DIR__ . '/fixtures/enum.php';
 
 $res[] = ClassType::from(Abc\Enum1::class);
 $res[] = ClassType::from(Abc\Enum2::class);

tests/PhpGenerator/ClassType.from.phpt

@@ -11,7 +11,7 @@ use Nette\PhpGenerator\Factory;
 
 
 require __DIR__ . '/../bootstrap.php';
-@require __DIR__ . '/fixtures/classes.php'; // triggers error 'Required parameter $c follows optional parameter $a'
+require __DIR__ . '/fixtures/classes.php';
 
 $res[] = ClassType::from(Abc\Interface1::class);
 $res[] = ClassType::from(Abc\Interface2::class);

tests/PhpGenerator/ClassType.from.trait.phpt

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * Test: Nette\PhpGenerator generator.
- */
-
 declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
@@ -12,25 +8,27 @@ use Nette\PhpGenerator\ClassType;
 require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/fixtures/traits.php';
 
-
-$res[] = ClassType::from('Trait1');
-$res[] = ClassType::from('Trait2');
-$res[] = ClassType::from('Class1');
-$res[] = ClassType::from('Class2');
-$res[] = ClassType::from('Class3');
-$res[] = ClassType::from('Class4');
-$res[] = ClassType::from('Class5');
+$classes = [
+	Trait1::class,
+	Trait1b::class,
+	Trait2::class,
+	ParentClass::class,
+	Class1::class,
+	Class2::class,
+	Class3::class,
+	Class4::class,
+	Class5::class,
+];
+
+$res = array_map(function ($class) {
+	return ClassType::from($class);
+}, $classes);
 
 sameFile(__DIR__ . '/expected/ClassType.from.trait.expect', implode("\n", $res));
 
 
-$res = [];
-$res[] = ClassType::withBodiesFrom('Trait1');
-$res[] = ClassType::withBodiesFrom('Trait2');
-$res[] = ClassType::withBodiesFrom('Class1');
-$res[] = ClassType::withBodiesFrom('Class2');
-$res[] = ClassType::withBodiesFrom('Class3');
-$res[] = ClassType::withBodiesFrom('Class4');
-$res[] = ClassType::withBodiesFrom('Class5');
+$res = array_map(function ($class) {
+	return ClassType::withBodiesFrom($class);
+}, $classes);
 
 sameFile(__DIR__ . '/expected/ClassType.from.trait.bodies.expect', implode("\n", $res));

tests/PhpGenerator/ClassType.inheritance.phpt

@@ -54,4 +54,4 @@ class B extends A implements I3
 }
 
 
-sameFile(__DIR__ . '/expected/ClassType.inheritance.expect', (string) ClassType::from('B'));
+sameFile(__DIR__ . '/expected/ClassType.inheritance.expect', (string) ClassType::from(B::class));

tests/PhpGenerator/Method.returnTypes.phpt

@@ -30,10 +30,10 @@ namespace
 		public function testScalar(): string;
 	}
 
-	$method = Method::from(A::class . '::testClass');
+	$method = Method::from([A::class, 'testClass']);
 	Assert::same('A\Foo', $method->getReturnType());
 
-	$method = Method::from(A::class . '::testScalar');
+	$method = Method::from([A::class, 'testScalar']);
 	Assert::same('string', $method->getReturnType());
 
 	// generating methods with return type declarations