Merge pull request #2876 from Aerendir/AnnotateThrowables-improve-tests-organization

`AnnotateThrowablesRector`: Improve organization of tests.

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Fixture/custom_exception_in_function_with_docblock.php.inc

@@ -7,9 +7,9 @@ namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixtur
  *
  * @param int $code
  */
-function throwCustomExceptionInFunctionWithDockblock(int $code)
+function throwCustomExceptionInFunctionWithDocblock(int $code)
 {
-    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException('', $code);
+    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException('', $code);
 }
 
 ?>
@@ -22,11 +22,11 @@ namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixtur
  * This is a comment.
  *
  * @param int $code
- * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException
+ * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException
  */
-function throwCustomExceptionInFunctionWithDockblock(int $code)
+function throwCustomExceptionInFunctionWithDocblock(int $code)
 {
-    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException('', $code);
+    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException('', $code);
 }
 
 ?>

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Fixture/custom_exception_in_function_without_docblock.php.inc

@@ -2,9 +2,9 @@
 
 namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixture;
 
-function throwCustomExceptionInFunctionWithoutDockblock()
+function throwCustomExceptionInFunctionWithoutDocblock()
 {
-    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException();
+    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException();
 }
 
 ?>
@@ -14,11 +14,11 @@ function throwCustomExceptionInFunctionWithoutDockblock()
 namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixture;
 
 /**
- * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException
+ * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException
  */
-function throwCustomExceptionInFunctionWithoutDockblock()
+function throwCustomExceptionInFunctionWithoutDocblock()
 {
-    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException();
+    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException();
 }
 
 ?>

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Fixture/custom_exception_in_method_without_docblock.php.inc

@@ -6,7 +6,7 @@ class CustomExceptionInMethodWithoutDocblock
 {
     public function throwException()
     {
-        throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException();
+        throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException();
     }
 }
 
@@ -19,11 +19,11 @@ namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixtur
 class CustomExceptionInMethodWithoutDocblock
 {
     /**
-     * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException
+     * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException
      */
     public function throwException()
     {
-        throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException();
+        throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException();
     }
 }
 

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Fixture/skip_custom_exception_already_annotated_in_function.php.inc

@@ -3,9 +3,9 @@
 namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixture;
 
 /**
- * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException
+ * @throws \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException
  */
 function throwCustomExceptionAlreadyAnnotatedInFunction()
 {
-    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException();
+    throw new \Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException();
 }

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Fixture/skip_custom_imported_exception_already_annotated_in_function.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixture;
 
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException;
 
 /**
  * @throws TheException

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Fixture/skip_custom_imported_exception_already_annotated_in_method.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixture;
 
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException;
 
 class SkipCustomImportedExceptionAlreadyAnnotatedInMethod
 {

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/FixtureTodo/factory_static_method_with_return_dockblock.php.inc

@@ -2,35 +2,11 @@
 
 namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixture;
 
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\ExceptionsFactoryStaticMethodWithReturnDocblock;
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheExceptionTheSecond;
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheExceptionTheThird;
 
-class ExceptionsFactoryStaticMethodWithReturnDockblock
+function throwWithFactoryStaticMethodWithReturnDocblock()
 {
-    /**
+    throw ExceptionsFactoryStaticMethodWithReturnDocblock::createExceptionEccolo(1);
-     * @param int $code
-     *
-     * @return TheException|TheExceptionTheSecond|TheExceptionTheThird|\RuntimeException
-     */
-    public static function createExceptionEccolo(int $code)
-    {
-        switch ($code) {
-            case 1:
-                return new TheException();
-            case 2:
-                return new TheExceptionTheSecond();
-            case 3:
-                return new TheExceptionTheThird();
-            default:
-                return new \RuntimeException();
-        }
-    }
-}
-
-function throwWithFactoryStaticMethodWithReturnDockblock()
-{
-    throw ExceptionsFactoryStaticMethodWithReturnDockblock::createExceptionEccolo(1);
 }
 
 ?>
@@ -39,31 +15,10 @@ function throwWithFactoryStaticMethodWithReturnDockblock()
 
 namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Fixture;
 
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheException;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException;
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheExceptionTheSecond;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheExceptionTheSecond;
-use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\TheExceptionTheThird;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheExceptionTheThird;
-
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\ExceptionsFactoryStaticMethodWithReturnDocblock;
-class ExceptionsFactoryStaticMethodWithReturnDockblock
-{
-    /**
-     * @param int $code
-     *
-     * @return TheException|TheExceptionTheSecond|TheExceptionTheThird|\RuntimeException
-     */
-    public static function createExceptionEccolo(int $code)
-    {
-        switch ($code) {
-            case 1:
-                return new TheException();
-            case 2:
-                return new TheExceptionTheSecond();
-            case 3:
-                return new TheExceptionTheThird();
-            default:
-                return new \RuntimeException();
-        }
-    }
-}
 
 /**
  * @throws TheException
@@ -71,9 +26,9 @@ class ExceptionsFactoryStaticMethodWithReturnDockblock
  * @throws TheExceptionTheThird
  * @throws \RuntimeException
  */
-function throwWithFactoryStaticMethodWithReturnDockblock()
+function throwWithFactoryStaticMethodWithReturnDocblock()
 {
-    throw ExceptionsFactoryStaticMethodWithReturnDockblock::createExceptionEccolo(1);
+    throw ExceptionsFactoryStaticMethodWithReturnDocblock::createExceptionEccolo(1);
 }
 
 ?>

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Source/Exceptions/TheException.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source;
+namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions;
 
 class TheException extends \RuntimeException {
 }

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Source/Exceptions/TheExceptionTheSecond.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source;
+namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions;
 
 class TheExceptionTheSecond extends \RuntimeException {}

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Source/Exceptions/TheExceptionTheThird.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source;
+namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions;
 
 class TheExceptionTheThird extends \RuntimeException {}

rules/coding-style/tests/Rector/Throw_/AnnotateThrowablesRector/Source/ExceptionsFactoryStaticMethodWithReturnDocblock.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source;
+
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheException;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheExceptionTheSecond;
+use Rector\CodingStyle\Tests\Rector\Throw_\AnnotateThrowablesRector\Source\Exceptions\TheExceptionTheThird;
+
+class ExceptionsFactoryStaticMethodWithReturnDocblock
+{
+    /**
+     * @param int $code
+     *
+     * @return TheException|TheExceptionTheSecond|TheExceptionTheThird|\RuntimeException
+     */
+    public static function createExceptionEccolo(int $code)
+    {
+        switch ($code) {
+            case 1:
+                return new TheException();
+            case 2:
+                return new TheExceptionTheSecond();
+            case 3:
+                return new TheExceptionTheThird();
+            default:
+                return new \RuntimeException();
+        }
+    }
+}