From f3e5912ebb22d543cd43711568aad99a4a2a00a2 Mon Sep 17 00:00:00 2001
From: Jens True <jens.chr.true@gmail.com>
Date: Wed, 21 Feb 2024 13:40:20 +0000
Subject: [PATCH] Rector: codeQuality

---
 examples/3teams.php                                 |  2 +-
 examples/basic.php                                  |  2 +-
 rector.php                                          |  7 +++++--
 src/Numerics/Matrix.php                             |  8 ++++----
 src/TrueSkill/Factors/GaussianWeightedSumFactor.php | 10 ++++++++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/examples/3teams.php b/examples/3teams.php
index 76a48de..f90aac5 100644
--- a/examples/3teams.php
+++ b/examples/3teams.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once("vendor/autoload.php");
+require_once(__DIR__ . "/vendor/autoload.php");
 
 use DNW\Skills\TrueSkill\FactorGraphTrueSkillCalculator;
 use DNW\Skills\GameInfo;
diff --git a/examples/basic.php b/examples/basic.php
index 6399649..8dc12f1 100644
--- a/examples/basic.php
+++ b/examples/basic.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once("vendor/autoload.php");
+require_once(__DIR__ . "/vendor/autoload.php");
 
 use DNW\Skills\TrueSkill\TwoPlayerTrueSkillCalculator;
 use DNW\Skills\GameInfo;
diff --git a/rector.php b/rector.php
index 388c52c..6956680 100644
--- a/rector.php
+++ b/rector.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
+use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector;
 
 return RectorConfig::configure()
     ->withPaths([
@@ -14,4 +14,7 @@ return RectorConfig::configure()
     ])
     // uncomment to reach your current PHP version
     ->withPhpSets()
-    ->withPreparedSets(deadCode: true, codeQuality: true, typeDeclarations : true);
+    ->withPreparedSets(deadCode: true, codeQuality: true, typeDeclarations : true)
+    ->withSkip([
+        LocallyCalledStaticMethodToNonStaticRector::class,
+    ]);;
diff --git a/src/Numerics/Matrix.php b/src/Numerics/Matrix.php
index 948c918..8c7aa1d 100644
--- a/src/Numerics/Matrix.php
+++ b/src/Numerics/Matrix.php
@@ -88,7 +88,7 @@ class Matrix
 
     private function isSquare(): bool
     {
-        return ($this->rowCount == $this->columnCount) && ($this->rowCount > 0);
+        return ($this->rowCount === $this->columnCount) && ($this->rowCount > 0);
     }
 
     public function getDeterminant(): float
@@ -208,7 +208,7 @@ class Matrix
 
     public static function add(Matrix $left, Matrix $right): Matrix
     {
-        if (($left->getRowCount() != $right->getRowCount()) || ($left->getColumnCount() != $right->getColumnCount())) {
+        if (($left->getRowCount() !== $right->getRowCount()) || ($left->getColumnCount() !== $right->getColumnCount())) {
             throw new Exception('Matrices must be of the same size');
         }
 
@@ -233,7 +233,7 @@ class Matrix
         // Just your standard matrix multiplication.
         // See http://en.wikipedia.org/wiki/Matrix_multiplication for details
 
-        if ($left->getColumnCount() != $right->getRowCount()) {
+        if ($left->getColumnCount() !== $right->getRowCount()) {
             throw new Exception('The width of the left matrix must match the height of the right matrix');
         }
 
@@ -308,7 +308,7 @@ class Matrix
 
     public function equals(Matrix $otherMatrix): bool
     {
-        if (($this->rowCount != $otherMatrix->getRowCount()) || ($this->columnCount != $otherMatrix->getColumnCount())) {
+        if (($this->rowCount !== $otherMatrix->getRowCount()) || ($this->columnCount !== $otherMatrix->getColumnCount())) {
             return FALSE;
         }
 
diff --git a/src/TrueSkill/Factors/GaussianWeightedSumFactor.php b/src/TrueSkill/Factors/GaussianWeightedSumFactor.php
index 6575eeb..27ad12a 100644
--- a/src/TrueSkill/Factors/GaussianWeightedSumFactor.php
+++ b/src/TrueSkill/Factors/GaussianWeightedSumFactor.php
@@ -131,9 +131,11 @@ class GaussianWeightedSumFactor extends GaussianFactor
         $messages = $this->getMessages();
 
         $result = 0.0;
+        // We start at 1 since offset 0 has the sum
+        $counter = count($vars);
 
         // We start at 1 since offset 0 has the sum
-        for ($i = 1; $i < count($vars); $i++) {
+        for ($i = 1; $i < $counter; $i++) {
             $result += GaussianDistribution::logRatioNormalization($vars[$i]->getValue(), $messages[$i]->getValue());
         }
 
@@ -211,11 +213,15 @@ class GaussianWeightedSumFactor extends GaussianFactor
         $updatedVariables = [];
 
         $indicesToUse = $this->variableIndexOrdersForWeights[$messageIndex];
+        // The tricky part here is that we have to put the messages and variables in the same
+        // order as the weights. Thankfully, the weights and messages share the same index numbers,
+        // so we just need to make sure they're consistent
+        $counter = count($allMessages);
 
         // The tricky part here is that we have to put the messages and variables in the same
         // order as the weights. Thankfully, the weights and messages share the same index numbers,
         // so we just need to make sure they're consistent
-        for ($i = 0; $i < count($allMessages); $i++) {
+        for ($i = 0; $i < $counter; $i++) {
             $updatedMessages[] = $allMessages[$indicesToUse[$i]];
             $updatedVariables[] = $allVariables[$indicesToUse[$i]];
         }