diff --git a/.gitignore b/.gitignore index 7ae4f63..fbf3e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ composer.lock /.idea doc/api/* -libpairtwo-distro\.zip +libpairtwo-dist.zip -distro/ +dist/* +!dist/boilerplate.php +!dist/composer-*.json diff --git a/Makefile b/Makefile index fe0f3eb..d5dd541 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: help tests +.PHONY: help tests dist .DEFAULT_GOAL := help help: @@ -18,23 +18,24 @@ api: ## Generates api-docs chmod +x vendor/bin/phpdoc vendor/bin/phpdoc -distro: ## Generates distribution - mkdir distro - touch .libpairtwo-distro +dist: ## Generates distribution + touch .libpairtwo-dist git add -A git commit -m "Commit before release" - cp res/composer-dist.json distro/composer.json - cd distro && composer install - rm distro/composer.json - cp res/composer-dist-installed.json distro/composer.json - git reset --soft HEAD^ + cp dist/composer* res/ + mv dist/composer-dist.json dist/composer.json + cd dist && composer install + rm dist/composer.json + rm dist/composer.lock + mv dist/composer-dist-installed.json dist/composer.json + git reset --hard HEAD^ wget -O vendor/bin/phpdoc http://www.phpdoc.org/phpDocumentor.phar chmod +x vendor/bin/phpdoc vendor/bin/phpdoc - mkdir -p distro/doc - cp -r doc/api distro/doc - cp -r res/boilerplate.php distro/libpairtwo.php - cd distro && zip -r ../libpairtwo-distro * + mkdir -p dist/doc + cp -r doc/api dist/doc + cd dist && zip -r ../libpairtwo-dist * + mv res/composer* res/ cs: ## Fixes coding standard problems vendor/bin/php-cs-fixer fix || true diff --git a/dist/boilerplate.php b/dist/boilerplate.php new file mode 100644 index 0000000..ab6f906 --- /dev/null +++ b/dist/boilerplate.php @@ -0,0 +1,86 @@ +read($pairingfile); + +// From here on you can start. Please use the examples on https://github.com/jeroened/libpairtwo/wiki +// You can also use the doc/api folder to get all possible methods and fields + +// Below is an example of what can be used. Feel free to modify this. +echo "
"; +echo "Name: " . $sws->getTournament()->getName() . PHP_EOL; +echo "Organiser: " . $sws->getTournament()->getOrganiser(). PHP_EOL; +echo "Tempo: " . $sws->getTournament()->getTempo() . PHP_EOL; +echo "Country: " . $sws->getTournament()->getOrganiserCountry() . PHP_EOL; +echo "Arbiter: " . $sws->getTournament()->getArbiter() . PHP_EOL; +echo "Rounds: " . $sws->getTournament()->getNoOfRounds() . PHP_EOL; +echo "Participants: " . $sws->getTournament()->getNoOfRounds() . PHP_EOL; +echo "Fidehomol: " . $sws->getTournament()->getFideHomol() . PHP_EOL; +echo "Start-Date: " . $sws->getTournament()->getStartDate()->format('d/m/Y') . PHP_EOL; +echo "End-Date: " . $sws->getTournament()->getEndDate()->format('d/m/Y') . PHP_EOL; +echo "System: " . $sws->getTournament()->getSystem()->getKey() . PHP_EOL; +echo "Place: " . $sws->getTournament()->getOrganiserPlace() . PHP_EOL; +echo "Unrated-Elo: " . $sws->getTournament()->getNonRatedElo() . PHP_EOL; +echo "Federation: " . $sws->getTournament()->getFederation() . PHP_EOL; +echo "Organiser: " . $sws->getTournament()->getOrganiserClubNo() . PHP_EOL; +echo "Fide Elo P1: " . $sws->getTournament()->getPlayerById(0)->getElo('Fide') . PHP_EOL; +echo "Fide Elo P2: " . $sws->getTournament()->getPlayerById(1)->getElo('Fide') . PHP_EOL; +echo "Fide Elo P3: " . $sws->getTournament()->getPlayerById(2)->getElo('Fide') . PHP_EOL; +echo "KBSB Elo P1: " . $sws->getTournament()->getPlayerById(0)->getElo('Nation') . PHP_EOL; +echo "KBSB Elo P2: " . $sws->getTournament()->getPlayerById(1)->getElo('Nation') . PHP_EOL; +echo "KBSB Elo P3: " . $sws->getTournament()->getPlayerById(2)->getElo('Nation') . PHP_EOL; +echo "Name P1: " . $sws->getTournament()->getPlayerById(0)->getName() . PHP_EOL; +echo "Name P2: " . $sws->getTournament()->getPlayerById(1)->getName() . PHP_EOL; +echo "Name P3: " . $sws->getTournament()->getPlayerById(2)->getName() . PHP_EOL; +echo "Gender P1: " . $sws->getTournament()->getPlayerById(0)->getGender()->getKey() . PHP_EOL; +echo "Gender P2: " . $sws->getTournament()->getPlayerById(1)->getGender()->getKey() . PHP_EOL; +echo "Gender P3: " . $sws->getTournament()->getPlayerById(2)->getGender()->getKey() . PHP_EOL; +echo "Absent P1: " . $sws->getTournament()->getPlayerById(0)->getBinaryData("Absent") . PHP_EOL; +echo "Absent P2: " . $sws->getTournament()->getPlayerById(1)->getBinaryData("Absent") . PHP_EOL; +echo "Absent P3: " . $sws->getTournament()->getPlayerById(2)->getBinaryData("Absent") . PHP_EOL; +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 "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; +echo "Player Pairing 1: " . $sws->getTournament()->getPairings()[0]->getPlayer()->getName() . PHP_EOL; +echo "Player Pairing 2: " . $sws->getTournament()->getPairings()[1]->getPlayer()->getName() . PHP_EOL; +echo "Player Pairing 3: " . $sws->getTournament()->getPairings()[2]->getPlayer()->getName() . PHP_EOL; +echo "Bye Round 1: " . $sws->getTournament()->getRoundByNo(2)->getBye()[0]->getPlayer()->getName() . PHP_EOL; +echo "Absent Round 1: " . $sws->getTournament()->getRoundByNo(2)->getAbsent()[0]->getPlayer()->getName() . PHP_EOL; +echo "Tiebreak 1: " . $sws->getTournament()->getTiebreaks()[0]->getValue() . PHP_EOL; +echo "Tiebreak 2: " . $sws->getTournament()->getTiebreaks()[1]->getValue() . PHP_EOL; +echo "Tiebreak 3: " . $sws->getTournament()->getTiebreaks()[2]->getValue() . PHP_EOL; +echo "Tiebreak 4: " . $sws->getTournament()->getTiebreaks()[3]->getValue() . PHP_EOL; +echo "Tiebreak 5: " . $sws->getTournament()->getTiebreaks()[4]->getValue() . PHP_EOL; +echo "Tiebreak 6: " . $sws->getTournament()->getTiebreaks()[5]->getValue() . PHP_EOL; +echo "Average Elo: " . $sws->getTournament()->getAverageElo() . PHP_EOL; +foreach ($sws->getTournament()->getRanking() as $player) { + echo str_pad($player->getName() . '(' . $player->getElo($sws->getTournament()->getPriorityElo()) . ') ', 35) . implode_pad(' ', $player->getTiebreaks(), 5, ' ') . PHP_EOL; +} + + +echo ""; +function implode_pad($glue, $collection, $padlength, $padstring): string +{ + $newarray = []; + foreach ($collection as $elem) { + $newarray[] = str_pad($elem, $padlength, $padstring); + } + return implode($glue, $newarray); +} diff --git a/res/composer-dist-installed.json b/dist/composer-dist-installed.json similarity index 100% rename from res/composer-dist-installed.json rename to dist/composer-dist-installed.json diff --git a/res/composer-dist.json b/dist/composer-dist.json similarity index 100% rename from res/composer-dist.json rename to dist/composer-dist.json diff --git a/res/boilerplate.php b/res/boilerplate.php deleted file mode 100644 index 66d06f9..0000000 --- a/res/boilerplate.php +++ /dev/null @@ -1,12 +0,0 @@ -read('your pairing-file.sws'); - -// From here on you can start. Please use the examples on https://github.com/jeroened/libpairtwo/wiki -// You can also use the doc/api folder to get all possible methods and fields