Apply dev tools

tattersoftware · Apr 30, 2022 · 80f9b79 · 80f9b79
1 parent 5883c73
commit 80f9b79
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 45 deletions.
diff --git a/composer-unused.php b/composer-unused.php
@@ -9,8 +9,7 @@
 
 return static function (Configuration $config): Configuration {
     return $config
-        // ->addNamedFilter(NamedFilter::fromString('symfony/config'))
-        // ->addPatternFilter(PatternFilter::fromString('/symfony-.*/'))
+        ->addNamedFilter(NamedFilter::fromString('tatter/layouts'))
         ->setAdditionalFilesFor('codeigniter4/framework', [
             ...Glob::glob(__DIR__ . '/vendor/codeigniter4/framework/system/Helpers/*.php'),
         ]);

diff --git a/rector.php b/rector.php
@@ -112,8 +112,8 @@
     $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
     $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
-    $rectorConfig
-        ->ruleWithConfiguration(TypedPropertyRector::class, [
-            TypedPropertyRector::INLINE_PUBLIC => true,
-        ]);
+    // $rectorConfig
+    //     ->ruleWithConfiguration(TypedPropertyRector::class, [
+    //         TypedPropertyRector::INLINE_PUBLIC => true,
+    //     ]);
 };
diff --git a/src/Config/Routes.php b/src/Config/Routes.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace Tatter\Outbox\Config;
+
 if (empty(config('Outbox')->routeTemplates)) {
     return;
 }
-
 // Routes to Email Templates
 $routes->group('emails', ['namespace' => '\Tatter\Outbox\Controllers'], static function ($routes) {
     $routes->get('templates/new/(:segment)', 'Templates::new/$1');

diff --git a/src/Database/Seeds/TemplateSeeder.php b/src/Database/Seeds/TemplateSeeder.php
@@ -2,9 +2,10 @@
 
 namespace Tatter\Outbox\Database\Seeds;
 
+use CodeIgniter\Database\Seeder;
 use Tatter\Outbox\Models\TemplateModel;
 
-class TemplateSeeder extends \CodeIgniter\Database\Seeder
+class TemplateSeeder extends Seeder
 {
     public function run()
     {

diff --git a/src/Exceptions/TemplatesException.php b/src/Exceptions/TemplatesException.php
@@ -2,7 +2,9 @@
 
 namespace Tatter\Outbox\Exceptions;
 
-class TemplatesException extends \RuntimeException
+use RuntimeException;
+
+class TemplatesException extends RuntimeException
 {
     public static function forMissingTemplate(string $name)
     {

diff --git a/src/Language/en/Templates.php b/src/Language/en/Templates.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tatter\Outbox\Language\en;
+
 return [
     'missingTemplate' => 'Unable to find the email template "{0}".',
 ];
diff --git a/tests/entities/EmailTest.php b/tests/entities/EmailTest.php
@@ -16,10 +16,8 @@ final class EmailTest extends OutboxTestCase
 
     /**
      * Record of the email sent during setUp.
-     *
-     * @var Tatter\Outbox\Entities\Email
      */
-    private $entity;
+    private Email $entity;
 
     /**
      * Send an email and fetch the database entry.

diff --git a/tests/entities/ParentTemplateTest.php b/tests/entities/ParentTemplateTest.php
@@ -13,20 +13,9 @@ final class ParentTemplateTest extends OutboxTestCase
 {
     use DatabaseTestTrait;
 
-    /**
-     * @var DOMParser
-     */
-    private $parser;
-
-    /**
-     * @var Template
-     */
-    private $parent;
-
-    /**
-     * @var Template
-     */
-    private $template;
+    private DOMParser $parser;
+    private Template $parent;
+    private Template $template;
 
     protected function setUp(): void
     {

diff --git a/tests/entities/TemplateTest.php b/tests/entities/TemplateTest.php
@@ -10,15 +10,8 @@
  */
 final class TemplateTest extends CIUnitTestCase
 {
-    /**
-     * @var DOMParser
-     */
-    protected $parser;
-
-    /**
-     * @var Template
-     */
-    protected $template;
+    protected DOMParser $parser;
+    protected Template $template;
 
     protected function setUp(): void
     {

diff --git a/tests/models/TemplateModelTest.php b/tests/models/TemplateModelTest.php
@@ -14,10 +14,7 @@ final class TemplateModelTest extends OutboxTestCase
 {
     use DatabaseTestTrait;
 
-    /**
-     * @var Template
-     */
-    private $template;
+    private Template $template;
 
     protected function setUp(): void
     {

diff --git a/tests/unit/ControllerTest.php b/tests/unit/ControllerTest.php
@@ -18,17 +18,13 @@ final class ControllerTest extends OutboxTestCase
 
     /**
      * Our Controller set by the trait
-     *
-     * @var Templates|null
      */
-    protected $controller;
+    protected ?Templates $controller = null;
 
     /**
      * A test Template
-     *
-     * @var Template
      */
-    private $template;
+    private Template $template;
 
     protected function setUp(): void
     {