add strict_types in UTs

comodojo · Nov 15, 2021 · 293efb1 · 293efb1
1 parent f0a3242
commit 293efb1
Show file tree

Hide file tree

Showing 19 changed files with 222 additions and 205 deletions.
diff --git a/tests/Comodojo/Foundation/Base/ConfigurationLoaderTest.php b/tests/Comodojo/Foundation/Base/ConfigurationLoaderTest.php
@@ -1,4 +1,6 @@
-<?php namespace Comodojo\Foundation\Tests\Base;
+<?php declare(strict_types=1);
+
+namespace Comodojo\Foundation\Tests\Base;
 
 use \Comodojo\Foundation\Base\ConfigurationLoader;
 use \PHPUnit\Framework\TestCase;
@@ -27,5 +29,4 @@ public function testConfiguration()
     {
         $this->assertEquals(300, $this->config->get("routing-table-ttl"));
     }
-
 }
diff --git a/tests/Comodojo/Foundation/Base/ConfigurationTest.php b/tests/Comodojo/Foundation/Base/ConfigurationTest.php
@@ -1,4 +1,6 @@
-<?php namespace Comodojo\Foundation\Tests\Base;
+<?php declare(strict_types=1);
+
+namespace Comodojo\Foundation\Tests\Base;
 
 use \Comodojo\Foundation\Base\Configuration;
 use \PHPUnit\Framework\TestCase;
@@ -24,14 +26,12 @@ protected function setUp(): void
         ];
 
         $this->config = new Configuration($test_values);
-
     }
 
     protected function tearDown(): void
     {
 
         unset($this->config);
-
     }
 
     public function testGetSetDelete()
@@ -52,7 +52,6 @@ public function testGetSetDelete()
         $remove = $this->config->get("t");
 
         $this->assertNull($remove);
-
     }
 
     public function testGetAll()
@@ -64,7 +63,6 @@ public function testGetAll()
 
         $this->assertEquals($config["c"], 42);
         $this->assertEquals($config["a"]["a"], 'lorem');
-
     }
 
     public function testHas()
@@ -75,7 +73,6 @@ public function testHas()
         $this->assertTrue($this->config->isDefined('a'));
 
         $this->assertFalse($this->config->has('z'));
-
     }
 
     public function testWholeDelete()
@@ -84,7 +81,6 @@ public function testWholeDelete()
         $this->assertTrue($result = $this->config->delete());
 
         $this->assertFalse($this->config->isDefined('a'));
-
     }
 
     public function testMerge()
@@ -96,7 +92,6 @@ public function testMerge()
 
         $this->assertFalse($this->config->get('a'));
         $this->assertTrue($this->config->get('b'));
-
     }
 
     public function testSelectiveCrud()
@@ -122,7 +117,6 @@ public function testSelectiveCrud()
         $this->assertArrayNotHasKey('amet', $ac_value);
 
         $this->assertFalse($this->config->has("a.c.amet"));
-
     }
 
     public function testStaticConstructor()
@@ -133,7 +127,5 @@ public function testStaticConstructor()
         $this->assertInstanceOf('\\Comodojo\\Foundation\\Base\\Configuration', $config);
         $this->assertEquals("is", $config->get("this"));
         $this->assertIsArray($config->get("a"));
-
     }
-
 }
diff --git a/tests/Comodojo/Foundation/Base/ParametersTraitTest.php b/tests/Comodojo/Foundation/Base/ParametersTraitTest.php
@@ -1,4 +1,6 @@
-<?php namespace Comodojo\Dispatcher\Tests\Components;
+<?php declare(strict_types=1);
+
+namespace Comodojo\Dispatcher\Tests\Components;
 
 use \Comodojo\Foundation\Base\ParametersTrait;
 use \PHPUnit\Framework\TestCase;
@@ -16,7 +18,6 @@ protected function setUp(): void
     {
 
         $this->set($this->param, $this->value);
-
     }
 
     public function testParameters()
@@ -43,7 +44,5 @@ public function testParameters()
         $params = $this->get();
 
         $this->assertEquals(0, count($params));
-
     }
-
 }
diff --git a/tests/Comodojo/Foundation/Base/VersionTest.php b/tests/Comodojo/Foundation/Base/VersionTest.php
@@ -1,4 +1,6 @@
-<?php namespace Comodojo\Foundation\Tests\Base;
+<?php declare(strict_types=1);
+
+namespace Comodojo\Foundation\Tests\Base;
 
 use Comodojo\Foundation\Tests\Mock\Version;
 use \Comodojo\Foundation\Base\ConfigurationLoader;
@@ -12,9 +14,9 @@ class VersionTest extends TestCase
     protected $name = 'Heart of Gold';
     protected $description = 'The first spacecraft to make use of the Infinite Improbability Drive';
     protected $version = '42';
-    protected $ascii = "/r/n                       _    __         /r/n".
-                       "|_| _  _  ___|_    _ _|_   /__ _  |  _|/r/n".
-                       "| |(/_(_| |  |_   (_) |    \_|(_) | (_|/r/n";
+    protected $ascii = "/r/n                       _    __         /r/n" .
+        "|_| _  _  ___|_    _ _|_   /__ _  |  _|/r/n" .
+        "| |(/_(_| |  |_   (_) |    \_|(_) | (_|/r/n";
 
     protected $template = "{name} + {description} + {version}";
 
@@ -27,14 +29,12 @@ protected function setUp(): void
         $this->config = ConfigurationLoader::load($config_file, [
             'base-path' => $basepath,
         ]);
-
     }
 
     protected function tearDown(): void
     {
 
         unset($this->config);
-
     }
 
     public function testVersion()
@@ -46,7 +46,6 @@ public function testVersion()
         $this->assertEquals($this->description, $version->getDescription());
         $this->assertEquals($this->version, $version->getVersion());
         $this->assertEquals($this->ascii, $version->getAscii());
-
     }
 
     public function testVersionConfigurationOverride()
@@ -56,7 +55,5 @@ public function testVersionConfigurationOverride()
 
         $this->assertEquals('42 is the new black', $version->getName());
         $this->assertEquals($this->description, $version->getDescription());
-
     }
-
 }
diff --git a/tests/Comodojo/Foundation/DataAccess/MockPdModel.php b/tests/Comodojo/Foundation/DataAccess/MockPdModel.php
@@ -1,4 +1,6 @@
-<?php namespace Comodojo\Foundation\Tests\DataAccess;
+<?php declare(strict_types=1);
+
+namespace Comodojo\Foundation\Tests\DataAccess;
 
 use \Comodojo\Foundation\DataAccess\Model;
 
@@ -18,7 +20,8 @@
  * THE SOFTWARE.
  */
 
-class MockPdModel extends Model {
+class MockPdModel extends Model
+{
 
     protected int $mode = self::PROTECTDATA;
 
@@ -27,8 +30,8 @@ class MockPdModel extends Model {
         "answer" => 42
     ];
 
-    public function mockSetRaw($name, $value) {
+    public function mockSetRaw($name, $value)
+    {
         return $this->setRaw($name, $value);
     }
-
 }
diff --git a/tests/Comodojo/Foundation/DataAccess/MockRoModel.php b/tests/Comodojo/Foundation/DataAccess/MockRoModel.php
@@ -1,4 +1,6 @@
-<?php namespace Comodojo\Foundation\Tests\DataAccess;
+<?php declare(strict_types=1);
+
+namespace Comodojo\Foundation\Tests\DataAccess;
 
 use \Comodojo\Foundation\DataAccess\Model;
 
@@ -18,7 +20,8 @@
  * THE SOFTWARE.
  */
 
-class MockRoModel extends Model {
+class MockRoModel extends Model
+{
 
     protected int $mode = self::READONLY;
 
@@ -27,8 +30,8 @@ class MockRoModel extends Model {
         "answer" => 42
     ];
 
-    public function mockSetRaw($name, $value) {
+    public function mockSetRaw($name, $value)
+    {
         return $this->setRaw($name, $value);
     }
-
 }
diff --git a/tests/Comodojo/Foundation/DataAccess/MockRwModel.php b/tests/Comodojo/Foundation/DataAccess/MockRwModel.php
@@ -1,4 +1,6 @@
-<?php namespace Comodojo\Foundation\Tests\DataAccess;
+<?php declare(strict_types=1);
+
+namespace Comodojo\Foundation\Tests\DataAccess;
 
 use \Comodojo\Foundation\DataAccess\Model;
 
@@ -18,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-class MockRwModel extends Model {
+class MockRwModel extends Model
+{
 
     protected int $mode = self::READWRITE;
 
     protected array $data = [
         "question" => "Ultimate Question of Life, The Universe, and Everything",
         "answer" => 42
     ];
-
 }