2023.07.01

hsegnitz · hsegnitz · commit a0cb7b8c6465 · 2023-12-07T08:05:03.000+01:00
diff --git a/php/2023/07/01.php b/php/2023/07/01.php
@@ -69,7 +69,7 @@ private function determineSortScore(): void
             return;
         }
 
-        // fullHouse  -- cards are ordered, they are the same if first and penultimate have the same value
+        // fullHouse
         if (($this->cards[0] === $this->cards[1] && $this->cards[2] === $this->cards[4]) || ($this->cards[0] === $this->cards[2] && $this->cards[3] === $this->cards[4])) {
             $this->sortScore += self::SORT_SCORES['fullHouse'];
             return;
@@ -82,7 +82,11 @@ private function determineSortScore(): void
         }
 
         // twoPair
-        if (($this->cards[0] === $this->cards[1] && $this->cards[2] === $this->cards[3]) || ($this->cards[1] === $this->cards[2] && $this->cards[3] === $this->cards[4])) {
+        if (
+            ($this->cards[0] === $this->cards[1] && $this->cards[2] === $this->cards[3])
+            || ($this->cards[1] === $this->cards[2] && $this->cards[3] === $this->cards[4])
+            || ($this->cards[0] === $this->cards[1] && $this->cards[3] === $this->cards[4])
+        ) {
             $this->sortScore += self::SORT_SCORES['twoPair'];
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private function determineSortScore(): void`
`69`	`69`	`return;`
`70`	`70`	`}`
`71`	`71`
`72`		`- // fullHouse -- cards are ordered, they are the same if first and penultimate have the same value`
	`72`	`+ // fullHouse`
`73`	`73`	`if (($this->cards[0] === $this->cards[1] && $this->cards[2] === $this->cards[4]) \|\| ($this->cards[0] === $this->cards[2] && $this->cards[3] === $this->cards[4])) {`
`74`	`74`	`$this->sortScore += self::SORT_SCORES['fullHouse'];`
`75`	`75`	`return;`
`@@ -82,7 +82,11 @@ private function determineSortScore(): void`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// twoPair`
`85`		`- if (($this->cards[0] === $this->cards[1] && $this->cards[2] === $this->cards[3]) \|\| ($this->cards[1] === $this->cards[2] && $this->cards[3] === $this->cards[4])) {`
	`85`	`+ if (`
	`86`	`+ ($this->cards[0] === $this->cards[1] && $this->cards[2] === $this->cards[3])`
	`87`	`+ \|\| ($this->cards[1] === $this->cards[2] && $this->cards[3] === $this->cards[4])`
	`88`	`+ \|\| ($this->cards[0] === $this->cards[1] && $this->cards[3] === $this->cards[4])`
	`89`	`+ ) {`
`86`	`90`	`$this->sortScore += self::SORT_SCORES['twoPair'];`
`87`	`91`	`return;`
`88`	`92`	`}`