pint & strict types 🔧

michael-rubel · Jul 27, 2023 · 796a489 · 796a489
1 parent c601df5
commit 796a489
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 12 deletions.
diff --git a/config/formatters.php b/config/formatters.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
 
     /*

diff --git a/pint.json b/pint.json
@@ -2,6 +2,7 @@
   "preset": "laravel",
   "rules": {
     "phpdoc_separation": false,
+    "declare_strict_types": true,
     "concat_space": {
       "spacing": "one"
     },

diff --git a/src/Collection/DateFormatter.php b/src/Collection/DateFormatter.php
@@ -17,8 +17,8 @@ class DateFormatter implements Formatter
      */
     public function __construct(
         public string|null|CarbonInterface $date = null,
-        public string|null $timezone = null,
-        public string|null $date_format = 'Y-m-d',
+        public ?string $timezone = null,
+        public ?string $date_format = 'Y-m-d',
     ) {
         if (empty($this->date)) {
             $this->date = null;

diff --git a/src/Collection/DateTimeFormatter.php b/src/Collection/DateTimeFormatter.php
@@ -17,8 +17,8 @@ class DateTimeFormatter implements Formatter
      */
     public function __construct(
         public string|null|CarbonInterface $datetime = null,
-        public string|null $timezone = null,
-        public string|null $datetime_format = 'Y-m-d H:i',
+        public ?string $timezone = null,
+        public ?string $datetime_format = 'Y-m-d H:i',
     ) {
         if (empty($this->datetime)) {
             $this->datetime = null;

diff --git a/tests/DateFormatterTest.php b/tests/DateFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use Carbon\Carbon;

diff --git a/tests/DateTimeFormatterTest.php b/tests/DateTimeFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use Carbon\Carbon;

diff --git a/tests/FormatterBindingsTest.php b/tests/FormatterBindingsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use Illuminate\Support\Facades\File;

diff --git a/tests/FormatterConfigTest.php b/tests/FormatterConfigTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use Illuminate\Filesystem\Filesystem;
@@ -13,8 +15,8 @@ public function testConfigSettingsAndProviderFiles()
     {
         $mock = $this->partialMock(Filesystem::class, function (MockInterface $mock) {
             $mock->shouldReceive('isDirectory')
-                 ->once()
-                 ->andReturnFalse();
+                ->once()
+                ->andReturnFalse();
         });
 
         app()->instance('files', $mock);

diff --git a/tests/FullNameFormatterTest.php b/tests/FullNameFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use MichaelRubel\Formatters\Collection\FullNameFormatter;

diff --git a/tests/LocaleNumberFormatterTest.php b/tests/LocaleNumberFormatterTest.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use MichaelRubel\Formatters\Collection\LocaleNumberFormatter;
-use MichaelRubel\Formatters\Collection\TaxNumberFormatter;
 
 class LocaleNumberFormatterTest extends TestCase
 {

diff --git a/tests/MakeFormatterCommandTest.php b/tests/MakeFormatterCommandTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use Illuminate\Support\Facades\File;

diff --git a/tests/MaskStringFormatterTest.php b/tests/MaskStringFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use MichaelRubel\Formatters\Collection\MaskStringFormatter;
@@ -59,11 +61,11 @@ public function testCanExtendFormatterBinding()
             $formatter->length    = -5;
             $formatter->encoding  = 'KOI8-U';
 
-            $this->assertStringContainsString('[email protected]', $formatter->string);
-            $this->assertStringContainsString('%', $formatter->character);
-            $this->assertStringContainsString(5, $formatter->index);
-            $this->assertStringContainsString(-5, $formatter->length);
-            $this->assertStringContainsString('KOI8-U', $formatter->encoding);
+            $this->assertSame('[email protected]', $formatter->string);
+            $this->assertSame('%', $formatter->character);
+            $this->assertSame(5, $formatter->index);
+            $this->assertSame(-5, $formatter->length);
+            $this->assertSame('KOI8-U', $formatter->encoding);
 
             return $formatter;
         });

diff --git a/tests/NameFormatterTest.php b/tests/NameFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use MichaelRubel\Formatters\Collection\NameFormatter;

diff --git a/tests/TableColumnFormatterTest.php b/tests/TableColumnFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use MichaelRubel\Formatters\Collection\TableColumnFormatter;

diff --git a/tests/TaxNumberFormatterTest.php b/tests/TaxNumberFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use MichaelRubel\Formatters\Collection\TaxNumberFormatter;

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MichaelRubel\Formatters\Tests;
 
 use MichaelRubel\Formatters\FormatterServiceProvider;