tests: .expect files moved to /expected

Author: dg

tests/PhpGenerator/ClassType.from.anonymous.phpt

@@ -43,4 +43,4 @@ $res[] = ClassType::from(new class extends Class1 {
 	}
 });
 
-Assert::matchFile(__DIR__ . '/ClassType.from.anonymous.expect', implode("\n", $res));
+Assert::matchFile(__DIR__ . '/expected/ClassType.from.anonymous.expect', implode("\n", $res));

tests/PhpGenerator/ClassType.from.phpt

@@ -25,4 +25,4 @@ $res[] = ClassType::from(Abc\Class4::class);
 $res[] = ClassType::from(Abc\Class5::class);
 $res[] = ClassType::from(Abc\Class6::class);
 
-Assert::matchFile(__DIR__ . '/ClassType.from.expect', implode("\n", $res));
+Assert::matchFile(__DIR__ . '/expected/ClassType.from.expect', implode("\n", $res));

tests/PhpGenerator/ClassType.from.trait.phpt

@@ -45,4 +45,4 @@ $res[] = ClassType::from('Trait2');
 $res[] = ClassType::from('Class1');
 $res[] = ClassType::from('Class2');
 
-Assert::matchFile(__DIR__ . '/ClassType.from.trait.expect', implode("\n", $res));
+Assert::matchFile(__DIR__ . '/expected/ClassType.from.trait.expect', implode("\n", $res));

tests/PhpGenerator/ClassType.inheritance.phpt

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

tests/PhpGenerator/ClassType.interface.phpt

@@ -24,4 +24,4 @@ Assert::same(['IOne', 'ITwo'], $interface->getExtends());
 
 $interface->addMethod('getForm');
 
-Assert::matchFile(__DIR__ . '/ClassType.interface.expect', (string) $interface);
+Assert::matchFile(__DIR__ . '/expected/ClassType.interface.expect', (string) $interface);

tests/PhpGenerator/ClassType.phpt

@@ -99,7 +99,7 @@ $method->addParameter('res', null)
 		->setReference(true)
 		->setTypeHint('array');
 
-Assert::matchFile(__DIR__ . '/ClassType.expect', (string) $class);
+Assert::matchFile(__DIR__ . '/expected/ClassType.expect', (string) $class);
 
 
 // global setters & getters

tests/PhpGenerator/PhpFile.phpt

@@ -68,15 +68,15 @@ $traitG = $file->addTrait('Baz\\G');
 Assert::same($file->addNamespace('Baz'), $traitG->getNamespace());
 
 
-Assert::matchFile(__DIR__ . '/PhpFile.regular.expect', (string) $file);
+Assert::matchFile(__DIR__ . '/expected/PhpFile.regular.expect', (string) $file);
 
 $file->addClass('H');
 
 $file->addClass('FooBar\\I');
 
-Assert::matchFile(__DIR__ . '/PhpFile.bracketed.expect', (string) $file);
+Assert::matchFile(__DIR__ . '/expected/PhpFile.bracketed.expect', (string) $file);
 
 $file = new PhpFile;
 $file->addClass('A');
 
-Assert::matchFile(__DIR__ . '/PhpFile.globalNamespace.expect', (string) $file);
+Assert::matchFile(__DIR__ . '/expected/PhpFile.globalNamespace.expect', (string) $file);

tests/PhpGenerator/PhpNamespace.fqn.phpt

@@ -34,7 +34,7 @@ $method->addParameter('one')
 $method->addParameter('two')
 		->setTypeHint('\Two');
 
-Assert::matchFile(__DIR__ . '/PhpNamespace.fqn1.expect', (string) $class);
+Assert::matchFile(__DIR__ . '/expected/PhpNamespace.fqn1.expect', (string) $class);
 
 
 // global namespace
@@ -58,4 +58,4 @@ $method->addParameter('one')
 $method->addParameter('two')
 		->setTypeHint('\Two');
 
-Assert::matchFile(__DIR__ . '/PhpNamespace.fqn2.expect', (string) $class);
+Assert::matchFile(__DIR__ . '/expected/PhpNamespace.fqn2.expect', (string) $class);

tests/PhpGenerator/PhpNamespace.phpt

@@ -75,4 +75,4 @@ $method->addParameter('c')->setTypeHint('parent');
 $method->addParameter('d')->setTypeHint('array');
 $method->addParameter('e')->setTypeHint('callable');
 
-Assert::matchFile(__DIR__ . '/PhpNamespace.expect', (string) $namespace);
+Assert::matchFile(__DIR__ . '/expected/PhpNamespace.expect', (string) $namespace);