mirror of
https://github.com/JeroenED/libpairtwo.git
synced 2024-11-21 22:17:41 +01:00
Merge branch 'bugfix/getresult' into develop
This commit is contained in:
commit
70114338f5
@ -1,5 +1,8 @@
|
||||
# CHANGELOG
|
||||
|
||||
## v1.1.2 (Release: 21-jun-2019)
|
||||
* MAJOR BUGFIX: `Game::GetResult` throws fatal error `Cannot access parent:: when current class scope has no parent`
|
||||
|
||||
## v1.1.1 (Released: 20-jun-2019)
|
||||
* NEW FEATURE: Added clean-dist and clean-dev targets
|
||||
* ENHANCEMENT: Better Docs generation
|
||||
|
3
dist/boilerplate.php
vendored
3
dist/boilerplate.php
vendored
@ -56,6 +56,9 @@ echo "Absent P3: " . $reader->getTournament()->getPlayerById(2)->getBinaryDat
|
||||
echo "Date Round 1: " . $reader->getTournament()->getRoundByNo(0)->getDate()->format('d/m/Y') . PHP_EOL;
|
||||
echo "Date Round 2: " . $reader->getTournament()->getRoundByNo(1)->getDate()->format('d/m/Y') . PHP_EOL;
|
||||
echo "Date Round 3: " . $reader->getTournament()->getRoundByNo(2)->getDate()->format('d/m/Y') . PHP_EOL;
|
||||
echo "Game Round 1: " . $sws->getTournament()->getRoundByNo(0)->getGames()[0]->getResult()->getValue() . PHP_EOL;
|
||||
echo "Game Round 2: " . $sws->getTournament()->getRoundByNo(1)->getGames()[0]->getResult()->getValue() . PHP_EOL;
|
||||
echo "Game Round 3: " . $sws->getTournament()->getRoundByNo(2)->getGames()[0]->getResult()->getValue() . PHP_EOL;
|
||||
echo "Color Pairing 1: " . $reader->getTournament()->getPairings()[1]->getColor()->getKey() . PHP_EOL;
|
||||
echo "Color Pairing 2: " . $reader->getTournament()->getPairings()[2]->getColor()->getKey() . PHP_EOL;
|
||||
echo "Color Pairing 3: " . $reader->getTournament()->getPairings()[3]->getColor()->getKey() . PHP_EOL;
|
||||
|
@ -45,8 +45,8 @@ class Game
|
||||
*/
|
||||
public function getResult(): Gameresult
|
||||
{
|
||||
if (!is_null(parent::getResult())) {
|
||||
return parent::getResult();
|
||||
if (!is_null($this->result)) {
|
||||
return $this->result;
|
||||
}
|
||||
|
||||
$whiteResult = $this->getWhite()->getResult();
|
||||
|
@ -64,6 +64,9 @@ echo "Absent P3: " . $sws->getTournament()->getPlayerById(2)->getBinaryData("
|
||||
echo "Date Round 1: " . $sws->getTournament()->getRoundByNo(0)->getDate()->format('d/m/Y') . PHP_EOL;
|
||||
echo "Date Round 2: " . $sws->getTournament()->getRoundByNo(1)->getDate()->format('d/m/Y') . PHP_EOL;
|
||||
echo "Date Round 3: " . $sws->getTournament()->getRoundByNo(2)->getDate()->format('d/m/Y') . PHP_EOL;
|
||||
echo "Game Round 1: " . $sws->getTournament()->getRoundByNo(0)->getGames()[0]->getResult()->getValue() . PHP_EOL;
|
||||
echo "Game Round 2: " . $sws->getTournament()->getRoundByNo(1)->getGames()[0]->getResult()->getValue() . PHP_EOL;
|
||||
echo "Game Round 3: " . $sws->getTournament()->getRoundByNo(2)->getGames()[0]->getResult()->getValue() . PHP_EOL;
|
||||
echo "Color Pairing 1: " . $sws->getTournament()->getPairings()[1]->getColor()->getKey() . PHP_EOL;
|
||||
echo "Color Pairing 2: " . $sws->getTournament()->getPairings()[2]->getColor()->getKey() . PHP_EOL;
|
||||
echo "Color Pairing 3: " . $sws->getTournament()->getPairings()[3]->getColor()->getKey() . PHP_EOL;
|
||||
|
Loading…
Reference in New Issue
Block a user