Merge pull request #8 from localheinz/fix/fixture

Fix: Do not reuse test fixtures
ergebnis · Nov 14, 2018 · 7f1a019 · 7f1a019
2 parents 8c544dc + a73ff85
commit 7f1a019
Show file tree

Hide file tree

Showing 21 changed files with 224 additions and 32 deletions.
diff --git a/test/AutoReview/TestCodeTest.php b/test/AutoReview/TestCodeTest.php
@@ -13,7 +13,7 @@
 
 namespace Localheinz\PHPStan\Rules\Test\AutoReview;
 
-use Localheinz\PHPStan\Rules\Test\Integration;
+use Localheinz\PHPStan\Rules\Test\Fixture;
 use Localheinz\Test\Util\Helper;
 use PHPUnit\Framework;
 
@@ -27,7 +27,8 @@ final class TestCodeTest extends Framework\TestCase
     public function testTestClassesAreAbstractOrFinal(): void
     {
         $this->assertClassesAreAbstractOrFinal(__DIR__ . '/..', [
-            Integration\Classes\Fixture\NeitherAbstractNorFinalClass::class,
+            Fixture\Classes\AbstractOrFinalRule\NeitherAbstractNorFinalClass::class,
+            Fixture\Classes\FinalRule\NeitherAbstractNorFinalClass::class,
         ]);
     }
 }
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/AbstractClass.php b/test/Fixture/Classes/AbstractOrFinalRule/AbstractClass.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+abstract class AbstractClass
+{
+}
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/AbstractClassWithAnonymousClass.php b/test/Fixture/Classes/AbstractOrFinalRule/AbstractClassWithAnonymousClass.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+abstract class AbstractClassWithAnonymousClass
+{
+    public function create()
+    {
+        return new class() {
+            public function __toString(): string
+            {
+                return 'Hmm';
+            }
+        };
+    }
+}
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/ExampleInterface.php b/test/Fixture/Classes/AbstractOrFinalRule/ExampleInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+interface ExampleInterface
+{
+}
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/ExampleTrait.php b/test/Fixture/Classes/AbstractOrFinalRule/ExampleTrait.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+trait ExampleTrait
+{
+}
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/FinalClass.php b/test/Fixture/Classes/AbstractOrFinalRule/FinalClass.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+final class FinalClass
+{
+}
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/FinalClassWithAnonymousClass.php b/test/Fixture/Classes/AbstractOrFinalRule/FinalClassWithAnonymousClass.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+final class FinalClassWithAnonymousClass
+{
+    public function create()
+    {
+        return new class() {
+            public function __toString(): string
+            {
+                return 'Hmm';
+            }
+        };
+    }
+}
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/NeitherAbstractNorFinalClass.php b/test/Fixture/Classes/AbstractOrFinalRule/NeitherAbstractNorFinalClass.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+class NeitherAbstractNorFinalClass
+{
+}
diff --git a/test/Fixture/Classes/AbstractOrFinalRule/TraitWithAnonymousClass.php b/test/Fixture/Classes/AbstractOrFinalRule/TraitWithAnonymousClass.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\AbstractOrFinalRule;
+
+trait TraitWithAnonymousClass
+{
+    public function create()
+    {
+        return new class() {
+            public function __toString(): string
+            {
+                return 'Hmm';
+            }
+        };
+    }
+}
diff --git a/...s/Fixture/script-with-anonymous-class.php → ...FinalRule/script-with-anonymous-class.php b/...s/Fixture/script-with-anonymous-class.php → ...FinalRule/script-with-anonymous-class.php
diff --git a/...gration/Classes/Fixture/AbstractClass.php → ...xture/Classes/FinalRule/AbstractClass.php b/...gration/Classes/Fixture/AbstractClass.php → ...xture/Classes/FinalRule/AbstractClass.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 abstract class AbstractClass
 {

diff --git a/...xture/AbstractClassWithAnonymousClass.php → ...lRule/AbstractClassWithAnonymousClass.php b/...xture/AbstractClassWithAnonymousClass.php → ...lRule/AbstractClassWithAnonymousClass.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 abstract class AbstractClassWithAnonymousClass
 {

diff --git a/...tion/Classes/Fixture/ExampleInterface.php → ...re/Classes/FinalRule/ExampleInterface.php b/...tion/Classes/Fixture/ExampleInterface.php → ...re/Classes/FinalRule/ExampleInterface.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 interface ExampleInterface
 {

diff --git a/...egration/Classes/Fixture/ExampleTrait.php → ...ixture/Classes/FinalRule/ExampleTrait.php b/...egration/Classes/Fixture/ExampleTrait.php → ...ixture/Classes/FinalRule/ExampleTrait.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 trait ExampleTrait
 {

diff --git a/...ntegration/Classes/Fixture/FinalClass.php → .../Fixture/Classes/FinalRule/FinalClass.php b/...ntegration/Classes/Fixture/FinalClass.php → .../Fixture/Classes/FinalRule/FinalClass.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 final class FinalClass
 {

diff --git a/.../Fixture/FinalClassWithAnonymousClass.php → ...inalRule/FinalClassWithAnonymousClass.php b/.../Fixture/FinalClassWithAnonymousClass.php → ...inalRule/FinalClassWithAnonymousClass.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 final class FinalClassWithAnonymousClass
 {

diff --git a/.../Fixture/NeitherAbstractNorFinalClass.php → ...inalRule/NeitherAbstractNorFinalClass.php b/.../Fixture/NeitherAbstractNorFinalClass.php → ...inalRule/NeitherAbstractNorFinalClass.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 class NeitherAbstractNorFinalClass
 {

diff --git a/...asses/Fixture/TraitWithAnonymousClass.php → ...ses/FinalRule/TraitWithAnonymousClass.php b/...asses/Fixture/TraitWithAnonymousClass.php → ...ses/FinalRule/TraitWithAnonymousClass.php
@@ -11,7 +11,7 @@
  * @see https://github.com/localheinz/phpstan-rules
  */
 
-namespace Localheinz\PHPStan\Rules\Test\Integration\Classes\Fixture;
+namespace Localheinz\PHPStan\Rules\Test\Fixture\Classes\FinalRule;
 
 trait TraitWithAnonymousClass
 {

diff --git a/test/Fixture/Classes/FinalRule/script-with-anonymous-class.php b/test/Fixture/Classes/FinalRule/script-with-anonymous-class.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2018 Andreas Möller.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/localheinz/phpstan-rules
+ */
+$foo = new class() {
+    public function __toString(): string
+    {
+        return 'Hmm';
+    }
+};
diff --git a/test/Integration/Classes/AbstractOrFinalRuleTest.php b/test/Integration/Classes/AbstractOrFinalRuleTest.php
@@ -14,6 +14,7 @@
 namespace Localheinz\PHPStan\Rules\Test\Integration\Classes;
 
 use Localheinz\PHPStan\Rules\Classes\AbstractOrFinalRule;
+use Localheinz\PHPStan\Rules\Test\Fixture;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 
@@ -26,8 +27,8 @@ public function testNotClasses(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixture/ExampleInterface.php',
-                __DIR__ . '/Fixture/ExampleTrait.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/ExampleInterface.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/ExampleTrait.php',
             ],
             []
         );
@@ -37,8 +38,8 @@ public function testAbstractOrFinalClasses(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixture/AbstractClass.php',
-                __DIR__ . '/Fixture/FinalClass.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/AbstractClass.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/FinalClass.php',
             ],
             []
         );
@@ -48,10 +49,10 @@ public function testConstructsWithAnonymousClasses(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixture/AbstractClassWithAnonymousClass.php',
-                __DIR__ . '/Fixture/FinalClassWithAnonymousClass.php',
-                __DIR__ . '/Fixture/script-with-anonymous-class.php',
-                __DIR__ . '/Fixture/TraitWithAnonymousClass.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/AbstractClassWithAnonymousClass.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/FinalClassWithAnonymousClass.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/script-with-anonymous-class.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/TraitWithAnonymousClass.php',
             ],
             []
         );
@@ -61,13 +62,13 @@ public function testNeitherAbstractNorFinalClass(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixture/NeitherAbstractNorFinalClass.php',
+                __DIR__ . '/../../Fixture/Classes/AbstractOrFinalRule/NeitherAbstractNorFinalClass.php',
             ],
             [
                 [
                     \sprintf(
                         'Class "%s" should be marked as abstract or final.',
-                        Fixture\NeitherAbstractNorFinalClass::class
+                        Fixture\Classes\AbstractOrFinalRule\NeitherAbstractNorFinalClass::class
                     ),
                     16,
                 ],