Merge branch 'master' into dev-4.2

# Conflicts: # src/Console/Commands/ElectionCommand.php
julien-boudry · Nov 17, 2022 · 55be62d · 55be62d
2 parents 270c3d0 + 195b27f
commit 55be62d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/Dev/bugs/JitBug.php b/Dev/bugs/JitBug.php
@@ -28,7 +28,6 @@
 require_once __DIR__.'/../../__CondorcetAutoload.php';
 
 for ($i=1; $i <= 4000; $i++) {
-
     # With Condorcet
     $election = new Election;
 

diff --git a/__CondorcetAutoload.php b/__CondorcetAutoload.php
@@ -17,7 +17,6 @@
 
 // Self Autoload function coming after and as a fallback of composer or other framework PSR autoload implementation. Composer or framework autoload will alway be will be preferred to that custom function.
 spl_autoload_register(static function (string $class): void {
-
     // project-specific namespace prefix
     $prefix = 'CondorcetPHP\Condorcet\\';
 

diff --git a/composer.json b/composer.json
@@ -37,10 +37,10 @@
         "phpbench/phpbench": "*",
         "phpunit/phpunit": "^9 || ^10",
         "phploc/phploc": "dev-main",
-        "haydenpierce/class-finder": ">= 0.4.3",
+        "haydenpierce/class-finder": ">= 0.4.4",
         "infection/infection": "^0.26",
-        "phpstan/phpstan": "^1.8",
-        "laravel/pint": "^1.1"
+        "phpstan/phpstan": "^1.9",
+        "laravel/pint": "^1.2"
     },
     "suggest": {
         "ext-mbstring": "If you need to deal with Debian vote format",

diff --git a/src/Algo/Methods/RankedPairs/RankedPairs_Core.php b/src/Algo/Methods/RankedPairs/RankedPairs_Core.php
@@ -220,7 +220,6 @@ protected function pairwiseSort(): array
         foreach ($this->getElection()->getPairwise() as $candidate_key => $candidate_value) {
             foreach ($candidate_value['win'] as $challenger_key => $challenger_value) {
                 if ($challenger_value > $candidate_value['lose'][$challenger_key]) {
-
                     // Victory
                     $pairs[$i]['from'] = $candidate_key;
                     // Defeat

diff --git a/src/DataManager/DataHandlerDrivers/PdoDriver/PdoHandlerDriver.php b/src/DataManager/DataHandlerDrivers/PdoDriver/PdoHandlerDriver.php
@@ -141,7 +141,6 @@ protected function initTransaction(): void
     public function closeTransaction(): void
     {
         if ($this->transaction === true) {
-
             /**
              * @infection-ignore-all
              */
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,7 +141,6 @@ protected function initTransaction(): void @@
         public function closeTransaction(): void
         {
             if ($this->transaction === true) {
                 /**
                  * @infection-ignore-all
                  */
@@ Expand Down @@