feat: typed properties defaults to true

paul-thebaud · Apr 28, 2022 · 4a94e9a · 4a94e9a
1 parent 9b52ce9
commit 4a94e9a
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 205 deletions.
diff --git a/config/phpunitgen.php b/config/phpunitgen.php
@@ -75,7 +75,7 @@
      | Tells if the test class properties should be typed or documented.
      |--------------------------------------------------------------------------
      */
-    'testClassTypedProperties' => false,
+    'testClassTypedProperties' => true,
 
     /*
      |--------------------------------------------------------------------------

diff --git a/tests/Feature/Generators/Basic/BasicWithTypedPropertiesTestGeneratorTest.php b/tests/Feature/Generators/Basic/BasicWithTypedPropertiesTestGeneratorTest.php
@@ -14,9 +14,9 @@ class BasicWithTypedPropertiesTestGeneratorTest extends AbstractGeneratorTester
 {
     public function testItGeneratesTests(): void
     {
-        $this->assertGeneratedIs('BasicWithTypedProperties/Rendered', 'BasicWithTypedProperties/Source', [
+        $this->assertGeneratedIs('BasicWithoutTypedProperties/Rendered', 'BasicWithoutTypedProperties/Source', [
             'implementations'          => BasicTestGenerator::implementations(),
-            'testClassTypedProperties' => true,
+            'testClassTypedProperties' => false,
         ]);
     }
 }
diff --git a/tests/Feature/Resources/Generators/Basic/Rendered.stub b/tests/Feature/Resources/Generators/Basic/Rendered.stub
@@ -17,20 +17,11 @@ use Tests\TestCase;
  */
 final class PersonTest extends TestCase
 {
-    /**
-     * @var Person
-     */
-    private $person;
+    private Person $person;
 
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
-    /**
-     * @var Work|Mock
-     */
-    private $work;
+    private Work|Mock $work;
 
     /**
      * {@inheritdoc}

diff --git a/...rs/BasicWithTypedProperties/Rendered.stub → ...BasicWithoutTypedProperties/Rendered.stub b/...rs/BasicWithTypedProperties/Rendered.stub → ...BasicWithoutTypedProperties/Rendered.stub
@@ -17,11 +17,20 @@ use Tests\TestCase;
  */
 final class PersonTest extends TestCase
 {
-    private Person $person;
+    /**
+     * @var Person
+     */
+    private $person;
 
-    private string $name;
+    /**
+     * @var string
+     */
+    private $name;
 
-    private Work|Mock $work;
+    /**
+     * @var Work|Mock
+     */
+    private $work;
 
     /**
      * {@inheritdoc}

diff --git a/...tors/BasicWithTypedProperties/Source.stub → ...s/BasicWithoutTypedProperties/Source.stub b/...tors/BasicWithTypedProperties/Source.stub → ...s/BasicWithoutTypedProperties/Source.stub
diff --git a/tests/Feature/Resources/Generators/Laravel/ApiController/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/ApiController/Rendered.stub
@@ -16,15 +16,9 @@ use Tests\TestCase;
  */
 final class UserControllerTest extends TestCase
 {
-    /**
-     * @var UserController
-     */
-    private $userController;
+    private UserController $userController;
 
-    /**
-     * @var UserService|Mock
-     */
-    private $userService;
+    private UserService|Mock $userService;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Channel/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Channel/Rendered.stub
@@ -17,20 +17,11 @@ use Tests\TestCase;
  */
 final class EventChannelTest extends TestCase
 {
-    /**
-     * @var EventChannel
-     */
-    private $eventChannel;
+    private EventChannel $eventChannel;
 
-    /**
-     * @var EventService|Mock
-     */
-    private $eventService;
+    private EventService|Mock $eventService;
 
-    /**
-     * @var User
-     */
-    private $user;
+    private User $user;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Command/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Command/Rendered.stub
@@ -16,15 +16,9 @@ use Tests\TestCase;
  */
 final class PruneUsersCommandTest extends TestCase
 {
-    /**
-     * @var PruneUsersCommand
-     */
-    private $pruneUsersCommand;
+    private PruneUsersCommand $pruneUsersCommand;
 
-    /**
-     * @var UserService|Mock
-     */
-    private $userService;
+    private UserService|Mock $userService;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Controller/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Controller/Rendered.stub
@@ -16,15 +16,9 @@ use Tests\TestCase;
  */
 final class UserControllerTest extends TestCase
 {
-    /**
-     * @var UserController
-     */
-    private $userController;
+    private UserController $userController;
 
-    /**
-     * @var UserService|Mock
-     */
-    private $userService;
+    private UserService|Mock $userService;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Job/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Job/Rendered.stub
@@ -17,15 +17,9 @@ use Tests\TestCase;
  */
 final class SendWelcomeMessageJobTest extends TestCase
 {
-    /**
-     * @var SendWelcomeMessageJob
-     */
-    private $sendWelcomeMessageJob;
+    private SendWelcomeMessageJob $sendWelcomeMessageJob;
 
-    /**
-     * @var User|Mock
-     */
-    private $user;
+    private User|Mock $user;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Listener/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Listener/Rendered.stub
@@ -17,15 +17,9 @@ use Tests\TestCase;
  */
 final class NewUserListenerTest extends TestCase
 {
-    /**
-     * @var NewUserListener
-     */
-    private $newUserListener;
+    private NewUserListener $newUserListener;
 
-    /**
-     * @var UserService|Mock
-     */
-    private $userService;
+    private UserService|Mock $userService;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Policy/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Policy/Rendered.stub
@@ -18,20 +18,11 @@ use Tests\TestCase;
  */
 final class ProductPolicyTest extends TestCase
 {
-    /**
-     * @var ProductPolicy
-     */
-    private $productPolicy;
+    private ProductPolicy $productPolicy;
 
-    /**
-     * @var RoleService|Mock
-     */
-    private $roleService;
+    private RoleService|Mock $roleService;
 
-    /**
-     * @var User
-     */
-    private $user;
+    private User $user;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Resource/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Resource/Rendered.stub
@@ -17,15 +17,9 @@ use Tests\TestCase;
  */
 final class ProductResourceTest extends TestCase
 {
-    /**
-     * @var ProductResource
-     */
-    private $productResource;
+    private ProductResource $productResource;
 
-    /**
-     * @var ProductService|Mock
-     */
-    private $productService;
+    private ProductService|Mock $productService;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Laravel/Rule/Rendered.stub b/tests/Feature/Resources/Generators/Laravel/Rule/Rendered.stub
@@ -16,15 +16,9 @@ use Tests\TestCase;
  */
 final class ProductRuleTest extends TestCase
 {
-    /**
-     * @var ProductRule
-     */
-    private $productRule;
+    private ProductRule $productRule;
 
-    /**
-     * @var ProductService|Mock
-     */
-    private $productService;
+    private ProductService|Mock $productService;
 
     /**
      * {@inheritdoc}

diff --git a/tests/Feature/Resources/Generators/Php8Features/Rendered.stub b/tests/Feature/Resources/Generators/Php8Features/Rendered.stub
@@ -18,30 +18,15 @@ use Tests\TestCase;
  */
 final class PersonTest extends TestCase
 {
-    /**
-     * @var Person
-     */
-    private $person;
+    private Person $person;
 
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
-    /**
-     * @var Work|Mock
-     */
-    private $work;
+    private Work|Mock $work;
 
-    /**
-     * @var Post|Mock
-     */
-    private $foo;
+    private Post|Mock $foo;
 
-    /**
-     * @var Post|Mock
-     */
-    private $bar;
+    private Post|Mock $bar;
 
     /**
      * {@inheritdoc}