template fixes + bug fixes + style fixes

Karaka-Management · Apr 2, 2024 · ab3e8e0 · ab3e8e0
1 parent 61f44bc
commit ab3e8e0
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 48 deletions.
diff --git a/Algorithm/Rating/TrueSkill.php b/Algorithm/Rating/TrueSkill.php
@@ -226,37 +226,22 @@ private function wDraw(float $t, float $epsilon) : float
                 / (NormalDistribution::getCdf($epsilon - $tAbs, 0.0, 1.0) - NormalDistribution::getCdf(-$epsilon - $tAbs, 0.0, 1.0));
     }
 
-    /**
-     *
-     */
     private function buildRatingLayer() : void
     {
     }
 
-    /**
-     *
-     */
     private function buildPerformanceLayer() : void
     {
     }
 
-    /**
-     *
-     */
     private function buildTeamPerformanceLayer() : void
     {
     }
 
-    /**
-     *
-     */
     private function buildTruncLayer() : void
     {
     }
 
-    /**
-     *
-     */
     private function factorGraphBuilders()
     {
         // Rating layer
@@ -275,9 +260,6 @@ private function factorGraphBuilders()
         ];
     }
 
-    /**
-     *
-     */
     public function rating() : void
     {
         // Start values

diff --git a/Business/Recommendation/BayesianPersonalizedRanking.php b/Business/Recommendation/BayesianPersonalizedRanking.php
@@ -40,12 +40,12 @@ final class BayesianPersonalizedRanking
     /**
      * Constructor.
      *
-     * @param int   $numFactors     Determines the dimensionality of the latent factor space.
-     * @param float $learningRate   Controls the step size for updating the latent factors during optimization.
-     * @param float $regularization Prevents over-fitting by adding a penalty for large parameter values.
+     * @param int   $numFactors     determines the dimensionality of the latent factor space
+     * @param float $learningRate   controls the step size for updating the latent factors during optimization
+     * @param float $regularization prevents over-fitting by adding a penalty for large parameter values
      *
      * @since 1.0.0
-    */
+     */
     public function __construct(int $numFactors, float $learningRate, float $regularization)
     {
         $this->numFactors     = $numFactors;

diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
@@ -1336,4 +1336,17 @@ public function hasManyRelations(object $obj) : bool
             }
         }
     }
+
+    public function paginate(string $member, string $ptype, mixed $offset) : self
+    {
+        if ($ptype === 'p') {
+            $this->where($member, $offset ?? 0, '<');
+        } elseif ($ptype === 'n') {
+            $this->where($member, $offset ?? 0, '>');
+        } else {
+            $this->where($member, 0, '>');
+        }
+
+        return $this;
+    }
 }
diff --git a/Math/Matrix/Matrix.php b/Math/Matrix/Matrix.php
@@ -852,8 +852,8 @@ public function exp() : self
         }
 
         $eig = new EigenvalueDecomposition($this);
-        $v = $eig->getV();
-        $d = $eig->getD();
+        $v   = $eig->getV();
+        $d   = $eig->getD();
 
         $vInv = $v->inverse();
 

diff --git a/Uri/UriFactory.php b/Uri/UriFactory.php
@@ -228,6 +228,12 @@ private static function unique(string $url) : string
             );
         */
 
+        // @feature Implement whitelisting/blacklisting for {?}
+        //      Currently it copies all parameters
+        //      Ideally you could use
+        //          {?+para1,para2} for whitelisting
+        //          {?-para1,para2} for blacklisting
+
         if (\stripos($url, '?') === false && ($pos = \stripos($url, '&')) !== false) {
             $url = \substr_replace($url, '?', $pos, 1);
         }

diff --git a/Utils/Barcode/TwoDAbstract.php b/Utils/Barcode/TwoDAbstract.php
@@ -57,6 +57,10 @@ abstract public function generateCodeArray() : array;
      */
     protected function createImage(array $codeArray) : mixed
     {
+        if (empty($codeArray)) {
+            return null;
+        }
+
         $dimensions = $this->calculateDimensions($codeArray);
         $image      = \imagecreate($dimensions['width'], $dimensions['height']);
 
@@ -115,6 +119,13 @@ protected function createImage(array $codeArray) : mixed
      */
     private function calculateDimensions(array $codeArray) : array
     {
+        if (empty($codeArray)) {
+            return [
+                'width'  => 0,
+                'height' => 0,
+            ];
+        }
+
         $matrixDimension = \max(\count($codeArray), \count(\reset($codeArray)));
         $imageDimension  = \max($this->dimension['width'], $this->dimension['width']);
 

diff --git a/Utils/ColorUtils.php b/Utils/ColorUtils.php
@@ -110,9 +110,9 @@ public static function colorDistance(array $rgb1, array $rgb2) : float
     public static function approximateColorDistance(array $rgb1, array $rgb2) : float
     {
         $rMean = (int) (($rgb1['r'] + $rgb2['r']) / 2);
-        $r = ($rgb2['r'] - $rgb1['r']);
-        $g = ($rgb2['g'] - $rgb1['g']);
-        $b = ($rgb2['b'] - $rgb1['b']);
+        $r     = ($rgb2['r'] - $rgb1['r']);
+        $g     = ($rgb2['g'] - $rgb1['g']);
+        $b     = ($rgb2['b'] - $rgb1['b']);
 
         return \sqrt(
             (((512 + $rMean) * $r * $r) >> 8)

diff --git a/Utils/Parser/Markdown/Markdown.php b/Utils/Parser/Markdown/Markdown.php
@@ -4576,7 +4576,7 @@ protected function element(array $element) : string
         }
 
         $permitRawHtml = false;
-        $text = null;
+        $text          = null;
 
         if (isset($element['text'])) {
             $text = $element['text'];

diff --git a/tests/DataStorage/Database/DataMapperAbstractTest.php b/tests/DataStorage/Database/DataMapperAbstractTest.php
@@ -288,7 +288,7 @@ public function testGetRaw() : void
     public function testGetAll() : void
     {
         BaseModelMapper::create()->execute($this->model);
-        self::assertCount(1, BaseModelMapper::getAll()->execute());
+        self::assertCount(1, BaseModelMapper::getAll()->executeGetArray());
     }
 
     public function testGetYield() : void
@@ -303,7 +303,7 @@ public function testGetYield() : void
     public function testGetFor() : void
     {
         $id  = BaseModelMapper::create()->execute($this->model);
-        $for = ManyToManyDirectModelMapper::getAll()->where('to', $id)->execute();
+        $for = ManyToManyDirectModelMapper::getAll()->where('to', $id)->executeGetArray();
 
         self::assertEquals(
             \reset($this->model->hasManyDirect)->string,
@@ -337,7 +337,7 @@ public function testGetNewest() : void
         $model2->datetime = new \DateTime('now');
         $id2              = BaseModelMapper::create()->execute($model2);
 
-        $newest = BaseModelMapper::getAll()->sort('id', OrderType::DESC)->limit(1)->execute();
+        $newest = BaseModelMapper::getAll()->sort('id', OrderType::DESC)->limit(1)->executeGetArray();
         self::assertEquals($id2, \reset($newest)->id);
     }
 
@@ -393,7 +393,7 @@ public function testFind() : void
         BaseModelMapper::create()->execute($model2);
         BaseModelMapper::create()->execute($model3);
 
-        $found = BaseModelMapper::getAll()->where('string', '%sir%' , 'LIKE')->execute();
+        $found = BaseModelMapper::getAll()->where('string', '%sir%' , 'LIKE')->executeGetArray();
         self::assertCount(2, $found);
         self::assertEquals($model2->string, \reset($found)->string);
         self::assertEquals($model3->string, \end($found)->string);
@@ -455,7 +455,7 @@ public function testWithConditional() : void
         $cond3->base     = $id2;
         ConditionalMapper::create()->execute($cond3);
 
-        $found = BaseModelMapper::getAll()->with('conditional')->where('conditional/language', 'de')->execute();
+        $found = BaseModelMapper::getAll()->with('conditional')->where('conditional/language', 'de')->executeGetArray();
         self::assertCount(2, $found);
         self::assertEquals($model1->string, \reset($found)->string);
         self::assertEquals($model2->string, \end($found)->string);

diff --git a/tests/Module/ModuleAbstractTest.php b/tests/Module/ModuleAbstractTest.php
@@ -407,7 +407,7 @@ public function testModelCreate() : void
         $this->dbSetup();
 
         $this->module->create();
-        self::assertCount(1, BaseModelMapper::getAll()->execute());
+        self::assertCount(1, BaseModelMapper::getAll()->executeGetArray());
 
         $this->dbTeardown();
     }
@@ -419,7 +419,7 @@ public function testModelsCreate() : void
         $this->dbSetup();
 
         $this->module->createMultiple();
-        self::assertCount(2, BaseModelMapper::getAll()->execute());
+        self::assertCount(2, BaseModelMapper::getAll()->executeGetArray());
 
         $this->dbTeardown();
     }
@@ -447,7 +447,7 @@ public function testModelDelete() : void
         $this->module->create();
         self::assertCount(1, BaseModelMapper::getAll()->execute());
         $this->module->delete();
-        self::assertCount(0, BaseModelMapper::getAll()->execute());
+        self::assertCount(0, BaseModelMapper::getAll()->executeGetArray());
 
         $this->dbTeardown();
     }

diff --git a/tests/Stdlib/Base/AddressTest.php b/tests/Stdlib/Base/AddressTest.php
@@ -15,7 +15,6 @@
 namespace phpOMS\tests\Stdlib\Base;
 
 use phpOMS\Stdlib\Base\Address;
-use phpOMS\Stdlib\Base\Location;
 
 /**
  * @internal
@@ -39,8 +38,8 @@ protected function setUp() : void
     public function testDefault() : void
     {
         $expected = [
-            'fao'       => '',
-            'name'       => '',
+            'fao'     => '',
+            'name'    => '',
             'postal'  => '',
             'city'    => '',
             'country' => 'XX',
@@ -69,8 +68,8 @@ public function testFAOInputOutput() : void
     public function testArray() : void
     {
         $expected = [
-            'fao'       => 'fao',
-            'name'  => '',
+            'fao'     => 'fao',
+            'name'    => '',
             'postal'  => '',
             'city'    => '',
             'country' => 'XX',
@@ -80,7 +79,7 @@ public function testArray() : void
             'lon'     => 0.0,
         ];
 
-        $this->address->fao       = 'fao';
+        $this->address->fao = 'fao';
 
         self::assertEquals($expected, $this->address->toArray());
     }
@@ -90,8 +89,8 @@ public function testArray() : void
     public function testJsonSerialize() : void
     {
         $expected = [
-            'fao'       => 'fao',
-            'name'  => '',
+            'fao'     => 'fao',
+            'name'    => '',
             'postal'  => '',
             'city'    => '',
             'country' => 'XX',
@@ -101,7 +100,7 @@ public function testJsonSerialize() : void
             'lon'     => 0.0,
         ];
 
-        $this->address->fao       = 'fao';
+        $this->address->fao = 'fao';
 
         self::assertEquals($expected, $this->address->jsonSerialize());
     }

diff --git a/tests/Stdlib/Graph/NodeTest.php b/tests/Stdlib/Graph/NodeTest.php
@@ -115,7 +115,6 @@ public function testNodeRelation() : void
     }
 
     /**
-     *
      * @bug Directed graphs may return invalid neighbors
      *      https://github.com/Karaka-Management/phpOMS/issues/366
      */

diff --git a/tests/Utils/ArrayUtilsTest.php b/tests/Utils/ArrayUtilsTest.php
@@ -234,7 +234,6 @@ public function testInvalidArgGet() : void
         self::assertNull(ArrayUtils::getArg('--testNull', $_SERVER['argv'] ?? []));
     }
 
-
     #[\PHPUnit\Framework\Attributes\Group('framework')]
     #[\PHPUnit\Framework\Attributes\TestDox('All array values in an array can be potentiated by a numeric value')]
     public function test() : void

diff --git a/tests/Utils/TaskSchedule/ScheduleTest.php b/tests/Utils/TaskSchedule/ScheduleTest.php
@@ -32,7 +32,6 @@ public function testDefault() : void
         self::assertInstanceOf('\phpOMS\Utils\TaskSchedule\TaskAbstract', $job);
     }
 
-
     #[\PHPUnit\Framework\Attributes\Group('framework')]
     #[\PHPUnit\Framework\Attributes\TestDox('A task can be created from an array and rendered')]
     public function testCreateJobWithData() : void