Merge branch 'meta/fixes' into develop

This commit is contained in:
Jeroen De Meerleer 2019-12-26 20:34:04 +01:00
commit 018b77abb7
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
3 changed files with 8 additions and 8 deletions

View File

@ -1,9 +1,9 @@
{ {
"name": "jeroened/libpairtwo", "name": "jeroened/libpairtwo",
"type": "library", "type": "library",
"description": "A library written in PHP that reads files which are saved using common pairing applications", "description": "Export chess tournaments directly on the web",
"keywords": ["chess", "pairing"], "keywords": ["chess", "pairing"],
"license": "MIT", "license": "AGPL-3.0-or-later",
"authors": [ "authors": [
{ {
"name": "Jeroen De Meerleer", "name": "Jeroen De Meerleer",
@ -14,12 +14,11 @@
], ],
"require": { "require": {
"php": "^7.1", "php": "^7.1",
"myclabs/php-enum": "^1.6", "myclabs/php-enum": "^1.7",
"ext-iconv": "*" "ext-iconv": "*"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7.0", "friendsofphp/php-cs-fixer": "^2.16"
"friendsofphp/php-cs-fixer": "^2.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

View File

@ -348,7 +348,8 @@ class Player
* *
* @return Player[] * @return Player[]
*/ */
private function opponents() { private function opponents()
{
$return = array(); $return = array();
foreach ($this->Pairings as $pairing) { foreach ($this->Pairings as $pairing) {
if (!empty($pairing->Opponent)) { if (!empty($pairing->Opponent)) {

View File

@ -700,10 +700,10 @@ class Tournament
} }
} }
} }
if($interestingplayers) { if ($interestingplayers) {
$allintplayers = $interestingplayers; $allintplayers = $interestingplayers;
$allintplayers[] = $player; $allintplayers[] = $player;
foreach($allintplayers as $player) { foreach ($allintplayers as $player) {
if (!$player->hasPlayedAllPlayersOfArray($allintplayers)) { if (!$player->hasPlayedAllPlayersOfArray($allintplayers)) {
return 0; return 0;
} }