fix code and tests after changes

Config/OptionsTrait.php

@@ -71,11 +71,11 @@ trait OptionsTrait
     public function setOptions(array $pair, bool $overwrite = true) : bool
     {
         if ($overwrite) {
+            $this->options = $pair + $this->options;
+        } else {
             $this->options += $pair;
-
-            return true;
         }
 
-        return false;
+        return true;
     }
 }

Module/ModuleAbstract.php

@@ -96,7 +96,7 @@ abstract class ModuleAbstract
     /**
      * Application instance.
      *
-     * @var \phpOMS\ApplicationAbstract
+     * @var null|\phpOMS\ApplicationAbstract
      * @since 1.0.0
      */
     protected $app = null;
@@ -104,11 +104,11 @@ abstract class ModuleAbstract
     /**
      * Constructor.
      *
-     * @param ApplicationAbstract $app Application instance
+     * @param null|ApplicationAbstract $app Application instance
      *
      * @since  1.0.0
      */
-    public function __construct(ApplicationAbstract $app)
+    public function __construct(ApplicationAbstract $app = null)
     {
         $this->app = $app;
     }

Views/ViewAbstract.php

@@ -179,7 +179,7 @@ abstract class ViewAbstract implements RenderableInterface
      *
      * @since  1.0.0
      */
-    public function addView(string $id, View $view, int $order = 0, bool $overwrite = true) : bool
+    public function addView(string $id, View $view, int $order = 0, bool $overwrite = false) : bool
     {
         if ($overwrite || !isset($this->views[$id])) {
             $this->views[$id] = $view;

tests/Business/Finance/FinanceFormulasTest.php

@@ -262,7 +262,7 @@ class FinanceFormulasTest extends \PHPUnit\Framework\TestCase
         $C = \round(FinanceFormulas::getCompoundInterest($P, $r, $t), 2);
 
         self::assertEquals(\round($expected, 2), $C);
-        self::assertTrue(\abs($P - FinanceFormulas::getPrincipalOfCompundInterest($C, $r, $t)) < 0.1);
+        self::assertEqualsWithDelta($P, FinanceFormulas::getPrincipalOfCompundInterest($C, $r, $t), 0.1);
         self::assertEquals($t, (int) \round(FinanceFormulas::getPeriodsOfCompundInterest($P, $C, $r), 0));
     }
 
@@ -281,8 +281,8 @@ class FinanceFormulasTest extends \PHPUnit\Framework\TestCase
 
         self::assertEquals(\round($expected, 2), $C);
         self::assertEquals(\round($P, 2), \round(FinanceFormulas::getPrincipalOfContinuousCompounding($C, $r, $t), 2));
-        self::assertTrue(\abs($t - FinanceFormulas::getPeriodsOfContinuousCompounding($P, $C, $r)) < 0.01);
+        self::assertEqualsWithDelta($t, FinanceFormulas::getPeriodsOfContinuousCompounding($P, $C, $r), 0.01);
-        self::assertTrue(\abs($r - FinanceFormulas::getRateOfContinuousCompounding($P, $C, $t)) < 0.01);
+        self::assertEqualsWithDelta($r, FinanceFormulas::getRateOfContinuousCompounding($P, $C, $t), 0.01);
     }
 
     /**
@@ -296,9 +296,9 @@ class FinanceFormulasTest extends \PHPUnit\Framework\TestCase
 
         $I = $P * $r * $t;
 
-        self::assertTrue(\abs($I - FinanceFormulas::getSimpleInterest($P, $r, $t)) < 0.01);
+        self::assertEqualsWithDelta($I, FinanceFormulas::getSimpleInterest($P, $r, $t), 0.01);
-        self::assertTrue(\abs($P - FinanceFormulas::getSimpleInterestPrincipal($I, $r, $t)) < 0.01);
+        self::assertEqualsWithDelta($P, FinanceFormulas::getSimpleInterestPrincipal($I, $r, $t), 0.01);
-        self::assertTrue(\abs($r - FinanceFormulas::getSimpleInterestRate($I, $P, $t)) < 0.01);
+        self::assertEqualsWithDelta($r, FinanceFormulas::getSimpleInterestRate($I, $P, $t), 0.01);
         self::assertEquals($t, FinanceFormulas::getSimpleInterestTime($I, $P, $r));
     }
 
@@ -311,7 +311,7 @@ class FinanceFormulasTest extends \PHPUnit\Framework\TestCase
         $r  = 0.05;
         $CF = 1000;
 
-        self::assertTrue(\abs(5.896 - FinanceFormulas::getDiscountedPaybackPeriod($CF, $O1, $r)) < 0.01);
+        self::assertEqualsWithDelta(5.896, FinanceFormulas::getDiscountedPaybackPeriod($CF, $O1, $r), 0.01);
     }
 
     /**
@@ -321,8 +321,8 @@ class FinanceFormulasTest extends \PHPUnit\Framework\TestCase
     {
         $r = 0.05;
 
-        self::assertTrue(\abs(14.207 - FinanceFormulas::getDoublingTime($r)) < 0.01);
+        self::assertEqualsWithDelta(14.207, FinanceFormulas::getDoublingTime($r), 0.01);
-        self::assertTrue(\abs($r - FinanceFormulas::getDoublingRate(14.207)) < 0.01);
+        self::assertEqualsWithDelta($r, FinanceFormulas::getDoublingRate(14.207), 0.01);
     }
 
     /**
@@ -333,7 +333,7 @@ class FinanceFormulasTest extends \PHPUnit\Framework\TestCase
         $r = 0.05;
 
         self::assertEqualsWithDelta(13.863, FinanceFormulas::getDoublingTimeContinuousCompounding($r), 0.01);
-        self::assertEqualsWithDelta(\abs($r - FinanceFormulas::getDoublingTimeContinuousCompounding(13.863)) < 0.01);
+        self::assertEqualsWithDelta($r, FinanceFormulas::getDoublingTimeContinuousCompounding(13.863), 0.01);
     }
 
     public function testEquivalentAnnualAnnuity() : void

tests/Config/OptionsTraitTest.php

@@ -67,7 +67,7 @@ class OptionsTraitTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('value3', $class->getOption('a'));
 
         self::assertTrue($class->setOptions(['b' => 2, 'c' => '3'], true));
-        self::assertFalse($class->setOptions(['b' => 4, 'c' => '5'], false));
+        self::assertTrue($class->setOptions(['b' => 4, 'c' => '5'], false)); // always returns true
         self::assertTrue($class->exists('a'));
         self::assertTrue($class->exists('b'));
         self::assertTrue($class->exists('c'));

tests/Router/RouterTest.php

@@ -43,7 +43,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
         $router = new Router();
         self::assertEmpty(
             $router->route(
-                (new Request(new Http()))->getUri()->getRoute()
+                (new Request(new Http('')))->getUri()->getRoute()
             )
         );
     }
@@ -68,7 +68,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
             $router->route(
                 (new Request(
                     new Http('http://test.com/backend/admin/settings/general/something?test')
-                ))->getUri()->getRoute(), RouteVerb::PUT)
+                ))->getUri()->getRoute(), null, RouteVerb::PUT)
         );
 
         self::assertNotEquals(
@@ -86,7 +86,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
             $router->route(
                 (new Request(
                     new Http('http://test.com/backends/admin/settings/general/something?test')
-                ))->getUri()->getRoute(), RouteVerb::ANY)
+                ))->getUri()->getRoute(), null, RouteVerb::ANY)
         );
 
         self::assertEquals(
@@ -94,14 +94,14 @@ class RouterTest extends \PHPUnit\Framework\TestCase
             $router->route(
                 (new Request(
                     new Http('http://test.com/backends/admin/settings/general/something?test')
-                ))->getUri()->getRoute(), RouteVerb::SET)
+                ))->getUri()->getRoute(), null, RouteVerb::SET)
         );
 
         self::assertEquals(
             [['dest' => 'Controller:test']],
             $router->route(
                 (new Request(
-                    new Http('http://test.com/backends/admin/settings/general/something?test')))->getUri()->getRoute(), RouteVerb::GET)
+                    new Http('http://test.com/backends/admin/settings/general/something?test')))->getUri()->getRoute(), null, RouteVerb::GET)
         );
     }
 
@@ -153,6 +153,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $router->route(
                 (new Request(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
+                null,
                 RouteVerb::GET,
                 null,
                 null,
@@ -202,6 +203,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $router->route(
                 (new Request(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
+                null,
                 RouteVerb::GET,
                 null,
                 null,

tests/Uri/HttpTest.php

@@ -86,13 +86,13 @@ class HttpTest extends \PHPUnit\Framework\TestCase
     public function testSubdmonain() : void
     {
         $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
-        self::assertEquals('www', $obj->getSubmdomain());
+        self::assertEquals('www', $obj->getSubdomain());
 
         $obj = new Http('https://google.com/test/path.php?para1=abc&para2=2#frag');
-        self::assertEquals('', $obj->getSubmdomain());
+        self::assertEquals('', $obj->getSubdomain());
 
         $obj = new Http('https://test.www.google.com/test/path.php?para1=abc&para2=2#frag');
-        self::assertEquals('test.www', $obj->getSubmdomain());
+        self::assertEquals('test.www', $obj->getSubdomain());
     }
 
     public function testQueryData() : void

tests/Views/ViewTest.php

@@ -121,6 +121,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
         self::assertTrue($view->addView('test', $tView));
         self::assertTrue($view->addView('test', $tView, 0, true));
         self::assertFalse($view->addView('test', $tView));
+        self::assertFalse($view->addView('test', $tView, 0, false));
     }
 
     public function testRender() : void