Added some more test cases

tests/Fixer/Preload/ExplicitlyLoadClassTest.php

@@ -44,16 +44,18 @@ public function provideFixCases()
 
         /** @var SplFileInfo $file */
         foreach ($finder as $file) {
-            $path = $file->getRealPath();
-            $output = file_get_contents($path);
+            $output = file_get_contents($file->getRealPath());
 
-            $input = null;
-            $inputFile = substr($path, 0, -7).'In.php';
-            if (is_file($inputFile)) {
-                $input = file_get_contents($inputFile);
+            $inputFilePattern = substr($file->getFilename(), 0, -7).'In*.php';
+            $inputFinder = new Finder();
+            $inputFinder->in($testDir)->name($inputFilePattern);
+
+            /** @var SplFileInfo $file */
+            foreach ($inputFinder as $input) {
+                yield sprintf('%s => %s', $input->getFilename(), $file->getFilename()) => [$output, file_get_contents($input->getRealPath())];
             }
 
-            yield $file->getFilename() => [$output, $input];
+            yield $file->getFilename() => [$output, null];
         }
     }
 }

tests/Fixtures/Preload/Case003_In.php

@@ -0,0 +1,15 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor with new Foo()
+ */
+class Case003
+{
+    private $foo;
+    public function __construct()
+    {
+        $this->foo = new Foo();
+    }
+}

tests/Fixtures/Preload/Case003_Out.php

@@ -0,0 +1,16 @@
+<?php
+
+use App\Foo;
+
+class_exists(Foo::class);
+/**
+ * Constructor with new Foo()
+ */
+class Case003
+{
+    private $foo;
+    public function __construct()
+    {
+        $this->foo = new Foo();
+    }
+}

tests/Fixtures/Preload/Case004_In.php

@@ -0,0 +1,15 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor with class reference
+ */
+class Case004
+{
+    private $foo;
+    public function __construct()
+    {
+        $this->foo = Foo::class;
+    }
+}

tests/Fixtures/Preload/Case004_Out.php

@@ -0,0 +1,16 @@
+<?php
+
+use App\Foo;
+
+class_exists(Foo::class);
+/**
+ * Constructor with class reference
+ */
+class Case004
+{
+    private $foo;
+    public function __construct()
+    {
+        $this->foo = Foo::class;
+    }
+}

tests/Fixtures/Preload/Case005_In.php

@@ -0,0 +1,21 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor using more complex class references
+ */
+class Case005
+{
+    private $baz;
+    private $bazClass;
+    private $bar;
+    private $barClass;
+    public function __construct()
+    {
+        $this->bar = new Foo\Bar();
+        $this->barClass = Foo\BarClass::class;
+        $this->baz = new \Biz\Baz();
+        $this->bazClass = \Biz\BazClass::class;
+    }
+}

tests/Fixtures/Preload/Case005_Out.php

@@ -0,0 +1,25 @@
+<?php
+
+use App\Foo;
+
+class_exists(Foo\Bar::class);
+class_exists(Foo\BarClass::class);
+class_exists(\Biz\Baz::class);
+class_exists(\Biz\BazClass::class);
+/**
+ * Constructor using more complex class references
+ */
+class Case005
+{
+    private $baz;
+    private $bazClass;
+    private $bar;
+    private $barClass;
+    public function __construct()
+    {
+        $this->bar = new Foo\Bar();
+        $this->barClass = Foo\BarClass::class;
+        $this->baz = new \Biz\Baz();
+        $this->bazClass = \Biz\BazClass::class;
+    }
+}

tests/Fixtures/Preload/Case006_In.php

@@ -0,0 +1,22 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor call to private method
+ */
+class Case006
+{
+    private $foo;
+    private $bar;
+    public function __construct()
+    {
+        $this->bar = 2;
+        $this->init();
+    }
+
+    private function init()
+    {
+        $this->foo = new Foo();
+    }
+}

tests/Fixtures/Preload/Case006_Out.php

@@ -0,0 +1,23 @@
+<?php
+
+use App\Foo;
+
+class_exists(Foo::class);
+/**
+ * Constructor call to private method
+ */
+class Case006
+{
+    private $foo;
+    private $bar;
+    public function __construct()
+    {
+        $this->bar = 2;
+        $this->init();
+    }
+
+    private function init()
+    {
+        $this->foo = new Foo();
+    }
+}

tests/Fixtures/Preload/Case007_In.php

@@ -0,0 +1,22 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor call to public method
+ */
+class Case007
+{
+    private $foo;
+    private $bar;
+    public function __construct()
+    {
+        $this->bar = 2;
+        $this->init();
+    }
+
+    public function init()
+    {
+        $this->foo = new Foo();
+    }
+}

tests/Fixtures/Preload/Case007_Out.php

@@ -0,0 +1,23 @@
+<?php
+
+use App\Foo;
+
+class_exists(Foo::class);
+/**
+ * Constructor call to public method
+ */
+class Case007
+{
+    private $foo;
+    private $bar;
+    public function __construct()
+    {
+        $this->bar = 2;
+        $this->init();
+    }
+
+    public function init()
+    {
+        $this->foo = new Foo();
+    }
+}

tests/Fixtures/Preload/Case008_In.php

@@ -0,0 +1,23 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor call to private method with parameter
+ */
+class Case008
+{
+    private $foo;
+    private $bar;
+    public function __construct()
+    {
+        $this->bar = 2;
+        $var = new Foo();
+        $this->init($var);
+    }
+
+    private function init(Foo $foo)
+    {
+        $this->foo = $foo;
+    }
+}

tests/Fixtures/Preload/Case008_Out.php

@@ -0,0 +1,24 @@
+<?php
+
+use App\Foo;
+
+class_exists(Foo::class);
+/**
+ * Constructor call to private method with parameter
+ */
+class Case008
+{
+    private $foo;
+    private $bar;
+    public function __construct()
+    {
+        $this->bar = 2;
+        $var = new Foo();
+        $this->init($var);
+    }
+
+    private function init(Foo $foo)
+    {
+        $this->foo = $foo;
+    }
+}

tests/Fixtures/Preload/Case009_Out.php

@@ -0,0 +1,23 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor call to public method with parameter
+ */
+class Case009
+{
+    private $foo;
+    private $bar;
+    public function __construct()
+    {
+        $this->bar = 2;
+        $var = new Foo();
+        $this->init($var);
+    }
+
+    public function init(Foo $foo)
+    {
+        $this->foo = $foo;
+    }
+}

tests/Fixtures/Preload/Case010_In.php

@@ -0,0 +1,26 @@
+<?php
+
+use App\Foo;
+
+/**
+ * Constructor using more complex class references
+ */
+class Case010
+{
+    private $baz;
+    private $bazClass;
+    private $bar;
+    private $barClass;
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    private function init()
+    {
+        $this->bar = new Foo\Bar();
+        $this->barClass = Foo\BarClass::class;
+        $this->baz = new \Biz\Baz();
+        $this->bazClass = \Biz\BazClass::class;
+    }
+}

tests/Fixtures/Preload/Case010_Out.php

@@ -0,0 +1,30 @@
+<?php
+
+use App\Foo;
+
+class_exists(Foo\Bar::class);
+class_exists(Foo\BarClass::class);
+class_exists(\Biz\Baz::class);
+class_exists(\Biz\BazClass::class);
+/**
+ * Constructor using more complex class references
+ */
+class Case010
+{
+    private $baz;
+    private $bazClass;
+    private $bar;
+    private $barClass;
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    private function init()
+    {
+        $this->bar = new Foo\Bar();
+        $this->barClass = Foo\BarClass::class;
+        $this->baz = new \Biz\Baz();
+        $this->bazClass = \Biz\BazClass::class;
+    }
+}

tests/Fixtures/Preload/Case011_In.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Return types of public functions
+ */
+class Case011
+{
+    private $foo;
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    public function init(): Foo
+    {
+        $bar = new Bar();
+        return $bar->createFoo();
+    }
+}