From 03c399ecd28ce902caa0a4ce2e0a657699ba7587 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 12 Dec 2025 17:48:49 +0100 Subject: [PATCH 01/34] Implement phpstan and phpunit to start pipeline CI Also start refactoring everything, because some of this stuff is a mess. Also also: fix some tile data based on errors caught by the unit tests. So that works, hurray! --- .gitignore | 3 +- app/Draft.php | 1 - app/Game/Planet.php | 82 +++++++++++++++ app/Game/PlanetTest.php | 179 ++++++++++++++++++++++++++++++++ app/Game/PlanetTrait.php | 10 ++ app/Game/TechSpecialties.php | 14 +++ app/Generator.php | 2 + app/{ => Map}/Station.php | 2 +- app/{ => Map}/Tile.php | 10 +- app/Planet.php | 40 ------- app/Slice.php | 2 + app/Testing/FakesData.php | 15 +++ app/Testing/TestCase.php | 21 ++++ bootstrap/helpers.php | 48 ++++++++- composer.json | 12 +++ data/tiles.json | 6 +- deploy/app/caddy/Caddyfile | 12 +-- deploy/app/workspace.Dockerfile | 2 +- phpstan.neon | 10 ++ phpunit.xml | 27 +++++ 20 files changed, 440 insertions(+), 58 deletions(-) create mode 100644 app/Game/Planet.php create mode 100644 app/Game/PlanetTest.php create mode 100644 app/Game/PlanetTrait.php create mode 100644 app/Game/TechSpecialties.php rename app/{ => Map}/Station.php (98%) rename app/{ => Map}/Tile.php (92%) delete mode 100644 app/Planet.php create mode 100644 app/Testing/FakesData.php create mode 100644 app/Testing/TestCase.php create mode 100644 phpstan.neon create mode 100644 phpunit.xml diff --git a/.gitignore b/.gitignore index 1a81e67..cd581ed 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ clean.php .DS_Store supervisord.log supervisord.pid -tmp \ No newline at end of file +tmp +.phpunit.cache diff --git a/app/Draft.php b/app/Draft.php index e5ceb4f..9308754 100644 --- a/app/Draft.php +++ b/app/Draft.php @@ -1,5 +1,4 @@ + */ + public array $traits = [], + /** + * @var array + */ + public array $specialties = [] + ) { + $this->optimalResources = 0; + $this->optimalInfluence = 0; + + if ($this->influence > $this->resources) { + $this->optimalInfluence = $this->influence; + } elseif ($this->resources > $this->influence) { + $this->optimalResources = $this->resources; + } elseif ($this->resources == $this->influence) { + $this->optimalInfluence = $this->influence / 2; + $this->optimalResources = $this->resources / 2; + } + + $this->optimalTotal = $this->optimalResources + $this->optimalInfluence; + } + + public static function fromJsonData(array $data): self + { + return new self( + $data['name'], + $data['resources'], + $data['influence'], + // @todo refactor tiles.json to use legendary: null instead of false + ($data['legendary'] !== false) ? $data['legendary'] : null, + self::traitsFromJsonData($data['trait']), + self::techSpecialtiesFromJsonData($data['specialties']) + ); + } + + // @todo update the tiles.json so that all planets just have an array of traits + /** + * @param string|array|null $data + * @return array + */ + private static function traitsFromJsonData(string|array|null $data): array + { + if ($data == null) { + return []; + } else { + // process array of traits, even if it's just one string + return array_map( + fn (string $str) => PlanetTrait::from($str), + is_array($data) ? $data : [$data] + ); + } + } + + /** + * @param array $data + * @return array + */ + private static function techSpecialtiesFromJsonData(array $data): array + { + return array_map( + fn (string $str) => TechSpecialties::from($str), + $data + ); + } +} diff --git a/app/Game/PlanetTest.php b/app/Game/PlanetTest.php new file mode 100644 index 0000000..9035ca5 --- /dev/null +++ b/app/Game/PlanetTest.php @@ -0,0 +1,179 @@ + [ + "resources" => 3, + "influence" => 1, + "expectedOptimalResources" => 3.0, + "expectedOptimalInfluence" => 0.0 + ]; + yield "when resource value is lower than influence" => [ + "resources" => 2, + "influence" => 4, + "expectedOptimalResources" => 0.0, + "expectedOptimalInfluence" => 4.0 + ]; + yield "when resource value equals influence" => [ + "resources" => 3, + "influence" => 3, + "expectedOptimalResources" => 1.5, + "expectedOptimalInfluence" => 1.5 + ]; + } + + public static function jsonData(): iterable { + yield "A planet without a legendary" => [ + "jsonData" => [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + "trait" => "hazardous", + "legendary" => false, + "specialties" => [ + "biotic", + "cybernetic" + ] + ], + "expectedLegendary" => null, + "expectedTraits" => [ + PlanetTrait::HAZARDOUS + ], + "expectedTechSpecialties" => [ + TechSpecialties::BIOTIC, + TechSpecialties::CYBERNETIC + ] + ]; + yield "A planet with a legendary" => [ + "jsonData" => [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + "trait" => "cultural", + "legendary" => "I am legend", + "specialties" => [ + "propulsion", + "warfare" + ] + ], + "expectedLegendary" => "I am legend", + "expectedTraits" => [ + PlanetTrait::CULTURAL + ], + "expectedTechSpecialties" => [ + TechSpecialties::PROPULSION, + TechSpecialties::WARFARE + ] + ]; + + yield "A planet with legendary false" => [ + "jsonData" => [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + "trait" => "industrial", + "legendary" => false, + "specialties" => [] + ], + "expectedLegendary" => null, + "expectedTraits" => [ + PlanetTrait::INDUSTRIAL + ], + "expectedTechSpecialties" => [] + ]; + yield "A planet with multiple traits" => [ + "jsonData" => [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + "trait" => ["cultural", "hazardous"], + "legendary" => null, + "specialties" => [] + ], + "expectedLegendary" => null, + "expectedTraits" => [ + PlanetTrait::CULTURAL, + PlanetTrait::HAZARDOUS + ], + "expectedTechSpecialties" => [] + ]; + yield "A planet with no traits" => [ + "jsonData" => [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + "trait" => null, + "legendary" => null, + "specialties" => [] + ], + "expectedLegendary" => null, + "expectedTraits" => [], + "expectedTechSpecialties" => [] + ]; + } + + #[DataProvider("planetValues")] + #[Test] + public function itCalculatesOptimalValues( + int $resources, + int $influence, + float $expectedOptimalResources, + float $expectedOptimalInfluence + ) { + $planet = new Planet( + $this->faker->word, + $resources, + $influence, + ); + + $this->assertSame($expectedOptimalResources, $planet->optimalResources); + $this->assertSame($expectedOptimalInfluence, $planet->optimalInfluence); + $this->assertSame($expectedOptimalInfluence + $expectedOptimalResources, $planet->optimalTotal); + } + + #[DataProvider("jsonData")] + #[Test] + public function itcanCreateAPlanetFromJsonData( + array $jsonData, + ?string $expectedLegendary, + array $expectedTraits, + array $expectedTechSpecialties, + ) { + $planet = Planet::fromJsonData($jsonData); + + $this->assertSame($jsonData['name'], $planet->name); + $this->assertSame($jsonData['resources'], $planet->resources); + $this->assertSame($jsonData['influence'], $planet->influence); + $this->assertSame($expectedTraits, $planet->traits); + $this->assertSame($expectedTechSpecialties, $planet->specialties); + $this->assertSame($expectedLegendary, $planet->legendary); + } + + // @todo maybe move this to a JsonValidationTest + #[Test] + public function allPlanetsInJsonAreValid() { + $tileData = json_decode(file_get_contents('data/tiles.json'), true); + $planetJsonData = []; + foreach($tileData as $t) { + foreach($t['planets'] as $p) { + $planetJsonData[] = $p; + } + } + + $planets = array_map(fn (array $data) => Planet::fromJsonData($data), $planetJsonData); + + $this->assertCount(count($planetJsonData), $planets); + } + + +} \ No newline at end of file diff --git a/app/Game/PlanetTrait.php b/app/Game/PlanetTrait.php new file mode 100644 index 0000000..c4f108e --- /dev/null +++ b/app/Game/PlanetTrait.php @@ -0,0 +1,10 @@ +anomaly = isset($json_data['anomaly']) ? $json_data['anomaly'] : null; $this->planets = []; foreach ($json_data['planets'] as $p) { - $planet = new Planet($p); + $planet = Planet::fromJsonData($p); $this->total_influence += $planet->influence; $this->total_resources += $planet->resources; - $this->optimal_influence += $planet->optimal_influence; - $this->optimal_resources += $planet->optimal_resources; + $this->optimal_influence += $planet->optimalInfluence; + $this->optimal_resources += $planet->optimalResources; $this->planets[] = $planet; } diff --git a/app/Planet.php b/app/Planet.php deleted file mode 100644 index 17a72ec..0000000 --- a/app/Planet.php +++ /dev/null @@ -1,40 +0,0 @@ -name = $json_data['name']; - $this->influence = $json_data['influence']; - $this->resources = $json_data['resources']; - $this->legendary = $json_data['legendary']; - $this->trait = isset($json_data["trait"]) ? $json_data['trait'] : null; - $this->specialties = $json_data["specialties"]; - - // pre-calculate the optimals - if ($this->influence > $this->resources) { - $this->optimal_influence = $this->influence; - $this->optimal_resources = 0; - } elseif ($this->resources > $this->influence) { - $this->optimal_influence = 0; - $this->optimal_resources = $this->resources; - } elseif ($this->resources == $this->influence) { - $this->optimal_influence = $this->resources / 2; - $this->optimal_resources = $this->resources / 2; - } - - $this->optimal_total = $this->optimal_resources + $this->optimal_influence; - } -} diff --git a/app/Slice.php b/app/Slice.php index 695fe2a..828067b 100644 --- a/app/Slice.php +++ b/app/Slice.php @@ -2,6 +2,8 @@ namespace App; +use App\Map\Tile; + class Slice { public $tiles; diff --git a/app/Testing/FakesData.php b/app/Testing/FakesData.php new file mode 100644 index 0000000..71fec5c --- /dev/null +++ b/app/Testing/FakesData.php @@ -0,0 +1,15 @@ +faker = Factory::create(); + } +} \ No newline at end of file diff --git a/app/Testing/TestCase.php b/app/Testing/TestCase.php new file mode 100644 index 0000000..487113f --- /dev/null +++ b/app/Testing/TestCase.php @@ -0,0 +1,21 @@ +bootFaker(); + } + } +} \ No newline at end of file diff --git a/bootstrap/helpers.php b/bootstrap/helpers.php index 19cb358..ff642f7 100644 --- a/bootstrap/helpers.php +++ b/bootstrap/helpers.php @@ -66,4 +66,50 @@ function abort($code, $message = null) { die($message ?? 'Something went wrong'); } } -} \ No newline at end of file +} + + +if (! function_exists('class_uses_recursive')) { + /** + * Returns all traits used by a class, its parent classes and trait of their traits. + * ("Borrowed" from Laravel) + * + * @param object|string $class + * @return array + */ + function class_uses_recursive($class) + { + if (is_object($class)) { + $class = get_class($class); + } + + $results = []; + + foreach (array_reverse(class_parents($class) ?: []) + [$class => $class] as $class) { + $results += trait_uses_recursive($class); + } + + return array_unique($results); + } +} + + +if (! function_exists('trait_uses_recursive')) { + /** + * Returns all traits used by a trait and its traits. + *("Borrowed" from Laravel) + * + * @param object|string $trait + * @return array + */ + function trait_uses_recursive($trait) + { + $traits = class_uses($trait) ?: []; + + foreach ($traits as $trait) { + $traits += trait_uses_recursive($trait); + } + + return $traits; + } +} diff --git a/composer.json b/composer.json index 1d02be2..82a3576 100644 --- a/composer.json +++ b/composer.json @@ -8,5 +8,17 @@ "psr-4": { "App\\": "app/" } + }, + "scripts": { + "phpstan": "vendor/bin/phpstan analyse --memory-limit=2G --ansi", + "paratest": [ + "Composer\\Config::disableProcessTimeout", + "@php artisan test --parallel --display-deprecations --processes=12 --passthru-php=\"'-d' 'memory_limit=2G'\" --ansi" + ] + }, + "require-dev": { + "phpstan/phpstan": "^2.1", + "brianium/paratest": "^7.8", + "fakerphp/faker": "^1.24" } } diff --git a/data/tiles.json b/data/tiles.json index aafb19a..2a8b339 100644 --- a/data/tiles.json +++ b/data/tiles.json @@ -2958,7 +2958,7 @@ "name": "Dorvok", "resources": 1, "influence": 2, - "trait": "industrial'", + "trait": "industrial", "legendary": false, "specialties": [ "warfare" @@ -2982,7 +2982,7 @@ "name": "Rysaa", "resources": 1, "influence": 2, - "trait": "industrial'", + "trait": "industrial", "legendary": false, "specialties": [ "propulsion" @@ -2992,7 +2992,7 @@ "name": "Moln", "resources": 2, "influence": 0, - "trait": "hazardous'", + "trait": "hazardous", "legendary": false, "specialties": [ "biotic" diff --git a/deploy/app/caddy/Caddyfile b/deploy/app/caddy/Caddyfile index d8a28ac..087b64b 100644 --- a/deploy/app/caddy/Caddyfile +++ b/deploy/app/caddy/Caddyfile @@ -1,20 +1,20 @@ :80 { log { - output stdout + output stdout } header { - X-Frame-Options DENY - Referrer-Policy no-referrer-when-downgrade - Access-Control-Allow-Origin * + X-Frame-Options DENY + Referrer-Policy no-referrer-when-downgrade + Access-Control-Allow-Origin * } @options method OPTIONS respond @options 204 @svg { - file - path *.svg + file + path *.svg } header @svg Content-Security-Policy "script-src 'none'" diff --git a/deploy/app/workspace.Dockerfile b/deploy/app/workspace.Dockerfile index c4e903b..69387b6 100644 --- a/deploy/app/workspace.Dockerfile +++ b/deploy/app/workspace.Dockerfile @@ -1,4 +1,4 @@ -FROM caddy:2.7-builder AS caddy-builder +FROM caddy:2.11-builder AS caddy-builder RUN xcaddy build \ --with github.com/baldinof/caddy-supervisor \ diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000..f2cb8d2 --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,10 @@ +parameters: + tmpDir: ./tmp/phpstan/ + inferPrivatePropertyTypeFromConstructor: true + level: 5 + paths: + - app + excludePaths: + - ./*/*Test.php + - ./app/Testing/* + - ./app/api/* \ No newline at end of file diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..1192a80 --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,27 @@ + + + + + ./app + + + + + + ./app + + + + + + From 35ddeb84bbd2de31ea114d82938fe853c0ed5c22 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 12 Dec 2025 17:53:52 +0100 Subject: [PATCH 02/34] Give github actions a shot --- .github/workflows/test-application.yml | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/test-application.yml diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml new file mode 100644 index 0000000..36ca03d --- /dev/null +++ b/.github/workflows/test-application.yml @@ -0,0 +1,27 @@ +name: test + +on: + pull_request: + paths-ignore: + - 'docs/**' + - '**.md' + workflow_call: + +concurrency: + group: 'test-${{ github.ref_name }}' + cancel-in-progress: true + +env: + APP_VERSION: ${{ format('0.0.0-build{0}', github.run_number) }} + +jobs: + bff: + runs-on: ubuntu-latest + strategy: + matrix: + testsuite: + - core + steps: + - uses: actions/checkout@v5 + - run: composer up:testing + - run: composer paratest -- --processes=4 --testsuite ${{ matrix.testsuite }} From 9af0ff2f8dfed650e21bc62b689aa5b511a6fbe6 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 12 Dec 2025 18:55:10 +0100 Subject: [PATCH 03/34] Try different composer install command --- .github/workflows/test-application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml index 36ca03d..028b9c0 100644 --- a/.github/workflows/test-application.yml +++ b/.github/workflows/test-application.yml @@ -23,5 +23,5 @@ jobs: - core steps: - uses: actions/checkout@v5 - - run: composer up:testing + - run: composer install --prefer-dist --no-ansi --no-interaction --no-progress - run: composer paratest -- --processes=4 --testsuite ${{ matrix.testsuite }} From 142d74487755a60351a0be2242b01f234db50cfe Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 12 Dec 2025 18:58:15 +0100 Subject: [PATCH 04/34] Fix paratest command --- .github/workflows/test-application.yml | 2 +- app/Game/PlanetTest.php | 18 ------------------ composer.json | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml index 028b9c0..d83f1b8 100644 --- a/.github/workflows/test-application.yml +++ b/.github/workflows/test-application.yml @@ -15,7 +15,7 @@ env: APP_VERSION: ${{ format('0.0.0-build{0}', github.run_number) }} jobs: - bff: + app: runs-on: ubuntu-latest strategy: matrix: diff --git a/app/Game/PlanetTest.php b/app/Game/PlanetTest.php index 9035ca5..9385194 100644 --- a/app/Game/PlanetTest.php +++ b/app/Game/PlanetTest.php @@ -158,22 +158,4 @@ public function itcanCreateAPlanetFromJsonData( $this->assertSame($expectedTechSpecialties, $planet->specialties); $this->assertSame($expectedLegendary, $planet->legendary); } - - // @todo maybe move this to a JsonValidationTest - #[Test] - public function allPlanetsInJsonAreValid() { - $tileData = json_decode(file_get_contents('data/tiles.json'), true); - $planetJsonData = []; - foreach($tileData as $t) { - foreach($t['planets'] as $p) { - $planetJsonData[] = $p; - } - } - - $planets = array_map(fn (array $data) => Planet::fromJsonData($data), $planetJsonData); - - $this->assertCount(count($planetJsonData), $planets); - } - - } \ No newline at end of file diff --git a/composer.json b/composer.json index 82a3576..2e52297 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "phpstan": "vendor/bin/phpstan analyse --memory-limit=2G --ansi", "paratest": [ "Composer\\Config::disableProcessTimeout", - "@php artisan test --parallel --display-deprecations --processes=12 --passthru-php=\"'-d' 'memory_limit=2G'\" --ansi" + "vendor/bin/paratest -p12 --passthru-php=\"'-d' 'memory_limit=2G'\"" ] }, "require-dev": { From f21406bd3c0aa7059411f0804a726a46ea29051a Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 12 Dec 2025 19:04:37 +0100 Subject: [PATCH 05/34] Fix paratest command + tiles.json bug that paratest found --- composer.json | 2 +- data/PlanetDataTest.php | 25 +++++++++++++++++++++++++ data/tiles.json | 1 + phpunit.xml | 4 ++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 data/PlanetDataTest.php diff --git a/composer.json b/composer.json index 2e52297..58136f7 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "phpstan": "vendor/bin/phpstan analyse --memory-limit=2G --ansi", "paratest": [ "Composer\\Config::disableProcessTimeout", - "vendor/bin/paratest -p12 --passthru-php=\"'-d' 'memory_limit=2G'\"" + "vendor/bin/paratest -p12 --passthru-php=\"'-d' 'memory_limit=2G'\" --" ] }, "require-dev": { diff --git a/data/PlanetDataTest.php b/data/PlanetDataTest.php new file mode 100644 index 0000000..782dce4 --- /dev/null +++ b/data/PlanetDataTest.php @@ -0,0 +1,25 @@ + Planet::fromJsonData($data), $planetJsonData); + + $this->assertCount(count($planetJsonData), $planets); + } +} \ No newline at end of file diff --git a/data/tiles.json b/data/tiles.json index 2a8b339..8ea112c 100644 --- a/data/tiles.json +++ b/data/tiles.json @@ -803,6 +803,7 @@ "name": "Creuss", "resources": 4, "influence": 2, + "trait": [], "legendary": false, "specialties": [] } diff --git a/phpunit.xml b/phpunit.xml index 1192a80..0aef90c 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,6 +7,7 @@ colors="true" processIsolation="false" stopOnFailure="false" + displayDetailsOnTestsThatTriggerWarnings="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false" > @@ -14,6 +15,9 @@ ./app + + ./data + From 50d8f4f1807531a53e4d1be1f451654826994154 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sat, 13 Dec 2025 17:10:05 +0100 Subject: [PATCH 06/34] Refactor slices, tiles, planets and stations --- app/Draft/DraftName.php | 50 +++ app/Draft/InvalidSliceException.php | 21 ++ app/Draft/Slice.php | 154 ++++++++ app/Draft/SliceTest.php | 324 +++++++++++++++++ app/Generator.php | 24 +- app/GeneratorConfig.php | 33 +- app/Map/Station.php | 34 -- app/Map/Tile.php | 109 ------ app/Slice.php | 130 ------- app/Testing/FakesData.php | 12 +- app/Testing/PlanetFactory.php | 36 ++ app/Testing/TestCase.php | 6 +- app/Testing/TileFactory.php | 29 ++ .../EntityWithResourcesAndInfluence.php | 27 ++ .../EntityWithResourcesAndInfluenceTest.php | 55 +++ app/{Game => TwilightImperium}/Planet.php | 30 +- app/{Game => TwilightImperium}/PlanetTest.php | 94 ++--- .../PlanetTrait.php | 2 +- app/TwilightImperium/SpaceStation.php | 24 ++ app/TwilightImperium/SpaceStationTest.php | 25 ++ .../TechSpecialties.php | 2 +- app/TwilightImperium/Tile.php | 103 ++++++ app/TwilightImperium/TileTest.php | 335 ++++++++++++++++++ app/TwilightImperium/TileType.php | 9 + app/TwilightImperium/Wormhole.php | 35 ++ app/TwilightImperium/WormholeTest.php | 33 ++ data/PlanetDataTest.php | 25 -- data/TileDataTest.php | 48 +++ data/tiles.json | 2 +- 29 files changed, 1391 insertions(+), 420 deletions(-) create mode 100644 app/Draft/DraftName.php create mode 100644 app/Draft/InvalidSliceException.php create mode 100644 app/Draft/Slice.php create mode 100644 app/Draft/SliceTest.php delete mode 100644 app/Map/Station.php delete mode 100644 app/Map/Tile.php delete mode 100644 app/Slice.php create mode 100644 app/Testing/PlanetFactory.php create mode 100644 app/Testing/TileFactory.php create mode 100644 app/TwilightImperium/EntityWithResourcesAndInfluence.php create mode 100644 app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php rename app/{Game => TwilightImperium}/Planet.php (68%) rename app/{Game => TwilightImperium}/PlanetTest.php (61%) rename app/{Game => TwilightImperium}/PlanetTrait.php (81%) create mode 100644 app/TwilightImperium/SpaceStation.php create mode 100644 app/TwilightImperium/SpaceStationTest.php rename app/{Game => TwilightImperium}/TechSpecialties.php (88%) create mode 100644 app/TwilightImperium/Tile.php create mode 100644 app/TwilightImperium/TileTest.php create mode 100644 app/TwilightImperium/TileType.php create mode 100644 app/TwilightImperium/Wormhole.php create mode 100644 app/TwilightImperium/WormholeTest.php delete mode 100644 data/PlanetDataTest.php create mode 100644 data/TileDataTest.php diff --git a/app/Draft/DraftName.php b/app/Draft/DraftName.php new file mode 100644 index 0000000..57c43ea --- /dev/null +++ b/app/Draft/DraftName.php @@ -0,0 +1,50 @@ +name = $this->generate(); + } else { + $this->name = htmlentities($submittedName); + } + } + + public function __toString() + { + return $this->name; + } + + protected function generate(): string + { + $adjectives = [ + 'adventurous', 'aggressive', 'angry', 'arrogant', 'beautiful', 'bloody', 'blushing', 'brave', + 'clever', 'clumsy', 'combative', 'confused', 'crazy', 'curious', 'defiant', 'difficult', 'disgusted', 'doubtful', 'easy', + 'famous', 'fantastic', 'filthy', 'frightened', 'funny', 'glamorous', 'gleaming', 'glorious', + 'grumpy', 'homeless', 'hilarious', 'impossible', 'itchy', 'imperial', 'jealous', 'long', 'magnificent', 'lucky', + 'modern', 'mysterious', 'naughty', 'old-fashioned', 'outstanding', 'outrageous', 'perfect', + 'poisoned', 'puzzled', 'rich', 'smiling', 'super', 'tasty', 'terrible', 'wandering', 'zealous' + ]; + $nouns = [ + 'people', 'history', 'art', 'world', 'space', 'universe', 'galaxy', 'story', + 'map', 'game', 'family', 'government', 'system', 'method', 'computer', 'problem', + 'theory', 'law', 'power', 'knowledge', 'control', 'ability', 'love', 'science', + 'fact', 'idea', 'area', 'society', 'industry', 'player', 'security', 'country', + 'equipment', 'analysis', 'policy', 'thought', 'strategy', 'direction', 'technology', + 'army', 'fight', 'war', 'freedom', 'failure', 'night', 'day', 'energy', 'nation', + 'moment', 'politics', 'empire', 'president', 'council', 'effort', 'situation', + 'resource', 'influence', 'agreement', 'union', 'religion', 'virus', 'republic', + 'drama', 'tension', 'suspense', 'friendship', 'twilight', 'imperium', 'leadership', + 'operation', 'disaster', 'leader', 'speaker', 'diplomacy', 'politics', 'warfare', 'construction', + 'trade', 'proposal', 'revolution', 'negotiation' + ]; + + return 'Operation ' . ucfirst($adjectives[rand(0, count($adjectives) - 1)]) . ' ' . ucfirst($nouns[rand(0, count($nouns) - 1)]); + } +} \ No newline at end of file diff --git a/app/Draft/InvalidSliceException.php b/app/Draft/InvalidSliceException.php new file mode 100644 index 0000000..3231088 --- /dev/null +++ b/app/Draft/InvalidSliceException.php @@ -0,0 +1,21 @@ + + */ + public array $wormholes = []; + /** + * @var array + */ + public array $specialties = []; + /** + * @var array + */ + public array $legendaryPlanets = []; + public int $totalInfluence = 0; + public int $totalResources = 0; + public float $optimalResources = 0; + public float $optimalInfluence = 0; + public float $optimalTotal = 0; + + /** + * @param Tile[] $tiles + */ + function __construct( + public array $tiles + ) { + // if the slice doesn't have 5 tiles in it, something went awry + if (count($this->tiles) != 5) { + throw InvalidSliceException::notEnoughTiles(); + } + + foreach ($tiles as $tile) { + $this->totalInfluence += $tile->totalInfluence; + $this->totalResources += $tile->totalResources; + $this->optimalInfluence += $tile->optimalInfluence; + $this->optimalResources += $tile->optimalResources; + $this->optimalTotal += $tile->optimalTotal; + + $this->wormholes = array_merge($tile->wormholes); + + foreach ($tile->planets as $planet) { + foreach ($planet->specialties as $spec) { + $this->specialties[] = $spec; + } + if ($planet->legendary) { + $this->legendaryPlanets[] = $planet->legendary; + } + } + } + } + + public function toJson(): array + { + return [ + 'tiles' => array_map(fn(Tile $tile) => $tile->id, $this->tiles), + 'specialties' => $this->specialties, + 'wormholes' => $this->wormholes, + // @todo: refactor to has_legendary_planets, but don't break backwards compatibility! + // or maybe just get rid altogether, since you can just check legendaries/legendary_planets + 'has_legendaries' => Tile::countSpecials($this->tiles)['legendary'] > 0, + // @todo: refactor to legendary_planets, but don't break backwards compatibility! + 'legendaries' => $this->legendaryPlanets, + 'total_influence' => $this->totalInfluence, + 'total_resources' => $this->totalResources, + 'optimal_influence' => $this->optimalInfluence, + 'optimal_resources' => $this->optimalResources + ]; + } + + /** + * @throws InvalidSliceException + */ + public function validate( + float $minimumOptimalInfluence, + float $minimumOptimalResources, + float $minimumOptimalTotal, + float $maximumOptimalTotal, + ?int $maxWormholes = null + ): bool { + $special_count = Tile::countSpecials($this->tiles); + + // can't have 2 alpha, beta or legendary planets + if ($special_count['alpha'] > 1 || $special_count['beta'] > 1 || $special_count['legendary'] > 1) { + throw InvalidSliceException::doesNotMeetRequirements("Too many wormholes or legendary planets"); + } + + // has the right minimum optimal values? + if ( + $this->optimalInfluence < $minimumOptimalInfluence || + $this->optimalResources < $minimumOptimalResources + ) { + throw InvalidSliceException::doesNotMeetRequirements("Minimal influence/resources too low"); + } + + if ($maxWormholes != null && $special_count['alpha'] + $special_count['beta'] > $maxWormholes) { + throw InvalidSliceException::doesNotMeetRequirements("More than allowed number of wormholes"); + } + + // has the right total optimal value? (not too much, not too little) + if ( + $this->optimalTotal < $minimumOptimalTotal || + $this->optimalTotal > $maximumOptimalTotal + ) { + throw InvalidSliceException::doesNotMeetRequirements("Optimal values too high or low"); + } + + return true; + } + + public function arrange(): void { + $tries = 0; + while (!$this->tileArrangementIsValid()) { + shuffle($this->tiles); + $tries++; + + if ($tries > self::MAX_ARRANGEMENT_TRIES) { + throw InvalidSliceException::hasNoValidArragenemnt(); + } + } + } + + public function tileArrangementIsValid(): bool + { + // tiles are laid out like this: + // 4 + // 3 + // 1 + // 0 2 + // H + // so for example, tile #1 neighbours #0, #3 and #4. #2 only neighbours #1 + + $neighbours = [[0, 1], [0, 3], [1, 2], [1, 3], [1, 4], [3, 4]]; + + foreach ($neighbours as $edge) { + // can't have two neighbouring anomalies + if ($this->tiles[$edge[0]]->hasAnomaly() && $this->tiles[$edge[1]]->hasAnomaly()) { + return false; + } + } + + return true; + } +} diff --git a/app/Draft/SliceTest.php b/app/Draft/SliceTest.php new file mode 100644 index 0000000..7f65eb9 --- /dev/null +++ b/app/Draft/SliceTest.php @@ -0,0 +1,324 @@ + 4, + 'influence' => 2 + ]), // optimal: 4, 0 + PlanetFactory::make([ + 'resources' => 3, + 'influence' => 3 + ]), // optimal: 1.5, 1.5 + PlanetFactory::make([ + 'resources' => 1, + 'influence' => 0 + ]), // optimal: 1, 0 + PlanetFactory::make([ + 'resources' => 1, + 'influence' => 2 + ]), // optimal: 0, 2 + ]; + + $totalInfluence = array_reduce($planets, fn ($sum, Planet $p) => $sum += $p->influence); + $totalResources = array_reduce($planets, fn ($sum, Planet $p) => $sum += $p->resources); + $optimalInfluence = array_reduce($planets, fn ($sum, Planet $p) => $sum += $p->optimalInfluence); + $optimalResources = array_reduce($planets, fn ($sum, Planet $p) => $sum += $p->optimalResources); + + + $slice = new Slice([ + TileFactory::make([$planets[0], $planets[1]]), + TileFactory::make([$planets[2], $planets[3]]), + TileFactory::make(), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->assertSame($totalResources, $slice->totalResources); + $this->assertSame($totalInfluence, $slice->totalInfluence); + $this->assertSame($optimalResources, $slice->optimalResources); + $this->assertSame($optimalInfluence, $slice->optimalInfluence); + $this->assertSame($optimalResources + $optimalInfluence, $slice->optimalTotal); + } + + public static function tileConfigurations(): iterable + { + yield "When it has no anomalies" => [ + "tiles" => [ + TileFactory::make([], [], null), + TileFactory::make([], [], null), + TileFactory::make([], [], null), + TileFactory::make([], [], null), + TileFactory::make([], [], null), + ], + "canBeArranged" => true + ]; + yield "When it has some anomalies" => [ + "tiles" => [ + TileFactory::make([], [], "nebula"), + TileFactory::make([], [], "asteroid field"), + TileFactory::make([], [], null), + TileFactory::make([], [], null), + TileFactory::make([], [], null), + ], + "canBeArranged" => true + ]; + yield "When it has too many anomalies" => [ + "tiles" => [ + TileFactory::make([], [], "nebula"), + TileFactory::make([], [], "asteroid field"), + TileFactory::make([], [], "gravity-rift"), + TileFactory::make([], [], "supernova"), + TileFactory::make([], [], null), + ], + "canBeArranged" => false + ]; + } + + #[DataProvider("tileConfigurations")] + #[Test] + public function itCanArrangeTiles(array $tiles, bool $canBeArranged) + { + if (!$canBeArranged) { + $this->expectException(InvalidSliceException::class); + } + + $slice = new Slice($tiles); + $slice->arrange(); + + $this->assertTrue($slice->tileArrangementIsValid()); + } + + #[Test] + public function itWontAllowSlicesWithTooManyWormholes() + { + $slice = new Slice([ + TileFactory::make([], [Wormhole::ALPHA]), + TileFactory::make([], [Wormhole::ALPHA]), + TileFactory::make(), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->expectException(InvalidSliceException::class); + + $slice->validate(0, 0, 0, 0, null); + } + + #[Test] + public function itWontAllowSlicesWithTooManyLegendaryPlanets() + { + $slice = new Slice([ + TileFactory::make([PlanetFactory::make(['legendary' => 'Yes'])]), + TileFactory::make([PlanetFactory::make(['legendary' => 'Yes'])]), + TileFactory::make(), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->expectException(InvalidSliceException::class); + + $slice->validate(0, 0, 0, 0, null); + } + + #[Test] + public function itCanValidateMaxWormholes() + { + $slice = new Slice([ + TileFactory::make([], [Wormhole::ALPHA]), + TileFactory::make([], [Wormhole::BETA]), + TileFactory::make(), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->expectException(InvalidSliceException::class); + + $slice->validate(0, 0, 0, 0, 1); + } + + #[Test] + public function itCanValidateMinimumOptimalInfluence() + { + $slice = new Slice([ + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 2, + 'resources' => 3 + ]) + ]), + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 1, + 'resources' => 0 + ]) + ]), + TileFactory::make(), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->expectException(InvalidSliceException::class); + + $slice->validate( + 2, + 0, + 0, + 0, + 1 + ); + } + + #[Test] + public function itCanValidateMinimumOptimalResources() + { + $slice = new Slice([ + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 5, + 'resources' => 2 + ]) + ]), + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 1, + 'resources' => 1 + ]) + ]), + TileFactory::make(), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->expectException(InvalidSliceException::class); + + $slice->validate( + 0, + 3, + 0, + 0, + ); + } + + #[Test] + public function itCanValidateMinimumOptimalTotal() + { + $slice = new Slice([ + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 4, + 'resources' => 2 + ]) + ]), + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 1, + 'resources' => 1 + ]) + ]), + TileFactory::make(), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->expectException(InvalidSliceException::class); + + $slice->validate( + 0, + 0, + 5, + 0 + ); + } + + #[Test] + public function itCanValidateMaximumOptimalTotal() + { + $slice = new Slice([ + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 2, + 'resources' => 4 + ]) + ]), + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 2, + 'resources' => 1 + ]) + ]), + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 3, + 'resources' => 1 + ]) + ]), + TileFactory::make(), + TileFactory::make(), + ]); + + $this->expectException(InvalidSliceException::class); + + $slice->validate( + 0, + 0, + 0, + 4 + ); + } + + + #[Test] + public function itCanValidateAValidSlice() + { + $slice = new Slice([ + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 2, + 'resources' => 3, + ]) + ]), + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 2, + 'resources' => 1 + ]) + ]), + TileFactory::make([ + PlanetFactory::make([ + 'influence' => 1, + 'resources' => 1 + ]), + PlanetFactory::make([ + 'influence' => 1, + 'resources' => 1 + ]) + ]), + TileFactory::make(), + TileFactory::make(), + ]); + + $valid = $slice->validate( + 1, + 3, + 5, + 7 + ); + + $this->assertTrue($valid); + } +} \ No newline at end of file diff --git a/app/Generator.php b/app/Generator.php index 4276b02..aa90ed1 100644 --- a/app/Generator.php +++ b/app/Generator.php @@ -2,7 +2,9 @@ namespace App; -use App\Map\Tile; +use App\Draft\InvalidSliceException; +use App\Draft\Slice; +use App\TwilightImperium\Tile; class Generator { @@ -51,6 +53,10 @@ public static function slices($config, $previous_tries = 0) } } + /** + * @param array $slices + * @return array + */ private static function convert_slices_data($slices) { $data = []; @@ -97,12 +103,16 @@ private static function slicesFromTiles($tiles, $config, $previous_tries = 0) $tiles['red'][(2 * $i) + 1], ]); - if (!$slice->validate($config)) { - return self::slicesFromTiles($tiles, $config, $previous_tries + 1); - } - - if ($slice->arrange() == false) { - // impossible slice, retry + try { + $slice->validate( + $config->minimum_optimal_influence, + $config->minimum_optimal_resources, + $config->minimum_optimal_total, + $config->maximum_optimal_total, + $config->max_1_wormhole ? 1 : null + ); + $slice->arrange(); + } catch (InvalidSliceException $e) { return self::slicesFromTiles($tiles, $config, $previous_tries + 1); } diff --git a/app/GeneratorConfig.php b/app/GeneratorConfig.php index 8048e7c..52f7019 100644 --- a/app/GeneratorConfig.php +++ b/app/GeneratorConfig.php @@ -2,6 +2,8 @@ namespace App; +use App\Draft\DraftName; + class GeneratorConfig { // Maximum value for random seed generation (2^50) @@ -59,9 +61,7 @@ function __construct($get_values_from_request) return_error('Number of players does not match number of names'); } - $this->name = get('game_name', ''); - if (trim($this->name) == '') $this->name = $this->generateName(); - else $this->name = htmlentities($this->name); + $this->name = new DraftName(get('game_name', '')); $this->num_slices = (int) get('num_slices'); $this->num_factions = (int) get('num_factions'); $this->include_pok = get('include_pok') == true; @@ -162,33 +162,6 @@ private function validate(): void } } - private function generateName(): string - { - $adjectives = [ - 'adventurous', 'aggressive', 'angry', 'arrogant', 'beautiful', 'bloody', 'blushing', 'brave', - 'clever', 'clumsy', 'combative', 'confused', 'crazy', 'curious', 'defiant', 'difficult', 'disgusted', 'doubtful', 'easy', - 'famous', 'fantastic', 'filthy', 'frightened', 'funny', 'glamorous', 'gleaming', 'glorious', - 'grumpy', 'homeless', 'hilarious', 'impossible', 'itchy', 'imperial', 'jealous', 'long', 'magnificent', 'lucky', - 'modern', 'mysterious', 'naughty', 'old-fashioned', 'outstanding', 'outrageous', 'perfect', - 'poisoned', 'puzzled', 'rich', 'smiling', 'super', 'tasty', 'terrible', 'wandering', 'zealous' - ]; - $nouns = [ - 'people', 'history', 'art', 'world', 'space', 'universe', 'galaxy', 'story', - 'map', 'game', 'family', 'government', 'system', 'method', 'computer', 'problem', - 'theory', 'law', 'power', 'knowledge', 'control', 'ability', 'love', 'science', - 'fact', 'idea', 'area', 'society', 'industry', 'player', 'security', 'country', - 'equipment', 'analysis', 'policy', 'thought', 'strategy', 'direction', 'technology', - 'army', 'fight', 'war', 'freedom', 'failure', 'night', 'day', 'energy', 'nation', - 'moment', 'politics', 'empire', 'president', 'council', 'effort', 'situation', - 'resource', 'influence', 'agreement', 'union', 'religion', 'virus', 'republic', - 'drama', 'tension', 'suspense', 'friendship', 'twilight', 'imperium', 'leadership', - 'operation', 'disaster', 'leader', 'speaker', 'diplomacy', 'politics', 'warfare', 'construction', - 'trade', 'proposal', 'revolution', 'negotiation' - ]; - - return 'Operation ' . ucfirst($adjectives[rand(0, count($adjectives) - 1)]) . ' ' . ucfirst($nouns[rand(0, count($nouns) - 1)]); - } - public function toJson(): array { return get_object_vars($this); diff --git a/app/Map/Station.php b/app/Map/Station.php deleted file mode 100644 index 7ac1459..0000000 --- a/app/Map/Station.php +++ /dev/null @@ -1,34 +0,0 @@ -name = $json_data['name']; - $this->influence = $json_data['influence']; - $this->resources = $json_data['resources']; - - // pre-calculate the optimals (same logic as planets) - if ($this->influence > $this->resources) { - $this->optimal_influence = $this->influence; - $this->optimal_resources = 0; - } elseif ($this->resources > $this->influence) { - $this->optimal_influence = 0; - $this->optimal_resources = $this->resources; - } elseif ($this->resources == $this->influence) { - $this->optimal_influence = $this->resources / 2; - $this->optimal_resources = $this->resources / 2; - } - - $this->optimal_total = $this->optimal_resources + $this->optimal_influence; - } -} diff --git a/app/Map/Tile.php b/app/Map/Tile.php deleted file mode 100644 index 446704b..0000000 --- a/app/Map/Tile.php +++ /dev/null @@ -1,109 +0,0 @@ -id = $id; - $this->type = $json_data['type']; - $this->wormhole = $json_data['wormhole']; - $this->hyperlanes = isset($json_data['hyperlanes']) ? $json_data['hyperlanes'] : null; - $this->anomaly = isset($json_data['anomaly']) ? $json_data['anomaly'] : null; - $this->planets = []; - foreach ($json_data['planets'] as $p) { - $planet = Planet::fromJsonData($p); - $this->total_influence += $planet->influence; - $this->total_resources += $planet->resources; - $this->optimal_influence += $planet->optimalInfluence; - $this->optimal_resources += $planet->optimalResources; - $this->planets[] = $planet; - } - - // Process stations if they exist - $this->stations = []; - if (isset($json_data['stations'])) { - foreach ($json_data['stations'] as $s) { - $station = new Station($s); - $this->total_influence += $station->influence; - $this->total_resources += $station->resources; - $this->optimal_influence += $station->optimal_influence; - $this->optimal_resources += $station->optimal_resources; - $this->stations[] = $station; - } - } - - $this->optimal_total = $this->optimal_resources + $this->optimal_influence; - } - - function hasAnomaly() - { - return $this->anomaly != null; - } - - function hasWormhole($wormhole) - { - return $wormhole == $this->wormhole; - } - - function hasLegendary() - { - foreach ($this->planets as $p) { - if ($p->legendary) return true; - } - - return false; - } - - - /** - * @param Tile[] $tiles - * @return int[] - */ - public static function countSpecials(array $tiles) - { - $alpha_count = 0; - $beta_count = 0; - $legendary_count = 0; - - foreach ($tiles as $tile) { - if ($tile->hasWormhole("alpha")) $alpha_count++; - if ($tile->hasWormhole("beta")) $beta_count++; - if ($tile->hasWormhole("alpha-beta")) { - $alpha_count++; - $beta_count++; - } - if ($tile->hasLegendary()) $legendary_count++; - } - - return [ - 'alpha' => $alpha_count, - 'beta' => $beta_count, - 'legendary' => $legendary_count - ]; - } -} diff --git a/app/Slice.php b/app/Slice.php deleted file mode 100644 index 828067b..0000000 --- a/app/Slice.php +++ /dev/null @@ -1,130 +0,0 @@ -tiles = $tiles; - foreach ($tiles as $tile) { - - $this->tile_ids[] = $tile->id; - $this->total_influcence += $tile->total_influence; - $this->total_resources += $tile->total_resources; - $this->optimal_influence += $tile->optimal_influence; - $this->optimal_resources += $tile->optimal_resources; - - if ($tile->wormhole != null) $this->wormholes[] = $tile->wormhole; - - foreach ($tile->planets as $planet) { - foreach ($planet->specialties as $spec) { - $this->specialties[] = $spec; - } - if ($planet->legendary) { - $this->legendaries[] = $planet->legendary; - } - } - } - - $this->total_optimal = $this->optimal_resources + $this->optimal_influence; - } - - public function toJson(): array - { - return [ - 'tiles' => $this->tile_ids, - 'specialties' => $this->specialties, - 'wormholes' => $this->wormholes, - 'has_legendaries' => Tile::countSpecials($this->tiles)['legendary'] > 0, - 'legendaries' => $this->legendaries, - 'total_influence' => $this->total_influcence, - 'total_resources' => $this->total_resources, - 'optimal_influence' => $this->optimal_influence, - 'optimal_resources' => $this->optimal_resources - ]; - } - - /** - * @param GeneratorConfig $config - * @return bool - */ - function validate(GeneratorConfig $config): bool - { - $special_count = Tile::countSpecials($this->tiles); - - // can't have 2 alpha, beta or legendaries - if ($special_count['alpha'] > 1 || $special_count['beta'] > 1 || $special_count['legendary'] > 1) { - return false; - } - - // has the right minimum optimal values? - if ($this->optimal_influence < $config->minimum_optimal_influence || $this->optimal_resources < $config->minimum_optimal_resources) { - //echo "not enough minimum
"; - return false; - } - - if ($special_count['alpha'] > 0 && $special_count['beta'] > 0 && $config->max_1_wormhole) { - return false; - } - - // has the right total optimal value? (not too much, not too little) - if ($this->total_optimal < $config->minimum_optimal_total || $this->total_optimal > $config->maximum_optimal_total) { - return false; - } - - return true; - } - - function arrange($previous_tries = 0) - { - // miltydraft.com only shuffles it 12 times max, no idea why but we're gonna assume they have a reason - if ($previous_tries > 12) { - return false; - } - - shuffle($this->tiles); - // tiles are laid out like this: - // 4 - // 3 - // 1 - // 0 2 - // H - // so for example, tile #1 neighbours #0, #3 and #4. #2 only neighbours #1 - - $neighbours = [[0, 1], [0, 3], [1, 2], [1, 3], [1, 4], [3, 4]]; - - foreach ($neighbours as $edge) { - // can't have two neighbouring anomalies - if ($this->tiles[$edge[0]]->hasAnomaly() && $this->tiles[$edge[1]]->hasAnomaly()) { - return $this->arrange($previous_tries + 1); - } - } - - // if we're all good at this point then we should fix the order of the tile ids - $this->tile_ids = []; - foreach ($this->tiles as $t) { - $this->tile_ids[] = $t->id; - } - - return true; - } - -} diff --git a/app/Testing/FakesData.php b/app/Testing/FakesData.php index 71fec5c..05a9f99 100644 --- a/app/Testing/FakesData.php +++ b/app/Testing/FakesData.php @@ -7,9 +7,17 @@ trait FakesData { - protected Generator $faker; + private Generator $faker; - protected function bootFaker() { + private function bootFaker() { $this->faker = Factory::create(); } + + protected function faker(): Generator { + if (!isset($this->faker)) { + $this->bootFaker(); + } + + return $this->faker; + } } \ No newline at end of file diff --git a/app/Testing/PlanetFactory.php b/app/Testing/PlanetFactory.php new file mode 100644 index 0000000..6bd2da6 --- /dev/null +++ b/app/Testing/PlanetFactory.php @@ -0,0 +1,36 @@ +word(), + $properties['resources'] ?? $faker->numberBetween(0, 4), + $properties['influence'] ?? $faker->numberBetween(0, 4), + $properties['legendary'] ?? null, + $properties['traits'] ?? $faker->randomElements([ + PlanetTrait::INDUSTRIAL, + PlanetTrait::HAZARDOUS, + PlanetTrait::CULTURAL, + ], 1), + $properties['specialties'] ??$faker->randomElements([ + TechSpecialties::WARFARE, + TechSpecialties::PROPULSION, + TechSpecialties::CYBERNETIC, + TechSpecialties::BIOTIC, + ], $faker->numberBetween(0, 2)), + ); + } +} \ No newline at end of file diff --git a/app/Testing/TestCase.php b/app/Testing/TestCase.php index 487113f..4ce53bf 100644 --- a/app/Testing/TestCase.php +++ b/app/Testing/TestCase.php @@ -7,15 +7,19 @@ class TestCase extends BaseTestCase { + // unused right now, but we can do stuff like initialize traits and whatnot here + + /* #[Before] protected function setUpTraits(): void { require_once 'bootstrap/helpers.php'; - $uses = array_flip(class_uses_recursive(static::class)); + // $uses = array_flip(class_uses_recursive(static::class)); if (isset($uses[FakesData::class])) { $this->bootFaker(); } } + */ } \ No newline at end of file diff --git a/app/Testing/TileFactory.php b/app/Testing/TileFactory.php new file mode 100644 index 0000000..81f2844 --- /dev/null +++ b/app/Testing/TileFactory.php @@ -0,0 +1,29 @@ + $planets + * @param array $wormholes + * @param string|null $anomaly + * @return Tile + */ + public static function make(array $planets = [], array $wormholes = [], ?string $anomaly = null): Tile + { + return new Tile( + "tile", + TileType::BLUE, + $planets, + [], + $wormholes, + $anomaly + ); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/EntityWithResourcesAndInfluence.php b/app/TwilightImperium/EntityWithResourcesAndInfluence.php new file mode 100644 index 0000000..0910704 --- /dev/null +++ b/app/TwilightImperium/EntityWithResourcesAndInfluence.php @@ -0,0 +1,27 @@ +influence > $this->resources) { + $this->optimalInfluence = $this->influence; + } elseif ($this->resources > $this->influence) { + $this->optimalResources = $this->resources; + } elseif ($this->resources == $this->influence) { + $this->optimalInfluence = $this->influence / 2; + $this->optimalResources = $this->resources / 2; + } + + $this->optimalTotal = $this->optimalResources + $this->optimalInfluence; + } +} \ No newline at end of file diff --git a/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php b/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php new file mode 100644 index 0000000..88b9882 --- /dev/null +++ b/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php @@ -0,0 +1,55 @@ + [ + "resources" => 3, + "influence" => 1, + "expectedOptimalResources" => 3.0, + "expectedOptimalInfluence" => 0.0 + ]; + yield "when resource value is lower than influence" => [ + "resources" => 2, + "influence" => 4, + "expectedOptimalResources" => 0.0, + "expectedOptimalInfluence" => 4.0 + ]; + yield "when resource value equals influence" => [ + "resources" => 3, + "influence" => 3, + "expectedOptimalResources" => 1.5, + "expectedOptimalInfluence" => 1.5 + ]; + } + + #[DataProvider("values")] + #[Test] + public function itCalculatesOptimalValues( + int $resources, + int $influence, + float $expectedOptimalResources, + float $expectedOptimalInfluence + ) + { + $planet = new Planet( + $this->faker->word, + $resources, + $influence, + ); + + $this->assertSame($expectedOptimalResources, $planet->optimalResources); + $this->assertSame($expectedOptimalInfluence, $planet->optimalInfluence); + $this->assertSame($expectedOptimalInfluence + $expectedOptimalResources, $planet->optimalTotal); + } +} \ No newline at end of file diff --git a/app/Game/Planet.php b/app/TwilightImperium/Planet.php similarity index 68% rename from app/Game/Planet.php rename to app/TwilightImperium/Planet.php index 068e418..286f701 100644 --- a/app/Game/Planet.php +++ b/app/TwilightImperium/Planet.php @@ -1,17 +1,13 @@ @@ -22,19 +18,7 @@ public function __construct( */ public array $specialties = [] ) { - $this->optimalResources = 0; - $this->optimalInfluence = 0; - - if ($this->influence > $this->resources) { - $this->optimalInfluence = $this->influence; - } elseif ($this->resources > $this->influence) { - $this->optimalResources = $this->resources; - } elseif ($this->resources == $this->influence) { - $this->optimalInfluence = $this->influence / 2; - $this->optimalResources = $this->resources / 2; - } - - $this->optimalTotal = $this->optimalResources + $this->optimalInfluence; + parent::__construct($resources, $influence); } public static function fromJsonData(array $data): self @@ -79,4 +63,8 @@ private static function techSpecialtiesFromJsonData(array $data): array $data ); } + + public function isLegendary(): bool { + return $this->legendary != null; + } } diff --git a/app/Game/PlanetTest.php b/app/TwilightImperium/PlanetTest.php similarity index 61% rename from app/Game/PlanetTest.php rename to app/TwilightImperium/PlanetTest.php index 9385194..71810a5 100644 --- a/app/Game/PlanetTest.php +++ b/app/TwilightImperium/PlanetTest.php @@ -1,43 +1,45 @@ [ - "resources" => 3, - "influence" => 1, - "expectedOptimalResources" => 3.0, - "expectedOptimalInfluence" => 0.0 - ]; - yield "when resource value is lower than influence" => [ - "resources" => 2, - "influence" => 4, - "expectedOptimalResources" => 0.0, - "expectedOptimalInfluence" => 4.0 + public static function planets(): iterable + { + yield "For a legendary planet" => [ + 'planet' => new Planet( + "Legendplanet", + 0, + 0, + "Some string value" + ), + 'expected' => true ]; - yield "when resource value equals influence" => [ - "resources" => 3, - "influence" => 3, - "expectedOptimalResources" => 1.5, - "expectedOptimalInfluence" => 1.5 + yield "For a regular planet" => [ + 'planet' => new Planet( + "RegularJoePlanet", + 0, + 0, + null + ), + 'expected' => false ]; } public static function jsonData(): iterable { + $baseJsonData = [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + ]; + yield "A planet without a legendary" => [ - "jsonData" => [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, + "jsonData" => $baseJsonData + [ "trait" => "hazardous", "legendary" => false, "specialties" => [ @@ -55,10 +57,7 @@ public static function jsonData(): iterable { ] ]; yield "A planet with a legendary" => [ - "jsonData" => [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, + "jsonData" => $baseJsonData + [ "trait" => "cultural", "legendary" => "I am legend", "specialties" => [ @@ -77,10 +76,7 @@ public static function jsonData(): iterable { ]; yield "A planet with legendary false" => [ - "jsonData" => [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, + "jsonData" => $baseJsonData + [ "trait" => "industrial", "legendary" => false, "specialties" => [] @@ -92,10 +88,7 @@ public static function jsonData(): iterable { "expectedTechSpecialties" => [] ]; yield "A planet with multiple traits" => [ - "jsonData" => [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, + "jsonData" => $baseJsonData + [ "trait" => ["cultural", "hazardous"], "legendary" => null, "specialties" => [] @@ -108,10 +101,7 @@ public static function jsonData(): iterable { "expectedTechSpecialties" => [] ]; yield "A planet with no traits" => [ - "jsonData" => [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, + "jsonData" => $baseJsonData + [ "trait" => null, "legendary" => null, "specialties" => [] @@ -122,24 +112,6 @@ public static function jsonData(): iterable { ]; } - #[DataProvider("planetValues")] - #[Test] - public function itCalculatesOptimalValues( - int $resources, - int $influence, - float $expectedOptimalResources, - float $expectedOptimalInfluence - ) { - $planet = new Planet( - $this->faker->word, - $resources, - $influence, - ); - - $this->assertSame($expectedOptimalResources, $planet->optimalResources); - $this->assertSame($expectedOptimalInfluence, $planet->optimalInfluence); - $this->assertSame($expectedOptimalInfluence + $expectedOptimalResources, $planet->optimalTotal); - } #[DataProvider("jsonData")] #[Test] @@ -158,4 +130,10 @@ public function itcanCreateAPlanetFromJsonData( $this->assertSame($expectedTechSpecialties, $planet->specialties); $this->assertSame($expectedLegendary, $planet->legendary); } + + #[DataProvider("planets")] + #[Test] + public function itExposesHasLegendaryMethod(Planet $planet, bool $expected) { + $this->assertSame($expected, $planet->isLegendary()); + } } \ No newline at end of file diff --git a/app/Game/PlanetTrait.php b/app/TwilightImperium/PlanetTrait.php similarity index 81% rename from app/Game/PlanetTrait.php rename to app/TwilightImperium/PlanetTrait.php index c4f108e..d246ce3 100644 --- a/app/Game/PlanetTrait.php +++ b/app/TwilightImperium/PlanetTrait.php @@ -1,6 +1,6 @@ "Oluz Station", + "resources" => 1, + "influence" => 1, + ]; + $spaceStation = SpaceStation::fromJsonData($jsonData); + + $this->assertSame($jsonData['name'], $spaceStation->name); + $this->assertSame($jsonData['resources'], $spaceStation->resources); + $this->assertSame($jsonData['influence'], $spaceStation->influence); + } +} \ No newline at end of file diff --git a/app/Game/TechSpecialties.php b/app/TwilightImperium/TechSpecialties.php similarity index 88% rename from app/Game/TechSpecialties.php rename to app/TwilightImperium/TechSpecialties.php index a6df3ff..c769c3c 100644 --- a/app/Game/TechSpecialties.php +++ b/app/TwilightImperium/TechSpecialties.php @@ -1,6 +1,6 @@ + */ + public array $planets = [], + /** + * @var array + */ + public array $spaceStations = [], + /** + * @var array + */ + public array $wormholes = [], + // @todo anomaly enum, but not priority because it doesn't influence generator + public ?string $anomaly = null, + // @todo make a Hyperlane class, but not priority because it doesn't influence generator + public array $hyperlanes = [], + ) { + // calculate total and optimal values + foreach (array_merge($this->planets, $this->spaceStations) as $entity) { + $this->totalInfluence += $entity->influence; + $this->totalResources += $entity->resources; + $this->optimalResources += $entity->optimalResources; + $this->optimalInfluence += $entity->optimalInfluence; + $this->optimalTotal += $entity->optimalTotal; + } + } + + public static function fromJsonData(string $id, array $data): self { + return new self( + $id, + TileType::from($data['type']), + array_map(fn(array $planetData) => Planet::fromJsonData($planetData), $data['planets'] ?? []), + array_map(fn(array $stationData) => SpaceStation::fromJsonData($stationData), $data['stations'] ?? []), + Wormhole::fromJsonData($data['wormhole']), + $data['anomaly'], + $data['hyperlanes'] ?? [], + ); + } + + function hasAnomaly() + { + return $this->anomaly != null; + } + + function hasWormhole($wormhole) + { + return in_array($wormhole, $this->wormholes); + } + + function hasLegendaryPlanet() + { + foreach ($this->planets as $p) { + if ($p->isLegendary()) return true; + } + + return false; + } + + + /** + * @todo Refactor + * + * @param Tile[] $tiles + * @return int[] + */ + public static function countSpecials(array $tiles) + { + $count = [ + "legendary" => 0 + ]; + foreach(Wormhole::cases() as $wormhole) { + $count[$wormhole->value] = 0; + } + + foreach ($tiles as $tile) { + foreach ($tile->wormholes as $w) [ + $count[$w->value]++ + ]; + + if ($tile->hasLegendaryPlanet()) $count["legendary"]++; + } + + return $count; + } +} diff --git a/app/TwilightImperium/TileTest.php b/app/TwilightImperium/TileTest.php new file mode 100644 index 0000000..4905cd2 --- /dev/null +++ b/app/TwilightImperium/TileTest.php @@ -0,0 +1,335 @@ +assertSame(7, $tile->totalResources); + $this->assertSame(5, $tile->totalInfluence); + $this->assertSame(1.5, $tile->optimalInfluence); + $this->assertSame(5.5, $tile->optimalResources); + $this->assertSame(7.0, $tile->optimalTotal); + } + + + public static function jsonData() { + yield "For a regular tile" => [ + "jsonData" => [ + "type" => "red", + "wormhole" => null, + "anomaly" => null, + "planets" => [], + "stations" => [] + ], + "expectedWormholes" => [], + ]; + yield "For a tile with a a wormhole" => [ + "jsonData" => [ + "type" => "blue", + "wormhole" => "gamma", + "anomaly" => null, + "planets" => [], + "stations" => [] + ], + "expectedWormholes" => [Wormhole::GAMMA], + ]; + yield "For a tile with an anomaly" => [ + "jsonData" => [ + "type" => "green", + "wormhole" => null, + "anomaly" => "nebula", + "planets" => [], + "stations" => [] + ], + "expectedWormholes" => [], + ]; + yield "For a tile with no stations property" => [ + "jsonData" => [ + "type" => "red", + "wormhole" => null, + "anomaly" => null, + "planets" => [] + ], + "expectedWormholes" => [], + ]; + yield "For a tile with planets" => [ + "jsonData" => [ + "type" => "red", + "wormhole" => null, + "anomaly" => null, + "planets" => [ + [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + "trait" => "hazardous", + "legendary" => false, + "specialties" => [] + ], + [ + "name" => "Tinnes 2", + "resources" => 1, + "influence" => 1, + "trait" => "industrial", + "legendary" => false, + "specialties" => [] + ] + ] + ], + "expectedWormholes" => [], + ]; + yield "For a tile with no stations property" => [ + "jsonData" => [ + "type" => "red", + "wormhole" => null, + "anomaly" => null, + "planets" => [] + ], + "expectedWormholes" => [], + ]; + yield "For a tile with stations" => [ + "jsonData" => [ + "type" => "red", + "wormhole" => null, + "anomaly" => null, + "planets" => [], + "stations" => [ + [ + "name" => "Tinnes", + "resources" => 2, + "influence" => 1, + ], + [ + "name" => "Tinnes 2", + "resources" => 1, + "influence" => 1, + ] + ] + ], + "expectedWormholes" => [], + ]; + yield "For a tile with hyperlanes" => [ + "jsonData" => [ + "type" => "red", + "wormhole" => null, + "anomaly" => null, + "planets" => [], + "hyperlanes" => [ + [ + 0, + 3 + ], + [ + 0, + 2 + ], + ] + ], + "expectedWormholes" => [], + ]; + } + + #[DataProvider("jsonData")] + #[Test] + public function itCanBeInitializedFromJsonData(array $jsonData, array $expectedWormholes) { + $id = "tile-id"; + + $tile = Tile::fromJsonData($id, $jsonData); + $this->assertSame($id, $tile->id); + $this->assertSame($jsonData['anomaly'], $tile->anomaly); + $this->assertSame($jsonData['hyperlanes'], $jsonData['hyperlanes'] ?? []); + $this->assertSame($expectedWormholes, $tile->wormholes); + } + + + public static function anomalies() { + yield "When tile has anomaly" => [ + "anomaly" => "nebula", + "expected" => true + ]; + yield "When tile has no anomaly" => [ + "anomaly" => null, + "expected" => false + ]; + } + + #[DataProvider("anomalies")] + #[Test] + public function itCanCheckForAnomalies(?string $anomaly, bool $expected) { + $tile = new Tile( + "test-with-anomaly", + TileType::BLUE, + [], + [], + [], + $anomaly + ); + + $this->assertSame($expected, $tile->hasAnomaly()); + } + + public static function wormholeTiles() { + yield "When tile has wormhole" => [ + "lookingFor" => Wormhole::ALPHA, + "has" => [Wormhole::ALPHA], + "expected" => true + ]; + yield "When tile has multiple wormholes" => [ + "lookingFor" => Wormhole::BETA, + "has" => [Wormhole::ALPHA, Wormhole::BETA], + "expected" => true + ]; + yield "When tile does not have wormhole" => [ + "lookingFor" => Wormhole::EPSILON, + "has" => [Wormhole::GAMMA], + "expected" => false + ]; + yield "When tile has no wormholes" => [ + "lookingFor" => Wormhole::DELTA, + "has" => [], + "expected" => false + ]; + } + + #[DataProvider('wormholeTiles')] + #[Test] + public function itCanCheckForWormholes(Wormhole $lookingFor, array $has, bool $expected) { + $tile = new Tile( + "test", + TileType::BLUE, + [], + [], + $has + ); + + $this->assertSame($expected, $tile->hasWormhole($lookingFor)); + } + + #[Test] + public function itCanCheckForLegendaryPlanets() { + $regularPlanet = new Planet("regular", 1, 1); + $legendaryPlanet = new Planet("legendary", 3, 3, "Legend has it..."); + + $tileWithLegendary = new Tile("with-legendary", TileType::GREEN, [ + $regularPlanet, + $legendaryPlanet + ]); + $tileWithoutLegendary = new Tile("without-legendary", TileType::GREEN, [ + $regularPlanet + ]); + + $this->assertTrue($tileWithLegendary->hasLegendaryPlanet()); + $this->assertFalse($tileWithoutLegendary->hasLegendaryPlanet()); + } + + public static function tiles() + { + yield "When tile has nothing special" => [ + "tile" => new Tile( + "regular-tile", + TileType::BLUE, + ), + "expected" => [ + "alpha" => 0, + "beta" => 0, + "legendary" => 0 + ] + ]; + yield "When tile has wormhole" => [ + "tile" => new Tile( + "regular-tile", + TileType::BLUE, + [], + [], + [Wormhole::ALPHA] + ), + "expected" => [ + "alpha" => 1, + "beta" => 0, + "legendary" => 0 + ] + ]; + yield "When tile has multiple wormholes" => [ + "tile" => new Tile( + "regular-tile", + TileType::BLUE, + [], + [], + [Wormhole::ALPHA, Wormhole::BETA] + ), + "expected" => [ + "alpha" => 1, + "beta" => 1, + "legendary" => 0 + ] + ]; + yield "When tile has legendary" => [ + "tile" => new Tile( + "regular-tile", + TileType::BLUE, + [ + new Planet("test", 0, 0, "yes") + ] + ), + "expected" => [ + "alpha" => 0, + "beta" => 0, + "legendary" => 1 + ] + ]; + yield "When tile has wormhole and legendary" => [ + "tile" => new Tile( + "regular-tile", + TileType::BLUE, + [ + new Planet("test", 0, 0, "yes") + ], + [], + [Wormhole::BETA] + ), + "expected" => [ + "alpha" => 0, + "beta" => 1, + "legendary" => 1 + ] + ]; + } + + #[DataProvider("tiles")] + #[Test] + public function itCanCountSpecials(Tile $tile, array $expected) { + $count = Tile::countSpecials([$tile]); + $this->assertSame($expected["alpha"], $count["alpha"]); + $this->assertSame($expected["beta"], $count["beta"]); + $this->assertSame($expected["legendary"], $count["legendary"]); + } + + // just to be sure + #[DataProvider("tiles")] + #[Test] + public function itCanCountSpecialsForMultipleTiles(Tile $tile, array $expected) { + $count = Tile::countSpecials([$tile, $tile]); + $this->assertSame($expected["alpha"] * 2, $count["alpha"]); + $this->assertSame($expected["beta"] * 2, $count["beta"]); + $this->assertSame($expected["legendary"] * 2, $count["legendary"]); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/TileType.php b/app/TwilightImperium/TileType.php new file mode 100644 index 0000000..8061588 --- /dev/null +++ b/app/TwilightImperium/TileType.php @@ -0,0 +1,9 @@ + + */ + public static function fromJsonData(?string $wormhole): array + { + if ($wormhole == null) return []; + + if ($wormhole == "alpha-beta") { + return [ + self::ALPHA, + self::BETA + ]; + } else { + return [ + self::from($wormhole) + ]; + } + } +} \ No newline at end of file diff --git a/app/TwilightImperium/WormholeTest.php b/app/TwilightImperium/WormholeTest.php new file mode 100644 index 0000000..210c9b1 --- /dev/null +++ b/app/TwilightImperium/WormholeTest.php @@ -0,0 +1,33 @@ + [ + "wormhole" => "alpha", + "expected" => [Wormhole::ALPHA] + ]; + yield "When slice has multiple wormholes" => [ + "wormhole" => "alpha-beta", + "expected" => [Wormhole::ALPHA, Wormhole::BETA] + ]; + yield "When slice has no wormholes" => [ + "wormhole" => null, + "expected" => [] + ]; + } + + #[DataProvider("jsonData")] + #[Test] + public function itCanGetWormholesFromJsonData(?string $wormhole, array $expected) + { + $this->assertSame($expected, Wormhole::fromJsonData($wormhole)); + } +} \ No newline at end of file diff --git a/data/PlanetDataTest.php b/data/PlanetDataTest.php deleted file mode 100644 index 782dce4..0000000 --- a/data/PlanetDataTest.php +++ /dev/null @@ -1,25 +0,0 @@ - Planet::fromJsonData($data), $planetJsonData); - - $this->assertCount(count($planetJsonData), $planets); - } -} \ No newline at end of file diff --git a/data/TileDataTest.php b/data/TileDataTest.php new file mode 100644 index 0000000..e0954ee --- /dev/null +++ b/data/TileDataTest.php @@ -0,0 +1,48 @@ +getJsonData() as $t) { + if (isset($t['planets'])) { + foreach($t['planets'] as $p) { + $planetJsonData[] = $p; + } + } + } + + $planets = array_map(fn (array $data) => Planet::fromJsonData($data), $planetJsonData); + + $this->assertCount(count($planetJsonData), $planets); + } + + #[Test] + public function allSpaceStationsInTilesJsonAreValid() { + $spaceStationData = []; + foreach($this->getJsonData() as $t) { + if (isset($t['stations'])) { + foreach($t['stations'] as $p) { + $spaceStationData[] = $p; + } + } + } + + $spaceStations = array_map(fn (array $data) => SpaceStation::fromJsonData($data), $spaceStationData); + + $this->assertCount(count($spaceStationData), $spaceStations); + } +} \ No newline at end of file diff --git a/data/tiles.json b/data/tiles.json index 8ea112c..1c28e26 100644 --- a/data/tiles.json +++ b/data/tiles.json @@ -1446,7 +1446,7 @@ ], [ 1, - 3 + ] ], "wormhole": null, From f32207b6a12666cecf25d9248e93ae49727a5f57 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sat, 13 Dec 2025 17:11:50 +0100 Subject: [PATCH 07/34] Try different paratest command --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 58136f7..2e52297 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "phpstan": "vendor/bin/phpstan analyse --memory-limit=2G --ansi", "paratest": [ "Composer\\Config::disableProcessTimeout", - "vendor/bin/paratest -p12 --passthru-php=\"'-d' 'memory_limit=2G'\" --" + "vendor/bin/paratest -p12 --passthru-php=\"'-d' 'memory_limit=2G'\"" ] }, "require-dev": { From 4d5ebbdf1ff8c8532037a9408b56bb41c2ac4c49 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sat, 13 Dec 2025 17:20:45 +0100 Subject: [PATCH 08/34] Fix all tests and tiles.json --- app/Draft/Slice.php | 6 +++--- .../EntityWithResourcesAndInfluenceTest.php | 12 ++++++------ app/TwilightImperium/Tile.php | 3 +-- app/TwilightImperium/TileTest.php | 13 ++----------- data/tiles.json | 2 +- 5 files changed, 13 insertions(+), 23 deletions(-) diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php index 6c981cb..c4280de 100644 --- a/app/Draft/Slice.php +++ b/app/Draft/Slice.php @@ -88,10 +88,10 @@ public function validate( float $maximumOptimalTotal, ?int $maxWormholes = null ): bool { - $special_count = Tile::countSpecials($this->tiles); + $specialCount = Tile::countSpecials($this->tiles); // can't have 2 alpha, beta or legendary planets - if ($special_count['alpha'] > 1 || $special_count['beta'] > 1 || $special_count['legendary'] > 1) { + if ($specialCount['alpha'] > 1 || $specialCount['beta'] > 1 || $specialCount['legendary'] > 1) { throw InvalidSliceException::doesNotMeetRequirements("Too many wormholes or legendary planets"); } @@ -103,7 +103,7 @@ public function validate( throw InvalidSliceException::doesNotMeetRequirements("Minimal influence/resources too low"); } - if ($maxWormholes != null && $special_count['alpha'] + $special_count['beta'] > $maxWormholes) { + if ($maxWormholes != null && $specialCount['alpha'] + $specialCount['beta'] > $maxWormholes) { throw InvalidSliceException::doesNotMeetRequirements("More than allowed number of wormholes"); } diff --git a/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php b/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php index 88b9882..04afdb9 100644 --- a/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php +++ b/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php @@ -3,6 +3,7 @@ namespace App\TwilightImperium; use App\Testing\FakesData; +use App\Testing\PlanetFactory; use App\Testing\TestCase; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; @@ -42,14 +43,13 @@ public function itCalculatesOptimalValues( float $expectedOptimalInfluence ) { - $planet = new Planet( - $this->faker->word, + $entity = new EntityWithResourcesAndInfluence( $resources, - $influence, + $influence ); - $this->assertSame($expectedOptimalResources, $planet->optimalResources); - $this->assertSame($expectedOptimalInfluence, $planet->optimalInfluence); - $this->assertSame($expectedOptimalInfluence + $expectedOptimalResources, $planet->optimalTotal); + $this->assertSame($expectedOptimalResources, $entity->optimalResources); + $this->assertSame($expectedOptimalInfluence, $entity->optimalInfluence); + $this->assertSame($expectedOptimalInfluence + $expectedOptimalResources, $entity->optimalTotal); } } \ No newline at end of file diff --git a/app/TwilightImperium/Tile.php b/app/TwilightImperium/Tile.php index 0b7650e..100129c 100644 --- a/app/TwilightImperium/Tile.php +++ b/app/TwilightImperium/Tile.php @@ -11,7 +11,6 @@ class Tile public float $optimalInfluence = 0; public float $optimalResources = 0; public float $optimalTotal = 0; - public $special_count; public function __construct( public string $id, @@ -51,7 +50,7 @@ public static function fromJsonData(string $id, array $data): self { array_map(fn(array $stationData) => SpaceStation::fromJsonData($stationData), $data['stations'] ?? []), Wormhole::fromJsonData($data['wormhole']), $data['anomaly'], - $data['hyperlanes'] ?? [], + isset($data['hyperlanes']) ? $data['hyperlanes'] : [], ); } diff --git a/app/TwilightImperium/TileTest.php b/app/TwilightImperium/TileTest.php index 4905cd2..1e9a4d8 100644 --- a/app/TwilightImperium/TileTest.php +++ b/app/TwilightImperium/TileTest.php @@ -42,7 +42,7 @@ public static function jsonData() { ], "expectedWormholes" => [], ]; - yield "For a tile with a a wormhole" => [ + yield "For a tile with a wormhole" => [ "jsonData" => [ "type" => "blue", "wormhole" => "gamma", @@ -97,15 +97,6 @@ public static function jsonData() { ], "expectedWormholes" => [], ]; - yield "For a tile with no stations property" => [ - "jsonData" => [ - "type" => "red", - "wormhole" => null, - "anomaly" => null, - "planets" => [] - ], - "expectedWormholes" => [], - ]; yield "For a tile with stations" => [ "jsonData" => [ "type" => "red", @@ -156,7 +147,7 @@ public function itCanBeInitializedFromJsonData(array $jsonData, array $expectedW $tile = Tile::fromJsonData($id, $jsonData); $this->assertSame($id, $tile->id); $this->assertSame($jsonData['anomaly'], $tile->anomaly); - $this->assertSame($jsonData['hyperlanes'], $jsonData['hyperlanes'] ?? []); + $this->assertSame($jsonData['hyperlanes'] ?? [], $tile->hyperlanes); $this->assertSame($expectedWormholes, $tile->wormholes); } diff --git a/data/tiles.json b/data/tiles.json index 1c28e26..8ea112c 100644 --- a/data/tiles.json +++ b/data/tiles.json @@ -1446,7 +1446,7 @@ ], [ 1, - + 3 ] ], "wormhole": null, From d8b92e30d95ab7261bf546c36a16ae7688dc308a Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sat, 13 Dec 2025 19:44:34 +0100 Subject: [PATCH 09/34] Add inline documentation about slice arrangement --- app/Draft/Slice.php | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php index c4280de..684f9f9 100644 --- a/app/Draft/Slice.php +++ b/app/Draft/Slice.php @@ -130,21 +130,36 @@ public function arrange(): void { } } + /** + * Determine if the tiles (in the current order) are a valid arrangement + * + * tiles are laid out like this: + * 4 + * 3 + * 1 + * 0 2 + * H + * so for example, tile #1 neighbours #0, #3 and #4. #2 only neighbours #1 + * And we want to avoid two neighbouring anomalies (That's in the rules). + * + * The nature of milty draft makes it so that you can't predict the placement of slices, + * so neighbouring anomalies might happen just by virtue of player order and slice choice. + * But since we can't really do anything about that, we just stop enforce the rule here. + * + * @return bool + */ public function tileArrangementIsValid(): bool { - // tiles are laid out like this: - // 4 - // 3 - // 1 - // 0 2 - // H - // so for example, tile #1 neighbours #0, #3 and #4. #2 only neighbours #1 + $neighbours = [[0, 1], [0, 3], [1, 2], [1, 3], [1, 4], [3, 4]]; - foreach ($neighbours as $edge) { + foreach ($neighbours as $neighbouringPair) { // can't have two neighbouring anomalies - if ($this->tiles[$edge[0]]->hasAnomaly() && $this->tiles[$edge[1]]->hasAnomaly()) { + if ( + $this->tiles[$neighbouringPair[0]]->hasAnomaly() && + $this->tiles[$neighbouringPair[1]]->hasAnomaly() + ) { return false; } } From ac4446c210063651d2e2b00d7445f85a33f373f7 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sun, 14 Dec 2025 13:53:08 +0100 Subject: [PATCH 10/34] Refactor GeneratorConfig to DraftSettings --- app/Draft/AllianceDraftSettings.php | 10 + app/Draft/DraftSeed.php | 49 +++ app/Draft/DraftSeedTest.php | 78 ++++ app/Draft/DraftSettings.php | 100 +++++ app/Draft/DraftSettingsTest.php | 94 +++++ app/Http/ErrorResponse.php | 14 + app/Http/ErrorResponseTest.php | 18 + app/Http/HttpRequest.php | 32 ++ app/Http/HttpRequestTest.php | 67 ++++ app/Http/HttpResponse.php | 7 + app/Http/JsonResponse.php | 17 + app/Http/JsonResponseTest.php | 18 + app/Http/RequestHandler.php | 13 + app/Testing/MakesHttpRequests.php | 24 ++ app/Testing/TestDrafts.php | 23 ++ app/Testing/TestResponse.php | 22 ++ app/TwilightImperium/AllianceTeamMode.php | 9 + app/TwilightImperium/AllianceTeamModeTest.php | 18 + app/TwilightImperium/AllianceTeamPosition.php | 10 + .../AllianceTeamPositionTest.php | 19 + app/TwilightImperium/Edition.php | 32 ++ app/TwilightImperium/EditionTest.php | 21 + app/TwilightImperium/Planet.php | 2 +- ...ourcesAndInfluence.php => SpaceObject.php} | 2 +- ...dInfluenceTest.php => SpaceObjectTest.php} | 6 +- app/TwilightImperium/SpaceStation.php | 2 +- composer.json | 3 +- .../draft.november2025.alliance.json | 242 ++++++++++++ .../draft.november2025.custom.json | 370 ++++++++++++++++++ .../draft.november2025.finished.json | 360 +++++++++++++++++ 30 files changed, 1674 insertions(+), 8 deletions(-) create mode 100644 app/Draft/AllianceDraftSettings.php create mode 100644 app/Draft/DraftSeed.php create mode 100644 app/Draft/DraftSeedTest.php create mode 100644 app/Draft/DraftSettings.php create mode 100644 app/Draft/DraftSettingsTest.php create mode 100644 app/Http/ErrorResponse.php create mode 100644 app/Http/ErrorResponseTest.php create mode 100644 app/Http/HttpRequest.php create mode 100644 app/Http/HttpRequestTest.php create mode 100644 app/Http/HttpResponse.php create mode 100644 app/Http/JsonResponse.php create mode 100644 app/Http/JsonResponseTest.php create mode 100644 app/Http/RequestHandler.php create mode 100644 app/Testing/MakesHttpRequests.php create mode 100644 app/Testing/TestDrafts.php create mode 100644 app/Testing/TestResponse.php create mode 100644 app/TwilightImperium/AllianceTeamMode.php create mode 100644 app/TwilightImperium/AllianceTeamModeTest.php create mode 100644 app/TwilightImperium/AllianceTeamPosition.php create mode 100644 app/TwilightImperium/AllianceTeamPositionTest.php create mode 100644 app/TwilightImperium/Edition.php create mode 100644 app/TwilightImperium/EditionTest.php rename app/TwilightImperium/{EntityWithResourcesAndInfluence.php => SpaceObject.php} (95%) rename app/TwilightImperium/{EntityWithResourcesAndInfluenceTest.php => SpaceObjectTest.php} (91%) create mode 100644 data/test-drafts/draft.november2025.alliance.json create mode 100644 data/test-drafts/draft.november2025.custom.json create mode 100644 data/test-drafts/draft.november2025.finished.json diff --git a/app/Draft/AllianceDraftSettings.php b/app/Draft/AllianceDraftSettings.php new file mode 100644 index 0000000..f2c7d36 --- /dev/null +++ b/app/Draft/AllianceDraftSettings.php @@ -0,0 +1,10 @@ +seed = self::generate(); + } else { + $this->seed = $seed; + } + } + + protected static function generate(): int + { + return mt_rand(1, self::MAX_VALUE); + } + + public function getValue(): int + { + return $this->seed; + } + + public function setForFactions() + { + mt_srand($this->seed + self::OFFSET_FACTIONS); + } + + public function setForSlices($previousTries = 0) + { + mt_srand($this->seed + self::OFFSET_SLICES + $previousTries); + } + + public function setForPlayerOrder() + { + mt_srand($this->seed + self::OFFSET_PLAYER_ORDER); + } +} \ No newline at end of file diff --git a/app/Draft/DraftSeedTest.php b/app/Draft/DraftSeedTest.php new file mode 100644 index 0000000..e243c17 --- /dev/null +++ b/app/Draft/DraftSeedTest.php @@ -0,0 +1,78 @@ +assertIsInt($seed->getValue()); + } + + #[Test] + public function itCanUseAUserSeed() + { + $seed = new DraftSeed(self::TEST_SEED); + $this->assertSame(self::TEST_SEED, $seed->getValue()); + } + + #[Test] + public function itCanSetTheFactionSeed() + { + $seed = new DraftSeed(self::TEST_SEED); + $seed->setForFactions(); + $n = mt_rand(1, 10000); + // pre-calculated using TEST_SEED + $this->assertSame(5295, $n); + } + + #[Test] + public function itCanSetTheSliceSeed() + { + $seed = new DraftSeed(self::TEST_SEED); + $seed->setForSlices(self::TEST_SLICE_TRIES); + $n = mt_rand(1, 10000); + // pre-calculated using TEST_SEED + $this->assertSame(823, $n); + } + + #[Test] + public function itCanSetThePlayerOrderSeed() + { + $seed = new DraftSeed(self::TEST_SEED); + $seed->setForPlayerOrder(); + $n = mt_rand(1, 10000); + // pre-calculated using TEST_SEED + $this->assertSame(1646, $n); + } + + #[Test] + public function arraysAreShuffledPredictablyWhenSeedIsSet() + { + $seed = new DraftSeed(self::TEST_SEED); + $seed->setForFactions(); + + $a = [ + "a", "b", "c", "d", "f", "e", "g" + ]; + + shuffle($a); + + // pre-calculated using TEST_SEED + factions + $newOrder = [ + "a", "g", "e", "f", "d", "c", "b" + ]; + + foreach ($a as $idx => $value) { + $this->assertSame($newOrder[$idx], $a[$idx]); + } + } +} \ No newline at end of file diff --git a/app/Draft/DraftSettings.php b/app/Draft/DraftSettings.php new file mode 100644 index 0000000..cb374e4 --- /dev/null +++ b/app/Draft/DraftSettings.php @@ -0,0 +1,100 @@ + $players + */ + public array $players, + public bool $presetDraftOrder, + public DraftName $name, + public DraftSeed $seed, + public int $numberOfSlices, + public int $numberOfFactions, + /** + * @var array + */ + public array $tileSets, + /** + * @var array + */ + public array $factionSets, + // @todo figure out a better way to integrate this + // should be required-ish when TE is included, but optional if PoK is included + public bool $includeCouncilKeleresFaction, + public int $minimumWormholes, + public bool $maxOneWormholesPerSlice, + public int $minimumLegendaryPlanets, + public float $minimumOptimalInfluence, + public float $minimumOptimalResources, + public float $minimumOptimalTotal, + public float $maximumOptimalTotal, + public array $customFactions, + public array $customSlices, + public bool $allianceMode, + public ?AllianceTeamMode $allianceTeamMode = null, + public ?AllianceTeamPosition $allianceTeamPosition = null, + public ?bool $allianceForceDoublePicks = null + ) { + } + + protected function includesFactionSet(Edition $e): bool { + return in_array($e, $this->factionSets); + } + + protected function includesTileSet(Edition $e): bool { + return in_array($e, $this->tileSets); + } + + public function toArray() + { + return [ + 'players' => $this->players, + 'num_players' => count($this->players), + 'preset_draft_order' => $this->presetDraftOrder, + 'name' => (string) $this->name, + 'num_slices' => $this->numberOfSlices, + 'num_factions' => $this->numberOfFactions, + // tiles + 'include_pok' => $this->includesTileSet(Edition::PROPHECY_OF_KINGS), + 'include_ds_tiles' => $this->includesTileSet(Edition::DISCORDANT_STARS_PLUS), + 'include_te_tiles' => $this->includesTileSet(Edition::THUNDERS_EDGE), + // @todo refactor frontend to use this. Don't break backwards compatibility! + 'tile_sets' => $this->tileSets, + // factions + 'include_base_factions' => $this->includesFactionSet(Edition::BASE_GAME), + 'include_pok_factions' => $this->includesFactionSet(Edition::PROPHECY_OF_KINGS), + 'include_te_factions' => $this->includesFactionSet(Edition::THUNDERS_EDGE), + 'include_discordant' => $this->includesFactionSet(Edition::DISCORDANT_STARS), + 'include_discordantexp' => $this->includesFactionSet(Edition::DISCORDANT_STARS_PLUS), + 'include_keleres' => $this->includeCouncilKeleresFaction, + // slice settings + 'min_wormholes' => $this->minimumWormholes, + 'max_1_wormhole' => $this->maxOneWormholesPerSlice, + 'min_legendaries' => $this->minimumLegendaryPlanets, + // @todo refactor frontend to use this instead of min_legendaries. Don't break backwards compatibility! + 'minimum_legendary_planets' => $this->minimumLegendaryPlanets, + 'minimum_optimal_influence' => $this->minimumOptimalInfluence, + 'minimum_optimal_resources' => $this->minimumOptimalResources, + 'minimum_optimal_total' => $this->minimumOptimalTotal, + 'maximum_optimal_total' => $this->maximumOptimalTotal, + 'custom_factions' => $this->customFactions, + 'custom_slices' => $this->customSlices, + 'seed' => $this->seed->getValue(), + 'alliance' => $this->allianceMode ? [ + 'alliance_teams' => $this->allianceTeamMode->value, + 'alliance_teams_position' => $this->allianceTeamPosition->value, + 'force_double_picks' => $this->allianceForceDoublePicks + ] : null + ]; + } + + // @todo validate +} \ No newline at end of file diff --git a/app/Draft/DraftSettingsTest.php b/app/Draft/DraftSettingsTest.php new file mode 100644 index 0000000..1f4f6f6 --- /dev/null +++ b/app/Draft/DraftSettingsTest.php @@ -0,0 +1,94 @@ +toArray(); + + $this->assertSame(["john", "mike", "suzy", "robin"], $array['players']); + $this->assertSame("Testgame", $array['name']); + $this->assertSame(5, $array['num_slices']); + $this->assertSame(8, $array['num_factions']); + $this->assertSame(true, $array['include_pok']); + $this->assertSame(true, $array['include_ds_tiles']); + $this->assertSame(true, $array['include_te_tiles']); + $this->assertSame(false, $array['include_base_factions']); + $this->assertSame(true, $array['include_pok_factions']); + $this->assertSame(true, $array['include_keleres']); + $this->assertSame(false, $array['include_discordant']); + $this->assertSame(true, $array['include_discordantexp']); + $this->assertSame(true, $array['include_te_factions']); + $this->assertSame(true, $array['preset_draft_order']); + $this->assertSame(2, $array['min_wormholes']); + $this->assertSame(3, $array['min_legendaries']); + $this->assertSame(true, $array['max_1_wormhole']); + $this->assertSame(4.5, $array['minimum_optimal_influence']); + $this->assertSame(7.2, $array['minimum_optimal_resources']); + $this->assertSame(18.3, $array['minimum_optimal_total']); + $this->assertSame(29.0, $array['maximum_optimal_total']); + $this->assertSame([ + "The Titans of Ul", + "Free Systems Compact" + ], $array['custom_factions']); + $this->assertSame([ + [ + 1, 2, 3, 4, 5 + ] + ], $array['custom_slices']); + $this->assertSame(123, $array['seed']); + $this->assertSame("random", $array['alliance']['alliance_teams']); + $this->assertSame("neighbors", $array['alliance']['alliance_teams_position']); + $this->assertSame(true, $array['alliance']['force_double_picks']); + } +} \ No newline at end of file diff --git a/app/Http/ErrorResponse.php b/app/Http/ErrorResponse.php new file mode 100644 index 0000000..141b726 --- /dev/null +++ b/app/Http/ErrorResponse.php @@ -0,0 +1,14 @@ + $this->error + ]); + } +} \ No newline at end of file diff --git a/app/Http/ErrorResponseTest.php b/app/Http/ErrorResponseTest.php new file mode 100644 index 0000000..339a4b6 --- /dev/null +++ b/app/Http/ErrorResponseTest.php @@ -0,0 +1,18 @@ +assertSame(json_encode([ + "error" => "foo" + ]), (string) $response); + } +} \ No newline at end of file diff --git a/app/Http/HttpRequest.php b/app/Http/HttpRequest.php new file mode 100644 index 0000000..369e2c8 --- /dev/null +++ b/app/Http/HttpRequest.php @@ -0,0 +1,32 @@ +getParameters[$key])) { + return $this->getParameters[$key]; + } + if (isset($this->postParameters[$key])) { + return $this->postParameters[$key]; + } + return $defaultValue; + } +} \ No newline at end of file diff --git a/app/Http/HttpRequestTest.php b/app/Http/HttpRequestTest.php new file mode 100644 index 0000000..aa5ea91 --- /dev/null +++ b/app/Http/HttpRequestTest.php @@ -0,0 +1,67 @@ + [ + "param" => "key", + "get" => [ + "key" => "value" + ], + "post" => [], + "expectedValue" => "value" + ]; + yield "When set in post" => [ + "param" => "key", + "post" => [ + "key" => "value" + ], + "get" => [], + "expectedValue" => "value" + ]; + yield "When not set anywhere" => [ + "param" => "key", + "post" => [], + "get" => [], + "expectedValue" => null + ]; + } + + #[DataProvider("requestParameters")] + #[Test] + public function itCanRetrieveParameters(string $param, array $get, array $post, $expectedValue) + { + $request = new HttpRequest($get, $post); + $this->assertSame($expectedValue, $request->get($param)); + } + + #[Test] + public function itCanReturnDefaultValueForParameter() + { + $request = new HttpRequest([], []); + $this->assertSame("bar", $request->get("foo", "bar")); + } + + #[Test] + public function itCanBeInitialisedFromGetRequest() + { + $_GET["foo"] = "bar"; + $request = HttpRequest::fromRequest(); + $this->assertSame("bar", $request->get("foo")); + } + + #[Test] + public function itCanBeInitialisedFromPostRequest() + { + $_POST["foo"] = "bar"; + $request = HttpRequest::fromRequest(); + $this->assertSame("bar", $request->get("foo")); + } +} \ No newline at end of file diff --git a/app/Http/HttpResponse.php b/app/Http/HttpResponse.php new file mode 100644 index 0000000..598fa29 --- /dev/null +++ b/app/Http/HttpResponse.php @@ -0,0 +1,7 @@ +data); + } +} \ No newline at end of file diff --git a/app/Http/JsonResponseTest.php b/app/Http/JsonResponseTest.php new file mode 100644 index 0000000..c0f3e3f --- /dev/null +++ b/app/Http/JsonResponseTest.php @@ -0,0 +1,18 @@ + "bar" + ]; + $response = new JsonResponse($data); + $this->assertSame(json_encode($data), (string) $response); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandler.php b/app/Http/RequestHandler.php new file mode 100644 index 0000000..9a8ee87 --- /dev/null +++ b/app/Http/RequestHandler.php @@ -0,0 +1,13 @@ +request($method, $url); + + return new TestResponse($response); + } + + public function get($url): TestResponse + { + return $this->call('GET', $url); + } + + public function post($url, $data): TestResponse + { + return $this->call('GET', $url, $data); + } +} \ No newline at end of file diff --git a/app/Testing/TestDrafts.php b/app/Testing/TestDrafts.php new file mode 100644 index 0000000..8ba5c61 --- /dev/null +++ b/app/Testing/TestDrafts.php @@ -0,0 +1,23 @@ +name => [ + 'data' => self::loadDraftByFilename($case->value) + ]; + } + } +} \ No newline at end of file diff --git a/app/Testing/TestResponse.php b/app/Testing/TestResponse.php new file mode 100644 index 0000000..fc858b7 --- /dev/null +++ b/app/Testing/TestResponse.php @@ -0,0 +1,22 @@ +response->getStatusCode(), 200); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/AllianceTeamMode.php b/app/TwilightImperium/AllianceTeamMode.php new file mode 100644 index 0000000..9ac704b --- /dev/null +++ b/app/TwilightImperium/AllianceTeamMode.php @@ -0,0 +1,9 @@ + $mode->value, AllianceTeamMode::cases()); + + $this->assertContains("random", $values); + $this->assertContains("preset", $values); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/AllianceTeamPosition.php b/app/TwilightImperium/AllianceTeamPosition.php new file mode 100644 index 0000000..9d7f23d --- /dev/null +++ b/app/TwilightImperium/AllianceTeamPosition.php @@ -0,0 +1,10 @@ + $mode->value, AllianceTeamPosition::cases()); + + $this->assertContains("neighbors", $values); + $this->assertContains("opposites", $values); + $this->assertContains("none", $values); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/Edition.php b/app/TwilightImperium/Edition.php new file mode 100644 index 0000000..4a8d7b0 --- /dev/null +++ b/app/TwilightImperium/Edition.php @@ -0,0 +1,32 @@ + + */ + private static function editionsWithoutTiles(): array + { + return [ + self::DISCORDANT_STARS + ]; + } + + public static function hasValidTileSet(Edition $edition): bool + { + return !in_array($edition, self::editionsWithoutTiles()); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/EditionTest.php b/app/TwilightImperium/EditionTest.php new file mode 100644 index 0000000..d980199 --- /dev/null +++ b/app/TwilightImperium/EditionTest.php @@ -0,0 +1,21 @@ +assertFalse(Edition::hasValidTileSet($edition)); + } else { + $this->assertTrue(Edition::hasValidTileSet($edition)); + } + } + } +} \ No newline at end of file diff --git a/app/TwilightImperium/Planet.php b/app/TwilightImperium/Planet.php index 286f701..7958013 100644 --- a/app/TwilightImperium/Planet.php +++ b/app/TwilightImperium/Planet.php @@ -2,7 +2,7 @@ namespace App\TwilightImperium; -class Planet extends EntityWithResourcesAndInfluence +class Planet extends SpaceObject { public function __construct( public string $name, diff --git a/app/TwilightImperium/EntityWithResourcesAndInfluence.php b/app/TwilightImperium/SpaceObject.php similarity index 95% rename from app/TwilightImperium/EntityWithResourcesAndInfluence.php rename to app/TwilightImperium/SpaceObject.php index 0910704..8ea453c 100644 --- a/app/TwilightImperium/EntityWithResourcesAndInfluence.php +++ b/app/TwilightImperium/SpaceObject.php @@ -2,7 +2,7 @@ namespace App\TwilightImperium; -class EntityWithResourcesAndInfluence +class SpaceObject { public float $optimalTotal = 0; public float $optimalResources = 0; diff --git a/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php b/app/TwilightImperium/SpaceObjectTest.php similarity index 91% rename from app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php rename to app/TwilightImperium/SpaceObjectTest.php index 04afdb9..96d21b8 100644 --- a/app/TwilightImperium/EntityWithResourcesAndInfluenceTest.php +++ b/app/TwilightImperium/SpaceObjectTest.php @@ -8,10 +8,8 @@ use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; -class EntityWithResourcesAndInfluenceTest extends TestCase +class SpaceObjectTest extends TestCase { - use FakesData; - public static function values(): iterable { yield "when resource value is higher than influence" => [ @@ -43,7 +41,7 @@ public function itCalculatesOptimalValues( float $expectedOptimalInfluence ) { - $entity = new EntityWithResourcesAndInfluence( + $entity = new SpaceObject( $resources, $influence ); diff --git a/app/TwilightImperium/SpaceStation.php b/app/TwilightImperium/SpaceStation.php index 208a262..c986ca5 100644 --- a/app/TwilightImperium/SpaceStation.php +++ b/app/TwilightImperium/SpaceStation.php @@ -2,7 +2,7 @@ namespace App\TwilightImperium; -class SpaceStation extends EntityWithResourcesAndInfluence +class SpaceStation extends SpaceObject { public function __construct( public string $name, diff --git a/composer.json b/composer.json index 2e52297..9e58e4b 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,8 @@ "require": { "vlucas/phpdotenv": "^5.4", "aws/aws-sdk-php": "^3.339", - "ext-json": "*" + "ext-json": "*", + "guzzlehttp/guzzle": "^7.9" }, "autoload": { "psr-4": { diff --git a/data/test-drafts/draft.november2025.alliance.json b/data/test-drafts/draft.november2025.alliance.json new file mode 100644 index 0000000..6e95d43 --- /dev/null +++ b/data/test-drafts/draft.november2025.alliance.json @@ -0,0 +1,242 @@ +{ + "done": false, + "id": "693e9b8424c14", + "secrets": { + "admin_pass": "84fea5bc6fef48ac892782bcc1d2d865" + }, + "draft": { + "players": { + "p_9d9b8e01cad9f44e964b31d7a6795882": { + "id": "p_9d9b8e01cad9f44e964b31d7a6795882", + "name": "Ben", + "claimed": false, + "position": null, + "slice": null, + "faction": null, + "team": "B" + }, + "p_bd2260ba98e0234d4df6b87595e4843c": { + "id": "p_bd2260ba98e0234d4df6b87595e4843c", + "name": "Charlie", + "claimed": false, + "position": null, + "slice": null, + "faction": null, + "team": "B" + }, + "p_5171f5f7525f25642e9293a4dd4832ee": { + "id": "p_5171f5f7525f25642e9293a4dd4832ee", + "name": "Amy", + "claimed": false, + "position": null, + "slice": null, + "faction": null, + "team": "A" + }, + "p_47144de1e821f459df3f088a950e8fc2": { + "id": "p_47144de1e821f459df3f088a950e8fc2", + "name": "Desmond", + "claimed": false, + "position": null, + "slice": null, + "faction": null, + "team": "A" + } + }, + "log": [], + "current": "p_9d9b8e01cad9f44e964b31d7a6795882" + }, + "slices": [ + { + "tiles": [ + 29, + 40, + 60, + 46, + 76 + ], + "specialties": [ + "biotic" + ], + "wormholes": [ + "beta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 10, + "total_resources": 5, + "optimal_influence": 8.5, + "optimal_resources": 2.5 + }, + { + "tiles": [ + 64, + 59, + 67, + 42, + 36 + ], + "specialties": [ + "propulsion" + ], + "wormholes": [ + "beta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 7, + "total_resources": 9, + "optimal_influence": 5, + "optimal_resources": 7 + }, + { + "tiles": [ + 38, + 37, + 49, + 50, + 61 + ], + "specialties": [ + "warfare", + "warfare" + ], + "wormholes": [], + "has_legendaries": false, + "legendaries": [], + "total_influence": 6, + "total_resources": 8, + "optimal_influence": 6, + "optimal_resources": 7 + }, + { + "tiles": [ + 63, + 78, + 32, + 77, + 72 + ], + "specialties": [ + "warfare", + "biotic" + ], + "wormholes": [], + "has_legendaries": false, + "legendaries": [], + "total_influence": 8, + "total_resources": 5, + "optimal_influence": 5.5, + "optimal_resources": 3.5 + }, + { + "tiles": [ + 20, + 71, + 80, + 73, + 44 + ], + "specialties": [ + "cybernetic" + ], + "wormholes": [], + "has_legendaries": false, + "legendaries": [], + "total_influence": 8, + "total_resources": 6, + "optimal_influence": 4.5, + "optimal_resources": 4.5 + }, + { + "tiles": [ + 26, + 45, + 19, + 75, + 47 + ], + "specialties": [ + "cybernetic" + ], + "wormholes": [ + "alpha" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 5, + "total_resources": 8, + "optimal_influence": 4, + "optimal_resources": 6 + }, + { + "tiles": [ + 43, + 66, + 41, + 24, + 30 + ], + "specialties": [ + "warfare" + ], + "wormholes": [], + "has_legendaries": true, + "legendaries": [ + "You may exhaust this card at the end of your turn to place 1 mech from your reinforcements on any planet you control, or draw 1 action card" + ], + "total_influence": 6, + "total_resources": 7, + "optimal_influence": 5, + "optimal_resources": 6 + } + ], + "factions": [ + "The Naalu Collective", + "The Titans of Ul", + "The L1z1x Mindnet", + "The Federation of Sol", + "The Barony of Letnev", + "The Xxcha Kingdom", + "The Universities of Jol-Nar", + "The Mentak Coalition", + "The Empyrean" + ], + "config": { + "players": [ + "Ben", + "Charlie", + "Amy", + "Desmond" + ], + "name": "Operation Super War", + "num_slices": 7, + "num_factions": 9, + "include_pok": true, + "include_ds_tiles": false, + "include_te_tiles": false, + "include_base_factions": true, + "include_pok_factions": true, + "include_keleres": false, + "include_discordant": false, + "include_discordantexp": false, + "include_te_factions": false, + "preset_draft_order": false, + "min_wormholes": 0, + "min_legendaries": 0, + "max_1_wormhole": false, + "minimum_optimal_influence": 4, + "minimum_optimal_resources": 2.5, + "minimum_optimal_total": 9, + "maximum_optimal_total": 13, + "custom_factions": null, + "custom_slices": null, + "alliance": { + "alliance_teams": "random", + "alliance_teams_position": "neighbors", + "force_double_picks": true + }, + "seed": 330899005632699 + }, + "name": "Operation Super War" +} \ No newline at end of file diff --git a/data/test-drafts/draft.november2025.custom.json b/data/test-drafts/draft.november2025.custom.json new file mode 100644 index 0000000..c0c81f3 --- /dev/null +++ b/data/test-drafts/draft.november2025.custom.json @@ -0,0 +1,370 @@ +{ + "done": false, + "id": "693e9b3fb8452", + "secrets": { + "admin_pass": "cbe0c4bed337c012996d9ee876510363" + }, + "draft": { + "players": { + "p_564cbfb050046007faea784931962140": { + "id": "p_564cbfb050046007faea784931962140", + "name": "Ben", + "claimed": false, + "position": null, + "slice": null, + "faction": "Free Systems Compact", + "team": null + }, + "p_ffbfdb5608320d54d904e07eae678c2a": { + "id": "p_ffbfdb5608320d54d904e07eae678c2a", + "name": "Esther", + "claimed": false, + "position": null, + "slice": null, + "faction": "Last Bastion", + "team": null + }, + "p_67161c4c41518e0e1cfc4e2c044269e2": { + "id": "p_67161c4c41518e0e1cfc4e2c044269e2", + "name": "Frank", + "claimed": false, + "position": null, + "slice": null, + "faction": "Gledge Union", + "team": null + }, + "p_e6556957358fe40ec9c0bf4a9ddab0ac": { + "id": "p_e6556957358fe40ec9c0bf4a9ddab0ac", + "name": "Desmond", + "claimed": false, + "position": null, + "slice": "1", + "faction": null, + "team": null + }, + "p_404e5780ee88e69cab1602093431c2a8": { + "id": "p_404e5780ee88e69cab1602093431c2a8", + "name": "Amy", + "claimed": false, + "position": null, + "slice": null, + "faction": null, + "team": null + }, + "p_e37356083346f2cb785de89c36faff1e": { + "id": "p_e37356083346f2cb785de89c36faff1e", + "name": "Charlie", + "claimed": false, + "position": null, + "slice": null, + "faction": null, + "team": null + } + }, + "log": [ + { + "player": "p_564cbfb050046007faea784931962140", + "category": "faction", + "value": "Free Systems Compact" + }, + { + "player": "p_ffbfdb5608320d54d904e07eae678c2a", + "category": "faction", + "value": "Last Bastion" + }, + { + "player": "p_67161c4c41518e0e1cfc4e2c044269e2", + "category": "faction", + "value": "Gledge Union" + }, + { + "player": "p_e6556957358fe40ec9c0bf4a9ddab0ac", + "category": "slice", + "value": "1" + } + ], + "current": "p_404e5780ee88e69cab1602093431c2a8" + }, + "slices": [ + { + "tiles": [ + 61, + 48, + 59, + 49, + 40 + ], + "specialties": [ + "warfare", + "propulsion" + ], + "wormholes": [ + "beta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 3, + "total_resources": 3, + "optimal_influence": 3, + "optimal_resources": 2 + }, + { + "tiles": [ + 60, + 72, + 39, + 68, + 25 + ], + "specialties": [ + "warfare" + ], + "wormholes": [ + "alpha", + "beta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 6, + "total_resources": 11, + "optimal_influence": 1, + "optimal_resources": 10 + }, + { + "tiles": [ + 27, + 44, + 76, + 79, + 35 + ], + "specialties": [ + "biotic", + "biotic" + ], + "wormholes": [ + "alpha" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 10, + "total_resources": 11, + "optimal_influence": 7, + "optimal_resources": 7 + }, + { + "tiles": [ + 45, + 34, + 46, + 11, + 36 + ], + "specialties": [ + "propulsion" + ], + "wormholes": [], + "has_legendaries": false, + "legendaries": [], + "total_influence": 8, + "total_resources": 8, + "optimal_influence": 5.5, + "optimal_resources": 5.5 + }, + { + "tiles": [ + 30, + 12, + 50, + 22, + 17 + ], + "specialties": [ + "biotic" + ], + "wormholes": [ + "delta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 9, + "total_resources": 7, + "optimal_influence": 7.5, + "optimal_resources": 3.5 + }, + { + "tiles": [ + 70, + 73, + 12, + 77, + 21 + ], + "specialties": [ + "cybernetic", + "propulsion" + ], + "wormholes": [], + "has_legendaries": false, + "legendaries": [], + "total_influence": 12, + "total_resources": 6, + "optimal_influence": 10.5, + "optimal_resources": 2.5 + } + ], + "factions": [ + "Veldyr Sovereignty", + "Free Systems Compact", + "Kyro Sodality", + "Ghoti Wayfarers", + "Zelian Purifier", + "Gledge Union", + "Nokar Sellships", + "Last Bastion", + "Savages of Cymiae" + ], + "config": { + "players": [ + "Ben", + "Esther", + "Frank", + "Desmond", + "Amy", + "Charlie" + ], + "name": "Operation Adventurous Fact", + "num_slices": 6, + "num_factions": 9, + "include_pok": true, + "include_ds_tiles": true, + "include_te_tiles": true, + "include_base_factions": true, + "include_pok_factions": true, + "include_keleres": true, + "include_discordant": true, + "include_discordantexp": true, + "include_te_factions": true, + "preset_draft_order": false, + "min_wormholes": 0, + "min_legendaries": 0, + "max_1_wormhole": false, + "minimum_optimal_influence": 4, + "minimum_optimal_resources": 2.5, + "minimum_optimal_total": 9, + "maximum_optimal_total": 13, + "custom_factions": [ + "Sardakk N'orr", + "The Arborec", + "The Barony of Letnev", + "The Clan of Saar", + "The Embers of Muaat", + "The Emirates of Hacan", + "The Federation of Sol", + "The Ghosts of Creuss", + "The L1z1x Mindnet", + "The Mentak Coalition", + "The Naalu Collective", + "The Nekro Virus", + "The Universities of Jol-Nar", + "The Winnu", + "The Xxcha Kingdom", + "The Yin Brotherhood", + "The Yssaril Tribes", + "The Argent Flight", + "The Empyrean", + "The Mahact Gene-sorcerers", + "The Naaz-Rokha Alliance", + "The Nomad", + "The Titans of Ul", + "The Vuil'raith Cabal", + "The Council Keleres", + "Augurs of Ilyxum", + "Celdauri Trade Confederation", + "Dih-Mohn Flotilla", + "Florzen Profiteers", + "Free Systems Compact", + "Ghemina Raiders", + "Glimmer of Mortheus", + "Kollecc Society", + "Kortali Tribunal", + "Li-Zho Dynasty", + "L'Tokk Khrask", + "Mirveda Protectorate", + "Myko-Mentori", + "Nivyn Star Kings", + "Olradin League", + "Roh'Dhna Mechatronics", + "Savages of Cymiae", + "Shipwrights of Axis", + "Tnelis Syndicate", + "Vaden Banking Clans", + "Vaylerian Scourge", + "Veldyr Sovereignty", + "Zealots of Rhodun", + "Zelian Purifier", + "Bentor Conglomerate", + "Berserkers of Kjalengard", + "Cheiran Hordes", + "Edyn Mandate", + "Ghoti Wayfarers", + "Gledge Union", + "Kyro Sodality", + "Lanefir Remnants", + "The Monks of Kolume", + "Nokar Sellships", + "Last Bastion", + "The Ral Nel Consortium", + "The Deepwrought Scholarate", + "The Crimson Rebellion", + "The Firmament / The Obsidian" + ], + "custom_slices": [ + [ + "61", + "48", + "59", + "49", + "40" + ], + [ + "60", + "72", + "39", + "68", + "25" + ], + [ + "27", + "44", + "76", + "79", + "35" + ], + [ + "45", + "34", + "46", + "11", + "36" + ], + [ + "30", + "12", + "50", + "22", + "17" + ], + [ + "70", + "73", + "12", + "77", + "21" + ] + ], + "alliance": null, + "seed": 896134222637712 + }, + "name": "Custom Slices and Factions" +} \ No newline at end of file diff --git a/data/test-drafts/draft.november2025.finished.json b/data/test-drafts/draft.november2025.finished.json new file mode 100644 index 0000000..cb9e67b --- /dev/null +++ b/data/test-drafts/draft.november2025.finished.json @@ -0,0 +1,360 @@ +{ + "done": true, + "id": "693e979ca04c9", + "secrets": { + "admin_pass": "1d9f392001338a452efa9e27e843780c", + "p_b26d3bfd9f83d741cd71c8023cace30a": "1d57678d1c34aef831fd71fedf07d58e" + }, + "draft": { + "players": { + "p_b26d3bfd9f83d741cd71c8023cace30a": { + "id": "p_b26d3bfd9f83d741cd71c8023cace30a", + "name": "Amy", + "claimed": true, + "position": "3", + "slice": "3", + "faction": "Berserkers of Kjalengard", + "team": null + }, + "p_f57c3d5d815fd0b4aa2579ab15cf17aa": { + "id": "p_f57c3d5d815fd0b4aa2579ab15cf17aa", + "name": "Ben", + "claimed": false, + "position": "5", + "slice": "0", + "faction": "The Ral Nel Consortium", + "team": null + }, + "p_a25a5582f3c732d4e2daab7aa80e2c19": { + "id": "p_a25a5582f3c732d4e2daab7aa80e2c19", + "name": "Charlie", + "claimed": false, + "position": "4", + "slice": "1", + "faction": "The Vuil'raith Cabal", + "team": null + }, + "p_6ebcab571e776e0ae4692940b72872be": { + "id": "p_6ebcab571e776e0ae4692940b72872be", + "name": "Desmond", + "claimed": false, + "position": "0", + "slice": "2", + "faction": "The Yin Brotherhood", + "team": null + }, + "p_8ae9f03017af74dc88d267fcc56e308b": { + "id": "p_8ae9f03017af74dc88d267fcc56e308b", + "name": "Esther", + "claimed": false, + "position": "2", + "slice": "5", + "faction": "Myko-Mentori", + "team": null + }, + "p_d9e0f5382fb4da130428ca06936abfaf": { + "id": "p_d9e0f5382fb4da130428ca06936abfaf", + "name": "Frank", + "claimed": false, + "position": "1", + "slice": "6", + "faction": "Roh'Dhna Mechatronics", + "team": null + } + }, + "log": [ + { + "player": "p_b26d3bfd9f83d741cd71c8023cace30a", + "category": "faction", + "value": "Berserkers of Kjalengard" + }, + { + "player": "p_f57c3d5d815fd0b4aa2579ab15cf17aa", + "category": "faction", + "value": "The Ral Nel Consortium" + }, + { + "player": "p_a25a5582f3c732d4e2daab7aa80e2c19", + "category": "slice", + "value": "1" + }, + { + "player": "p_6ebcab571e776e0ae4692940b72872be", + "category": "slice", + "value": "2" + }, + { + "player": "p_8ae9f03017af74dc88d267fcc56e308b", + "category": "position", + "value": "2" + }, + { + "player": "p_d9e0f5382fb4da130428ca06936abfaf", + "category": "position", + "value": "1" + }, + { + "player": "p_d9e0f5382fb4da130428ca06936abfaf", + "category": "slice", + "value": "6" + }, + { + "player": "p_8ae9f03017af74dc88d267fcc56e308b", + "category": "slice", + "value": "5" + }, + { + "player": "p_6ebcab571e776e0ae4692940b72872be", + "category": "position", + "value": "0" + }, + { + "player": "p_a25a5582f3c732d4e2daab7aa80e2c19", + "category": "position", + "value": "4" + }, + { + "player": "p_f57c3d5d815fd0b4aa2579ab15cf17aa", + "category": "slice", + "value": "0" + }, + { + "player": "p_b26d3bfd9f83d741cd71c8023cace30a", + "category": "slice", + "value": "3" + }, + { + "player": "p_b26d3bfd9f83d741cd71c8023cace30a", + "category": "position", + "value": "3" + }, + { + "player": "p_f57c3d5d815fd0b4aa2579ab15cf17aa", + "category": "position", + "value": "5" + }, + { + "player": "p_a25a5582f3c732d4e2daab7aa80e2c19", + "category": "faction", + "value": "The Vuil'raith Cabal" + }, + { + "player": "p_6ebcab571e776e0ae4692940b72872be", + "category": "faction", + "value": "The Yin Brotherhood" + }, + { + "player": "p_8ae9f03017af74dc88d267fcc56e308b", + "category": "faction", + "value": "Myko-Mentori" + }, + { + "player": "p_d9e0f5382fb4da130428ca06936abfaf", + "category": "faction", + "value": "Roh'Dhna Mechatronics" + } + ], + "current": "p_d9e0f5382fb4da130428ca06936abfaf" + }, + "slices": [ + { + "tiles": [ + 4274, + 29, + 115, + 61, + 109 + ], + "specialties": [ + "warfare", + "warfare" + ], + "wormholes": [], + "has_legendaries": true, + "legendaries": [ + "You may exhaust this card when you pass to place 1 ship that matches a unit upgrade technology you owm from your reinforcements into a system that contains your ships." + ], + "total_influence": 8, + "total_resources": 7, + "optimal_influence": 7.5, + "optimal_resources": 4.5 + }, + { + "tiles": [ + 4273, + 102, + 77, + 76, + 75 + ], + "specialties": [ + "biotic", + "propulsion" + ], + "wormholes": [ + "alpha" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 7, + "total_resources": 7, + "optimal_influence": 6, + "optimal_resources": 4 + }, + { + "tiles": [ + 49, + 64, + 43, + 4262, + 20 + ], + "specialties": [ + "warfare" + ], + "wormholes": [ + "beta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 8, + "total_resources": 8, + "optimal_influence": 6, + "optimal_resources": 4 + }, + { + "tiles": [ + 105, + 48, + 24, + 32, + 39 + ], + "specialties": [ + "biotic", + "biotic", + "warfare" + ], + "wormholes": [ + "alpha" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 8, + "total_resources": 5, + "optimal_influence": 6, + "optimal_resources": 3 + }, + { + "tiles": [ + 117, + 38, + 4269, + 19, + 111 + ], + "specialties": [ + "cybernetic" + ], + "wormholes": [], + "has_legendaries": true, + "legendaries": [ + "You may exhaust this card at the end of your turn to remove 1 of your ships from the game board and place that unit in an adjacent system that does not contain another player’s ships." + ], + "total_influence": 7, + "total_resources": 11, + "optimal_influence": 5, + "optimal_resources": 8 + }, + { + "tiles": [ + 4256, + 28, + 113, + 104, + 42 + ], + "specialties": [], + "wormholes": [ + "beta" + ], + "has_legendaries": true, + "legendaries": [ + "You may exhaust this card at the end of your turn and purge a non-faction, non-unit upgrade technology you own to gain 1 technology with the same number of prerequisites." + ], + "total_influence": 7, + "total_resources": 4, + "optimal_influence": 6, + "optimal_resources": 4 + }, + { + "tiles": [ + 98, + 63, + 50, + 79, + 4268 + ], + "specialties": [ + "biotic" + ], + "wormholes": [ + "alpha" + ], + "has_legendaries": true, + "legendaries": [ + "You may exhaust this card when you pass to place 1 action card from the discard pile faceup on this card; you can purge cards on this card to play them as if they were in your hand." + ], + "total_influence": 6, + "total_resources": 5, + "optimal_influence": 4.5, + "optimal_resources": 4.5 + } + ], + "factions": [ + "Roh'Dhna Mechatronics", + "Berserkers of Kjalengard", + "The Yin Brotherhood", + "Savages of Cymiae", + "Myko-Mentori", + "Sardakk N'orr", + "Ghoti Wayfarers", + "The Ral Nel Consortium", + "The Vuil'raith Cabal" + ], + "config": { + "players": [ + "Amy", + "Ben", + "Charlie", + "Desmond", + "Esther", + "Frank" + ], + "name": "Game with every checkbox checked", + "num_slices": 7, + "num_factions": 9, + "include_pok": true, + "include_ds_tiles": true, + "include_te_tiles": true, + "include_base_factions": true, + "include_pok_factions": true, + "include_keleres": false, + "include_discordant": true, + "include_discordantexp": true, + "include_te_factions": true, + "preset_draft_order": true, + "min_wormholes": 2, + "min_legendaries": 1, + "max_1_wormhole": true, + "minimum_optimal_influence": 4, + "minimum_optimal_resources": 2.5, + "minimum_optimal_total": 9, + "maximum_optimal_total": 13, + "custom_factions": null, + "custom_slices": null, + "alliance": null, + "seed": 123 + }, + "name": "Game with every checkbox checked" +} \ No newline at end of file From 515a99149df73716b05199808b117d0e3570444b Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sun, 14 Dec 2025 13:56:00 +0100 Subject: [PATCH 11/34] Add data integrity tests to workflow --- .github/workflows/test-application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml index d83f1b8..c3f7b61 100644 --- a/.github/workflows/test-application.yml +++ b/.github/workflows/test-application.yml @@ -21,6 +21,7 @@ jobs: matrix: testsuite: - core + - data steps: - uses: actions/checkout@v5 - run: composer install --prefer-dist --no-ansi --no-interaction --no-progress From 4ab0b27b56690924c625e8775bea8e57e3544f73 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sun, 14 Dec 2025 14:09:09 +0100 Subject: [PATCH 12/34] Add data integrity test for tile data and images --- data/TileDataTest.php | 25 ++++++ data/all-tiles-ever.json | 190 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 215 insertions(+) create mode 100644 data/all-tiles-ever.json diff --git a/data/TileDataTest.php b/data/TileDataTest.php index e0954ee..086b17c 100644 --- a/data/TileDataTest.php +++ b/data/TileDataTest.php @@ -45,4 +45,29 @@ public function allSpaceStationsInTilesJsonAreValid() { $this->assertCount(count($spaceStationData), $spaceStations); } + + /** + * If we ever change tilenames again (bad idea, turns out) these next test should prevent us from breaking old drafts + * + * @return void + */ + #[Test] + public function allHistoricTileIdsHaveData() { + $historicTileIds = json_decode(file_get_contents('data/all-tiles-ever.json')); + + $currentTileIds = array_keys($this->getJsonData()); + + foreach($historicTileIds as $id) { + $this->assertContains($id, $currentTileIds); + } + } + + #[Test] + public function allHistoricTileIdsHaveImages() { + $historicTileIds = json_decode(file_get_contents('data/all-tiles-ever.json')); + + foreach($historicTileIds as $id) { + $this->assertFileExists('img/tiles/ST_' . $id . '.png'); + } + } } \ No newline at end of file diff --git a/data/all-tiles-ever.json b/data/all-tiles-ever.json new file mode 100644 index 0000000..9de81e1 --- /dev/null +++ b/data/all-tiles-ever.json @@ -0,0 +1,190 @@ +[ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + "83A", + "83B", + "84A", + "84B", + "85A", + "85B", + "86A", + "86B", + "87A", + "87B", + "88A", + "88B", + "89A", + "89B", + "90A", + "90B", + "91A", + "91B", + 92, + 93, + 94, + 95, + "96a", + "96b", + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 4200, + 4222, + 4223, + 4201, + 4212, + 4213, + 4214, + 4215, + 4204, + 4205, + 4206, + 4207, + 4203, + 4208, + 4216, + 4209, + 4217, + 4210, + 4218, + 4211, + 4219, + 4220, + 4202, + 4221, + 4224, + 4225, + 4230, + 4231, + 4228, + 4232, + 4229, + 4227, + 4233, + 4234, + 4236, + 4235, + 4253, + 4254, + 4255, + 4256, + 4257, + 4258, + 4259, + 4260, + 4261, + 4262, + 4263, + 4264, + 4265, + 4266, + 4267, + 4268, + 4269, + 4270, + 4271, + 4272, + 4273, + 4274, + 4275, + 4276 +] \ No newline at end of file From a656ad427d846f6db194329ea8cc8c93e10e828b Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Mon, 15 Dec 2025 08:58:41 +0100 Subject: [PATCH 13/34] DraftSettings tests + data integrity tests --- app/Draft/DraftName.php | 8 +- app/Draft/DraftSeed.php | 6 + app/Draft/DraftSettings.php | 118 ++++++++++- app/Draft/DraftSettingsTest.php | 186 ++++++++++++++++++ app/Draft/InvalidDraftSettingsException.php | 67 +++++++ app/Testing/DraftSettingsFactory.php | 73 +++++++ app/TwilightImperium/Edition.php | 51 ++++- app/TwilightImperium/EditionTest.php | 50 ++++- app/TwilightImperium/Tile.php | 5 +- data/FactionDataTest.php | 45 +++++ data/TileDataTest.php | 23 ++- .../historic-test-data/all-factions-ever.json | 66 +++++++ .../all-tiles-ever.json | 0 img/tiles/ST_-1.png | Bin 2697 -> 0 bytes img/tiles/ST_EMPTY.png | Bin 8493 -> 0 bytes img/tiles/ST_undefined.png | Bin 2697 -> 0 bytes 16 files changed, 670 insertions(+), 28 deletions(-) create mode 100644 app/Draft/InvalidDraftSettingsException.php create mode 100644 app/Testing/DraftSettingsFactory.php create mode 100644 data/FactionDataTest.php create mode 100644 data/historic-test-data/all-factions-ever.json rename data/{ => historic-test-data}/all-tiles-ever.json (100%) delete mode 100644 img/tiles/ST_-1.png delete mode 100644 img/tiles/ST_EMPTY.png delete mode 100644 img/tiles/ST_undefined.png diff --git a/app/Draft/DraftName.php b/app/Draft/DraftName.php index 57c43ea..b51f264 100644 --- a/app/Draft/DraftName.php +++ b/app/Draft/DraftName.php @@ -6,13 +6,11 @@ class DraftName implements \Stringable { private string $name; - public function __construct(string $submittedName = '') { - $submittedName = trim($submittedName); - - if($submittedName == '') { + public function __construct(?string $submittedName = null) { + if($submittedName == null || trim($submittedName) == '') { $this->name = $this->generate(); } else { - $this->name = htmlentities($submittedName); + $this->name = htmlentities(trim($submittedName)); } } diff --git a/app/Draft/DraftSeed.php b/app/Draft/DraftSeed.php index 5a18690..3aa2d71 100644 --- a/app/Draft/DraftSeed.php +++ b/app/Draft/DraftSeed.php @@ -7,6 +7,7 @@ class DraftSeed // Maximum value for random seed generation (2^50) // Limited by JavaScript's Number.MAX_SAFE_INTEGER (2^53 - 1) for JSON compatibility public const MAX_VALUE = 1125899906842624; + public const MIN_VALUE = 1; private const OFFSET_SLICES = 0; private const OFFSET_FACTIONS = 1; @@ -46,4 +47,9 @@ public function setForPlayerOrder() { mt_srand($this->seed + self::OFFSET_PLAYER_ORDER); } + + public function isValid() + { + return $this->seed >= self::MIN_VALUE && $this->seed <= self::MAX_VALUE; + } } \ No newline at end of file diff --git a/app/Draft/DraftSettings.php b/app/Draft/DraftSettings.php index cb374e4..4f4887b 100644 --- a/app/Draft/DraftSettings.php +++ b/app/Draft/DraftSettings.php @@ -6,9 +6,14 @@ use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; +/** + * @todo This class is friggin huge. We could sepatate all the validators into their own class + * or have SliceSettings, FactionSettings,... + */ class DraftSettings { public function __construct( + public int $numberOfPlayers, /** * @var array $players */ @@ -57,7 +62,7 @@ public function toArray() { return [ 'players' => $this->players, - 'num_players' => count($this->players), + 'num_players' => $this->numberOfPlayers, 'preset_draft_order' => $this->presetDraftOrder, 'name' => (string) $this->name, 'num_slices' => $this->numberOfSlices, @@ -66,8 +71,7 @@ public function toArray() 'include_pok' => $this->includesTileSet(Edition::PROPHECY_OF_KINGS), 'include_ds_tiles' => $this->includesTileSet(Edition::DISCORDANT_STARS_PLUS), 'include_te_tiles' => $this->includesTileSet(Edition::THUNDERS_EDGE), - // @todo refactor frontend to use this. Don't break backwards compatibility! - 'tile_sets' => $this->tileSets, + // @todo refactor frontend to use tile sets. Backwards compatibility! // factions 'include_base_factions' => $this->includesFactionSet(Edition::BASE_GAME), 'include_pok_factions' => $this->includesFactionSet(Edition::PROPHECY_OF_KINGS), @@ -75,12 +79,12 @@ public function toArray() 'include_discordant' => $this->includesFactionSet(Edition::DISCORDANT_STARS), 'include_discordantexp' => $this->includesFactionSet(Edition::DISCORDANT_STARS_PLUS), 'include_keleres' => $this->includeCouncilKeleresFaction, + // @todo refactor frontend to use faction sets. Backwards compatibility! // slice settings 'min_wormholes' => $this->minimumWormholes, 'max_1_wormhole' => $this->maxOneWormholesPerSlice, + // @todo refactor frontend to use this instead of min_legendary_planets. Don't break backwards compatibility! 'min_legendaries' => $this->minimumLegendaryPlanets, - // @todo refactor frontend to use this instead of min_legendaries. Don't break backwards compatibility! - 'minimum_legendary_planets' => $this->minimumLegendaryPlanets, 'minimum_optimal_influence' => $this->minimumOptimalInfluence, 'minimum_optimal_resources' => $this->minimumOptimalResources, 'minimum_optimal_total' => $this->minimumOptimalTotal, @@ -96,5 +100,107 @@ public function toArray() ]; } - // @todo validate + /** + * @return bool + * @throws InvalidDraftSettingsException + */ + public function validate(): bool + { + /* + + if ($this->custom_slices != null) { + if (count($this->custom_slices) < count($this->players)) return_error("Not enough custom slices for number of players"); + foreach ($this->custom_slices as $s) { + if (count($s) != 5) return_error('Some of the custom slices have the wrong number of tiles. (each should have five)'); + } + } + */ + if (!$this->seed->isValid()) { + throw InvalidDraftSettingsException::invalidSeed(); + } + + + $this->validatePlayers(); + $this->validateTiles(); + $this->validateFactions(); + $this->validateCustomSlices(); + + return true; + } + + protected function validatePlayers(): bool + { + if ($this->numberOfPlayers != count(array_filter($this->players))) { + throw InvalidDraftSettingsException::playerCountDoesNotMatch(); + } + + if (count(array_unique($this->players)) != count($this->players)) { + throw InvalidDraftSettingsException::playerNamesNotUnique(); + } + + if (count($this->players) < 3) { + throw InvalidDraftSettingsException::notEnoughPlayers(); + } + + if ($this->numberOfPlayers > $this->numberOfSlices) { + throw InvalidDraftSettingsException::notEnoughSlicesForPlayers(); + } + + if ($this->numberOfPlayers > $this->numberOfFactions) { + throw InvalidDraftSettingsException::notEnoughFactionsForPlayers(); + } + + return true; + } + + protected function validateTiles() { + // @todo base this on tile-selection.json instead of constants + // better yet: make a tileset php class that contain the data instead of loading json + + $blueTiles = array_reduce($this->tileSets, fn ($sum, Edition $e) => $sum += $e->blueTileCount(), 0); + $redTiles = array_reduce($this->tileSets, fn ($sum, Edition $e) => $sum += $e->redTileCount(), 0); + $legendaryPlanets = array_reduce($this->tileSets, fn ($sum, Edition $e) => $sum += $e->legendaryPlanetCount(), 0); + + $maxSlices = min(floor($blueTiles/3), floor($redTiles/2)); + + if ($this->numberOfSlices > $maxSlices) { + throw InvalidDraftSettingsException::notEnoughTilesForSlices($maxSlices); + } + + if ($this->maximumOptimalTotal < $this->minimumOptimalTotal) { + throw InvalidDraftSettingsException::invalidMaximumOptimal(); + } + + if ($this->minimumLegendaryPlanets > $this->numberOfSlices) { + throw InvalidDraftSettingsException::notEnoughSlicesForLegendaryPlanets(); + } + + if ($this->minimumLegendaryPlanets > $legendaryPlanets) { + throw InvalidDraftSettingsException::notEnoughLegendaryPlanets($legendaryPlanets); + } + } + + protected function validateFactions() + { + $factions = array_reduce($this->factionSets, fn ($sum, Edition $e) => $sum += $e->factionCount(), 0); + if ($factions < $this->numberOfFactions) { + throw InvalidDraftSettingsException::notEnoughFactionsInSet($factions); + } + } + + protected function validateCustomSlices(): bool + { + if (!empty($this->customSlices)) { + if (count($this->customSlices) < $this->numberOfPlayers) { + throw InvalidDraftSettingsException::notEnoughCustomSlices(); + } + foreach ($this->customSlices as $s) { + if (count($s) != 5) { + throw InvalidDraftSettingsException::invalidCustomSlices(); + } + } + } + + return true; + } } \ No newline at end of file diff --git a/app/Draft/DraftSettingsTest.php b/app/Draft/DraftSettingsTest.php index 1f4f6f6..a68897f 100644 --- a/app/Draft/DraftSettingsTest.php +++ b/app/Draft/DraftSettingsTest.php @@ -2,10 +2,12 @@ namespace App\Draft; +use App\Testing\DraftSettingsFactory; use App\Testing\TestCase; use App\TwilightImperium\AllianceTeamMode; use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; class DraftSettingsTest extends TestCase @@ -14,6 +16,7 @@ class DraftSettingsTest extends TestCase public function itCanBeConvertedToAnArray() { $draftSettings = new DraftSettings( + 4, ["john", "mike", "suzy", "robin"], true, new DraftName("Testgame"), @@ -56,6 +59,7 @@ public function itCanBeConvertedToAnArray() $array = $draftSettings->toArray(); + $this->assertSame(4, $array['num_players']); $this->assertSame(["john", "mike", "suzy", "robin"], $array['players']); $this->assertSame("Testgame", $array['name']); $this->assertSame(5, $array['num_slices']); @@ -91,4 +95,186 @@ public function itCanBeConvertedToAnArray() $this->assertSame("neighbors", $array['alliance']['alliance_teams_position']); $this->assertSame(true, $array['alliance']['force_double_picks']); } + + public static function validationCases() + { + yield "When player count does not match player names" => [ + 'data' => [ + 'numberOfPlayers' => 4, + 'players' => [ + 'sam', + 'josie', + 'kyle' + ] + ], + 'exception' => InvalidDraftSettingsException::playerCountDoesNotMatch() + ]; + yield "When player names are not unique" => [ + "data" => [ + 'players' => [ + 'sam', + 'sam', + 'kyle' + ] + ], + 'exception' => InvalidDraftSettingsException::playerNamesNotUnique() + ]; + yield "When not enough players" => [ + "data" => [ + 'players' => [ + 'sam', + 'kyle' + ] + ], + 'exception' => InvalidDraftSettingsException::notEnoughPlayers() + ]; + yield "When checking slice count" => [ + "data" => [ + 'numberOfPlayers' => 4, + 'numberOfSlices' => 3 + ], + 'exception' => InvalidDraftSettingsException::notEnoughSlicesForPlayers() + ]; + } + + #[DataProvider("validationCases")] + #[Test] + public function itThrowsValidationErrors($data, \Exception $exception) + { + $draft = DraftSettingsFactory::make($data); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage($exception->getMessage()); + $draft->validate(); + } + + #[Test] + public function itValidatesFactionCount() + { + $draft = DraftSettingsFactory::make([ + 'numberOfPlayers' => 4, + 'numberOfFactions' => 2 + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::notEnoughFactionsForPlayers()->getMessage()); + $draft->validate(); + } + + #[Test] + public function itValidatesNumberOfSlices() { + $draft = DraftSettingsFactory::make([ + 'numberOfSlices' => 7, + 'tileSets' => [ + Edition::BASE_GAME + ] + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::notEnoughTilesForSlices(6)->getMessage()); + $draft->validate(); + } + + #[Test] + public function itValidatesOptimalMaximum() { + $draft = DraftSettingsFactory::make([ + 'minimumOptimalTotal' => 7, + 'maximumOptimalTotal' => 4, + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::invalidMaximumOptimal()->getMessage()); + $draft->validate(); + } + + #[Test] + public function itValidatesMinimumLegendaryPlanets() { + $draft = DraftSettingsFactory::make([ + 'minimumLegendaryPlanets' => 6, + 'tileSets' => [ + Edition::BASE_GAME, + Edition::THUNDERS_EDGE + ] + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::notEnoughLegendaryPlanets(5)->getMessage()); + $draft->validate(); + } + + #[Test] + public function itValidatesMinimumLegendaryPlanetsAgainstSlices() { + $draft = DraftSettingsFactory::make([ + 'numberOfPlayers' => 5, + 'minimumLegendaryPlanets' => 6, + 'numberOfSlices' => 5 + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::notEnoughSlicesForLegendaryPlanets()->getMessage()); + $draft->validate(); + } + + public static function seedValues(): iterable + { + yield "When seed is negative" => [ + "seed" => -1, + "valid" => false + ]; + yield "When seed is too high" => [ + "seed" => DraftSeed::MAX_VALUE + 12, + "valid" => false + ]; + yield "When seed is valid" => [ + "seed" => 50312, + "valid" => true + ]; + } + + #[DataProvider("seedValues")] + #[Test] + public function itValidatesSeed($seed, $valid) { + $draft = DraftSettingsFactory::make([ + 'seed' => $seed + ]); + + if ($valid) { + $this->assertTrue($draft->validate()); + } else { + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::invalidSeed()->getMessage()); + + $draft->validate(); + } + } + + #[Test] + public function itValidatesFactionSetCount() { + $draft = DraftSettingsFactory::make([ + 'numberOfFactions' => 20, + 'factionSets' => [ + Edition::BASE_GAME + ] + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::notEnoughFactionsInSet(17)->getMessage()); + + $draft->validate(); + } + + #[Test] + public function itValidatesCustomSlices() { + $draft = DraftSettingsFactory::make([ + 'numberOfPlayers' => 5, + 'customSlices' => [ + [1, 2, 3, 4, 5] + ] + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::notEnoughCustomSlices()->getMessage()); + + $draft->validate(); + } } \ No newline at end of file diff --git a/app/Draft/InvalidDraftSettingsException.php b/app/Draft/InvalidDraftSettingsException.php new file mode 100644 index 0000000..4439a33 --- /dev/null +++ b/app/Draft/InvalidDraftSettingsException.php @@ -0,0 +1,67 @@ + $faker->name(), range(1, $numberOfPlayers)); + + $allianceMode = $properties['allianceMode'] ?? false; + + return new DraftSettings( + $numberOfPlayers, + $names, + $properties['presetDraftOrder'] ?? $faker->boolean(), + new DraftName($properties['name'] ?? null), + new DraftSeed($properties['seed'] ?? null), + $properties['numberOfSlices'] ?? $numberOfPlayers + 2, + $properties['numberOfFactions'] ?? $numberOfPlayers + 2, + $properties['tileSets'] ?? [ + Edition::BASE_GAME, + Edition::PROPHECY_OF_KINGS, + Edition::THUNDERS_EDGE + ], + $properties['factionSets'] ?? [ + Edition::BASE_GAME, + Edition::PROPHECY_OF_KINGS, + Edition::THUNDERS_EDGE + ], + $properties['includeCouncilKeleresFaction'] ?? false, + $properties['minimumWormholes'] ?? 0, + + $properties['maxOneWormholePerSlice'] ?? $faker->boolean(), + $properties['minimumLegendaryPlanets'] ?? $faker->numberBetween(0, 1), + $properties['minimumOptimalInfluence'] ?? 4, + $properties['minimumOptimalResources'] ?? 2.5, + $properties['minimumOptimalTotal'] ?? 9, + $properties['maximumOptimalTotal'] ?? 13, + $properties['customFactions'] ?? [], + $properties['customSlices'] ?? [], + $allianceMode, + $allianceMode ? $properties['allianceTeamMode'] ?? AllianceTeamMode::RANDOM : null, + $allianceMode ? $properties['allianceTeamPosition'] ?? AllianceTeamPosition::OPPOSITES : null, + $allianceMode ? $properties['allianceForceDoublePicks'] ?? false : null, + ); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/Edition.php b/app/TwilightImperium/Edition.php index 4a8d7b0..0e01c6e 100644 --- a/app/TwilightImperium/Edition.php +++ b/app/TwilightImperium/Edition.php @@ -8,7 +8,6 @@ enum Edition: string case BASE_GAME = "BaseGame"; case PROPHECY_OF_KINGS = "PoK"; case THUNDERS_EDGE = "TE"; - case CODEX_IV = "CodexIV"; case DISCORDANT_STARS = "DS"; // @todo merge DS and DS plus? case DISCORDANT_STARS_PLUS = "DSPlus"; @@ -25,8 +24,54 @@ private static function editionsWithoutTiles(): array ]; } - public static function hasValidTileSet(Edition $edition): bool + public function hasValidTileSet(): bool { - return !in_array($edition, self::editionsWithoutTiles()); + return !in_array($this, self::editionsWithoutTiles()); + } + + // @todo move to tileset class? + public function blueTileCount(): int + { + return match($this) { + Edition::BASE_GAME => 20, + Edition::PROPHECY_OF_KINGS => 16, + Edition::THUNDERS_EDGE => 15, + Edition::DISCORDANT_STARS => 0, + Edition::DISCORDANT_STARS_PLUS => 16, + }; + } + + public function redTileCount(): int + { + return match($this) { + Edition::BASE_GAME => 12, + Edition::PROPHECY_OF_KINGS => 6, + Edition::THUNDERS_EDGE => 5, + Edition::DISCORDANT_STARS => 0, + Edition::DISCORDANT_STARS_PLUS => 8, + }; + } + + public function legendaryPlanetCount(): int + { + return match($this) { + Edition::BASE_GAME => 0, + Edition::PROPHECY_OF_KINGS => 2, + Edition::THUNDERS_EDGE => 5, + Edition::DISCORDANT_STARS => 0, + Edition::DISCORDANT_STARS_PLUS => 5, + }; + } + + + public function factionCount(): int + { + return match($this) { + Edition::BASE_GAME => 17, + Edition::PROPHECY_OF_KINGS => 7, + Edition::THUNDERS_EDGE => 5, + Edition::DISCORDANT_STARS => 24, + Edition::DISCORDANT_STARS_PLUS => 10, + }; } } \ No newline at end of file diff --git a/app/TwilightImperium/EditionTest.php b/app/TwilightImperium/EditionTest.php index d980199..ff77d78 100644 --- a/app/TwilightImperium/EditionTest.php +++ b/app/TwilightImperium/EditionTest.php @@ -12,10 +12,56 @@ public function itCanCheckForValidTileSets() { foreach(Edition::cases() as $edition) { if ($edition == Edition::DISCORDANT_STARS) { - $this->assertFalse(Edition::hasValidTileSet($edition)); + $this->assertFalse($edition->hasValidTileSet()); } else { - $this->assertTrue(Edition::hasValidTileSet($edition)); + $this->assertTrue($edition->hasValidTileSet()); } } } + + #[Test] + public function itReturnsTheCorrectNumbersForBaseGame() + { + $this->assertSame(20, Edition::BASE_GAME->blueTileCount()); + $this->assertSame(12, Edition::BASE_GAME->redTileCount()); + $this->assertSame(0, Edition::BASE_GAME->legendaryPlanetCount()); + $this->assertSame(17, Edition::BASE_GAME->factionCount()); + } + + #[Test] + public function itReturnsTheCorrectNumbersForPoK() + { + $this->assertSame(16, Edition::PROPHECY_OF_KINGS->blueTileCount()); + $this->assertSame(6, Edition::PROPHECY_OF_KINGS->redTileCount()); + $this->assertSame(2, Edition::PROPHECY_OF_KINGS->legendaryPlanetCount()); + $this->assertSame(7, Edition::PROPHECY_OF_KINGS->factionCount()); + } + + #[Test] + public function itReturnsTheCorrectNumbersForThundersEdge() + { + $this->assertSame(15, Edition::THUNDERS_EDGE->blueTileCount()); + $this->assertSame(5, Edition::THUNDERS_EDGE->redTileCount()); + $this->assertSame(5, Edition::THUNDERS_EDGE->legendaryPlanetCount()); + $this->assertSame(5, Edition::THUNDERS_EDGE->factionCount()); + } + + #[Test] + public function itReturnsTheCorrectNumbersForDiscordantStars() + { + $this->assertSame(0, Edition::DISCORDANT_STARS->blueTileCount()); + $this->assertSame(0, Edition::DISCORDANT_STARS->redTileCount()); + $this->assertSame(0, Edition::DISCORDANT_STARS->legendaryPlanetCount()); + $this->assertSame(24, Edition::DISCORDANT_STARS->factionCount()); + } + + #[Test] + public function itReturnsTheCorrectNumbersForDiscordantStarsPlus() + { + $this->assertSame(16, Edition::DISCORDANT_STARS_PLUS->blueTileCount()); + $this->assertSame(8, Edition::DISCORDANT_STARS_PLUS->redTileCount()); + $this->assertSame(5, Edition::DISCORDANT_STARS_PLUS->legendaryPlanetCount()); + $this->assertSame(10, Edition::DISCORDANT_STARS_PLUS->factionCount()); + } + } \ No newline at end of file diff --git a/app/TwilightImperium/Tile.php b/app/TwilightImperium/Tile.php index 100129c..da07675 100644 --- a/app/TwilightImperium/Tile.php +++ b/app/TwilightImperium/Tile.php @@ -5,9 +5,8 @@ class Tile { - - public $totalInfluence = 0; - public $totalResources = 0; + public int $totalInfluence = 0; + public int $totalResources = 0; public float $optimalInfluence = 0; public float $optimalResources = 0; public float $optimalTotal = 0; diff --git a/data/FactionDataTest.php b/data/FactionDataTest.php new file mode 100644 index 0000000..4b0176c --- /dev/null +++ b/data/FactionDataTest.php @@ -0,0 +1,45 @@ +getJsonData(); + + foreach($factions as $faction) { + $this->assertNotEmpty($faction['set']); + // fix data, then enable this + // $this->assertNotEmpty($faction['homesystem']); + $this->assertNotEmpty($faction['name']); + $this->assertNotEmpty($faction['wiki']); + } + } + + /** + * Changing the name of a faction would break old drafts + * + * @return void + */ + #[Test] + public function allHistoricFactionsHaveData() { + $historicFactions = json_decode(file_get_contents('data/historic-test-data/all-factions-ever.json')); + + $currentFactions = array_keys($this->getJsonData()); + + foreach($historicFactions as $name) { + $this->assertContains($name, $currentFactions); + } + } +} \ No newline at end of file diff --git a/data/TileDataTest.php b/data/TileDataTest.php index 086b17c..a822c36 100644 --- a/data/TileDataTest.php +++ b/data/TileDataTest.php @@ -53,7 +53,7 @@ public function allSpaceStationsInTilesJsonAreValid() { */ #[Test] public function allHistoricTileIdsHaveData() { - $historicTileIds = json_decode(file_get_contents('data/all-tiles-ever.json')); + $historicTileIds = json_decode(file_get_contents('data/historic-test-data/all-tiles-ever.json')); $currentTileIds = array_keys($this->getJsonData()); @@ -62,12 +62,17 @@ public function allHistoricTileIdsHaveData() { } } - #[Test] - public function allHistoricTileIdsHaveImages() { - $historicTileIds = json_decode(file_get_contents('data/all-tiles-ever.json')); - - foreach($historicTileIds as $id) { - $this->assertFileExists('img/tiles/ST_' . $id . '.png'); - } - } + /** + * This is a really useful test, but first the tilenames need to be sorted out + **/ +// public function allHistoricTileIdsHaveImages() { +// $historicTileIds = json_decode(file_get_contents('data/all-tiles-ever.json')); +// $tiles = $this->getJsonData(); +// +// foreach($historicTileIds as $id) { +// if (!isset($tiles[$id]['faction'])) { +// $this->assertFileExists('img/tiles/ST_' . $id . '.png'); +// } +// } +// } } \ No newline at end of file diff --git a/data/historic-test-data/all-factions-ever.json b/data/historic-test-data/all-factions-ever.json new file mode 100644 index 0000000..1fd2afd --- /dev/null +++ b/data/historic-test-data/all-factions-ever.json @@ -0,0 +1,66 @@ +[ + "Sardakk N'orr", + "The Arborec", + "The Barony of Letnev", + "The Clan of Saar", + "The Embers of Muaat", + "The Emirates of Hacan", + "The Federation of Sol", + "The Ghosts of Creuss", + "The L1z1x Mindnet", + "The Mentak Coalition", + "The Naalu Collective", + "The Nekro Virus", + "The Universities of Jol-Nar", + "The Winnu", + "The Xxcha Kingdom", + "The Yin Brotherhood", + "The Yssaril Tribes", + "The Argent Flight", + "The Empyrean", + "The Mahact Gene-sorcerers", + "The Naaz-Rokha Alliance", + "The Nomad", + "The Titans of Ul", + "The Vuil'raith Cabal", + "The Council Keleres", + "Augurs of Ilyxum", + "Celdauri Trade Confederation", + "Dih-Mohn Flotilla", + "Florzen Profiteers", + "Free Systems Compact", + "Ghemina Raiders", + "Glimmer of Mortheus", + "Kollecc Society", + "Kortali Tribunal", + "Li-Zho Dynasty", + "L'Tokk Khrask", + "Mirveda Protectorate", + "Myko-Mentori", + "Nivyn Star Kings", + "Olradin League", + "Roh'Dhna Mechatronics", + "Savages of Cymiae", + "Shipwrights of Axis", + "Tnelis Syndicate", + "Vaden Banking Clans", + "Vaylerian Scourge", + "Veldyr Sovereignty", + "Zealots of Rhodun", + "Zelian Purifier", + "Bentor Conglomerate", + "Berserkers of Kjalengard", + "Cheiran Hordes", + "Edyn Mandate", + "Ghoti Wayfarers", + "Gledge Union", + "Kyro Sodality", + "Lanefir Remnants", + "The Monks of Kolume", + "Nokar Sellships", + "Last Bastion", + "The Ral Nel Consortium", + "The Deepwrought Scholarate", + "The Crimson Rebellion", + "The Firmament \/ The Obsidian" +] \ No newline at end of file diff --git a/data/all-tiles-ever.json b/data/historic-test-data/all-tiles-ever.json similarity index 100% rename from data/all-tiles-ever.json rename to data/historic-test-data/all-tiles-ever.json diff --git a/img/tiles/ST_-1.png b/img/tiles/ST_-1.png deleted file mode 100644 index f9aba0c3eae4bde4fcb8bec96414ee9582c2580e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2697 zcmeHJ&x_@)vor^^qU_w5<&+(XN)5$0&V22+ufEmPnETqBc7TJtD<*OOtPr=)_DAgO zh`C(5@v6Er^MD`~6;)?xl9k@f*XFz)+}GWPrp_VNk+1F66RL;7f!dXYP#qm3hA~mw zu5LP()#<#V5=^jx+lGk|As%)-yQMZi4Q4BNU~FX@Z0qGnyNw zj_Z(?z#zCBnx-psS?!&`EREg^iObPxE{vfl<#EBp-igSn?d4>gt;XiZMKX_+GeaaI z1y~8f%+*x+L{_q#$Opu+dcBG!_qv6kl`KY5CQG9ZmMkhEI#yo_D2ub2_vKnsGeq=g zC48;+4b`UEBk+y1Jkvzj@-SXN1E>T}D|#MG5GEr)+O~(=2*dvpEO{KAt^*AMZ;+K0 z&6pVUd<{hDam+o}cFd^dP~^BFN0wum$Q3q6G-?S>h(p83nd^e_J;{#i1lHphh07%a zj#Z94%pHn5+(uy(5fpNZA=+*c)WKHBYzLFjHkWK~6fvwFnw)2?RdHY>OtghXL59T` zvfRi*)avPdaZN}STMF!F4yseh^I%0w1{~$T}bsR)=vo3s)0pa%J5?nrQmeOtUPIH&U>byQZ%Iam|YpkvZ!L_D4 zz97x(1+<`@P6Uu%QY8ymDWhsi3$Z%}OV+4E<3aLEdUCn=P8&P4E!rsJI7Hy2gE}E@ zA+|Dxi|4Dq4S~j8CSinAOXb&IGdL{pFFD_h!59h_j;TZJ>yQnkcpCved zcWyHVGv{5f!`HW~qXiyThm*)4Qw1D7!%y#gt|(8$gWm3F_VcelUEhF%?%v&x{`m6i zU!Lo~@T`?S^TE5HDc{}Qz=?8i^FOp(*B1D-S|Fd})@m0bwyv$$J{J8q2iD3kI5)?w om*J%ok4&atR326JAMf0M@5$dM-~9M}{joUM+wXmG^X(7+1X^G-{Qv*} diff --git a/img/tiles/ST_EMPTY.png b/img/tiles/ST_EMPTY.png deleted file mode 100644 index d708fd7adab92c3ba5ac2b4f0c122f59ce4fb5a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8493 zcmaKQXH?VQvi1*<-jv>}sPq;}=tU5eCL%>zLI@CAAoOYkrAkqn^xmWxEP!-GnsgKh zT{=i;0s#c^jpv;IdGCk2ZdS5Z_UxHwW=~nO_r#hQ-Jzx8paKAZR$uS7DF6_;6Mm`` zWCV(&q2)FJP-!EywN3Q3wfVeINGF6l8~_4mavua(rkt>-EuO&X&9$)mbs6qY00F^j zioUB>MOR+}(5F`!G`gR~P?<9^U(3;Z_&H*NN-sBNx!_i#vu0e(qxgq5io3jX#(JOoThYYKdf%_`U0ome#m4u1X3Zfe6UFb>}*#aiyb{2yIm_bB7q+N(%TVS|-zLKmc^6me?S`r$`KF^DqvP@EMR4NR79DueA4i z)~H7WbPS{oW!xK=Wok?t|9zQ%`ICE{7L--^suSg^Ku$)sAfw&}iNP=p0C1d* zbzUl}CvU8;F0DIlxbGcx7hSsTBL&p>4;C+5o)cdIt{RQ(&DgK4O_F%^5@Gz>-72kt z8FRp8@yu3sma^ax)oAcpe30UW22Wn0NuLTg7Zo-2j*vrPtJF%o+8@~^fn{u?iGX2m z&_~l3xB2_imKnAl%N+2g|E5d{parUu^(tehtAxZ=cWt6M{K+7hZO+_lJK@SB0+%9+`g3%13+zpv&pxZs}kp zhLYXZpt;_ma#f3L70pFe$d<0jZq}iMz48G=!clN7Yw7CyPH9EjjqeOLPqw{S$slZb zpV(TWD6eStQ7}UJm13?rBw_`IDOfWTuLwZ(KrhiHd|NS0_XWE9P$k5bTCOi_^#p&4 zqnN-6HX6T@XZ!eM;x6J^?ntLTd3&Ga8?m3p#|mDKxSj%^F<%h9Ejqo(ZH(hRk1D#p zsC?|+rk^hm7MBP^k4e)xJ)ef!Jdf6a#9DIP=w*SeS<0Cw$-%fS75tewJMy4=6xWI4 z(Tq3>yQfz_xkn@?-?22X)UFW13BG4&qOhQhd@B9vra(%C@q3|QhO^Is4oY>&mb%q9 zcKLbu^Mvef(lOen=v}Alf4OQz#V?dBqff2xrZ=l6Uh<$sZTu=C$Kb|xvPb{ID#crL zHDAVyhGhC=Z-67k}R(JX{B;>1OA%eRSgK9WZ#V>DyjZIgU!V=M9~ zfQB}THnLaG;TF3adkA|uTLZgfra>9$*Nn_QGpQ*V&P?Z5^skT)Ek*Dmq0BG7Fr+D^ znWu%PZM-&n=<`s0BIq@>S=B@ODm(MAGTn#oOjar>zp+$JRB}ITu9UAGHVrUMG8wsV zU)*N@JK`6N_HEQN-GV5+Vl!An4|@VXOOFivz*1`xWlpj!=Jv|a!TRkP&cL7aoYP-2 z#NdIp&ugb@rx#AS>)t~|bUk(7_rcRScZd0hX@^6^NyOE~>n2@moNB^r6lQ{F+GZSf zP&+I;+cSH9Ubz~%V!6jk9!e*EluhzY_nV$I&H9b}Q2Pqo4%(tT{&GyWH9vOe*yE`9 znDxirBVQ4;xYZ=n~gViqn%ge z0$J6Zs*zj{)u09VoSO>N0U^)h)}ZY3%)1-@(B?vAJq&bw4fIH-7x*6`jxqwd64!|iUh)7#hJOa@1CR2!a?kwWfwVP_ z-KOymUyqBko3rO?raivR52|*DRh=73WOMf0cB$@Z9_^o4E_)BIzOwkhJr+ zv$8vH8S&N2} z)`}OEg6v@Z$$18oopTn;8e{%Kk<0vu^Ow}%4FjIZYl%@K6pL5Gk!5EFTZ8o!G2idF z$29UH*fUwr!kC0bWL``Bxc~lvuea}s*ktvp)wy$P;z3g7^N-52uJtH?=W17XQ+F6H zyAj>^y75V1^r_B427@o-b;_OC)z8?^s^p}%W!84!3S!VZV24ltVO>0f)SPUd9L<6natOFbMTJ;`%lU;PW z{Bb5o9l;XXnv5}N#Js~c23j3_7iiaMW)X~kz#1SSZEM=(7>L*(4;ye9c$@y)WZBa6 z;ZN6~xu1!qk>jPM+M*E_ptQ=={sGV0qemZM%+NH)hkLFW6V~RBMOf49tG%i#YELn` zjqA%6M)nh-$3Y%5GYfYczU*x4ZI^6&R-ah4zq#A$syQ(lwNG2ad62NiY434&!M8Bj z^*C|p{m_>o5;>^cj`d)D_3Y0=`C@!(p>AjxmXq&vSPAXINUYYHME%dxZ#*$TQ5j-T&dl! zTD;h!K((-SZ}WL^F1H=`owkNQ;d|06Fuz{8B#XR)+*_&#XR8q@E9H*mdAUaFs^2o_ zf=&!BGTm(N+qODukL0Pd`tBMu*q`(tE^H*(?zeay37k003N_rTQLRw9Fltvt5(_3Mmd4&LGM{S?vx8R@d3-=m|9&bv(g^EG;D{LbK=2|-=K zgrrq=&%JeAM_vZ6oyZLh|J4;W-*C zbd7MUWcSsv^nHMI@(qBZ;DDwh(gDt=?*Vm&o5G=vLEimv6#yWKLYP_lS{fQC!H^yj z(7!wqfgWB2X#h}B5A=e<+~B@^4sd6Lr>ekSbGrZ^!ckSgLe5ai&`TTcg3t>_!5;)0 znZbhHU|>f9bu~VfKqUfz2izCR7wF;c>7x{=D)28{CBpx|WJv+Of3f(wsS5ntC`&^V zK5Zll&Zi(DBMy_2lHyYUOGrD&%Rv>u4j?f;87UbVNhx_rX<2a@86_!c!k6zq9|3|w zl%tc9>22Nrs3WXY1zdc6y_6&+0|Ejh0%RqSC}&A&Fc>T;B_k;#BTnED_X+a!g$9ay z`Uw7ma2xIeLm|9;5lBzIzlcx=q@S;<0KwRQpTfh-(D1*&o<9Ha6~Swgflx0=X$dJw z50Ae``xm#5uPOZhoAJML`{03zvt9OFJsS#6eJbMRBOCoPxNc6i7-MBtm-r{rlh2AT0h{TyRf9MWG0#BNH@J1^^7Z`nNUB0%vgZC+}=0 z{DAK@A(~9FbUjC|!Ln?(@9@zy8Za#PV-M&vFNn@Ee!?7#Wm2U1k8T8$!#Y5mS14{v zmQe}z+08jySE$UN?+Tyi9EQodL9Xo0hfGaBLbm(h?Lw@IDAfnNT@w>bHIr~JS8}UJ070QKgq>yZ{m~-3_KoCnMwYOtRsp zrSiAfNnLSAKs1)YLxq30$DW1jIHJSFNRQd?X^PX0cz*y%X-MmzUGLpCg+|RYyAhz` z$#E1joBOEo(^yLS6o zd|!2Y_Sak^Z5FCZS-UG$^%cb>NU$#@(I91(zXK=nGNQDOE(CEY(W^EN++*0`R2!+Y z6B)#8vqb;k5vP^Pm_VS6IZ2!4y}w+njRQXM;nP(mnw_-|j;QON)4$G!&-#`@rUaS} zf-H$A-VPdf)^?xu%cxb%Tq4Hr@Q^mkM3?mMTrCJzH%RFUxsMU`j%CvDSXQv0KV-(; zh}-$G@mDlHk|lhcWT+Wr$b&D27{fm>X;g916+w)JvZ{C`X-8jM zE(b(_Zef*CnM`Oa|5&l@^ZG!ncNs|Inz`7wij0y^G$GdNEyF2fx4t|B<5S2;L+;gS zI!PkXMV|}#Js)_=S2_MJuuwS9heYHKb6PY<@Rzlhj&4Z8N>thpP%gKLYOmWwiN2 zEM)qs`l$)8Qcv)<{V!S)B}BJYr=4?@DotI8>&+D&CD9o@np*qcSE>EQKB>U?chALWNpW%=vFd_RXX&R89%x#Q43DYTs$pLadr# zq~(EpYDBBbmLF}{2V^240GBc0O(7gpqucE(=eMx)tnoNwg}lNk2SLL-OB9Ew#%hrxX$}5=)3WTao3p$pO#s zu-0hqFtYHE`^FHz|uJ-0Fa(s=t2D zwk27!P7B5iHb~0i0x@23(vl7`%E^rY`Sr?|3FEe=t(Z+?F*(FAv>EZ=@j!i)>fMdlDOU)I+` zrmm;2<{+LEF~=H(-x0+gH_n|Bi%e$bP1^=84!#kU#VMNkBzTj4 zyS@v5V}hwVDCTNrf1qKQE_uQ71~MX?KCg(UuCT7wu&#uRY()258%1yavO1#sF;0!Q zLZD)9XfPUm@h*u_ZMN)0y*MBNRb!iEB~%bMIg~ZJmd&z~Q0`J)dBcTZ30Y5cx{b~9 z)B11hcw--&^B^ET?FZGe{#Mv3G>l0yPRZj3JmP8#LPW9gBd2dbMrdMODwXxR#iLHU zT%~Xt)lt!d*>LH5@%Kcqb;lR(DLJSv!?s_R7Il6gCU!(TB+i7H^LH;GcfA$@YfyzHez$dv5V3J_by;w=6 z_RqNvo0l79?k!9=$*2>^NjXg+HrR81*hM?bq(JW5p@T4mG(I&~vC>Z`q3AZr8P0 z;vi8ynCEiFe}LSHEN``i72J_<`SC2vX0pLJF@Mc+{TH$7+jA{j>#1^fe3sd6VLNcx z7zj0;iI3nem(N+wB35OV#mxk0$ot(}WvxWpy#?grZuswQ1il-P#l5oP{r-rU#AKVK zugMwfU9j7J{iOB@G)9?{)2DiGnI^;!^^!(P%-dy;$5s>@UD`ish~|$?AN$~bwfY@o zo0XVmqLMmg(ufK74wbW+MMP5H^aE+x`+H6CL@fPa2Nz64!V)i`Hhd7=FN@1B={Gk- z7dDGM45V?GAXQHMtu!r1e5z|;XOU)!p&vXz>igV84|O|brIj+{|kZtjhS=kd3&86SCo_^gn0+wQk*F2aGY-H0$1fx{51lA#g2*1Ov-8=gfv)^AIN^qdNO z#l?WjAslN;g-7VOUqzSMD!O$pOyD>QnCo7wzp|q8cUQL;MgldB?lTds$Sj8-O5j86 z>{z+s1I&u>n#>uo%Y^y4ef?Y(4|CWD6{7c^-Je#2=IfoX$~Ghv8pXrbx8|&wagE5< zqziyakZ!xxYak*_BT;mXtU%HG%T!x7t9z9e@CEd1;HlE(S~Ga~B_rB_5Ueg(THoRZ z)>sXQtG_ddq0b;kFLTSkBtd(cV2GI90Va3!Qjj_oe)cC|(vndGSrnxQx$@UmdL z3~IE4>dTc6?Q>mi`UHR@Xd>r|eNXo9PNV)C9O&`SPk&`M^JTwb2(qyQ;!r#5AA$}e zetRaKuaXx~$@`QZ;uazMBeP#?>&usIkqn@RPp&!&m9D?~?t@ z8g4v&2a_OD)NKQw0iuG?#@#0ZpDqP(iKRL ztOY_t{&=_av0j3EEx?Is+US|?xa2>N+>2U@@vl#AhUo%XUKUxnX#IQQSk3%v=-`?G z?~%mIas(BA0GyX$jGmcO8Ttd-iIr{ma#KS*Jfp1TSS9Z#XZXt-&3sAe*61&xc`Fu( zc=64{VT?8?>X$}1kqG1LhskE)GQ z*J^7Z(ame@klpFyu6N;Mfs~R*_Y>E^bSXY)p^yB%QC96P??1D~b0`0L4h%}*>s9Jf zC2d?g6Rq$GKk2022}v%n4ILC6Fn-b`2fl_}?-li6!hI*Y-r;+hx;`hTmUl?|`AKWY zx?xS&5{{qrfr}GkISYJbe@i;L%FzjJ&&1{Sf zha{5Nu%eMcO1<0PJ2Qs zmuaI`;uaww(6n&xQZ2KTm-k|DSlXhOSy%S+Ay9s!c?UY|)ymlGb_6$R2rN4nTfl#Y=My8x?l_45=0|%k3 z)c!GQg7(c(9YE-dl_n*7h|MASsc#{KckL0eD(gv2e(fQtE^TN`^LWVvW)1tW91g6a zqU&at;wG^9j@&2I?j-&>Vdf^?H917TS#05RQ5MU}A$MBn>0|qZ=h5sp>IBXUlLG*? zQ8Gd?%3JqzueQw2{o8(Yb3maN$x&yGVVmVwQsubgKOcKE=x?_t>soXqJUUJGmKh43 z;@HHDnCfhR((N!^kES>`F_y0{g1$=5n0H=kXK@LWjmmjPe{Ykw3;ebmooH3BCa96| zxhC1Z;dt4D1sCuj!GnUxb>Aqow}R~NiXSH=P#eu;AjZRw*;dG1^i*6zTfQkMh^Pb|r0g=oC|o-7 zO_$1{2};SIXP*le5KXP0YIWv~5Xw*{9nI1DYUSDZ;%bFp|MTO&1>qOt44(>EN=Q_G zIXc3!9MZ#LQinY`aA#fEtkBjEyVYw=pcDp<1|lsMa22qAzfmHS(v1hvo(+l0>2tJT zym3kw9k70_z3$JQjD`J*Nd2}EMG}#Hlc@zSLWcSN3>mZ}SJ zw<-OzTAIRODe~Ka6RMcU=4tlV5>}wY!QswI2I11UaIfi%C_dgWfIi^2_VZwr^zwz= zzy*3|tGjbyCC}!$<@(76S1(6K2TPuTs#Ss1k1?It9utC$wb8og?m#sAF>ZMd9!i`Y zOX8<)iWy*{=gn8peFC!T3AmT9Hd+zQy5+gT)aN-=S82@aGS?N)bW^W-&>M3=6?yEM znEeZ1$dV0}+}_`4Do3hYJ*n*0ZE`z5?d(x)h2)p_M@BI|w`I%u01jX5rI-J4pc7x- zwVhzgmP&7$l>I3oIQ+m6RL{#xx|>fA`29&G6+}B#@(|VNu)-I!1D}g&B-*Z!+P+ zgA@!OVR&Gn+Q^ptl_>;Yxlsa{zxPTEUzKiwdQreA#9uCnEbs|Zx~GtJaxKtZk2f%e z^gNfVU2d}QkgVYq1T;z=2Fvn2CTZGw0qU5|))vQ(as9A^@hELS;Sb*&Lrb1Uf)_x$ zg+9x-Is%w*OLc{0O+s`tZDAF>;hUt&JZiOv0f5rV6aL4iFSZxkVNVOni#Qiy+D7Pz z-0>*FbDxB1ufFi6MrU3OqexpS*{#X1{gj0M9^pc_Hc64HTFF6Z{K)0{zL0UCJJz3p zlklot80R(xbYeY2PY93fR&nDS0~ZC?$2NYsAxtn08@j@10hKgZ4dERbA0)W7PA-I* zGw;m1TYYk2z)>J4jR>~lX!8&wojuaY@;y?v6DjcK^to`(;@XO4$D8pOHl1m5@{Al* z66D{#wdBoWCXb(!pryi_ewJx>E+OJz?EXbfP?YgQLKv-kA#GJy3K`K?P{L_{%dIL&`L{3b`w;y%ZR=SW(1Zz++;gmi* zWo?uaT3!|AsL%rAR;(atwsKrT-Wp;1&JTfVux&PD}8q@Yf-`+fwQQ$Z+0Ab zaGnnW7XYNq-Um<57kxqnm@(QTLcQU_Sn>Gc&vvO~SpMGxFo9~@TXP-wKZz}T1X;?3 zA@4{~hks29F=_MlI*D^X1iHrN4MY?xG(JS%CVoRYNncy8$JC^+K5*_pDHrL(#=LA;@#V@oa-6IM8dYzWEIdIH*RTcs1*d40V@)vor^^qU_w5<&+(XN)5$0&V22+ufEmPnETqBc7TJtD<*OOtPr=)_DAgO zh`C(5@v6Er^MD`~6;)?xl9k@f*XFz)+}GWPrp_VNk+1F66RL;7f!dXYP#qm3hA~mw zu5LP()#<#V5=^jx+lGk|As%)-yQMZi4Q4BNU~FX@Z0qGnyNw zj_Z(?z#zCBnx-psS?!&`EREg^iObPxE{vfl<#EBp-igSn?d4>gt;XiZMKX_+GeaaI z1y~8f%+*x+L{_q#$Opu+dcBG!_qv6kl`KY5CQG9ZmMkhEI#yo_D2ub2_vKnsGeq=g zC48;+4b`UEBk+y1Jkvzj@-SXN1E>T}D|#MG5GEr)+O~(=2*dvpEO{KAt^*AMZ;+K0 z&6pVUd<{hDam+o}cFd^dP~^BFN0wum$Q3q6G-?S>h(p83nd^e_J;{#i1lHphh07%a zj#Z94%pHn5+(uy(5fpNZA=+*c)WKHBYzLFjHkWK~6fvwFnw)2?RdHY>OtghXL59T` zvfRi*)avPdaZN}STMF!F4yseh^I%0w1{~$T}bsR)=vo3s)0pa%J5?nrQmeOtUPIH&U>byQZ%Iam|YpkvZ!L_D4 zz97x(1+<`@P6Uu%QY8ymDWhsi3$Z%}OV+4E<3aLEdUCn=P8&P4E!rsJI7Hy2gE}E@ zA+|Dxi|4Dq4S~j8CSinAOXb&IGdL{pFFD_h!59h_j;TZJ>yQnkcpCved zcWyHVGv{5f!`HW~qXiyThm*)4Qw1D7!%y#gt|(8$gWm3F_VcelUEhF%?%v&x{`m6i zU!Lo~@T`?S^TE5HDc{}Qz=?8i^FOp(*B1D-S|Fd})@m0bwyv$$J{J8q2iD3kI5)?w om*J%ok4&atR326JAMf0M@5$dM-~9M}{joUM+wXmG^X(7+1X^G-{Qv*} From e96e4aa7be5b3d643799b3ca85f7e0e98d5485f1 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Tue, 16 Dec 2025 20:54:14 +0100 Subject: [PATCH 14/34] Add decode draftsettings from JSON method --- app/Draft/DraftSettings.php | 96 ++++++++++++++++--- app/Draft/DraftSettingsTest.php | 62 +++++++++--- app/Draft/InvalidDraftSettingsException.php | 5 - app/Testing/DraftSettingsFactory.php | 7 -- app/Testing/TestDrafts.php | 4 +- .../draft.november2025.custom.json | 2 +- 6 files changed, 137 insertions(+), 39 deletions(-) diff --git a/app/Draft/DraftSettings.php b/app/Draft/DraftSettings.php index 4f4887b..7c46e67 100644 --- a/app/Draft/DraftSettings.php +++ b/app/Draft/DraftSettings.php @@ -13,7 +13,6 @@ class DraftSettings { public function __construct( - public int $numberOfPlayers, /** * @var array $players */ @@ -50,11 +49,11 @@ public function __construct( ) { } - protected function includesFactionSet(Edition $e): bool { + public function includesFactionSet(Edition $e): bool { return in_array($e, $this->factionSets); } - protected function includesTileSet(Edition $e): bool { + public function includesTileSet(Edition $e): bool { return in_array($e, $this->tileSets); } @@ -62,7 +61,6 @@ public function toArray() { return [ 'players' => $this->players, - 'num_players' => $this->numberOfPlayers, 'preset_draft_order' => $this->presetDraftOrder, 'name' => (string) $this->name, 'num_slices' => $this->numberOfSlices, @@ -130,10 +128,6 @@ public function validate(): bool protected function validatePlayers(): bool { - if ($this->numberOfPlayers != count(array_filter($this->players))) { - throw InvalidDraftSettingsException::playerCountDoesNotMatch(); - } - if (count(array_unique($this->players)) != count($this->players)) { throw InvalidDraftSettingsException::playerNamesNotUnique(); } @@ -142,11 +136,11 @@ protected function validatePlayers(): bool throw InvalidDraftSettingsException::notEnoughPlayers(); } - if ($this->numberOfPlayers > $this->numberOfSlices) { + if (count($this->players) > $this->numberOfSlices) { throw InvalidDraftSettingsException::notEnoughSlicesForPlayers(); } - if ($this->numberOfPlayers > $this->numberOfFactions) { + if (count($this->players) > $this->numberOfFactions) { throw InvalidDraftSettingsException::notEnoughFactionsForPlayers(); } @@ -191,7 +185,7 @@ protected function validateFactions() protected function validateCustomSlices(): bool { if (!empty($this->customSlices)) { - if (count($this->customSlices) < $this->numberOfPlayers) { + if (count($this->customSlices) < count($this->players)) { throw InvalidDraftSettingsException::notEnoughCustomSlices(); } foreach ($this->customSlices as $s) { @@ -203,4 +197,84 @@ protected function validateCustomSlices(): bool return true; } + + public static function fromJson(array $data): self + { + $allianceMode = $data['alliance'] != null; + + return new self( + $data['players'], + $data['preset_draft_order'], + new DraftName($data['name']), + new DraftSeed($data['seed']), + $data['num_slices'], + $data['num_factions'], + self::tileSetsFromJson($data), + self::factionSetsFromJson($data), + $data['include_keleres'], + $data['min_wormholes'], + $data['max_1_wormhole'], + $data['min_legendaries'], + (float) $data['minimum_optimal_influence'], + (float) $data['minimum_optimal_resources'], + (float) $data['minimum_optimal_total'], + (float) $data['maximum_optimal_total'], + $data['custom_factions'] ?? [], + $data['custom_slices'] ?? [], + $allianceMode, + $allianceMode ? AllianceTeamMode::from($data['alliance']['alliance_teams']) : null, + $allianceMode ? AllianceTeamPosition::from($data['alliance']['alliance_teams_position']) : null, + $allianceMode ? (bool) $data['alliance']['force_double_picks'] : null, + ); + } + + /** + * @param $data + * @return array + */ + private static function tileSetsFromJson($data): array + { + $tilesets = []; + + // currently there's no way to disable base game tiles + $tilesets[] = Edition::BASE_GAME; + if ($data['include_pok']) { + $tilesets[] = Edition::PROPHECY_OF_KINGS; + } + if ($data['include_ds_tiles']) { + $tilesets[] = Edition::DISCORDANT_STARS_PLUS; + } + if ($data['include_te_tiles']) { + $tilesets[] = Edition::THUNDERS_EDGE; + } + + return $tilesets; + } + + /** + * @param $data + * @return array + */ + private static function factionSetsFromJson($data): array + { + $tilesets = []; + + if ($data['include_base_factions']) { + $tilesets[] = Edition::BASE_GAME; + } + if ($data['include_pok_factions']) { + $tilesets[] = Edition::PROPHECY_OF_KINGS; + } + if ($data['include_discordant']) { + $tilesets[] = Edition::DISCORDANT_STARS; + } + if ($data['include_discordantexp']) { + $tilesets[] = Edition::DISCORDANT_STARS_PLUS; + } + if ($data['include_te_factions']) { + $tilesets[] = Edition::THUNDERS_EDGE; + } + + return $tilesets; + } } \ No newline at end of file diff --git a/app/Draft/DraftSettingsTest.php b/app/Draft/DraftSettingsTest.php index a68897f..d5a8da2 100644 --- a/app/Draft/DraftSettingsTest.php +++ b/app/Draft/DraftSettingsTest.php @@ -4,10 +4,12 @@ use App\Testing\DraftSettingsFactory; use App\Testing\TestCase; +use App\Testing\TestDrafts; use App\TwilightImperium\AllianceTeamMode; use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\DataProviderExternal; use PHPUnit\Framework\Attributes\Test; class DraftSettingsTest extends TestCase @@ -16,7 +18,6 @@ class DraftSettingsTest extends TestCase public function itCanBeConvertedToAnArray() { $draftSettings = new DraftSettings( - 4, ["john", "mike", "suzy", "robin"], true, new DraftName("Testgame"), @@ -59,7 +60,6 @@ public function itCanBeConvertedToAnArray() $array = $draftSettings->toArray(); - $this->assertSame(4, $array['num_players']); $this->assertSame(["john", "mike", "suzy", "robin"], $array['players']); $this->assertSame("Testgame", $array['name']); $this->assertSame(5, $array['num_slices']); @@ -98,17 +98,6 @@ public function itCanBeConvertedToAnArray() public static function validationCases() { - yield "When player count does not match player names" => [ - 'data' => [ - 'numberOfPlayers' => 4, - 'players' => [ - 'sam', - 'josie', - 'kyle' - ] - ], - 'exception' => InvalidDraftSettingsException::playerCountDoesNotMatch() - ]; yield "When player names are not unique" => [ "data" => [ 'players' => [ @@ -277,4 +266,51 @@ public function itValidatesCustomSlices() { $draft->validate(); } + + #[DataProviderExternal(TestDrafts::class, "provideTestDrafts")] + #[Test] + public function itCanBeInstantiatedFromJson($data) { + $draftSettings = DraftSettings::fromJson($data['config']); + + $this->assertSame($data['config']['name'], (string) $draftSettings->name); + $this->assertSame($data['config']['num_slices'], $draftSettings->numberOfSlices); + $this->assertSame($data['config']['num_factions'], $draftSettings->numberOfFactions); + $this->assertSame($data['config']['include_pok'], $draftSettings->includesTileSet(Edition::PROPHECY_OF_KINGS)); + $this->assertSame($data['config']['include_ds_tiles'], $draftSettings->includesTileSet(Edition::DISCORDANT_STARS_PLUS)); + $this->assertSame($data['config']['include_te_tiles'], $draftSettings->includesTileSet(Edition::THUNDERS_EDGE)); + $this->assertSame($data['config']['include_base_factions'], $draftSettings->includesFactionSet(Edition::BASE_GAME)); + $this->assertSame($data['config']['include_pok_factions'], $draftSettings->includesFactionSet(Edition::PROPHECY_OF_KINGS)); + $this->assertSame($data['config']['include_te_factions'], $draftSettings->includesFactionSet(Edition::THUNDERS_EDGE)); + $this->assertSame($data['config']['include_discordant'], $draftSettings->includesFactionSet(Edition::DISCORDANT_STARS)); + $this->assertSame($data['config']['include_discordantexp'], $draftSettings->includesFactionSet(Edition::DISCORDANT_STARS_PLUS)); + $this->assertSame($data['config']['include_keleres'], $draftSettings->includeCouncilKeleresFaction); + $this->assertSame($data['config']['preset_draft_order'], $draftSettings->presetDraftOrder); + $this->assertSame($data['config']['min_wormholes'], $draftSettings->minimumWormholes); + $this->assertSame($data['config']['min_legendaries'], $draftSettings->minimumLegendaryPlanets); + $this->assertSame($data['config']['max_1_wormhole'], $draftSettings->maxOneWormholesPerSlice); + $this->assertSame((float) $data['config']['minimum_optimal_influence'], $draftSettings->minimumOptimalInfluence); + $this->assertSame((float) $data['config']['minimum_optimal_resources'], $draftSettings->minimumOptimalResources); + $this->assertSame((float) $data['config']['minimum_optimal_total'], $draftSettings->minimumOptimalTotal); + $this->assertSame((float) $data['config']['maximum_optimal_total'], $draftSettings->maximumOptimalTotal); + if ($data['config']['custom_factions'] == null) { + $this->assertSame([], $draftSettings->customFactions); + } else { + $this->assertSame($data['config']['custom_factions'], $draftSettings->customFactions); + } + if ($data['config']['custom_slices'] == null) { + $this->assertSame([], $draftSettings->customSlices); + } else { + $this->assertSame($data['config']['custom_slices'], $draftSettings->customSlices); + } + $this->assertSame($data['config']['seed'], $draftSettings->seed->getValue()); + if ($data['config']['alliance'] != null) { + $this->assertSame($data['config']['alliance']['alliance_teams'], $draftSettings->allianceTeamMode->value); + $this->assertSame($data['config']['alliance']['alliance_teams_position'], $draftSettings->allianceTeamPosition->value); + $this->assertSame($data['config']['alliance']['force_double_picks'], $draftSettings->allianceForceDoublePicks); + } else { + $this->assertNull($draftSettings->allianceTeamMode); + $this->assertNull($draftSettings->allianceTeamPosition); + $this->assertNull($draftSettings->allianceForceDoublePicks); + } + } } \ No newline at end of file diff --git a/app/Draft/InvalidDraftSettingsException.php b/app/Draft/InvalidDraftSettingsException.php index 4439a33..73e62ea 100644 --- a/app/Draft/InvalidDraftSettingsException.php +++ b/app/Draft/InvalidDraftSettingsException.php @@ -4,11 +4,6 @@ class InvalidDraftSettingsException extends \Exception { - public static function playerCountDoesNotMatch(): self - { - return new self("Player count does not match number of names"); - } - public static function playerNamesNotUnique(): self { return new self("Player names are not unique"); diff --git a/app/Testing/DraftSettingsFactory.php b/app/Testing/DraftSettingsFactory.php index 55aa0b0..65e76ee 100644 --- a/app/Testing/DraftSettingsFactory.php +++ b/app/Testing/DraftSettingsFactory.php @@ -8,12 +8,6 @@ use App\TwilightImperium\AllianceTeamMode; use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; -use App\TwilightImperium\Planet; -use App\TwilightImperium\PlanetTrait; -use App\TwilightImperium\TechSpecialties; -use App\TwilightImperium\Tile; -use App\TwilightImperium\TileType; -use App\TwilightImperium\Wormhole; use Faker\Factory; class DraftSettingsFactory @@ -36,7 +30,6 @@ public static function make(array $properties = []): DraftSettings $allianceMode = $properties['allianceMode'] ?? false; return new DraftSettings( - $numberOfPlayers, $names, $properties['presetDraftOrder'] ?? $faker->boolean(), new DraftName($properties['name'] ?? null), diff --git a/app/Testing/TestDrafts.php b/app/Testing/TestDrafts.php index 8ba5c61..12b3b35 100644 --- a/app/Testing/TestDrafts.php +++ b/app/Testing/TestDrafts.php @@ -9,10 +9,10 @@ enum TestDrafts: string case ALLIANCE_MODE = "draft.november2025.alliance.json"; private static function loadDraftByFilename(string $filename): array { - return json_decode(file_get_contents('data/test-drafts/' . $filename . '.json')); + return json_decode(file_get_contents('data/test-drafts/' . $filename), true); } - public static function testDraftsProvider(): iterable + public static function provideTestDrafts(): iterable { foreach(TestDrafts::cases() as $case) { yield $case->name => [ diff --git a/data/test-drafts/draft.november2025.custom.json b/data/test-drafts/draft.november2025.custom.json index c0c81f3..71e5b0e 100644 --- a/data/test-drafts/draft.november2025.custom.json +++ b/data/test-drafts/draft.november2025.custom.json @@ -233,7 +233,7 @@ "Amy", "Charlie" ], - "name": "Operation Adventurous Fact", + "name": "Custom Slices and Factions", "num_slices": 6, "num_factions": 9, "include_pok": true, From c7840a7afbd6fb36cb298f0856039461d8e51a09 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Wed, 17 Dec 2025 16:27:32 +0100 Subject: [PATCH 15/34] Get started on draft model --- app/Draft.php | 22 +- app/Draft/Draft.php | 40 +++ app/Draft/DraftSettings.php | 26 +- app/Draft/DraftSettingsTest.php | 8 +- app/Draft/DraftTest.php | 43 +++ app/Draft/InvalidDraftSettingsException.php | 6 +- app/Draft/Player.php | 59 ++++ app/Draft/PlayerTest.php | 90 +++++++ app/GeneratorConfig.php | 16 +- app/Testing/DraftSettingsFactory.php | 6 +- ...aft.march2024.pre-alliance-pre-secret.json | 253 ++++++++++++++++++ 11 files changed, 527 insertions(+), 42 deletions(-) create mode 100644 app/Draft/Draft.php create mode 100644 app/Draft/DraftTest.php create mode 100644 app/Draft/Player.php create mode 100644 app/Draft/PlayerTest.php create mode 100644 data/test-drafts/draft.march2024.pre-alliance-pre-secret.json diff --git a/app/Draft.php b/app/Draft.php index 9308754..834b0a1 100644 --- a/app/Draft.php +++ b/app/Draft.php @@ -21,7 +21,7 @@ private function __construct( private string $name ) { $this->draft = ($draft === [] ? [ - 'players' => $this->generatePlayerData(), + 'playerNames' => $this->generatePlayerData(), 'log' => [], ] : $draft); @@ -151,7 +151,7 @@ public function config(): GeneratorConfig public function currentPlayer(): string { $doneSteps = count($this->draft['log']); - $snakeDraft = array_merge(array_keys($this->draft['players']), array_keys(array_reverse($this->draft['players']))); + $snakeDraft = array_merge(array_keys($this->draft['playerNames']), array_keys(array_reverse($this->draft['playerNames']))); return $snakeDraft[$doneSteps % count($snakeDraft)]; } @@ -162,7 +162,7 @@ public function log(): array public function players(): array { - return $this->draft['players']; + return $this->draft['playerNames']; } public function isDone(): bool @@ -174,7 +174,7 @@ public function undoLastAction() { $last_log = array_pop($this->draft['log']); - $this->draft["players"][$last_log['player']][$last_log['category']] = null; + $this->draft["playerNames"][$last_log['player']][$last_log['category']] = null; $this->draft['current'] = $last_log['player']; $this->save(); @@ -188,7 +188,7 @@ public function pick($player, $category, $value) 'value' => $value ]; - $this->draft['players'][$player][$category] = $value; + $this->draft['playerNames'][$player][$category] = $value; $this->draft['current'] = $this->currentPlayer(); @@ -199,10 +199,10 @@ public function pick($player, $category, $value) public function claim($player) { - if ($this->draft['players'][$player]["claimed"] == true) { + if ($this->draft['playerNames'][$player]["claimed"] == true) { return_error('Already claimed'); } - $this->draft['players'][$player]["claimed"] = true; + $this->draft['playerNames'][$player]["claimed"] = true; $this->secrets[$player] = md5(uniqid("", true)); return $this->save(); @@ -210,10 +210,10 @@ public function claim($player) public function unclaim($player) { - if ($this->draft['players'][$player]["claimed"] == false) { + if ($this->draft['playerNames'][$player]["claimed"] == false) { return_error('Already unclaimed'); } - $this->draft['players'][$player]["claimed"] = false; + $this->draft['playerNames'][$player]["claimed"] = false; unset($this->secrets[$player]); return $this->save(); @@ -253,7 +253,7 @@ public function regenerate(bool $regen_slices, bool $regen_factions, bool $regen } if ($regen_order) { - $this->draft['players'] = $this->generatePlayerData(); + $this->draft['playerNames'] = $this->generatePlayerData(); } $this->save(); @@ -309,7 +309,7 @@ private function generateTeams(): array $teams = []; $currentTeam = []; $i = 0; - // put players in teams + // put playerNames in teams while(count($teamNames) > 0) { $currentTeam[] = $this->config->players[$i]; $i++; diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php new file mode 100644 index 0000000..c5ebeea --- /dev/null +++ b/app/Draft/Draft.php @@ -0,0 +1,40 @@ + $players + */ + public array $players, + public DraftSettings $settings, + // @todo secrets + // @todo logs + ) { + + } + + public static function fromJson($data) + { + return new self( + $data['id'], + $data['done'], + array_map(fn ($playerData) => Player::fromJson($playerData), $data['draft']['players']), + DraftSettings::fromJson($data['config']) + ); + } + + public function toArray(): array + { + return [ + 'id' => $this->id, + 'done' => $this->isDone, + 'config' => $this->settings->toArray(), + 'players' => array_map(fn (Player $player) => $player->toArray(), $this->players), + ]; + } +} \ No newline at end of file diff --git a/app/Draft/DraftSettings.php b/app/Draft/DraftSettings.php index 7c46e67..8d3e51d 100644 --- a/app/Draft/DraftSettings.php +++ b/app/Draft/DraftSettings.php @@ -14,18 +14,18 @@ class DraftSettings { public function __construct( /** - * @var array $players + * @var array $playerNames */ - public array $players, - public bool $presetDraftOrder, + public array $playerNames, + public bool $presetDraftOrder, public DraftName $name, public DraftSeed $seed, - public int $numberOfSlices, - public int $numberOfFactions, + public int $numberOfSlices, + public int $numberOfFactions, /** * @var array */ - public array $tileSets, + public array $tileSets, /** * @var array */ @@ -60,7 +60,7 @@ public function includesTileSet(Edition $e): bool { public function toArray() { return [ - 'players' => $this->players, + 'playerNames' => $this->playerNames, 'preset_draft_order' => $this->presetDraftOrder, 'name' => (string) $this->name, 'num_slices' => $this->numberOfSlices, @@ -107,7 +107,7 @@ public function validate(): bool /* if ($this->custom_slices != null) { - if (count($this->custom_slices) < count($this->players)) return_error("Not enough custom slices for number of players"); + if (count($this->custom_slices) < count($this->playerNames)) return_error("Not enough custom slices for number of playerNames"); foreach ($this->custom_slices as $s) { if (count($s) != 5) return_error('Some of the custom slices have the wrong number of tiles. (each should have five)'); } @@ -128,19 +128,19 @@ public function validate(): bool protected function validatePlayers(): bool { - if (count(array_unique($this->players)) != count($this->players)) { + if (count(array_unique($this->playerNames)) != count($this->playerNames)) { throw InvalidDraftSettingsException::playerNamesNotUnique(); } - if (count($this->players) < 3) { + if (count($this->playerNames) < 3) { throw InvalidDraftSettingsException::notEnoughPlayers(); } - if (count($this->players) > $this->numberOfSlices) { + if (count($this->playerNames) > $this->numberOfSlices) { throw InvalidDraftSettingsException::notEnoughSlicesForPlayers(); } - if (count($this->players) > $this->numberOfFactions) { + if (count($this->playerNames) > $this->numberOfFactions) { throw InvalidDraftSettingsException::notEnoughFactionsForPlayers(); } @@ -185,7 +185,7 @@ protected function validateFactions() protected function validateCustomSlices(): bool { if (!empty($this->customSlices)) { - if (count($this->customSlices) < count($this->players)) { + if (count($this->customSlices) < count($this->playerNames)) { throw InvalidDraftSettingsException::notEnoughCustomSlices(); } foreach ($this->customSlices as $s) { diff --git a/app/Draft/DraftSettingsTest.php b/app/Draft/DraftSettingsTest.php index d5a8da2..493d29d 100644 --- a/app/Draft/DraftSettingsTest.php +++ b/app/Draft/DraftSettingsTest.php @@ -60,7 +60,7 @@ public function itCanBeConvertedToAnArray() $array = $draftSettings->toArray(); - $this->assertSame(["john", "mike", "suzy", "robin"], $array['players']); + $this->assertSame(["john", "mike", "suzy", "robin"], $array['playerNames']); $this->assertSame("Testgame", $array['name']); $this->assertSame(5, $array['num_slices']); $this->assertSame(8, $array['num_factions']); @@ -100,7 +100,7 @@ public static function validationCases() { yield "When player names are not unique" => [ "data" => [ - 'players' => [ + 'playerNames' => [ 'sam', 'sam', 'kyle' @@ -108,9 +108,9 @@ public static function validationCases() ], 'exception' => InvalidDraftSettingsException::playerNamesNotUnique() ]; - yield "When not enough players" => [ + yield "When not enough playerNames" => [ "data" => [ - 'players' => [ + 'playerNames' => [ 'sam', 'kyle' ] diff --git a/app/Draft/DraftTest.php b/app/Draft/DraftTest.php new file mode 100644 index 0000000..ac69922 --- /dev/null +++ b/app/Draft/DraftTest.php @@ -0,0 +1,43 @@ +assertNotEmpty($draft->players); + $this->assertSame($data['config']['name'], (string) $draft->settings->name); + $this->assertSame($draft->id, $data['id']); + $this->assertSame($draft->isDone, $data['done']); + } + + #[Test] + public function itCanBeConvertedToArray() + { + $draft = new Draft( + '1243', + true, + [], + DraftSettingsFactory::make() + ); + + $data = $draft->toArray(); + + $this->assertSame($draft->settings->toArray(), $data['config']); + $this->assertSame($draft->id, $data['id']); + $this->assertSame($draft->isDone, $data['done']); + } +} \ No newline at end of file diff --git a/app/Draft/InvalidDraftSettingsException.php b/app/Draft/InvalidDraftSettingsException.php index 73e62ea..2a825c7 100644 --- a/app/Draft/InvalidDraftSettingsException.php +++ b/app/Draft/InvalidDraftSettingsException.php @@ -11,17 +11,17 @@ public static function playerNamesNotUnique(): self public static function notEnoughPlayers(): self { - return new self("Should have at least 3 players"); + return new self("Should have at least 3 playerNames"); } public static function notEnoughSlicesForPlayers(): self { - return new self("Cannot have less slices than players"); + return new self("Cannot have less slices than playerNames"); } public static function notEnoughFactionsForPlayers(): self { - return new self("Cannot have less factions than players"); + return new self("Cannot have less factions than playerNames"); } public static function notEnoughTilesForSlices(float $maxSlices): self diff --git a/app/Draft/Player.php b/app/Draft/Player.php new file mode 100644 index 0000000..085fb68 --- /dev/null +++ b/app/Draft/Player.php @@ -0,0 +1,59 @@ + $this->id, + 'name' => $this->name, + 'claimed' => $this->claimed, + 'position' => $this->pickedPosition, + 'faction' => $this->pickedFaction, + 'slice' => $this->pickedSlice, + 'team' => $this->team, + ]; + } + + public function hasPickedSlice(): bool + { + return $this->pickedSlice != null; + } + + public function hasPickedFaction(): bool + { + return $this->pickedFaction != null; + } + + public function hasPickedPosition(): bool + { + return $this->pickedPosition != null; + } +} \ No newline at end of file diff --git a/app/Draft/PlayerTest.php b/app/Draft/PlayerTest.php new file mode 100644 index 0000000..a5a0204 --- /dev/null +++ b/app/Draft/PlayerTest.php @@ -0,0 +1,90 @@ +assertSame($playerData['id'], $p->id); + $this->assertSame($playerData['name'], $p->name); + $this->assertSame($playerData['faction'], $p->pickedFaction); + $this->assertSame($playerData['slice'], $p->pickedSlice); + $this->assertSame($playerData['position'], $p->pickedPosition); + } + } + + #[Test] + public function itChecksIfPlayerHasPickedPosition() + { + $player1 = new Player('1', 'Alice', false, "1"); + $player2 = new Player('2', 'Bob'); + + $this->assertTrue($player1->hasPickedPosition()); + $this->assertFalse($player2->hasPickedPosition()); + } + + #[Test] + public function itChecksIfPlayerHasPickedFaction() + { + $player1 = new Player('1', 'Alice', false, null, "Mahact"); + $player2 = new Player('2', 'Bob'); + + $this->assertTrue($player1->hasPickedFaction()); + $this->assertFalse($player2->hasPickedFaction()); + } + + #[Test] + public function itChecksIfPlayerHasPickedSlice() + { + $player1 = new Player('1', 'Alice', false, null, null, "1"); + $player2 = new Player('2', 'Bob'); + + $this->assertTrue($player1->hasPickedSlice()); + $this->assertFalse($player2->hasPickedSlice()); + } + + + #[Test] + public function itCanBeConvertedToAnArray() + { + $player1 = new Player( + '1', + 'Alice', + true, + '2', + "Mahact", + '3', + 'A' + ); + $player2 = new Player('2', 'Bob'); + + $this->assertSame([ + 'id' => '1', + 'name' => 'Alice', + 'claimed' => true, + 'position' => '2', + 'faction' => 'Mahact', + 'slice' => '3', + 'team' => 'A', + ], $player1->toArray()); + $this->assertSame([ + 'id' => '2', + 'name' => 'Bob', + 'claimed' => false, + 'position' => null, + 'faction' => null, + 'slice' => null, + 'team' => null + ], $player2->toArray()); + } +} \ No newline at end of file diff --git a/app/GeneratorConfig.php b/app/GeneratorConfig.php index 52f7019..17c9801 100644 --- a/app/GeneratorConfig.php +++ b/app/GeneratorConfig.php @@ -58,7 +58,7 @@ function __construct($get_values_from_request) $this->players = array_filter(array_map('htmlentities', get('player', []))); if ((int) get('num_players') != count($this->players)) { - return_error('Number of players does not match number of names'); + return_error('Number of playerNames does not match number of names'); } $this->name = new DraftName(get('game_name', '')); @@ -136,16 +136,16 @@ public static function fromArray(array $array): GeneratorConfig private function validate(): void { - if (count($this->players) > count(array_filter($this->players))) return_error('Some players names are not filled out'); + if (count($this->players) > count(array_filter($this->players))) return_error('Some playerNames names are not filled out'); if (count(array_unique($this->players)) != count($this->players)) return_error('Players should all have unique names'); $num_tiles = self::NUM_BASE_BLUE + $this->include_pok*self::NUM_POK_BLUE + $this->include_ds_tiles*self::NUM_DS_BLUE + $this->include_te_tiles*self::NUM_TE_BLUE; $num_red = self::NUM_BASE_RED + $this->include_pok*self::NUM_POK_RED + $this->include_ds_tiles*self::NUM_DS_RED + $this->include_te_tiles*self::NUM_TE_RED; // maximum number of possible slices, 3 blue and 2 red tiles per slice $max_slices = min(floor($num_tiles/3), floor($num_red/2)); - if ($max_slices < $this->num_slices) return_error('Can only draft up to ' . $max_slices . ' slices with the selected tiles. (And by extension you can only do drafts up to ' . $max_slices . ' players)'); - if (count($this->players) < 3) return_error('Please enter at least 3 players'); - if ($this->num_factions < count($this->players)) return_error("Can't have less factions than players"); - if ($this->num_slices < count($this->players)) return_error("Can't have less slices than players"); + if ($max_slices < $this->num_slices) return_error('Can only draft up to ' . $max_slices . ' slices with the selected tiles. (And by extension you can only do drafts up to ' . $max_slices . ' playerNames)'); + if (count($this->players) < 3) return_error('Please enter at least 3 playerNames'); + if ($this->num_factions < count($this->players)) return_error("Can't have less factions than playerNames"); + if ($this->num_slices < count($this->players)) return_error("Can't have less slices than playerNames"); if ($this->maximum_optimal_total < $this->minimum_optimal_total) return_error("Maximum optimal can't be less than minimum"); $max_legendaries = $this->include_pok*self::NUM_POK_LEGENDARIES + $this->include_ds_tiles*self::NUM_DS_LEGENDARIES + $this->include_te_tiles*self::NUM_TE_LEGENDARIES; if ($max_legendaries < $this->min_legendaries) return_error('Cannot include ' . $this->min_legendaries . ' legendaries, maximum number available is ' . $max_legendaries); @@ -153,9 +153,9 @@ private function validate(): void if ($this->seed !== null && ($this->seed < 1 || $this->seed > self::MAX_SEED_VALUE)) return_error('Seed must be between 1 and ' . self::MAX_SEED_VALUE); // Must include at least 1 of base, pok, discordant, or discordant expansion to have enough factions to use if (!($this->include_base_factions || $this->include_pok_factions || $this->include_discordant || $this->include_discordantexp || $this->include_te_factions)) return_error("Not enough factions selected."); - // if($this->custom_factions != null && count($this->custom_factions) < count($this->players)) return_error("Not enough custom factions for number of players"); + // if($this->custom_factions != null && count($this->custom_factions) < count($this->playerNames)) return_error("Not enough custom factions for number of playerNames"); if ($this->custom_slices != null) { - if (count($this->custom_slices) < count($this->players)) return_error("Not enough custom slices for number of players"); + if (count($this->custom_slices) < count($this->players)) return_error("Not enough custom slices for number of playerNames"); foreach ($this->custom_slices as $s) { if (count($s) != 5) return_error('Some of the custom slices have the wrong number of tiles. (each should have five)'); } diff --git a/app/Testing/DraftSettingsFactory.php b/app/Testing/DraftSettingsFactory.php index 65e76ee..d5081d6 100644 --- a/app/Testing/DraftSettingsFactory.php +++ b/app/Testing/DraftSettingsFactory.php @@ -19,13 +19,13 @@ public static function make(array $properties = []): DraftSettings if (isset($properties['numberOfPlayers'])) { $numberOfPlayers = $properties['numberOfPlayers']; - } elseif (isset($properties['players'])) { - $numberOfPlayers = count($properties['players']); + } elseif (isset($properties['playerNames'])) { + $numberOfPlayers = count($properties['playerNames']); } else { $numberOfPlayers = 6; } - $names = $properties['players'] ?? array_map(fn () => $faker->name(), range(1, $numberOfPlayers)); + $names = $properties['playerNames'] ?? array_map(fn () => $faker->name(), range(1, $numberOfPlayers)); $allianceMode = $properties['allianceMode'] ?? false; diff --git a/data/test-drafts/draft.march2024.pre-alliance-pre-secret.json b/data/test-drafts/draft.march2024.pre-alliance-pre-secret.json new file mode 100644 index 0000000..fbc5aac --- /dev/null +++ b/data/test-drafts/draft.march2024.pre-alliance-pre-secret.json @@ -0,0 +1,253 @@ +{ + "done": false, + "id": "693e9b3fb8452", + "draft": { + "players": { + "p_564cbfb050046007faea784931962140": { + "id": "p_564cbfb050046007faea784931962140", + "name": "Ben", + "claimed": false, + "position": null, + "slice": null, + "faction": "Free Systems Compact" + }, + "p_ffbfdb5608320d54d904e07eae678c2a": { + "id": "p_ffbfdb5608320d54d904e07eae678c2a", + "name": "Esther", + "claimed": false, + "position": null, + "slice": null, + "faction": "Last Bastion" + }, + "p_67161c4c41518e0e1cfc4e2c044269e2": { + "id": "p_67161c4c41518e0e1cfc4e2c044269e2", + "name": "Frank", + "claimed": false, + "position": null, + "slice": null, + "faction": "Gledge Union" + }, + "p_e6556957358fe40ec9c0bf4a9ddab0ac": { + "id": "p_e6556957358fe40ec9c0bf4a9ddab0ac", + "name": "Desmond", + "claimed": false, + "position": null, + "slice": "1", + "faction": null + }, + "p_404e5780ee88e69cab1602093431c2a8": { + "id": "p_404e5780ee88e69cab1602093431c2a8", + "name": "Amy", + "claimed": false, + "position": null, + "slice": null, + "faction": null + }, + "p_e37356083346f2cb785de89c36faff1e": { + "id": "p_e37356083346f2cb785de89c36faff1e", + "name": "Charlie", + "claimed": false, + "position": null, + "slice": null, + "faction": null + } + }, + "log": [ + { + "player": "p_564cbfb050046007faea784931962140", + "category": "faction", + "value": "Free Systems Compact" + }, + { + "player": "p_ffbfdb5608320d54d904e07eae678c2a", + "category": "faction", + "value": "Last Bastion" + }, + { + "player": "p_67161c4c41518e0e1cfc4e2c044269e2", + "category": "faction", + "value": "Gledge Union" + }, + { + "player": "p_e6556957358fe40ec9c0bf4a9ddab0ac", + "category": "slice", + "value": "1" + } + ], + "current": "p_404e5780ee88e69cab1602093431c2a8" + }, + "slices": [ + { + "tiles": [ + 61, + 48, + 59, + 49, + 40 + ], + "specialties": [ + "warfare", + "propulsion" + ], + "wormholes": [ + "beta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 3, + "total_resources": 3, + "optimal_influence": 3, + "optimal_resources": 2 + }, + { + "tiles": [ + 60, + 72, + 39, + 68, + 25 + ], + "specialties": [ + "warfare" + ], + "wormholes": [ + "alpha", + "beta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 6, + "total_resources": 11, + "optimal_influence": 1, + "optimal_resources": 10 + }, + { + "tiles": [ + 27, + 44, + 76, + 79, + 35 + ], + "specialties": [ + "biotic", + "biotic" + ], + "wormholes": [ + "alpha" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 10, + "total_resources": 11, + "optimal_influence": 7, + "optimal_resources": 7 + }, + { + "tiles": [ + 45, + 34, + 46, + 11, + 36 + ], + "specialties": [ + "propulsion" + ], + "wormholes": [], + "has_legendaries": false, + "legendaries": [], + "total_influence": 8, + "total_resources": 8, + "optimal_influence": 5.5, + "optimal_resources": 5.5 + }, + { + "tiles": [ + 30, + 12, + 50, + 22, + 17 + ], + "specialties": [ + "biotic" + ], + "wormholes": [ + "delta" + ], + "has_legendaries": false, + "legendaries": [], + "total_influence": 9, + "total_resources": 7, + "optimal_influence": 7.5, + "optimal_resources": 3.5 + }, + { + "tiles": [ + 70, + 73, + 12, + 77, + 21 + ], + "specialties": [ + "cybernetic", + "propulsion" + ], + "wormholes": [], + "has_legendaries": false, + "legendaries": [], + "total_influence": 12, + "total_resources": 6, + "optimal_influence": 10.5, + "optimal_resources": 2.5 + } + ], + "factions": [ + "Veldyr Sovereignty", + "Free Systems Compact", + "Kyro Sodality", + "Ghoti Wayfarers", + "Zelian Purifier", + "Gledge Union", + "Nokar Sellships", + "Last Bastion", + "Savages of Cymiae" + ], + "config": { + "players": [ + "Ben", + "Esther", + "Frank", + "Desmond", + "Amy", + "Charlie" + ], + "name": "Pre-alliance draft", + "num_slices": 6, + "num_factions": 9, + "include_pok": true, + "include_ds_tiles": true, + "include_te_tiles": true, + "include_base_factions": true, + "include_pok_factions": true, + "include_keleres": true, + "include_discordant": true, + "include_discordantexp": true, + "include_te_factions": true, + "preset_draft_order": false, + "min_wormholes": 0, + "min_legendaries": 0, + "max_1_wormhole": false, + "minimum_optimal_influence": 4, + "minimum_optimal_resources": 2.5, + "minimum_optimal_total": 9, + "maximum_optimal_total": 13, + "custom_factions": null, + "custom_slices": null, + "alliance": null, + "seed": 896134222637712 + }, + "name": "Pre-alliance draft" +} \ No newline at end of file From d16f972e86980d69d9b790e28ca5bf20d31cdb04 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Wed, 17 Dec 2025 16:34:16 +0100 Subject: [PATCH 16/34] Not using AllianceDraftSettings, it's overkill --- app/Draft/AllianceDraftSettings.php | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 app/Draft/AllianceDraftSettings.php diff --git a/app/Draft/AllianceDraftSettings.php b/app/Draft/AllianceDraftSettings.php deleted file mode 100644 index f2c7d36..0000000 --- a/app/Draft/AllianceDraftSettings.php +++ /dev/null @@ -1,10 +0,0 @@ - Date: Wed, 17 Dec 2025 16:34:29 +0100 Subject: [PATCH 17/34] Try to undo some damage I accidentally did while refactoring --- app/Draft.php | 22 ++++++++++----------- app/Draft/DraftSeed.php | 2 +- app/Draft/DraftSettings.php | 12 +---------- app/Draft/DraftSettingsTest.php | 2 +- app/Draft/InvalidDraftSettingsException.php | 6 +++--- app/GeneratorConfig.php | 16 +++++++-------- 6 files changed, 25 insertions(+), 35 deletions(-) diff --git a/app/Draft.php b/app/Draft.php index 834b0a1..9308754 100644 --- a/app/Draft.php +++ b/app/Draft.php @@ -21,7 +21,7 @@ private function __construct( private string $name ) { $this->draft = ($draft === [] ? [ - 'playerNames' => $this->generatePlayerData(), + 'players' => $this->generatePlayerData(), 'log' => [], ] : $draft); @@ -151,7 +151,7 @@ public function config(): GeneratorConfig public function currentPlayer(): string { $doneSteps = count($this->draft['log']); - $snakeDraft = array_merge(array_keys($this->draft['playerNames']), array_keys(array_reverse($this->draft['playerNames']))); + $snakeDraft = array_merge(array_keys($this->draft['players']), array_keys(array_reverse($this->draft['players']))); return $snakeDraft[$doneSteps % count($snakeDraft)]; } @@ -162,7 +162,7 @@ public function log(): array public function players(): array { - return $this->draft['playerNames']; + return $this->draft['players']; } public function isDone(): bool @@ -174,7 +174,7 @@ public function undoLastAction() { $last_log = array_pop($this->draft['log']); - $this->draft["playerNames"][$last_log['player']][$last_log['category']] = null; + $this->draft["players"][$last_log['player']][$last_log['category']] = null; $this->draft['current'] = $last_log['player']; $this->save(); @@ -188,7 +188,7 @@ public function pick($player, $category, $value) 'value' => $value ]; - $this->draft['playerNames'][$player][$category] = $value; + $this->draft['players'][$player][$category] = $value; $this->draft['current'] = $this->currentPlayer(); @@ -199,10 +199,10 @@ public function pick($player, $category, $value) public function claim($player) { - if ($this->draft['playerNames'][$player]["claimed"] == true) { + if ($this->draft['players'][$player]["claimed"] == true) { return_error('Already claimed'); } - $this->draft['playerNames'][$player]["claimed"] = true; + $this->draft['players'][$player]["claimed"] = true; $this->secrets[$player] = md5(uniqid("", true)); return $this->save(); @@ -210,10 +210,10 @@ public function claim($player) public function unclaim($player) { - if ($this->draft['playerNames'][$player]["claimed"] == false) { + if ($this->draft['players'][$player]["claimed"] == false) { return_error('Already unclaimed'); } - $this->draft['playerNames'][$player]["claimed"] = false; + $this->draft['players'][$player]["claimed"] = false; unset($this->secrets[$player]); return $this->save(); @@ -253,7 +253,7 @@ public function regenerate(bool $regen_slices, bool $regen_factions, bool $regen } if ($regen_order) { - $this->draft['playerNames'] = $this->generatePlayerData(); + $this->draft['players'] = $this->generatePlayerData(); } $this->save(); @@ -309,7 +309,7 @@ private function generateTeams(): array $teams = []; $currentTeam = []; $i = 0; - // put playerNames in teams + // put players in teams while(count($teamNames) > 0) { $currentTeam[] = $this->config->players[$i]; $i++; diff --git a/app/Draft/DraftSeed.php b/app/Draft/DraftSeed.php index 3aa2d71..780fa69 100644 --- a/app/Draft/DraftSeed.php +++ b/app/Draft/DraftSeed.php @@ -14,7 +14,7 @@ class DraftSeed private const OFFSET_PLAYER_ORDER = 2; private int $seed; - public function __construct(int $seed = null) + public function __construct(?int $seed = null) { if ($seed == null) { $this->seed = self::generate(); diff --git a/app/Draft/DraftSettings.php b/app/Draft/DraftSettings.php index 8d3e51d..30beace 100644 --- a/app/Draft/DraftSettings.php +++ b/app/Draft/DraftSettings.php @@ -60,7 +60,7 @@ public function includesTileSet(Edition $e): bool { public function toArray() { return [ - 'playerNames' => $this->playerNames, + 'players' => $this->playerNames, 'preset_draft_order' => $this->presetDraftOrder, 'name' => (string) $this->name, 'num_slices' => $this->numberOfSlices, @@ -104,20 +104,10 @@ public function toArray() */ public function validate(): bool { - /* - - if ($this->custom_slices != null) { - if (count($this->custom_slices) < count($this->playerNames)) return_error("Not enough custom slices for number of playerNames"); - foreach ($this->custom_slices as $s) { - if (count($s) != 5) return_error('Some of the custom slices have the wrong number of tiles. (each should have five)'); - } - } - */ if (!$this->seed->isValid()) { throw InvalidDraftSettingsException::invalidSeed(); } - $this->validatePlayers(); $this->validateTiles(); $this->validateFactions(); diff --git a/app/Draft/DraftSettingsTest.php b/app/Draft/DraftSettingsTest.php index 493d29d..d9044d2 100644 --- a/app/Draft/DraftSettingsTest.php +++ b/app/Draft/DraftSettingsTest.php @@ -60,7 +60,7 @@ public function itCanBeConvertedToAnArray() $array = $draftSettings->toArray(); - $this->assertSame(["john", "mike", "suzy", "robin"], $array['playerNames']); + $this->assertSame(["john", "mike", "suzy", "robin"], $array['players']); $this->assertSame("Testgame", $array['name']); $this->assertSame(5, $array['num_slices']); $this->assertSame(8, $array['num_factions']); diff --git a/app/Draft/InvalidDraftSettingsException.php b/app/Draft/InvalidDraftSettingsException.php index 2a825c7..73e62ea 100644 --- a/app/Draft/InvalidDraftSettingsException.php +++ b/app/Draft/InvalidDraftSettingsException.php @@ -11,17 +11,17 @@ public static function playerNamesNotUnique(): self public static function notEnoughPlayers(): self { - return new self("Should have at least 3 playerNames"); + return new self("Should have at least 3 players"); } public static function notEnoughSlicesForPlayers(): self { - return new self("Cannot have less slices than playerNames"); + return new self("Cannot have less slices than players"); } public static function notEnoughFactionsForPlayers(): self { - return new self("Cannot have less factions than playerNames"); + return new self("Cannot have less factions than players"); } public static function notEnoughTilesForSlices(float $maxSlices): self diff --git a/app/GeneratorConfig.php b/app/GeneratorConfig.php index 17c9801..e3047c1 100644 --- a/app/GeneratorConfig.php +++ b/app/GeneratorConfig.php @@ -58,7 +58,7 @@ function __construct($get_values_from_request) $this->players = array_filter(array_map('htmlentities', get('player', []))); if ((int) get('num_players') != count($this->players)) { - return_error('Number of playerNames does not match number of names'); + return_error('Number of players does not match number of names'); } $this->name = new DraftName(get('game_name', '')); @@ -136,16 +136,16 @@ public static function fromArray(array $array): GeneratorConfig private function validate(): void { - if (count($this->players) > count(array_filter($this->players))) return_error('Some playerNames names are not filled out'); + if (count($this->players) > count(array_filter($this->players))) return_error('Some player names are not filled out'); if (count(array_unique($this->players)) != count($this->players)) return_error('Players should all have unique names'); $num_tiles = self::NUM_BASE_BLUE + $this->include_pok*self::NUM_POK_BLUE + $this->include_ds_tiles*self::NUM_DS_BLUE + $this->include_te_tiles*self::NUM_TE_BLUE; $num_red = self::NUM_BASE_RED + $this->include_pok*self::NUM_POK_RED + $this->include_ds_tiles*self::NUM_DS_RED + $this->include_te_tiles*self::NUM_TE_RED; // maximum number of possible slices, 3 blue and 2 red tiles per slice $max_slices = min(floor($num_tiles/3), floor($num_red/2)); - if ($max_slices < $this->num_slices) return_error('Can only draft up to ' . $max_slices . ' slices with the selected tiles. (And by extension you can only do drafts up to ' . $max_slices . ' playerNames)'); - if (count($this->players) < 3) return_error('Please enter at least 3 playerNames'); - if ($this->num_factions < count($this->players)) return_error("Can't have less factions than playerNames"); - if ($this->num_slices < count($this->players)) return_error("Can't have less slices than playerNames"); + if ($max_slices < $this->num_slices) return_error('Can only draft up to ' . $max_slices . ' slices with the selected tiles. (And by extension you can only do drafts up to ' . $max_slices . ' players)'); + if (count($this->players) < 3) return_error('Please enter at least 3 players'); + if ($this->num_factions < count($this->players)) return_error("Can't have less factions than players"); + if ($this->num_slices < count($this->players)) return_error("Can't have less slices than players"); if ($this->maximum_optimal_total < $this->minimum_optimal_total) return_error("Maximum optimal can't be less than minimum"); $max_legendaries = $this->include_pok*self::NUM_POK_LEGENDARIES + $this->include_ds_tiles*self::NUM_DS_LEGENDARIES + $this->include_te_tiles*self::NUM_TE_LEGENDARIES; if ($max_legendaries < $this->min_legendaries) return_error('Cannot include ' . $this->min_legendaries . ' legendaries, maximum number available is ' . $max_legendaries); @@ -153,9 +153,9 @@ private function validate(): void if ($this->seed !== null && ($this->seed < 1 || $this->seed > self::MAX_SEED_VALUE)) return_error('Seed must be between 1 and ' . self::MAX_SEED_VALUE); // Must include at least 1 of base, pok, discordant, or discordant expansion to have enough factions to use if (!($this->include_base_factions || $this->include_pok_factions || $this->include_discordant || $this->include_discordantexp || $this->include_te_factions)) return_error("Not enough factions selected."); - // if($this->custom_factions != null && count($this->custom_factions) < count($this->playerNames)) return_error("Not enough custom factions for number of playerNames"); + // if($this->custom_factions != null && count($this->custom_factions) < count($this->players)) return_error("Not enough custom factions for number of players"); if ($this->custom_slices != null) { - if (count($this->custom_slices) < count($this->players)) return_error("Not enough custom slices for number of playerNames"); + if (count($this->custom_slices) < count($this->players)) return_error("Not enough custom slices for number of players"); foreach ($this->custom_slices as $s) { if (count($s) != 5) return_error('Some of the custom slices have the wrong number of tiles. (each should have five)'); } From 152ed6984bb0d2a758b2724bcf6b157b0ed79317 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 19 Dec 2025 14:25:12 +0100 Subject: [PATCH 18/34] Refactor Draft picks and players --- app/Draft/Draft.php | 45 ++++++++--- app/Draft/DraftId.php | 10 +++ app/Draft/DraftTest.php | 23 +++++- app/Draft/InvalidDraftSettingsException.php | 2 +- app/Draft/InvalidPickException.php | 11 +++ app/Draft/{DraftName.php => Name.php} | 2 +- app/Draft/Pick.php | 31 ++++++++ app/Draft/PickCategory.php | 9 +++ app/Draft/PickTest.php | 48 ++++++++++++ app/Draft/Player.php | 44 ++++++++--- app/Draft/PlayerId.php | 10 +++ app/Draft/PlayerTest.php | 74 ++++++++++++++++--- app/Draft/Secrets.php | 46 ++++++++++++ app/Draft/SecretsTest.php | 53 +++++++++++++ app/Draft/{DraftSeed.php => Seed.php} | 2 +- app/Draft/{DraftSeedTest.php => SeedTest.php} | 14 ++-- app/Draft/{DraftSettings.php => Settings.php} | 22 +++--- ...DraftSettingsTest.php => SettingsTest.php} | 12 +-- app/GeneratorConfig.php | 4 +- app/Shared/IdStringBehavior.php | 20 +++++ app/Testing/DraftSettingsFactory.php | 14 ++-- composer.json | 3 +- phpunit.xml | 2 + 23 files changed, 431 insertions(+), 70 deletions(-) create mode 100644 app/Draft/DraftId.php create mode 100644 app/Draft/InvalidPickException.php rename app/Draft/{DraftName.php => Name.php} (98%) create mode 100644 app/Draft/Pick.php create mode 100644 app/Draft/PickCategory.php create mode 100644 app/Draft/PickTest.php create mode 100644 app/Draft/PlayerId.php create mode 100644 app/Draft/Secrets.php create mode 100644 app/Draft/SecretsTest.php rename app/Draft/{DraftSeed.php => Seed.php} (98%) rename app/Draft/{DraftSeedTest.php => SeedTest.php} (83%) rename app/Draft/{DraftSettings.php => Settings.php} (95%) rename app/Draft/{DraftSettingsTest.php => SettingsTest.php} (97%) create mode 100644 app/Shared/IdStringBehavior.php diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php index c5ebeea..a047f27 100644 --- a/app/Draft/Draft.php +++ b/app/Draft/Draft.php @@ -5,26 +5,44 @@ class Draft { public function __construct( - public string $id, - public bool $isDone, + public string $id, + public bool $isDone, /** - * @var array $players + * @var array $players */ - public array $players, - public DraftSettings $settings, - // @todo secrets - // @todo logs + public array $players, + public Settings $settings, + public Secrets $secrets, + /** + * @var array $log + */ + public array $log = [], + public ?PlayerId $currentPlayerId = null, + // @todo Current + // @todo Slices + // @todo Factions ) { - } public static function fromJson($data) { + /** + * @var array + */ + $players = array_reduce($data['draft']['players'], function ($players, $playerData) { + $player = Player::fromJson($playerData); + $players[$player->id->value] = $player; + return $players; + }, []); + return new self( $data['id'], $data['done'], - array_map(fn ($playerData) => Player::fromJson($playerData), $data['draft']['players']), - DraftSettings::fromJson($data['config']) + $players, + Settings::fromJson($data['config']), + Secrets::fromJson($data['secrets']), + array_map(fn ($logData) => Pick::fromJson($logData), $data['draft']['log']), + PlayerId::fromString($data['draft']['current']) ); } @@ -34,7 +52,12 @@ public function toArray(): array 'id' => $this->id, 'done' => $this->isDone, 'config' => $this->settings->toArray(), - 'players' => array_map(fn (Player $player) => $player->toArray(), $this->players), + 'draft' => [ + 'players' => array_map(fn (Player $player) => $player->toArray(), $this->players), + 'log' => array_map(fn (Pick $pick) => $pick->toArray(), $this->log), + 'current' => $this->currentPlayerId->value + ], + 'secrets' => $this->secrets->toArray(), ]; } } \ No newline at end of file diff --git a/app/Draft/DraftId.php b/app/Draft/DraftId.php new file mode 100644 index 0000000..bcb309c --- /dev/null +++ b/app/Draft/DraftId.php @@ -0,0 +1,10 @@ +assertNotEmpty($draft->players); $this->assertSame($data['config']['name'], (string) $draft->settings->name); $this->assertSame($draft->id, $data['id']); $this->assertSame($draft->isDone, $data['done']); + $this->assertSame($draft->currentPlayerId->value, $data['draft']['current']); } #[Test] public function itCanBeConvertedToArray() { + $player = new Player( + PlayerId::fromString("player_123"), + "Alice" + ); $draft = new Draft( '1243', true, - [], - DraftSettingsFactory::make() + [$player->id->value => $player], + DraftSettingsFactory::make(), + new Secrets( + 'secret123', + ), + [new Pick($player->id, PickCategory::FACTION, "Vulraith")], + $player->id ); $data = $draft->toArray(); @@ -39,5 +51,8 @@ public function itCanBeConvertedToArray() $this->assertSame($draft->settings->toArray(), $data['config']); $this->assertSame($draft->id, $data['id']); $this->assertSame($draft->isDone, $data['done']); + $this->assertSame($player->name, $data['draft']['players'][$player->id->value]['name']); + $this->assertSame($player->id->value, $data['draft']['current']); + $this->assertSame("Vulraith", $data['draft']['log'][0]['value']); } } \ No newline at end of file diff --git a/app/Draft/InvalidDraftSettingsException.php b/app/Draft/InvalidDraftSettingsException.php index 73e62ea..7157d9b 100644 --- a/app/Draft/InvalidDraftSettingsException.php +++ b/app/Draft/InvalidDraftSettingsException.php @@ -45,7 +45,7 @@ public static function invalidMaximumOptimal(): self { } public static function invalidSeed(): self { - return new self(sprintf("Seed must be between %d and %d", DraftSeed::MIN_VALUE, DraftSeed::MAX_VALUE)); + return new self(sprintf("Seed must be between %d and %d", Seed::MIN_VALUE, Seed::MAX_VALUE)); } public static function notEnoughFactionsInSet(int $max): self { diff --git a/app/Draft/InvalidPickException.php b/app/Draft/InvalidPickException.php new file mode 100644 index 0000000..e03a9eb --- /dev/null +++ b/app/Draft/InvalidPickException.php @@ -0,0 +1,11 @@ + $this->playerId->value, + 'category' => $this->category->value, + 'value' => $this->pickedOption + ]; + } +} \ No newline at end of file diff --git a/app/Draft/PickCategory.php b/app/Draft/PickCategory.php new file mode 100644 index 0000000..4a35b00 --- /dev/null +++ b/app/Draft/PickCategory.php @@ -0,0 +1,9 @@ + [ + "pickData" => [ + "player" => "1234", + "category" => "faction", + "value" => "Xxcha" + ] + ]; + + yield "For a position pick" => [ + "pickData" => [ + "player" => "1234", + "category" => "position", + "value" => "4" + ] + ]; + + yield "For a slice pick" => [ + "pickData" => [ + "player" => "1234", + "category" => "slice", + "value" => "1" + ] + ]; + } + + #[Test] + #[DataProvider('pickCases')] + public function itCanConvertFromJsonData($pickData) + { + $pick = Pick::fromJson($pickData); + + $this->assertSame($pick->pickedOption, $pickData['value']); + $this->assertSame($pick->category->value, $pickData['category']); + $this->assertSame($pick->playerId->value, $pickData['player']); + } +} \ No newline at end of file diff --git a/app/Draft/Player.php b/app/Draft/Player.php index 085fb68..e03ed97 100644 --- a/app/Draft/Player.php +++ b/app/Draft/Player.php @@ -5,21 +5,21 @@ class Player { public function __construct( - public string $id, - public string $name, - public bool $claimed = false, + public readonly PlayerId $id, + public readonly string $name, + public readonly bool $claimed = false, // enum with the 8 positions? - public ?string $pickedPosition = null, - public ?string $pickedFaction = null, - public ?string $pickedSlice = null, - public ?string $team = null + public readonly ?string $pickedPosition = null, + public readonly ?string $pickedFaction = null, + public readonly ?string $pickedSlice = null, + public readonly ?string $team = null ) { } public static function fromJson($playerData): self { return new self( - $playerData['id'], + PlayerId::fromString($playerData['id']), $playerData['name'], $playerData['claimed'], $playerData['position'], @@ -32,7 +32,7 @@ public static function fromJson($playerData): self public function toArray(): array { return [ - 'id' => $this->id, + 'id' => $this->id->value, 'name' => $this->name, 'claimed' => $this->claimed, 'position' => $this->pickedPosition, @@ -56,4 +56,30 @@ public function hasPickedPosition(): bool { return $this->pickedPosition != null; } + + public function hasPicked(PickCategory $category): bool + { + return match($category) { + PickCategory::FACTION => $this->hasPickedFaction(), + PickCategory::SLICE => $this->hasPickedSlice(), + PickCategory::POSITION => $this->hasPickedPosition(), + }; + } + + public function pick(PickCategory $category, string $pick): Player + { + if ($this->hasPicked($category)) { + throw InvalidPickException::playerHasAlreadyPicked($category); + } + + return new self( + $this->id, + $this->name, + $this->claimed, + $category == PickCategory::POSITION ? $pick : $this->pickedPosition, + $category == PickCategory::FACTION ? $pick : $this->pickedFaction, + $category == PickCategory::SLICE ? $pick : $this->pickedSlice, + $this->team, + ); + } } \ No newline at end of file diff --git a/app/Draft/PlayerId.php b/app/Draft/PlayerId.php new file mode 100644 index 0000000..f8492db --- /dev/null +++ b/app/Draft/PlayerId.php @@ -0,0 +1,10 @@ +assertSame($playerData['id'], $p->id); + $this->assertSame($playerData['id'], $p->id->value); $this->assertSame($playerData['name'], $p->name); $this->assertSame($playerData['faction'], $p->pickedFaction); $this->assertSame($playerData['slice'], $p->pickedSlice); @@ -26,8 +27,8 @@ public function itCanBeInstantiatedFromJson($data) #[Test] public function itChecksIfPlayerHasPickedPosition() { - $player1 = new Player('1', 'Alice', false, "1"); - $player2 = new Player('2', 'Bob'); + $player1 = new Player(PlayerId::fromString("1"), 'Alice', false, "1"); + $player2 = new Player(PlayerId::fromString("2"), 'Bob'); $this->assertTrue($player1->hasPickedPosition()); $this->assertFalse($player2->hasPickedPosition()); @@ -36,8 +37,8 @@ public function itChecksIfPlayerHasPickedPosition() #[Test] public function itChecksIfPlayerHasPickedFaction() { - $player1 = new Player('1', 'Alice', false, null, "Mahact"); - $player2 = new Player('2', 'Bob'); + $player1 = new Player(PlayerId::fromString("1"), 'Alice', false, null, "Mahact"); + $player2 = new Player(PlayerId::fromString("2"), 'Bob'); $this->assertTrue($player1->hasPickedFaction()); $this->assertFalse($player2->hasPickedFaction()); @@ -46,8 +47,8 @@ public function itChecksIfPlayerHasPickedFaction() #[Test] public function itChecksIfPlayerHasPickedSlice() { - $player1 = new Player('1', 'Alice', false, null, null, "1"); - $player2 = new Player('2', 'Bob'); + $player1 = new Player(PlayerId::fromString("1"), 'Alice', false, null, null, "1"); + $player2 = new Player(PlayerId::fromString("2"), 'Bob'); $this->assertTrue($player1->hasPickedSlice()); $this->assertFalse($player2->hasPickedSlice()); @@ -58,7 +59,7 @@ public function itChecksIfPlayerHasPickedSlice() public function itCanBeConvertedToAnArray() { $player1 = new Player( - '1', + PlayerId::fromString("1"), 'Alice', true, '2', @@ -66,7 +67,7 @@ public function itCanBeConvertedToAnArray() '3', 'A' ); - $player2 = new Player('2', 'Bob'); + $player2 = new Player(PlayerId::fromString("2"), 'Bob'); $this->assertSame([ 'id' => '1', @@ -87,4 +88,59 @@ public function itCanBeConvertedToAnArray() 'team' => null ], $player2->toArray()); } + + public static function picks(): iterable + { + yield "When picking slice" => [ + 'category' => PickCategory::SLICE, + ]; + + yield "When picking position" => [ + 'category' => PickCategory::POSITION, + ]; + + yield "When picking faction" => [ + 'category' => PickCategory::FACTION, + ]; + } + + #[Test] + #[DataProvider('picks')] + public function itCanPickSomething($category) + { + $player = new Player( + PlayerId::fromString("1"), + 'Alice', + true, + $category == PickCategory::POSITION ? null : '2', + $category == PickCategory::FACTION ? null : "Mahact", + $category == PickCategory::SLICE ? null : '3', + 'A' + ); + + $newPlayerVo = $player->pick($category, "some-value"); + + $this->assertEquals($player->id, $newPlayerVo->id); + $this->assertSame($player->name, $newPlayerVo->name); + $this->assertSame($player->claimed, $newPlayerVo->claimed); + $this->assertSame($player->team, $newPlayerVo->team); + + switch($category) { + case PickCategory::POSITION: + $this->assertSame($player->pickedSlice, $newPlayerVo->pickedSlice); + $this->assertSame($player->pickedFaction, $newPlayerVo->pickedFaction); + $this->assertSame("some-value", $newPlayerVo->pickedPosition); + break; + case PickCategory::FACTION: + $this->assertSame($player->pickedSlice, $newPlayerVo->pickedSlice); + $this->assertSame($player->pickedPosition, $newPlayerVo->pickedPosition); + $this->assertSame("some-value", $newPlayerVo->pickedFaction); + break; + case PickCategory::SLICE: + $this->assertSame($player->pickedPosition, $newPlayerVo->pickedPosition); + $this->assertSame($player->pickedFaction, $newPlayerVo->pickedFaction); + $this->assertSame("some-value", $newPlayerVo->pickedSlice); + break; + } + } } \ No newline at end of file diff --git a/app/Draft/Secrets.php b/app/Draft/Secrets.php new file mode 100644 index 0000000..1bff40c --- /dev/null +++ b/app/Draft/Secrets.php @@ -0,0 +1,46 @@ + $playerSecrets + */ + private array $playerSecrets = [] + ) { + } + + public function toArray(): array + { + return [ + self::ADMIN_SECRET_KEY => $this->adminSecret, + ...$this->playerSecrets + ]; + } + + public static function generate(): string + { + return base64_encode(random_bytes(16)); + } + + public function checkAdminSecret($secret): bool { + return $secret == $this->adminSecret; + } + + public function checkPlayerSecret($id, $secret): bool { + return isset($this->playerSecrets[$id]) && $secret == $this->playerSecrets[$id]; + } + + public static function fromJson($data): self + { + return new self( + $data[self::ADMIN_SECRET_KEY], + array_filter($data, fn (string $key) => $key != self::ADMIN_SECRET_KEY, ARRAY_FILTER_USE_KEY) + ); + } +} \ No newline at end of file diff --git a/app/Draft/SecretsTest.php b/app/Draft/SecretsTest.php new file mode 100644 index 0000000..476dab0 --- /dev/null +++ b/app/Draft/SecretsTest.php @@ -0,0 +1,53 @@ +assertNotSame($previouslyGenerated, $secret); + } + + #[Test] + public function itCanBeInitiatedFromJson() + { + $secretData = [ + 'admin_pass' => 'secret124', + 'player_1' => 'secret456', + 'player_3' => 'secret789', + ]; + + $secret = Secrets::fromJson($secretData); + + $this->assertTrue($secret->checkAdminSecret('secret124')); + $this->assertTrue($secret->checkPlayerSecret('player_1', 'secret456')); + $this->assertTrue($secret->checkPlayerSecret('player_3', 'secret789')); + } + + #[Test] + public function itCanBeConvertedToArray() + { + $secrets = new Secrets( + 'secret124', + [ + 'player_1' => 'secret456', + 'player_3' => 'secret789', + ] + ); + $array = $secrets->toArray(); + + $this->assertSame('secret124', $array['admin_pass']); + $this->assertSame('secret456', $array['player_1']); + $this->assertSame('secret789', $array['player_3']); + + } +} \ No newline at end of file diff --git a/app/Draft/DraftSeed.php b/app/Draft/Seed.php similarity index 98% rename from app/Draft/DraftSeed.php rename to app/Draft/Seed.php index 780fa69..9e3b269 100644 --- a/app/Draft/DraftSeed.php +++ b/app/Draft/Seed.php @@ -2,7 +2,7 @@ namespace App\Draft; -class DraftSeed +class Seed { // Maximum value for random seed generation (2^50) // Limited by JavaScript's Number.MAX_SAFE_INTEGER (2^53 - 1) for JSON compatibility diff --git a/app/Draft/DraftSeedTest.php b/app/Draft/SeedTest.php similarity index 83% rename from app/Draft/DraftSeedTest.php rename to app/Draft/SeedTest.php index e243c17..bc4a814 100644 --- a/app/Draft/DraftSeedTest.php +++ b/app/Draft/SeedTest.php @@ -5,7 +5,7 @@ use App\Testing\TestCase; use PHPUnit\Framework\Attributes\Test; -class DraftSeedTest extends TestCase +class SeedTest extends TestCase { private const TEST_SEED = 123; private const TEST_SLICE_TRIES = 3; @@ -13,21 +13,21 @@ class DraftSeedTest extends TestCase #[Test] public function itCanGenerateASeed() { - $seed = new DraftSeed(); + $seed = new Seed(); $this->assertIsInt($seed->getValue()); } #[Test] public function itCanUseAUserSeed() { - $seed = new DraftSeed(self::TEST_SEED); + $seed = new Seed(self::TEST_SEED); $this->assertSame(self::TEST_SEED, $seed->getValue()); } #[Test] public function itCanSetTheFactionSeed() { - $seed = new DraftSeed(self::TEST_SEED); + $seed = new Seed(self::TEST_SEED); $seed->setForFactions(); $n = mt_rand(1, 10000); // pre-calculated using TEST_SEED @@ -37,7 +37,7 @@ public function itCanSetTheFactionSeed() #[Test] public function itCanSetTheSliceSeed() { - $seed = new DraftSeed(self::TEST_SEED); + $seed = new Seed(self::TEST_SEED); $seed->setForSlices(self::TEST_SLICE_TRIES); $n = mt_rand(1, 10000); // pre-calculated using TEST_SEED @@ -47,7 +47,7 @@ public function itCanSetTheSliceSeed() #[Test] public function itCanSetThePlayerOrderSeed() { - $seed = new DraftSeed(self::TEST_SEED); + $seed = new Seed(self::TEST_SEED); $seed->setForPlayerOrder(); $n = mt_rand(1, 10000); // pre-calculated using TEST_SEED @@ -57,7 +57,7 @@ public function itCanSetThePlayerOrderSeed() #[Test] public function arraysAreShuffledPredictablyWhenSeedIsSet() { - $seed = new DraftSeed(self::TEST_SEED); + $seed = new Seed(self::TEST_SEED); $seed->setForFactions(); $a = [ diff --git a/app/Draft/DraftSettings.php b/app/Draft/Settings.php similarity index 95% rename from app/Draft/DraftSettings.php rename to app/Draft/Settings.php index 30beace..8708974 100644 --- a/app/Draft/DraftSettings.php +++ b/app/Draft/Settings.php @@ -10,26 +10,26 @@ * @todo This class is friggin huge. We could sepatate all the validators into their own class * or have SliceSettings, FactionSettings,... */ -class DraftSettings +class Settings { public function __construct( /** * @var array $playerNames */ - public array $playerNames, - public bool $presetDraftOrder, - public DraftName $name, - public DraftSeed $seed, - public int $numberOfSlices, - public int $numberOfFactions, + public array $playerNames, + public bool $presetDraftOrder, + public Name $name, + public Seed $seed, + public int $numberOfSlices, + public int $numberOfFactions, /** * @var array */ - public array $tileSets, + public array $tileSets, /** * @var array */ - public array $factionSets, + public array $factionSets, // @todo figure out a better way to integrate this // should be required-ish when TE is included, but optional if PoK is included public bool $includeCouncilKeleresFaction, @@ -195,8 +195,8 @@ public static function fromJson(array $data): self return new self( $data['players'], $data['preset_draft_order'], - new DraftName($data['name']), - new DraftSeed($data['seed']), + new Name($data['name']), + new Seed($data['seed']), $data['num_slices'], $data['num_factions'], self::tileSetsFromJson($data), diff --git a/app/Draft/DraftSettingsTest.php b/app/Draft/SettingsTest.php similarity index 97% rename from app/Draft/DraftSettingsTest.php rename to app/Draft/SettingsTest.php index d9044d2..670ff53 100644 --- a/app/Draft/DraftSettingsTest.php +++ b/app/Draft/SettingsTest.php @@ -12,16 +12,16 @@ use PHPUnit\Framework\Attributes\DataProviderExternal; use PHPUnit\Framework\Attributes\Test; -class DraftSettingsTest extends TestCase +class SettingsTest extends TestCase { #[Test] public function itCanBeConvertedToAnArray() { - $draftSettings = new DraftSettings( + $draftSettings = new Settings( ["john", "mike", "suzy", "robin"], true, - new DraftName("Testgame"), - new DraftSeed(123), + new Name("Testgame"), + new Seed(123), 5, 8, [ @@ -211,7 +211,7 @@ public static function seedValues(): iterable "valid" => false ]; yield "When seed is too high" => [ - "seed" => DraftSeed::MAX_VALUE + 12, + "seed" => Seed::MAX_VALUE + 12, "valid" => false ]; yield "When seed is valid" => [ @@ -270,7 +270,7 @@ public function itValidatesCustomSlices() { #[DataProviderExternal(TestDrafts::class, "provideTestDrafts")] #[Test] public function itCanBeInstantiatedFromJson($data) { - $draftSettings = DraftSettings::fromJson($data['config']); + $draftSettings = Settings::fromJson($data['config']); $this->assertSame($data['config']['name'], (string) $draftSettings->name); $this->assertSame($data['config']['num_slices'], $draftSettings->numberOfSlices); diff --git a/app/GeneratorConfig.php b/app/GeneratorConfig.php index e3047c1..66ba1a9 100644 --- a/app/GeneratorConfig.php +++ b/app/GeneratorConfig.php @@ -2,7 +2,7 @@ namespace App; -use App\Draft\DraftName; +use App\Draft\Name; class GeneratorConfig { @@ -61,7 +61,7 @@ function __construct($get_values_from_request) return_error('Number of players does not match number of names'); } - $this->name = new DraftName(get('game_name', '')); + $this->name = new Name(get('game_name', '')); $this->num_slices = (int) get('num_slices'); $this->num_factions = (int) get('num_factions'); $this->include_pok = get('include_pok') == true; diff --git a/app/Shared/IdStringBehavior.php b/app/Shared/IdStringBehavior.php new file mode 100644 index 0000000..c2c3d5d --- /dev/null +++ b/app/Shared/IdStringBehavior.php @@ -0,0 +1,20 @@ +value; + } +} \ No newline at end of file diff --git a/app/Testing/DraftSettingsFactory.php b/app/Testing/DraftSettingsFactory.php index d5081d6..497af48 100644 --- a/app/Testing/DraftSettingsFactory.php +++ b/app/Testing/DraftSettingsFactory.php @@ -2,9 +2,9 @@ namespace App\Testing; -use App\Draft\DraftName; -use App\Draft\DraftSeed; -use App\Draft\DraftSettings; +use App\Draft\Name; +use App\Draft\Seed; +use App\Draft\Settings; use App\TwilightImperium\AllianceTeamMode; use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; @@ -12,7 +12,7 @@ class DraftSettingsFactory { - public static function make(array $properties = []): DraftSettings + public static function make(array $properties = []): Settings { $faker = Factory::create(); @@ -29,11 +29,11 @@ public static function make(array $properties = []): DraftSettings $allianceMode = $properties['allianceMode'] ?? false; - return new DraftSettings( + return new Settings( $names, $properties['presetDraftOrder'] ?? $faker->boolean(), - new DraftName($properties['name'] ?? null), - new DraftSeed($properties['seed'] ?? null), + new Name($properties['name'] ?? null), + new Seed($properties['seed'] ?? null), $properties['numberOfSlices'] ?? $numberOfPlayers + 2, $properties['numberOfFactions'] ?? $numberOfPlayers + 2, $properties['tileSets'] ?? [ diff --git a/composer.json b/composer.json index 9e58e4b..c17c24b 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "paratest": [ "Composer\\Config::disableProcessTimeout", "vendor/bin/paratest -p12 --passthru-php=\"'-d' 'memory_limit=2G'\"" - ] + ], + "phpunit": "vendor/bin/phpunit $1" }, "require-dev": { "phpstan/phpstan": "^2.1", diff --git a/phpunit.xml b/phpunit.xml index 0aef90c..3a7d9a2 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -9,6 +9,8 @@ stopOnFailure="false" displayDetailsOnTestsThatTriggerWarnings="true" cacheDirectory=".phpunit.cache" + displayDetailsOnPhpunitDeprecations="true" + displayDetailsOnTestsThatTriggerDeprecations="true" backupStaticProperties="false" > From d3dcfb30d4df8af2e9117a86ca3806de2a84c87b Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Mon, 22 Dec 2025 11:16:17 +0100 Subject: [PATCH 19/34] Help me I've fallen down a refactoring rabbit hole and I can't get out --- README.md | 7 +- app/Application.php | 102 +++ app/ApplicationTest.php | 80 +++ app/Draft.php | 3 + app/Draft/Draft.php | 59 +- app/Draft/DraftId.php | 5 + app/Draft/DraftTest.php | 14 +- .../Exceptions/DraftRepositoryException.php | 11 + .../InvalidDraftSettingsException.php | 8 +- .../{ => Exceptions}/InvalidPickException.php | 4 +- .../InvalidSliceException.php | 4 +- app/Draft/Generators/FactionPoolGenerator.php | 60 ++ .../Generators/FactionPoolGeneratorTest.php | 105 +++ app/Draft/Generators/SlicePoolGenerator.php | 238 +++++++ .../Generators/SlicePoolGeneratorTest.php | 254 +++++++ app/Draft/Player.php | 15 + app/Draft/PlayerId.php | 5 + app/Draft/Repository/DraftRepository.php | 11 + app/Draft/Repository/LocalDraftRepository.php | 39 ++ app/Draft/Repository/S3DraftRepository.php | 49 ++ app/Draft/Secrets.php | 12 +- app/Draft/SecretsTest.php | 2 +- app/Draft/Settings.php | 16 +- app/Draft/SettingsTest.php | 5 +- app/Draft/Slice.php | 25 +- app/Draft/SliceTest.php | 10 +- app/Generator.php | 6 +- app/GeneratorConfig.php | 3 + app/Http/ErrorResponse.php | 3 +- app/Http/HtmlResponse.php | 23 + app/Http/HttpRequest.php | 14 +- app/Http/HttpResponse.php | 8 +- app/Http/JsonResponse.php | 10 +- app/Http/RequestHandler.php | 7 +- .../HandleClaimPlayerRequest.php | 15 + .../HandleClaimPlayerRequestTest.php | 20 + .../HandleGenerateDraftRequest.php | 14 + .../RequestHandlers/HandleGetDraftRequest.php | 20 + .../RequestHandlers/HandlePickRequest.php | 14 + .../HandleRegenerateDraftRequest.php | 14 + .../HandleRestoreClaimRequest.php | 14 + .../RequestHandlers/HandleTestRequest.php | 15 + .../RequestHandlers/HandleUndoRequest.php | 20 + .../HandleViewDraftRequest.php | 20 + .../RequestHandlers/HandleViewFormRequest.php | 17 + .../HandleViewFormRequestTest.php | 20 + app/Http/Route.php | 57 ++ app/Http/RouteMatch.php | 12 + app/Http/RouteTest.php | 54 ++ .../{ => Factories}/DraftSettingsFactory.php | 4 +- app/Testing/{ => Factories}/PlanetFactory.php | 5 +- app/Testing/{ => Factories}/TileFactory.php | 17 +- app/Testing/MakesHttpRequests.php | 2 +- app/Testing/RequestHandlerTestCase.php | 33 + app/Testing/TestCase.php | 15 +- app/Testing/TestSets.php | 49 ++ app/TwilightImperium/Faction.php | 52 ++ app/TwilightImperium/FactionTest.php | 29 + app/TwilightImperium/SpaceObjectTest.php | 2 - app/TwilightImperium/Tile.php | 60 +- app/TwilightImperium/TileTest.php | 123 ++-- app/TwilightImperium/TileTier.php | 21 + app/TwilightImperium/TileType.php | 1 + app/TwilightImperium/Wormhole.php | 7 + {bootstrap => app}/helpers.php | 90 +-- app/routes.php | 13 + bootstrap/boot.php | 47 +- composer.json | 3 + data/FactionDataTest.php | 39 +- data/TileDataTest.php | 85 ++- data/factions.json | 68 +- data/tile-selection.json | 20 +- data/tiles.json | 628 ++++++++++++------ deploy/app/caddy/Caddyfile | 29 +- docker-compose.yml | 9 +- index.php | 4 +- phpunit.xml | 1 + templates/generate.php | 6 +- 78 files changed, 2456 insertions(+), 549 deletions(-) create mode 100644 app/Application.php create mode 100644 app/ApplicationTest.php create mode 100644 app/Draft/Exceptions/DraftRepositoryException.php rename app/Draft/{ => Exceptions}/InvalidDraftSettingsException.php (86%) rename app/Draft/{ => Exceptions}/InvalidPickException.php (77%) rename app/Draft/{ => Exceptions}/InvalidSliceException.php (81%) create mode 100644 app/Draft/Generators/FactionPoolGenerator.php create mode 100644 app/Draft/Generators/FactionPoolGeneratorTest.php create mode 100644 app/Draft/Generators/SlicePoolGenerator.php create mode 100644 app/Draft/Generators/SlicePoolGeneratorTest.php create mode 100644 app/Draft/Repository/DraftRepository.php create mode 100644 app/Draft/Repository/LocalDraftRepository.php create mode 100644 app/Draft/Repository/S3DraftRepository.php create mode 100644 app/Http/HtmlResponse.php create mode 100644 app/Http/RequestHandlers/HandleClaimPlayerRequest.php create mode 100644 app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php create mode 100644 app/Http/RequestHandlers/HandleGenerateDraftRequest.php create mode 100644 app/Http/RequestHandlers/HandleGetDraftRequest.php create mode 100644 app/Http/RequestHandlers/HandlePickRequest.php create mode 100644 app/Http/RequestHandlers/HandleRegenerateDraftRequest.php create mode 100644 app/Http/RequestHandlers/HandleRestoreClaimRequest.php create mode 100644 app/Http/RequestHandlers/HandleTestRequest.php create mode 100644 app/Http/RequestHandlers/HandleUndoRequest.php create mode 100644 app/Http/RequestHandlers/HandleViewDraftRequest.php create mode 100644 app/Http/RequestHandlers/HandleViewFormRequest.php create mode 100644 app/Http/RequestHandlers/HandleViewFormRequestTest.php create mode 100644 app/Http/Route.php create mode 100644 app/Http/RouteMatch.php create mode 100644 app/Http/RouteTest.php rename app/Testing/{ => Factories}/DraftSettingsFactory.php (95%) rename app/Testing/{ => Factories}/PlanetFactory.php (89%) rename app/Testing/{ => Factories}/TileFactory.php (52%) create mode 100644 app/Testing/RequestHandlerTestCase.php create mode 100644 app/Testing/TestSets.php create mode 100644 app/TwilightImperium/Faction.php create mode 100644 app/TwilightImperium/FactionTest.php create mode 100644 app/TwilightImperium/TileTier.php rename {bootstrap => app}/helpers.php (53%) create mode 100644 app/routes.php diff --git a/README.md b/README.md index 3511f3a..c433bab 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,15 @@ To install a local copy of this app you can clone it from the Git Repo: Then follow these steps: -1. Add `127.0.0.1 miltydraft.test` to your `/etc/hosts` file. This first step is optional though. You can use +1. Add `127.0.0.1 milty.localhost` to your `/etc/hosts` file. This first step is optional though. You can use 127.0.0.1 directly as well. 2. Run `docker-compose up -d --build`. This will first build the image, then start all services. 3. Run `docker-compose exec app composer install`. This will install all php dependencies. 4. Create a `.env` file. See `.env.example` for details. -5. Go to [http://miltydraft.test](http://miltydraft.test) or [127.0.0.1](127.0.0.1) in your browser. +5. Go to [https://milty.localhost](https://milty.localhost) in your browser (or http://localhost if you don't want to go through the hassle of the following steps) +6. Your browser might give you some scary warnings about untrusted certificates. That's because we're using a self-signed certificate. +If you want to, you can add the certificate to your device's truster certificate. +7. Run `docker compose exec app cat /home/app/.local/share/caddy/pki/authorities/local/root.crt > caddy-cert.crt` to make a copy of the certificate in `caddy-cert.crt` (which you can then import wherever you need it) ### Libraries and Dependencies diff --git a/app/Application.php b/app/Application.php new file mode 100644 index 0000000..65c1c80 --- /dev/null +++ b/app/Application.php @@ -0,0 +1,102 @@ +repository = new S3DraftRepository(); + } else { + $this->repository = new LocalDraftRepository(); + } + } + + public function run() + { + $response = $this->handleIncomingRequest(); + + http_response_code($response->code); + echo $response->getBody(); + + exit; + } + + private function handleIncomingRequest(): HttpResponse + { + try { + $handler = $this->handlerForRequest($_SERVER['REQUEST_URI']); + if ($handler == null) { + return new ErrorResponse("Not found", 404); + } else { + return $handler->handle(); + } + + } catch (\Exception $e) { + return new ErrorResponse($e->getMessage()); + } + } + + private function matchToRoute(string $path): ?RouteMatch + { + $routes = include 'app/routes.php'; + + foreach($routes as $route => $handlerClass) { + $route = new Route($route, $handlerClass); + $match = $route->match($path); + + if ($match != null) { + return $match; + } + } + + return null; + } + + public function handlerForRequest(string $requestUri): ?RequestHandler + { + $requestChunks = explode("?", $requestUri); + + $match = $this->matchToRoute($requestChunks[0]); + + if ($match == null) { + return null; + } else { + $request = HttpRequest::fromRequest($match->requestParameters); + + $handler = new $match->requestHandlerClass($request); + + if (!$handler instanceof RequestHandler) { + throw new \Exception("Handler does not implement RequestHandler"); + } + + return $handler; + } + } + + public static function getInstance(): self + { + if (!isset(self::$instance)) { + self::$instance = new Application(); + } + + return self::$instance; + } +} \ No newline at end of file diff --git a/app/ApplicationTest.php b/app/ApplicationTest.php new file mode 100644 index 0000000..779e2fb --- /dev/null +++ b/app/ApplicationTest.php @@ -0,0 +1,80 @@ + [ + 'route' => '/', + 'handler' => HandleViewFormRequest::class + ]; + + yield "For viewing a draft" => [ + 'route' => '/d/1234', + 'handler' => HandleViewDraftRequest::class + ]; + + yield "For fetching draft data" => [ + 'route' => '/api/data/1234', + 'handler' => HandleGetDraftRequest::class + ]; + + yield "For generating a draft" => [ + 'route' => '/api/generate', + 'handler' => HandleGenerateDraftRequest::class + ]; + + yield "For making a pick" => [ + 'route' => '/api/draft/1234/pick', + 'handler' => HandlePickRequest::class + ]; + + yield "For claiming a player" => [ + 'route' => '/api/draft/1234/claim', + 'handler' => HandleClaimPlayerRequest::class + ]; + + yield "For restoring a claim" => [ + 'route' => '/api/draft/1234/restore', + 'handler' => HandleRestoreClaimRequest::class + ]; + + yield "For undoing a pick" => [ + 'route' => '/api/draft/1234/undo', + 'handler' => HandleUndoRequest::class + ]; + + yield "For regenerating a draft" => [ + 'route' => '/api/draft/1234/regenerate', + 'handler' => HandleRegenerateDraftRequest::class + ]; + } + + #[Test] + #[DataProvider('allRoutes')] + public function itHasHandlerForAllRoutes($route, $handler) + { + $application = new Application(); + $determinedHandler = $application->handlerForRequest($route); + + $this->assertInstanceOf($handler, $determinedHandler); + } +} \ No newline at end of file diff --git a/app/Draft.php b/app/Draft.php index 9308754..0846b73 100644 --- a/app/Draft.php +++ b/app/Draft.php @@ -4,6 +4,9 @@ use Aws\S3\Exception\S3Exception; +/** + * @deprecated + */ class Draft implements \JsonSerializable { private const SEED_OFFSET_PLAYER_ORDER = 2; diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php index a047f27..4e93292 100644 --- a/app/Draft/Draft.php +++ b/app/Draft/Draft.php @@ -2,25 +2,25 @@ namespace App\Draft; +use App\Draft\Generators\FactionPoolGenerator; +use App\Draft\Generators\SlicePoolGenerator; + class Draft { public function __construct( public string $id, public bool $isDone, - /** - * @var array $players - */ + /** @var array $players */ public array $players, public Settings $settings, public Secrets $secrets, - /** - * @var array $log - */ + /** @var array $slices */ + public array $slices, + /** @var array $factionPool */ + public array $factionPool, + /** @var array $log */ public array $log = [], public ?PlayerId $currentPlayerId = null, - // @todo Current - // @todo Slices - // @todo Factions ) { } @@ -41,14 +41,21 @@ public static function fromJson($data) $players, Settings::fromJson($data['config']), Secrets::fromJson($data['secrets']), + [], + $data['factions'], array_map(fn ($logData) => Pick::fromJson($logData), $data['draft']['log']), PlayerId::fromString($data['draft']['current']) ); } - public function toArray(): array + public function toFileContent(): string { - return [ + return json_encode($this->toArray(true)); + } + + public function toArray($includeSecrets = false): array + { + $data = [ 'id' => $this->id, 'done' => $this->isDone, 'config' => $this->settings->toArray(), @@ -57,7 +64,35 @@ public function toArray(): array 'log' => array_map(fn (Pick $pick) => $pick->toArray(), $this->log), 'current' => $this->currentPlayerId->value ], - 'secrets' => $this->secrets->toArray(), + 'factions' => $this->factionPool ]; + + if ($includeSecrets) { + $data['secrets'] = $this->secrets->toArray(); + } + + return $data; } + + public static function createFromSettings(Settings $settings) + { + $factionPooLGenerator = new FactionPoolGenerator($settings); + $slicePoolGenerator = new SlicePoolGenerator($settings); + + return new self( + DraftId::generate(), + false, + // @todo + [], + $settings, + Secrets::new(), + $slicePoolGenerator->generate(), + $factionPooLGenerator->generate(), + [], + // @todo + null + ); + } + + } \ No newline at end of file diff --git a/app/Draft/DraftId.php b/app/Draft/DraftId.php index bcb309c..94c1ebc 100644 --- a/app/Draft/DraftId.php +++ b/app/Draft/DraftId.php @@ -7,4 +7,9 @@ class DraftId { use IdStringBehavior; + + public static function generate() + { + return date('Ymd') . '_' . bin2hex(random_bytes(8)); + } } \ No newline at end of file diff --git a/app/Draft/DraftTest.php b/app/Draft/DraftTest.php index 8c73c30..b84fa99 100644 --- a/app/Draft/DraftTest.php +++ b/app/Draft/DraftTest.php @@ -2,7 +2,7 @@ namespace App\Draft; -use App\Testing\DraftSettingsFactory; +use App\Testing\Factories\DraftSettingsFactory; use App\Testing\TestCase; use App\Testing\TestDrafts; use PHPUnit\Framework\Attributes\DataProviderExternal; @@ -24,6 +24,9 @@ public function ìtCanBeInitialisedFromJson($data) $this->assertSame($data['config']['name'], (string) $draft->settings->name); $this->assertSame($draft->id, $data['id']); $this->assertSame($draft->isDone, $data['done']); + foreach($data['factions'] as $faction) { + $this->assertContains($faction, $draft->factionPool); + } $this->assertSame($draft->currentPlayerId->value, $data['draft']['current']); } @@ -42,6 +45,12 @@ public function itCanBeConvertedToArray() new Secrets( 'secret123', ), + [], + [ + "Mahact", + "Vulraith", + "Xxcha" + ], [new Pick($player->id, PickCategory::FACTION, "Vulraith")], $player->id ); @@ -54,5 +63,8 @@ public function itCanBeConvertedToArray() $this->assertSame($player->name, $data['draft']['players'][$player->id->value]['name']); $this->assertSame($player->id->value, $data['draft']['current']); $this->assertSame("Vulraith", $data['draft']['log'][0]['value']); + foreach($draft->factionPool as $faction) { + $this->assertContains($faction, $data['factions']); + } } } \ No newline at end of file diff --git a/app/Draft/Exceptions/DraftRepositoryException.php b/app/Draft/Exceptions/DraftRepositoryException.php new file mode 100644 index 0000000..7af9a76 --- /dev/null +++ b/app/Draft/Exceptions/DraftRepositoryException.php @@ -0,0 +1,11 @@ +factionData = Faction::all(); + } + + /** + * @return array + */ + public function generate(): array + { + $this->settings->seed->setForFactions(); + $factionsFromSets = $this->gatherFactionsFromSelectedSets(); + + $gatheredFactions = []; + + if (!empty($this->settings->customFactions)) { + foreach ($this->settings->customFactions as $f) { + $gatheredFactions[] = $factionsFromSets[$f]; + // take out the selected faction, so it doesn't get re-drawn in the next part + unset($factionsFromSets[$f]); + } + + $factionsStillToGather = $this->settings->numberOfFactions - count($gatheredFactions); + if ($factionsStillToGather > 0) { + shuffle($factionsFromSets); + $gatheredFactions = array_merge($gatheredFactions, array_slice($factionsFromSets, 0, $factionsStillToGather)); + } + } else { + $gatheredFactions = $factionsFromSets; + } + + shuffle($gatheredFactions); + return array_slice($gatheredFactions, 0, $this->settings->numberOfFactions); + } + + private function gatherFactionsFromSelectedSets(): array + { + return array_filter( + $this->factionData, + fn (Faction $faction) => + in_array($faction->edition, $this->settings->factionSets) || + $faction->name == "The Council Keleres" && $this->settings->includeCouncilKeleresFaction + ); + } +} \ No newline at end of file diff --git a/app/Draft/Generators/FactionPoolGeneratorTest.php b/app/Draft/Generators/FactionPoolGeneratorTest.php new file mode 100644 index 0000000..01814bd --- /dev/null +++ b/app/Draft/Generators/FactionPoolGeneratorTest.php @@ -0,0 +1,105 @@ + $sets, + 'numberOfFactions' => 10 + ])); + + $choices = $generator->generate(); + $choicesNames = array_map(fn (Faction $faction) => $faction->name, $choices); + + $this->assertCount(10, $choices); + $this->assertCount(10, array_unique($choicesNames)); + foreach($choices as $choice) { + $this->assertContains($choice->edition, $sets); + } + } + + #[Test] + public function itUsesOnlyCustomFactionsWhenEnoughAreProvided() + { + $customFactions = [ + "The Barony of Letnev", + "The Clan of Saar", + "The Emirates of Hacan", + "The Ghosts of Creuss", + ]; + $generator = new FactionPoolGenerator(DraftSettingsFactory::make([ + 'customFactions' => $customFactions, + 'factionSets' => [Edition::BASE_GAME], + 'numberOfFactions' => 3 + ])); + + $choices = $generator->generate(); + + $this->assertCount(3, $choices); + foreach($choices as $choice) { + $this->assertContains($choice->name, $customFactions); + } + } + + #[Test] + public function itGeneratesTheSameFactionsFromTheSameSeed() + { + $generator = new FactionPoolGenerator(DraftSettingsFactory::make([ + 'seed' => 123, + 'factionSets' => [Edition::BASE_GAME], + 'numberOfFactions' => 3 + ])); + $previouslyGeneratedChoices = [ + 'The Ghosts of Creuss', + 'The Emirates of Hacan', + 'The Yssaril Tribes' + ]; + + $choices = $generator->generate(); + + foreach($previouslyGeneratedChoices as $i => $name) { + $this->assertSame($name, $choices[$i]->name); + } + } + + #[Test] + public function itTakesFromSetsWhenNotEnoughCustomFactionsAreProvided() + { + $customFactions = [ + 'The Ghosts of Creuss', + 'The Emirates of Hacan', + 'The Yssaril Tribes' + ]; + $generator = new FactionPoolGenerator(DraftSettingsFactory::make([ + 'factionSets' => [Edition::BASE_GAME], + 'customFactions' => $customFactions, + 'numberOfFactions' => 10 + ])); + + $choices = $generator->generate(); + $choicesNames = array_map(fn (Faction $faction) => $faction->name, $choices); + + foreach($customFactions as $f) { + $this->assertContains($f, $choicesNames); + } + + foreach($choices as $c) { + $this->assertEquals($c->edition, Edition::BASE_GAME); + } + } +} \ No newline at end of file diff --git a/app/Draft/Generators/SlicePoolGenerator.php b/app/Draft/Generators/SlicePoolGenerator.php new file mode 100644 index 0000000..3c50691 --- /dev/null +++ b/app/Draft/Generators/SlicePoolGenerator.php @@ -0,0 +1,238 @@ + $tileData + */ + private readonly array $tileData; + + /** @var array $allGatheredTiles */ + private readonly array $allGatheredTiles; + /** @var array $gatheredHighTierTiles */ + private array $gatheredHighTierTiles; + /** @var array $gatheredMediumTierTiles */ + private array $gatheredMediumTierTiles; + /** @var array $gatheredLowTierTiles */ + private array $gatheredLowTierTiles; + /** @var array $gatheredRedTiles */ + private array $gatheredRedTiles; + + public int $tries; + + public function __construct( + private readonly Settings $settings + ) { + $this->tileData = Tile::all(); + + // make pre-selection based on tile sets + $this->allGatheredTiles = array_filter( + $this->tileData, + fn (Tile $tile) => + in_array($tile->edition, $this->settings->tileSets) && + // tier none is mec rex and such... + $tile->tier != TileTier::NONE + ); + + // sort pre-selected tiles in tiers + $highTier = []; + $midTier = []; + $lowTier = []; + $redTier = []; + + foreach($this->allGatheredTiles as $tile) { + switch($tile->tier) { + case TileTier::HIGH: + $highTier[] = $tile; + break; + case TileTier::MEDIUM: + $midTier[] = $tile; + break; + case TileTier::LOW: + $lowTier[] = $tile; + break; + case TileTier::RED: + $redTier[] = $tile; + break; + }; + } + + $this->gatheredHighTierTiles = $highTier; + $this->gatheredMediumTierTiles = $midTier; + $this->gatheredLowTierTiles = $lowTier; + $this->gatheredRedTiles = $redTier; + } + + /** + * @return array + */ + public function generate(): array + { + if (!empty($this->settings->customSlices)) { + return $this->slicesFromCustomSlices(); + } else { + return $this->attemptToGenerate(); + } + } + + + private function attemptToGenerate(int $previousTries = 0): array + { + if ($previousTries > self::MAX_TRIES) { + throw InvalidDraftSettingsException::cannotGenerateSlices(); + } + + $this->settings->seed->setForSlices($previousTries); + + shuffle($this->gatheredHighTierTiles); + shuffle($this->gatheredMediumTierTiles); + shuffle($this->gatheredLowTierTiles); + shuffle($this->gatheredRedTiles); + + // we need one high, medium, low and 2 red tier tiles per slice + $highTier = array_slice($this->gatheredHighTierTiles, 0, $this->settings->numberOfSlices); + $midTier = array_slice($this->gatheredMediumTierTiles, 0, $this->settings->numberOfSlices); + $lowTier = array_slice($this->gatheredLowTierTiles, 0, $this->settings->numberOfSlices); + $redTier = array_slice($this->gatheredRedTiles, 0, $this->settings->numberOfSlices * 2); + + $validSelection = $this->validateTileSelection(array_merge( + $highTier, + $midTier, + $lowTier, + $redTier + )); + + if (!$validSelection) { + return $this->attemptToGenerate($previousTries + 1); + } + + $slices = []; + for ($i = 0; $i < $this->settings->numberOfSlices; $i++) { + $slice = new Slice([ + $highTier[$i], + $midTier[$i], + $lowTier[$i], + $redTier[$i * 2], + $redTier[($i * 2) + 1] + ]); + try { + $slice->validate( + $this->settings->minimumOptimalInfluence, + $this->settings->minimumOptimalResources, + $this->settings->minimumOptimalTotal, + $this->settings->maximumOptimalTotal, + $this->settings->maxOneWormholesPerSlice ? 1 : null + ); + $slice->arrange($this->settings->seed); + + // if we didn't run into any exceptions here: it's a good slice! + $slices[] = $slice; + } catch (InvalidSliceException $invalidSlice) { + return $this->attemptToGenerate($previousTries + 1); + } + } + + $this->tries = $previousTries; + return $slices; + } + + /** + * @param array $tiles + * @return bool + */ + private function validateTileSelection(array $tiles): bool + { + $alphaWormholeCount = 0; + $betaWormholeCount = 0; + $legendaryPlanetCount = 0; + + foreach($tiles as $t) { + if ($t->hasWormhole(Wormhole::ALPHA)) { + $alphaWormholeCount++; + } + if ($t->hasWormhole(Wormhole::BETA)) { + $betaWormholeCount++; + } + if ($t->hasLegendaryPlanet()) { + $legendaryPlanetCount++; + } + } + + if ($legendaryPlanetCount < $this->settings->minimumLegendaryPlanets) { + return false; + } + + if ( + $this->settings->minimumTwoAlphaAndBetaWormholes && + ($alphaWormholeCount < 2 || $betaWormholeCount < 2) + ) { + return false; + } + + return true; + } + + /** + * @return array + */ + private function slicesFromCustomSlices(): array + { + return array_map(function (array $sliceData) { + $tileData = array_map(fn ($tileId) => $this->tileData[$tileId], $sliceData); + return new Slice($tileData); + }, $this->settings->customSlices); + } + + /** + * @param array $tiles + * @return array + */ + private function pluckTileIds(array $tiles): array + { + return array_map(fn(Tile $t) => $t->id, $tiles); + } + + /** + * Debug and test methods + */ + + public function gatheredTilesIds(): array + { + return $this->pluckTileIds($this->allGatheredTiles); + } + + public function gatheredTiles(): array + { + return $this->allGatheredTiles; + } + + public function gatheredTileTierIds(): array + { + return array_map(fn (array $tier) => $this->pluckTileIds($tier), $this->gatheredTileTiers()); + } + + public function gatheredTileTiers(): array + { + return [ + TileTier::HIGH->value => $this->gatheredHighTierTiles, + TileTier::MEDIUM->value => $this->gatheredMediumTierTiles, + TileTier::LOW->value => $this->gatheredLowTierTiles, + TileTier::RED->value => $this->gatheredRedTiles, + ]; + } +} \ No newline at end of file diff --git a/app/Draft/Generators/SlicePoolGeneratorTest.php b/app/Draft/Generators/SlicePoolGeneratorTest.php new file mode 100644 index 0000000..3392cd8 --- /dev/null +++ b/app/Draft/Generators/SlicePoolGeneratorTest.php @@ -0,0 +1,254 @@ + $sets, + ]); + $generator = new SlicePoolGenerator($settings); + + $tiles = $generator->gatheredTiles(); + $tiers = $generator->gatheredTileTiers(); + $combinedTiers = count($tiers["high"]) + count($tiers["mid"]) + count($tiers["low"]) + count($tiers["red"]); + + $this->assertSame(count($tiles), $combinedTiers); + foreach($tiles as $t) { + $this->assertContains($t->edition, $sets); + $this->assertNotEquals($t->tileType, TileType::GREEN); + if (!empty($t->planets)) { + $this->assertNotEquals($t->planets[0]->name, "Mecatol Rex"); + $this->assertNotEquals($t->planets[0]->name, "Mallice"); + } + } + + foreach($generator->gatheredTileTierIds() as $key => $tier) { + foreach ($tier as $tileId) { + foreach($generator->gatheredTileTierIds() as $key2 => $tier2) { + if ($key != $key2) { + $this->assertNotContains($tileId, $tier2); + } + } + } + } + } + + #[Test] + #[DataProviderExternal(TestSets::class, 'setCombinations')] + public function itCanGenerateValidSlicesBasedOnSets($sets) + { + // we're doing this on easy mode so that the "Only base game" tile set has a decent chance of working + $settings = DraftSettingsFactory::make([ + 'numberOfSlices' => 4, + 'tileSets' => $sets, + 'maxOneWormholePerSlice' => false, + 'minimumLegendaryPlanets' => 0, + 'minimumTwoAlphaBetaWormholes' => false, + ]); + $generator = new SlicePoolGenerator($settings); + + $slices = $generator->generate(); + + $tileIds = array_reduce( + $slices, + fn ($allTiles, Slice $s) => array_merge( + $allTiles, + array_map(fn (Tile $t) => $t->id, $s->tiles) + ), + [], + ); + + $this->assertCount(4, $slices); + foreach($slices as $slice) { + $this->assertTrue($slice->validate( + $settings->minimumOptimalInfluence, + $settings->minimumOptimalResources, + $settings->minimumOptimalTotal, + $settings->maximumOptimalTotal + )); + } + } + + #[Test] + #[DataProviderExternal(TestSets::class, 'setCombinations')] + public function itDoesNotReuseTiles($sets) + { + $settings = DraftSettingsFactory::make([ + 'numberOfSlices' => 4, + 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE], + 'maxOneWormholePerSlice' => false, + 'minimumLegendaryPlanets' => 0, + 'minimumTwoAlphaBetaWormholes' => false, + ]); + $generator = new SlicePoolGenerator($settings); + + $slices = $generator->generate(); + + $tileIds = array_reduce( + $slices, + fn($allTiles, Slice $s) => array_merge( + $allTiles, + array_map(fn(Tile $t) => $t->id, $s->tiles) + ), + [], + ); + + $this->assertSameSize($tileIds, array_unique($tileIds)); + } + + #[Test] + public function itGeneratesTheSameSlicesFromSameSeed() + { + $settings = DraftSettingsFactory::make([ + 'seed' => 123, + 'numberOfSlices' => 4, + 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS], + 'maxOneWormholePerSlice' => true, + 'minimumLegendaryPlanets' => 1, + 'minimumTwoAlphaBetaWormholes' => true, + 'minimumOptimalInfluence' => 4, + 'minimumOptimalResources' => 2.5, + 'minimumOptimalTotal' => 9, + 'maximumOptimalTotal' => 13, + ]); + $generator = new SlicePoolGenerator($settings); + $pregeneratedSlices = [ + ["64", "33", "42", "67", "59"], + ["29", "66", "20", "39", "47"], + ["27", "32", "79", "68", "19"], + ["35", "37", "22", "40", "50"], + ]; + + $slices = $generator->generate(); + + foreach($slices as $sliceIndex => $slice) { + $this->assertSame($pregeneratedSlices[$sliceIndex], $slice->tileIds()); + } + } + + #[Test] + public function itCanGenerateSlicesWithMinimumTwoAlphaAndBetaWormholes() + { + $settings = DraftSettingsFactory::make([ + 'numberOfSlices' => 6, + 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS], + 'maxOneWormholePerSlice' => false, + 'minimumTwoAlphaBetaWormholes' => true, + ]); + + $this->assertTrue($settings->minimumTwoAlphaAndBetaWormholes); + + $generator = new SlicePoolGenerator($settings); + + $slices = $generator->generate(); + + + $alphaWormholeCount = 0; + $betaWormholeCount = 0; + foreach($slices as $slice) { + if ($slice->hasWormhole(Wormhole::ALPHA)) { + $alphaWormholeCount++; + } + if ($slice->hasWormhole(Wormhole::BETA)) { + $betaWormholeCount++; + } + } + + $this->assertGreaterThanOrEqual(2, $alphaWormholeCount); + $this->assertGreaterThanOrEqual(2, $betaWormholeCount); + } + + #[Test] + public function itCanGenerateSlicesWithMinimumAmountOfLegendaryPlanets() + { + $settings = DraftSettingsFactory::make([ + 'numberOfSlices' => 6, + 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS], + 'minimumLegendaryPlanets' => 1, + ]); + $generator = new SlicePoolGenerator($settings); + + $slices = $generator->generate(); + + $legendaryPlanetCount = 0; + foreach($slices as $slice) { + if ($slice->hasLegendary()) { + $legendaryPlanetCount++; + } + } + + $this->assertGreaterThanOrEqual(1, $legendaryPlanetCount); + } + + #[Test] + public function itCanGenerateSlicesWithMaxOneWormholePerSlice() + { + $settings = DraftSettingsFactory::make([ + 'numberOfSlices' => 6, + 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::DISCORDANT_STARS], + 'maxOneWormholePerSlice' => true, + ]); + $generator = new SlicePoolGenerator($settings); + + $slices = $generator->generate(); + + foreach($slices as $slice) { + $this->assertLessThanOrEqual(1, count($slice->wormholes)); + } + } + + #[Test] + public function itCanReturnCustomSlices() + { + $customSlices = [ + ["64", "33", "42", "67", "59"], + ["29", "66", "20", "39", "47"], + ["27", "32", "79", "68", "19"], + ["35", "37", "22", "40", "50"], + ]; + + $generator = new SlicePoolGenerator(DraftSettingsFactory::make([ + 'numberOfSlices' => 4, + 'customSlices' => $customSlices + ])); + + + $slices = $generator->generate(); + + foreach($slices as $sliceIndex => $slice) { + $this->assertSame($customSlices[$sliceIndex], $slice->tileIds()); + } + } + + + #[Test] + public function itGivesUpIfSettingsAreImpossible() + { + $generator = new SlicePoolGenerator(DraftSettingsFactory::make([ + 'numberOfSlices' => 4, + 'minimumOptimalInfluence' => 40 + ])); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::cannotGenerateSlices()->getMessage()); + + $generator->generate(); + } +} \ No newline at end of file diff --git a/app/Draft/Player.php b/app/Draft/Player.php index e03ed97..cc727c7 100644 --- a/app/Draft/Player.php +++ b/app/Draft/Player.php @@ -2,6 +2,8 @@ namespace App\Draft; +use App\Draft\Exceptions\InvalidPickException; + class Player { public function __construct( @@ -29,6 +31,19 @@ public static function fromJson($playerData): self ); } + public static function create(string $name, ?string $team = null) + { + return new self( + PlayerId::generate(), + $name, + false, + null, + null, + null, + $team + ); + } + public function toArray(): array { return [ diff --git a/app/Draft/PlayerId.php b/app/Draft/PlayerId.php index f8492db..926e8f1 100644 --- a/app/Draft/PlayerId.php +++ b/app/Draft/PlayerId.php @@ -7,4 +7,9 @@ class PlayerId implements \Stringable { use IdStringBehavior; + + public static function generate() + { + return self::fromString('p_' . bin2hex(random_bytes(8))); + } } \ No newline at end of file diff --git a/app/Draft/Repository/DraftRepository.php b/app/Draft/Repository/DraftRepository.php new file mode 100644 index 0000000..cfaa42c --- /dev/null +++ b/app/Draft/Repository/DraftRepository.php @@ -0,0 +1,11 @@ +storagePath = env('STORAGE_PATH'); + } + + private function pathToDraft(string $draftId) + { + return $this->storagePath . '/' . 'draft_' . $draftId . '.json'; + } + + public function load(string $id): Draft + { + $path = $this->pathToDraft($id); + + if(!file_exists($path)) { + throw DraftRepositoryException::notFound($id); + } + + $rawDraft = file_get_contents($path); + + return Draft::fromJson($rawDraft); + } + + public function save(Draft $draft) + { + file_put_contents($this->pathToDraft($draft->id), $draft->toFileContent()); + } +} \ No newline at end of file diff --git a/app/Draft/Repository/S3DraftRepository.php b/app/Draft/Repository/S3DraftRepository.php new file mode 100644 index 0000000..4812006 --- /dev/null +++ b/app/Draft/Repository/S3DraftRepository.php @@ -0,0 +1,49 @@ +client = new S3Client([ + 'version' => 'latest', + // @todo fix this? + 'region' => 'us-east-1', + 'endpoint' => 'https://' . env('REGION') . '.digitaloceanspaces.com', + 'credentials' => [ + 'key' => env('ACCESS_KEY'), + 'secret' => env('ACCESS_SECRET'), + ], + ]); + $this->bucket = env('BUCKET'); + } + + public function load(string $id): Draft + { + $file = $this->client->getObject([ + 'Bucket' => $this->bucket, + 'Key' => 'draft_' . $id . '.json', + ]); + + $rawDraft = (string) $file['Body']; + + return Draft::fromJson($rawDraft); + } + + public function save(Draft $draft) + { + $this->client->putObject([ + 'Bucket' => $this->bucket, + 'Key' => 'draft_' . $draft->id . '.json', + 'Body' => $draft->toFileContent(), + 'ACL' => 'private' + ]); + } +} \ No newline at end of file diff --git a/app/Draft/Secrets.php b/app/Draft/Secrets.php index 1bff40c..6e726e0 100644 --- a/app/Draft/Secrets.php +++ b/app/Draft/Secrets.php @@ -2,6 +2,9 @@ namespace App\Draft; +/** + * Contains and generates the player "passwords" (used to authenticate across devices) + */ class Secrets { private const ADMIN_SECRET_KEY = 'admin_pass'; @@ -23,9 +26,9 @@ public function toArray(): array ]; } - public static function generate(): string + public static function generatePassword(): string { - return base64_encode(random_bytes(16)); + return base64_encode(random_bytes(16)); } public function checkAdminSecret($secret): bool { @@ -43,4 +46,9 @@ public static function fromJson($data): self array_filter($data, fn (string $key) => $key != self::ADMIN_SECRET_KEY, ARRAY_FILTER_USE_KEY) ); } + + public static function new(): self + { + return new self(self::generatePassword()); + } } \ No newline at end of file diff --git a/app/Draft/SecretsTest.php b/app/Draft/SecretsTest.php index 476dab0..f5b6821 100644 --- a/app/Draft/SecretsTest.php +++ b/app/Draft/SecretsTest.php @@ -12,7 +12,7 @@ public function itGeneratesRandomSecretsEvenIfSeedIsSet() { $previouslyGenerated = "kOFY/yBXdhP5cC97tlxPhQ=="; mt_srand(123); - $secret = Secrets::generate(); + $secret = Secrets::generatePassword(); $this->assertNotSame($previouslyGenerated, $secret); } diff --git a/app/Draft/Settings.php b/app/Draft/Settings.php index 8708974..bb21b83 100644 --- a/app/Draft/Settings.php +++ b/app/Draft/Settings.php @@ -2,6 +2,7 @@ namespace App\Draft; +use App\Draft\Exceptions\InvalidDraftSettingsException; use App\TwilightImperium\AllianceTeamMode; use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; @@ -33,7 +34,7 @@ public function __construct( // @todo figure out a better way to integrate this // should be required-ish when TE is included, but optional if PoK is included public bool $includeCouncilKeleresFaction, - public int $minimumWormholes, + public bool $minimumTwoAlphaAndBetaWormholes, public bool $maxOneWormholesPerSlice, public int $minimumLegendaryPlanets, public float $minimumOptimalInfluence, @@ -59,6 +60,10 @@ public function includesTileSet(Edition $e): bool { public function toArray() { + /** + * @todo refactor to use tileSets and factionSets and 'minimumLegendaryPlanets + * But don't break backwards compatibility! + */ return [ 'players' => $this->playerNames, 'preset_draft_order' => $this->presetDraftOrder, @@ -69,19 +74,16 @@ public function toArray() 'include_pok' => $this->includesTileSet(Edition::PROPHECY_OF_KINGS), 'include_ds_tiles' => $this->includesTileSet(Edition::DISCORDANT_STARS_PLUS), 'include_te_tiles' => $this->includesTileSet(Edition::THUNDERS_EDGE), - // @todo refactor frontend to use tile sets. Backwards compatibility! - // factions + // faction settings 'include_base_factions' => $this->includesFactionSet(Edition::BASE_GAME), 'include_pok_factions' => $this->includesFactionSet(Edition::PROPHECY_OF_KINGS), 'include_te_factions' => $this->includesFactionSet(Edition::THUNDERS_EDGE), 'include_discordant' => $this->includesFactionSet(Edition::DISCORDANT_STARS), 'include_discordantexp' => $this->includesFactionSet(Edition::DISCORDANT_STARS_PLUS), 'include_keleres' => $this->includeCouncilKeleresFaction, - // @todo refactor frontend to use faction sets. Backwards compatibility! // slice settings - 'min_wormholes' => $this->minimumWormholes, + 'min_wormholes' => $this->minimumTwoAlphaAndBetaWormholes ? 2 : 0, 'max_1_wormhole' => $this->maxOneWormholesPerSlice, - // @todo refactor frontend to use this instead of min_legendary_planets. Don't break backwards compatibility! 'min_legendaries' => $this->minimumLegendaryPlanets, 'minimum_optimal_influence' => $this->minimumOptimalInfluence, 'minimum_optimal_resources' => $this->minimumOptimalResources, @@ -196,7 +198,7 @@ public static function fromJson(array $data): self $data['players'], $data['preset_draft_order'], new Name($data['name']), - new Seed($data['seed']), + new Seed($data['seed'] ?? null), $data['num_slices'], $data['num_factions'], self::tileSetsFromJson($data), diff --git a/app/Draft/SettingsTest.php b/app/Draft/SettingsTest.php index 670ff53..2c17c79 100644 --- a/app/Draft/SettingsTest.php +++ b/app/Draft/SettingsTest.php @@ -2,7 +2,8 @@ namespace App\Draft; -use App\Testing\DraftSettingsFactory; +use App\Draft\Exceptions\InvalidDraftSettingsException; +use App\Testing\Factories\DraftSettingsFactory; use App\Testing\TestCase; use App\Testing\TestDrafts; use App\TwilightImperium\AllianceTeamMode; @@ -285,7 +286,7 @@ public function itCanBeInstantiatedFromJson($data) { $this->assertSame($data['config']['include_discordantexp'], $draftSettings->includesFactionSet(Edition::DISCORDANT_STARS_PLUS)); $this->assertSame($data['config']['include_keleres'], $draftSettings->includeCouncilKeleresFaction); $this->assertSame($data['config']['preset_draft_order'], $draftSettings->presetDraftOrder); - $this->assertSame($data['config']['min_wormholes'], $draftSettings->minimumWormholes); + $this->assertSame($data['config']['min_wormholes'], $draftSettings->minimumTwoAlphaAndBetaWormholes ? 2 : 0); $this->assertSame($data['config']['min_legendaries'], $draftSettings->minimumLegendaryPlanets); $this->assertSame($data['config']['max_1_wormhole'], $draftSettings->maxOneWormholesPerSlice); $this->assertSame((float) $data['config']['minimum_optimal_influence'], $draftSettings->minimumOptimalInfluence); diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php index 684f9f9..99fcc0f 100644 --- a/app/Draft/Slice.php +++ b/app/Draft/Slice.php @@ -2,6 +2,7 @@ namespace App\Draft; +use App\Draft\Exceptions\InvalidSliceException; use App\TwilightImperium\TechSpecialties; use App\TwilightImperium\Tile; use App\TwilightImperium\Wormhole; @@ -47,7 +48,7 @@ function __construct( $this->optimalResources += $tile->optimalResources; $this->optimalTotal += $tile->optimalTotal; - $this->wormholes = array_merge($tile->wormholes); + $this->wormholes = array_merge($this->wormholes, $tile->wormholes); foreach ($tile->planets as $planet) { foreach ($planet->specialties as $spec) { @@ -79,6 +80,8 @@ public function toJson(): array } /** + * @todo don't use countSpecials + * * @throws InvalidSliceException */ public function validate( @@ -118,14 +121,15 @@ public function validate( return true; } - public function arrange(): void { + public function arrange(Seed $seed): void { $tries = 0; while (!$this->tileArrangementIsValid()) { + $seed->setForSlices($tries); shuffle($this->tiles); $tries++; if ($tries > self::MAX_ARRANGEMENT_TRIES) { - throw InvalidSliceException::hasNoValidArragenemnt(); + throw InvalidSliceException::hasNoValidArrangement(); } } } @@ -166,4 +170,19 @@ public function tileArrangementIsValid(): bool return true; } + + public function tileIds(): array + { + return array_map(fn (Tile $t) => $t->id, $this->tiles); + } + + public function hasLegendary(): bool + { + return count($this->legendaryPlanets) > 0; + } + + public function hasWormhole(Wormhole $wormhole): bool + { + return in_array($wormhole, $this->wormholes); + } } diff --git a/app/Draft/SliceTest.php b/app/Draft/SliceTest.php index 7f65eb9..a195b73 100644 --- a/app/Draft/SliceTest.php +++ b/app/Draft/SliceTest.php @@ -2,9 +2,10 @@ namespace App\Draft; -use App\Testing\PlanetFactory; +use App\Draft\Exceptions\InvalidSliceException; +use App\Testing\Factories\PlanetFactory; +use App\Testing\Factories\TileFactory; use App\Testing\TestCase; -use App\Testing\TileFactory; use App\TwilightImperium\Planet; use App\TwilightImperium\Wormhole; use PHPUnit\Framework\Attributes\DataProvider; @@ -96,9 +97,10 @@ public function itCanArrangeTiles(array $tiles, bool $canBeArranged) if (!$canBeArranged) { $this->expectException(InvalidSliceException::class); } - $slice = new Slice($tiles); - $slice->arrange(); + $seed = new Seed(1); + + $slice->arrange($seed); $this->assertTrue($slice->tileArrangementIsValid()); } diff --git a/app/Generator.php b/app/Generator.php index aa90ed1..ce9801c 100644 --- a/app/Generator.php +++ b/app/Generator.php @@ -2,10 +2,13 @@ namespace App; -use App\Draft\InvalidSliceException; +use App\Draft\Exceptions\InvalidSliceException; use App\Draft\Slice; use App\TwilightImperium\Tile; +/** + * @deprecated + */ class Generator { private const SEED_OFFSET_SLICES = 0; @@ -247,7 +250,6 @@ public static function factions($config) $factions[] = $f; } - // add some more boys and girls untill we reach the magic number $i = 0; while (count($factions) < $config->num_factions) { diff --git a/app/GeneratorConfig.php b/app/GeneratorConfig.php index 66ba1a9..5953788 100644 --- a/app/GeneratorConfig.php +++ b/app/GeneratorConfig.php @@ -4,6 +4,9 @@ use App\Draft\Name; +/** + * @deprecated + */ class GeneratorConfig { // Maximum value for random seed generation (2^50) diff --git a/app/Http/ErrorResponse.php b/app/Http/ErrorResponse.php index 141b726..f4b15c2 100644 --- a/app/Http/ErrorResponse.php +++ b/app/Http/ErrorResponse.php @@ -6,9 +6,10 @@ class ErrorResponse extends JsonResponse { public function __construct( protected string $error, + public int $code = 500, ) { parent::__construct([ "error" => $this->error - ]); + ], $code); } } \ No newline at end of file diff --git a/app/Http/HtmlResponse.php b/app/Http/HtmlResponse.php new file mode 100644 index 0000000..f1391f0 --- /dev/null +++ b/app/Http/HtmlResponse.php @@ -0,0 +1,23 @@ +code); + } + + public function code(): int + { + return $this->code; + } + + public function getBody(): string + { + return $this->html; + } +} \ No newline at end of file diff --git a/app/Http/HttpRequest.php b/app/Http/HttpRequest.php index 369e2c8..5ff2b1f 100644 --- a/app/Http/HttpRequest.php +++ b/app/Http/HttpRequest.php @@ -5,22 +5,26 @@ class HttpRequest { public function __construct( - protected array $getParameters, - protected array $postParameters + protected readonly array $getParameters, + protected readonly array $postParameters, + protected readonly array $urlParameters ) { - } - public static function fromRequest(): self + public static function fromRequest($urlParameters = []): self { return new self( $_GET, - $_POST + $_POST, + $urlParameters ); } public function get($key, $defaultValue = null) { + if (isset($this->urlParameters[$key])) { + return $this->urlParameters[$key]; + } if (isset($this->getParameters[$key])) { return $this->getParameters[$key]; } diff --git a/app/Http/HttpResponse.php b/app/Http/HttpResponse.php index 598fa29..2f2a6db 100644 --- a/app/Http/HttpResponse.php +++ b/app/Http/HttpResponse.php @@ -2,6 +2,12 @@ namespace App\Http; -abstract class HttpResponse implements \Stringable +abstract class HttpResponse { + public function __construct( + public int $code + ) { + + } + abstract public function getBody(): string; } \ No newline at end of file diff --git a/app/Http/JsonResponse.php b/app/Http/JsonResponse.php index 240f876..bfd6708 100644 --- a/app/Http/JsonResponse.php +++ b/app/Http/JsonResponse.php @@ -5,12 +5,18 @@ class JsonResponse extends HttpResponse { public function __construct( - protected array $data + protected array $data, + public int $code = 200 ) { + parent::__construct($this->code); + } + public function code(): int + { + return $this->code; } - public function __toString() + public function getBody(): string { return json_encode($this->data); } diff --git a/app/Http/RequestHandler.php b/app/Http/RequestHandler.php index 9a8ee87..31c4373 100644 --- a/app/Http/RequestHandler.php +++ b/app/Http/RequestHandler.php @@ -4,7 +4,12 @@ abstract class RequestHandler { - public abstract function handle(HttpRequest $request): HttpResponse; + public function __construct( + protected HttpRequest $request + ) { + } + + public abstract function handle(): HttpResponse; protected function error(string $error): ErrorResponse { diff --git a/app/Http/RequestHandlers/HandleClaimPlayerRequest.php b/app/Http/RequestHandlers/HandleClaimPlayerRequest.php new file mode 100644 index 0000000..64936a4 --- /dev/null +++ b/app/Http/RequestHandlers/HandleClaimPlayerRequest.php @@ -0,0 +1,15 @@ +assertIsConfiguredAsHandlerForRoute('/api/draft/123/claim'); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php new file mode 100644 index 0000000..e99c011 --- /dev/null +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php @@ -0,0 +1,14 @@ +request->get('id')); + return new HtmlResponse( + require_once 'templates/draft.php' + ); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandlePickRequest.php b/app/Http/RequestHandlers/HandlePickRequest.php new file mode 100644 index 0000000..ced3663 --- /dev/null +++ b/app/Http/RequestHandlers/HandlePickRequest.php @@ -0,0 +1,14 @@ +request->get('id')); + return new HtmlResponse( + require_once 'templates/draft.php' + ); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequest.php b/app/Http/RequestHandlers/HandleViewDraftRequest.php new file mode 100644 index 0000000..489f8be --- /dev/null +++ b/app/Http/RequestHandlers/HandleViewDraftRequest.php @@ -0,0 +1,20 @@ +request->get('id')); + return new HtmlResponse( + require_once 'templates/draft.php' + ); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewFormRequest.php b/app/Http/RequestHandlers/HandleViewFormRequest.php new file mode 100644 index 0000000..db19446 --- /dev/null +++ b/app/Http/RequestHandlers/HandleViewFormRequest.php @@ -0,0 +1,17 @@ +assertIsConfiguredAsHandlerForRoute('/'); + } +} \ No newline at end of file diff --git a/app/Http/Route.php b/app/Http/Route.php new file mode 100644 index 0000000..fc955e4 --- /dev/null +++ b/app/Http/Route.php @@ -0,0 +1,57 @@ +routeChunks = explode('/', $this->route); + } + + /** + * @param string $path + * @return ?RouteMatch + */ + public function match(string $path): ?RouteMatch + { + $pathChunks = explode('/', $path); + + // remove trailing slash + if ($path != '/' && $pathChunks[count($pathChunks) - 1] == '') { + $pathChunks = array_slice($pathChunks, 0, count($pathChunks) - 1); + } + + // if it's not a match on chunk size, already discard + if (count($this->routeChunks) != count($pathChunks)) { + return null; + } + + $parameters = []; + $allChunksMatch = true; + foreach($this->routeChunks as $i => $chunk) { + + preg_match('/^\{(\w+)}$/', $chunk, $matches); + if (count($matches) > 0) { + $parameters[$matches[1]] = $pathChunks[$i]; + } else { + if ($pathChunks[$i] != $chunk) { + $allChunksMatch = false; + } + } + } + + if (!$allChunksMatch) { + return null; + } + + return new RouteMatch( + $this->handlerClass, + $parameters + ); + } +} \ No newline at end of file diff --git a/app/Http/RouteMatch.php b/app/Http/RouteMatch.php new file mode 100644 index 0000000..c6dd0d5 --- /dev/null +++ b/app/Http/RouteMatch.php @@ -0,0 +1,12 @@ +match('/hello/world'); + + $this->assertNotNull($result); + $this->assertSame('SomeClass', $result->requestHandlerClass); + $this->assertEmpty($result->requestParameters); + } + + #[Test] + public function itCanCaptureUrlParameters() + { + $route = new Route('/slug/{foo}/edit/{bar}', 'SomeClass'); + + $result = $route->match('/slug/123/edit/abc1234'); + + $this->assertSame('SomeClass', $result->requestHandlerClass); + $this->assertSame('123', $result->requestParameters['foo']); + $this->assertSame('abc1234', $result->requestParameters['bar']); + } + + #[Test] + public function itCanDealWithATrailingSlash() + { + $route = new Route('/slug/{id}', 'SomeClass'); + + $result = $route->match('/slug/123/'); + + $this->assertSame('SomeClass', $result->requestHandlerClass); + $this->assertSame('123', $result->requestParameters['id']); + } + + #[Test] + public function itCanRouteToIndex() + { + $route = new Route('/', 'IndexClass'); + + $result = $route->match('/'); + + $this->assertSame('IndexClass', $result->requestHandlerClass); + } +} \ No newline at end of file diff --git a/app/Testing/DraftSettingsFactory.php b/app/Testing/Factories/DraftSettingsFactory.php similarity index 95% rename from app/Testing/DraftSettingsFactory.php rename to app/Testing/Factories/DraftSettingsFactory.php index 497af48..0f90feb 100644 --- a/app/Testing/DraftSettingsFactory.php +++ b/app/Testing/Factories/DraftSettingsFactory.php @@ -1,6 +1,6 @@ boolean(), $properties['maxOneWormholePerSlice'] ?? $faker->boolean(), $properties['minimumLegendaryPlanets'] ?? $faker->numberBetween(0, 1), diff --git a/app/Testing/PlanetFactory.php b/app/Testing/Factories/PlanetFactory.php similarity index 89% rename from app/Testing/PlanetFactory.php rename to app/Testing/Factories/PlanetFactory.php index 6bd2da6..f32ae98 100644 --- a/app/Testing/PlanetFactory.php +++ b/app/Testing/Factories/PlanetFactory.php @@ -1,13 +1,10 @@ request($method, $url); diff --git a/app/Testing/RequestHandlerTestCase.php b/app/Testing/RequestHandlerTestCase.php new file mode 100644 index 0000000..e71897d --- /dev/null +++ b/app/Testing/RequestHandlerTestCase.php @@ -0,0 +1,33 @@ +application = new Application(); + } + + #[After] + public function unsetApplication() + { + unset($this->application); + } + + public function assertIsConfiguredAsHandlerForRoute($route) + { + $determinedHandler = $this->application->handlerForRequest($route); + $this->assertInstanceOf($this->requestHandlerClass, $determinedHandler); + } +} \ No newline at end of file diff --git a/app/Testing/TestCase.php b/app/Testing/TestCase.php index 4ce53bf..53acb19 100644 --- a/app/Testing/TestCase.php +++ b/app/Testing/TestCase.php @@ -2,24 +2,11 @@ namespace App\Testing; +use App\Application; use PHPUnit\Framework\Attributes\Before; use \PHPUnit\Framework\TestCase as BaseTestCase; class TestCase extends BaseTestCase { - // unused right now, but we can do stuff like initialize traits and whatnot here - /* - #[Before] - protected function setUpTraits(): void - { - require_once 'bootstrap/helpers.php'; - - // $uses = array_flip(class_uses_recursive(static::class)); - - if (isset($uses[FakesData::class])) { - $this->bootFaker(); - } - } - */ } \ No newline at end of file diff --git a/app/Testing/TestSets.php b/app/Testing/TestSets.php new file mode 100644 index 0000000..b695f26 --- /dev/null +++ b/app/Testing/TestSets.php @@ -0,0 +1,49 @@ + [ + 'sets' => [Edition::BASE_GAME] + ]; + + yield "For base game + Discordant" => [ + 'sets' => [Edition::BASE_GAME, Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS] + ]; + + yield "For base game + POK" => [ + 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS] + ]; + + yield "For base game + Thunder's edge" => [ + 'sets' => [Edition::BASE_GAME, Edition::THUNDERS_EDGE] + ]; + + yield "For all official editions" => [ + 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE] + ]; + + yield "For base game + POK + Discordant" => [ + 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS] + ]; + + yield "For the whole shebang" => [ + 'sets' => [ + Edition::BASE_GAME, + Edition::PROPHECY_OF_KINGS, + Edition::THUNDERS_EDGE, + Edition::DISCORDANT_STARS, + Edition::DISCORDANT_STARS_PLUS + ] + ]; + } +} \ No newline at end of file diff --git a/app/TwilightImperium/Faction.php b/app/TwilightImperium/Faction.php new file mode 100644 index 0000000..b684800 --- /dev/null +++ b/app/TwilightImperium/Faction.php @@ -0,0 +1,52 @@ + + */ + public static function all(): array + { + $rawData = json_decode(file_get_contents('data/factions.json'), true); + return array_map(fn ($factionData) => self::fromJson($factionData), $rawData); + } + + // + private static function editionFromFactionJson($factionEdition): Edition + { + return match ($factionEdition) { + "base" => Edition::BASE_GAME, + "pok" => Edition::PROPHECY_OF_KINGS, + "te" => Edition::THUNDERS_EDGE, + "keleres" => Edition::THUNDERS_EDGE, + "discordant" => Edition::DISCORDANT_STARS, + "discordantexp" => Edition::DISCORDANT_STARS_PLUS, + }; + } +} \ No newline at end of file diff --git a/app/TwilightImperium/FactionTest.php b/app/TwilightImperium/FactionTest.php new file mode 100644 index 0000000..e2a57ad --- /dev/null +++ b/app/TwilightImperium/FactionTest.php @@ -0,0 +1,29 @@ + $data) { + $faction = $factions[$key]; + + $this->assertSame($faction->name, $data['name']); + $this->assertSame($faction->id, $data['id']); + $this->assertSame($faction->homeSystemTileNumber, $data['homesystem']); + $this->assertSame($faction->linkToWiki, $data['wiki']); + } + } +} \ No newline at end of file diff --git a/app/TwilightImperium/SpaceObjectTest.php b/app/TwilightImperium/SpaceObjectTest.php index 96d21b8..b656bc4 100644 --- a/app/TwilightImperium/SpaceObjectTest.php +++ b/app/TwilightImperium/SpaceObjectTest.php @@ -2,8 +2,6 @@ namespace App\TwilightImperium; -use App\Testing\FakesData; -use App\Testing\PlanetFactory; use App\Testing\TestCase; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; diff --git a/app/TwilightImperium/Tile.php b/app/TwilightImperium/Tile.php index da07675..8cda675 100644 --- a/app/TwilightImperium/Tile.php +++ b/app/TwilightImperium/Tile.php @@ -14,6 +14,8 @@ class Tile public function __construct( public string $id, public TileType $tileType, + public TileTier $tier, + public Edition $edition, /** * @var array */ @@ -41,14 +43,20 @@ public function __construct( } } - public static function fromJsonData(string $id, array $data): self { + public static function fromJsonData( + string $id, + TileTier $tier, + array $data + ): self { return new self( $id, TileType::from($data['type']), + $tier, + Edition::from($data['set']), array_map(fn(array $planetData) => Planet::fromJsonData($planetData), $data['planets'] ?? []), array_map(fn(array $stationData) => SpaceStation::fromJsonData($stationData), $data['stations'] ?? []), Wormhole::fromJsonData($data['wormhole']), - $data['anomaly'], + $data['anomaly'] ?? null, isset($data['hyperlanes']) ? $data['hyperlanes'] : [], ); } @@ -74,7 +82,7 @@ function hasLegendaryPlanet() /** - * @todo Refactor + * @todo deprecate * * @param Tile[] $tiles * @return int[] @@ -98,4 +106,50 @@ public static function countSpecials(array $tiles) return $count; } + + /** + * @return string, TileTier + */ + public static function tierData(): array + { + $tierData = json_decode(file_get_contents('data/tile-selection.json')); + $tileTiers = []; + + foreach($tierData as $tierLists) { + foreach($tierLists as $level => $list) { + foreach($list as $id) { + $tileTiers[$id] = TileTier::from($level); + } + } + } + + return $tileTiers; + } + + /** + * @return array + */ + public static function all(): array + { + $allTileData = json_decode(file_get_contents('data/tiles.json'), true); + $tileTiers = self::tierData(); + $tiles = []; + + // merge tier and tile data + // We're keeping it in separate files for maintainability + foreach ($allTileData as $tileId => $tileData) { + $isMecRexOrMallice = count($tileData['planets']) > 0 && + ($tileData['planets'][0]['name'] == "Mecatol Rex" || $tileData['planets'][0]['name'] == "Mallice"); + + $tier = match($tileData['type']) { + "red" => TileTier::RED, + "blue" => $isMecRexOrMallice ? TileTier::NONE : $tileTiers[$tileId], + default => TileTier::NONE + }; + + $tiles[$tileId] = Tile::fromJsonData($tileId, $tier, $tileData); + } + + return $tiles; + } } diff --git a/app/TwilightImperium/TileTest.php b/app/TwilightImperium/TileTest.php index 1e9a4d8..d4aaec2 100644 --- a/app/TwilightImperium/TileTest.php +++ b/app/TwilightImperium/TileTest.php @@ -2,6 +2,7 @@ namespace App\TwilightImperium; +use App\Testing\Factories\TileFactory; use App\Testing\TestCase; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; @@ -16,12 +17,7 @@ public function itCalculatesTotalValues() new Planet('test',3, 3), ]; - $tile = new Tile( - "test", - TileType::BLUE, - $planets, - [], - ); + $tile = TileFactory::make($planets); $this->assertSame(7, $tile->totalResources); $this->assertSame(5, $tile->totalInfluence); @@ -38,7 +34,8 @@ public static function jsonData() { "wormhole" => null, "anomaly" => null, "planets" => [], - "stations" => [] + "stations" => [], + "set" => Edition::BASE_GAME->value ], "expectedWormholes" => [], ]; @@ -48,7 +45,8 @@ public static function jsonData() { "wormhole" => "gamma", "anomaly" => null, "planets" => [], - "stations" => [] + "stations" => [], + "set" => Edition::PROPHECY_OF_KINGS->value ], "expectedWormholes" => [Wormhole::GAMMA], ]; @@ -58,7 +56,8 @@ public static function jsonData() { "wormhole" => null, "anomaly" => "nebula", "planets" => [], - "stations" => [] + "stations" => [], + "set" => Edition::THUNDERS_EDGE->value ], "expectedWormholes" => [], ]; @@ -67,7 +66,8 @@ public static function jsonData() { "type" => "red", "wormhole" => null, "anomaly" => null, - "planets" => [] + "planets" => [], + "set" => Edition::DISCORDANT_STARS->value ], "expectedWormholes" => [], ]; @@ -93,7 +93,8 @@ public static function jsonData() { "legendary" => false, "specialties" => [] ] - ] + ], + "set" => Edition::DISCORDANT_STARS_PLUS->value ], "expectedWormholes" => [], ]; @@ -114,7 +115,8 @@ public static function jsonData() { "resources" => 1, "influence" => 1, ] - ] + ], + "set" => Edition::THUNDERS_EDGE->value ], "expectedWormholes" => [], ]; @@ -133,7 +135,8 @@ public static function jsonData() { 0, 2 ], - ] + ], + "set" => Edition::PROPHECY_OF_KINGS->value ], "expectedWormholes" => [], ]; @@ -144,7 +147,7 @@ public static function jsonData() { public function itCanBeInitializedFromJsonData(array $jsonData, array $expectedWormholes) { $id = "tile-id"; - $tile = Tile::fromJsonData($id, $jsonData); + $tile = Tile::fromJsonData($id,TileTier::MEDIUM, $jsonData); $this->assertSame($id, $tile->id); $this->assertSame($jsonData['anomaly'], $tile->anomaly); $this->assertSame($jsonData['hyperlanes'] ?? [], $tile->hyperlanes); @@ -166,14 +169,7 @@ public static function anomalies() { #[DataProvider("anomalies")] #[Test] public function itCanCheckForAnomalies(?string $anomaly, bool $expected) { - $tile = new Tile( - "test-with-anomaly", - TileType::BLUE, - [], - [], - [], - $anomaly - ); + $tile = TileFactory::make([], [], $anomaly); $this->assertSame($expected, $tile->hasAnomaly()); } @@ -181,36 +177,30 @@ public function itCanCheckForAnomalies(?string $anomaly, bool $expected) { public static function wormholeTiles() { yield "When tile has wormhole" => [ "lookingFor" => Wormhole::ALPHA, - "has" => [Wormhole::ALPHA], + "hasWormholes" => [Wormhole::ALPHA], "expected" => true ]; yield "When tile has multiple wormholes" => [ "lookingFor" => Wormhole::BETA, - "has" => [Wormhole::ALPHA, Wormhole::BETA], + "hasWormholes" => [Wormhole::ALPHA, Wormhole::BETA], "expected" => true ]; yield "When tile does not have wormhole" => [ "lookingFor" => Wormhole::EPSILON, - "has" => [Wormhole::GAMMA], + "hasWormholes" => [Wormhole::GAMMA], "expected" => false ]; yield "When tile has no wormholes" => [ "lookingFor" => Wormhole::DELTA, - "has" => [], + "hasWormholes" => [], "expected" => false ]; } #[DataProvider('wormholeTiles')] #[Test] - public function itCanCheckForWormholes(Wormhole $lookingFor, array $has, bool $expected) { - $tile = new Tile( - "test", - TileType::BLUE, - [], - [], - $has - ); + public function itCanCheckForWormholes(Wormhole $lookingFor, array $hasWormholes, bool $expected) { + $tile = TileFactory::make([], $hasWormholes); $this->assertSame($expected, $tile->hasWormhole($lookingFor)); } @@ -220,11 +210,11 @@ public function itCanCheckForLegendaryPlanets() { $regularPlanet = new Planet("regular", 1, 1); $legendaryPlanet = new Planet("legendary", 3, 3, "Legend has it..."); - $tileWithLegendary = new Tile("with-legendary", TileType::GREEN, [ + $tileWithLegendary = TileFactory::make([ $regularPlanet, $legendaryPlanet ]); - $tileWithoutLegendary = new Tile("without-legendary", TileType::GREEN, [ + $tileWithoutLegendary = TileFactory::make([ $regularPlanet ]); @@ -235,10 +225,7 @@ public function itCanCheckForLegendaryPlanets() { public static function tiles() { yield "When tile has nothing special" => [ - "tile" => new Tile( - "regular-tile", - TileType::BLUE, - ), + "tile" => TileFactory::make(), "expected" => [ "alpha" => 0, "beta" => 0, @@ -246,13 +233,7 @@ public static function tiles() ] ]; yield "When tile has wormhole" => [ - "tile" => new Tile( - "regular-tile", - TileType::BLUE, - [], - [], - [Wormhole::ALPHA] - ), + "tile" => TileFactory::make([], [Wormhole::ALPHA]), "expected" => [ "alpha" => 1, "beta" => 0, @@ -260,27 +241,17 @@ public static function tiles() ] ]; yield "When tile has multiple wormholes" => [ - "tile" => new Tile( - "regular-tile", - TileType::BLUE, - [], - [], - [Wormhole::ALPHA, Wormhole::BETA] - ), + "tile" => TileFactory::make([], [Wormhole::ALPHA, Wormhole::BETA]), "expected" => [ "alpha" => 1, "beta" => 1, "legendary" => 0 ] ]; - yield "When tile has legendary" => [ - "tile" => new Tile( - "regular-tile", - TileType::BLUE, - [ + yield "When tile has legendary planet" => [ + "tile" => TileFactory::make([ new Planet("test", 0, 0, "yes") - ] - ), + ]), "expected" => [ "alpha" => 0, "beta" => 0, @@ -288,13 +259,8 @@ public static function tiles() ] ]; yield "When tile has wormhole and legendary" => [ - "tile" => new Tile( - "regular-tile", - TileType::BLUE, - [ - new Planet("test", 0, 0, "yes") - ], - [], + "tile" => TileFactory::make( + [new Planet("test", 0, 0, "yes")], [Wormhole::BETA] ), "expected" => [ @@ -323,4 +289,25 @@ public function itCanCountSpecialsForMultipleTiles(Tile $tile, array $expected) $this->assertSame($expected["beta"] * 2, $count["beta"]); $this->assertSame($expected["legendary"] * 2, $count["legendary"]); } + + public static function allJsonTiles(): iterable + { + $tileJsonData = json_decode(file_get_contents('data/tiles.json'), true); + foreach($tileJsonData as $key => $tileData) { + yield "Tile #" . $key => [ + 'key' => $key, + 'tileData' => $tileData + ]; + } + } + + #[Test] + #[DataProvider('allJsonTiles')] + public function tilesCanBeFetchedFromJson($key, $tileData) + { + $tiles = Tile::all(); + $this->assertArrayHasKey($key, $tiles); + // the "toJson" tests should cover the rest, we're just making sure it can fetch all the tiles + } + } \ No newline at end of file diff --git a/app/TwilightImperium/TileTier.php b/app/TwilightImperium/TileTier.php new file mode 100644 index 0000000..0759d56 --- /dev/null +++ b/app/TwilightImperium/TileTier.php @@ -0,0 +1,21 @@ +'; - var_dump($var); - echo ''; +if (!function_exists('d')) { + function d($var) + { + echo '
';
+        var_dump($var);
+        echo '
'; + } } -function dd(...$variables) -{ - echo '
';
-    foreach($variables as $var) {
-        var_dump($var);
+
+if (!function_exists('app')) {
+    function app():\App\Application
+    {
+        return \App\Application::getInstance();
     }
-    die('
'); } -function e($condition, $yes, $no = '') -{ - if ($condition) echo $yes; - else echo $no; +if (!function_exists('dd')) { + function dd(...$variables) + { + echo '
';
+        foreach ($variables as $var) {
+            var_dump($var);
+        }
+        die('
'); + } } -function get($param, $default = null) -{ - if (isset($_POST[$param])) return $_POST[$param]; - if (isset($_GET[$param])) return $_GET[$param]; - return $default; + +if (!function_exists('e')) { + function e($condition, $yes, $no = '') + { + if ($condition) echo $yes; + else echo $no; + } } -function url($uri) -{ - return $_ENV['URL'] . $uri; +if (!function_exists('env')) { + function env($key, $defaultValue = null) + { + return $_ENV[$key] ?? $defaultValue; + } } -function return_error($err) -{ - die(json_encode(['error' => $err])); +if (!function_exists('get')) { + function get($key, $default = null) + { + return $_GET[$key] ?? $default; + } } -function return_data($data) -{ - header('Access-Control-Allow-Origin: *'); - die(json_encode($data)); +if (!function_exists('url')) { + function url($uri) + { + return env('URL', 'https://milty.shenanigans.be/') . $uri; + } } -function ordinal($number) -{ - $ends = array('th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th'); - if ((($number % 100) >= 11) && (($number % 100) <= 13)) - return $number . 'th'; - else - return $number . $ends[$number % 10]; + +if (!function_exists('ordinal')) { + function ordinal($number) + { + $ends = array('th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th'); + if ((($number % 100) >= 11) && (($number % 100) <= 13)) + return $number . 'th'; + else + return $number . $ends[$number % 10]; + } } function abort($code, $message = null) { diff --git a/app/routes.php b/app/routes.php new file mode 100644 index 0000000..866fe53 --- /dev/null +++ b/app/routes.php @@ -0,0 +1,13 @@ + \App\Http\RequestHandlers\HandleViewFormRequest::class, + '/d/{id}' => \App\Http\RequestHandlers\HandleViewDraftRequest::class, + '/api/generate' => \App\Http\RequestHandlers\HandleGenerateDraftRequest::class, + '/api/draft/{id}/regenerate' => \App\Http\RequestHandlers\HandleGenerateDraftRequest::class, + '/api/draft/{id}/pick' => \App\Http\RequestHandlers\HandlePickRequest::class, + '/api/draft/{id}/claim' => \App\Http\RequestHandlers\HandleClaimPlayerRequest::class, + '/api/draft/{id}/restore' => \App\Http\RequestHandlers\HandleRestoreClaimRequest::class, + '/api/draft/{id}/undo' => \App\Http\RequestHandlers\HandleUndoRequest::class, + '/api/data/{id}' => \App\Http\RequestHandlers\HandleGetDraftRequest::class, +]; diff --git a/bootstrap/boot.php b/bootstrap/boot.php index a4f13be..26fe095 100644 --- a/bootstrap/boot.php +++ b/bootstrap/boot.php @@ -5,51 +5,6 @@ } require_once 'vendor/autoload.php'; -require_once 'bootstrap/helpers.php'; - -function app() { - try { - $requestPath = $_SERVER['REQUEST_URI']; - - $requestChunks = explode('?', $requestPath); - - if($requestChunks[0] == '/') { - require_once 'templates/generate.php'; - } else { - $pathChunks = explode('/', substr($requestChunks[0], 1)); - - if(count($pathChunks) == 0) { - throw new Exception("Something went wrong decoding path"); - } - - if($pathChunks[0] == 'd') { - if(!isset($pathChunks[1])) { - abort(404, 'No draft specified'); - } - - define('DRAFT_ID', $pathChunks[1]); - require_once 'templates/draft.php'; - } elseif ($pathChunks[0] == 'api') { - - if(!isset($pathChunks[1])) { - abort(404, 'No API endpoint specified'); - } - - $apiFile = __DIR__ . '/../app/api/' . $pathChunks[1] . '.php'; - - if (file_exists($apiFile)) { - require_once $apiFile; - } else { - abort(404, 'Unknown API endpoint'); - } - } else { - abort(404, 'Unknown path'); - } - } - } catch (Exception $e) { - abort(500, $e->getMessage()); - } -} try { $dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . '/../'); @@ -76,4 +31,4 @@ function app() { die("

STORAGE_PATH does not exist or is not writeable.

"); } } -} +} \ No newline at end of file diff --git a/composer.json b/composer.json index c17c24b..96375fb 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,9 @@ "guzzlehttp/guzzle": "^7.9" }, "autoload": { + "files": [ + "app/helpers.php" + ], "psr-4": { "App\\": "app/" } diff --git a/data/FactionDataTest.php b/data/FactionDataTest.php index 4b0176c..7f05146 100644 --- a/data/FactionDataTest.php +++ b/data/FactionDataTest.php @@ -5,26 +5,43 @@ use App\TwilightImperium\Planet; use App\TwilightImperium\SpaceStation; use App\Testing\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; class FactionDataTest extends TestCase { - protected function getJsonData(): array + protected static function getJsonData(): array { return json_decode(file_get_contents('data/factions.json'), true); } + public static function allJsonFactions(): iterable + { + $data = self::getJsonData(); + foreach($data as $key => $factionData) { + yield 'For Faction ' . $factionData['name'] => [ + 'key' => $key, + 'factionData' => $factionData + ]; + } + } + #[Test] - public function eachFactionHasData() { - $factions = $this->getJsonData(); - - foreach($factions as $faction) { - $this->assertNotEmpty($faction['set']); - // fix data, then enable this - // $this->assertNotEmpty($faction['homesystem']); - $this->assertNotEmpty($faction['name']); - $this->assertNotEmpty($faction['wiki']); + #[DataProvider('allJsonFactions')] + public function eachFactionHasData($key, $factionData) { + $this->assertNotEmpty($factionData['set']); + if ($key != 'The Council Keleres') { + $this->assertNotEmpty($factionData['homesystem']); } + $this->assertNotEmpty($factionData['name']); + $this->assertNotEmpty($factionData['wiki']); + } + + + #[Test] + #[DataProvider('allJsonFactions')] + public function eachFactionHasNameAsKey($key, $factionData) { + $this->assertSame($factionData['name'], $key); } /** @@ -36,7 +53,7 @@ public function eachFactionHasData() { public function allHistoricFactionsHaveData() { $historicFactions = json_decode(file_get_contents('data/historic-test-data/all-factions-ever.json')); - $currentFactions = array_keys($this->getJsonData()); + $currentFactions = array_keys(self::getJsonData()); foreach($historicFactions as $name) { $this->assertContains($name, $currentFactions); diff --git a/data/TileDataTest.php b/data/TileDataTest.php index a822c36..de389a1 100644 --- a/data/TileDataTest.php +++ b/data/TileDataTest.php @@ -5,45 +5,61 @@ use App\TwilightImperium\Planet; use App\TwilightImperium\SpaceStation; use App\Testing\TestCase; +use App\TwilightImperium\Tile; +use App\TwilightImperium\TileTier; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; class TileDataTest extends TestCase { - protected function getJsonData(): array + protected static function getJsonData(): array { return json_decode(file_get_contents('data/tiles.json'), true); } + + public static function allJsonTiles() + { + foreach(self::getJsonData() as $key => $tileData) { + yield "Tile #" . $key => [ + 'id' => $key, + 'data' => $tileData + ]; + } + } + #[Test] - public function allPlanetsInTilesJsonAreValid() { + #[DataProvider('allJsonTiles')] + public function allPlanetsInTilesJsonAreValid($id, $data) { $planetJsonData = []; - foreach($this->getJsonData() as $t) { - if (isset($t['planets'])) { - foreach($t['planets'] as $p) { - $planetJsonData[] = $p; - } + if (isset($data['planets'])) { + foreach($data['planets'] as $p) { + $planetJsonData[] = $p; } } $planets = array_map(fn (array $data) => Planet::fromJsonData($data), $planetJsonData); - $this->assertCount(count($planetJsonData), $planets); + if (empty($planetJsonData)) { + $this->expectNotToPerformAssertions(); + } else { + $this->assertCount(count($planetJsonData), $planets); + } + } #[Test] - public function allSpaceStationsInTilesJsonAreValid() { - $spaceStationData = []; - foreach($this->getJsonData() as $t) { - if (isset($t['stations'])) { - foreach($t['stations'] as $p) { - $spaceStationData[] = $p; - } - } - } + #[DataProvider('allJsonTiles')] + public function allSpaceStationsInTilesJsonAreValid($id, $data) { + $spaceStationData = $data['stations'] ?? []; $spaceStations = array_map(fn (array $data) => SpaceStation::fromJsonData($data), $spaceStationData); - $this->assertCount(count($spaceStationData), $spaceStations); + if (empty($spaceStationData)) { + $this->expectNotToPerformAssertions(); + } else { + $this->assertCount(count($spaceStationData), $spaceStations); + } } /** @@ -52,22 +68,49 @@ public function allSpaceStationsInTilesJsonAreValid() { * @return void */ #[Test] - public function allHistoricTileIdsHaveData() { + public function allHistoricTileIdsHaveData() + { $historicTileIds = json_decode(file_get_contents('data/historic-test-data/all-tiles-ever.json')); - $currentTileIds = array_keys($this->getJsonData()); + $currentTileIds = array_keys(self::getJsonData()); foreach($historicTileIds as $id) { $this->assertContains($id, $currentTileIds); } } + #[Test] + #[DataProvider('allJsonTiles')] + public function allBlueTilesAreInTiers($id, $data) + { + $tileTiers = Tile::tierData(); + + $isMecRexOrMallice = count($data['planets']) > 0 && + ($data['planets'][0]['name'] == "Mecatol Rex" || $data['planets'][0]['name'] == "Mallice"); + + + if ($data['type'] == "blue" && !$isMecRexOrMallice) { + $this->assertArrayHasKey($id, $tileTiers); + } else { + $this->expectNotToPerformAssertions(); + } + } + + #[Test] + #[DataProvider('allJsonTiles')] + public function tilesCanBeFetchedFromJson($id, $data) + { + // we're ignoring the tier for now, that's for TileTest + $tile = Tile::fromJsonData($id,TileTier::MEDIUM, $data); + $this->assertSame($data['anomaly'] ?? null, $tile->anomaly); + } + /** * This is a really useful test, but first the tilenames need to be sorted out **/ // public function allHistoricTileIdsHaveImages() { // $historicTileIds = json_decode(file_get_contents('data/all-tiles-ever.json')); -// $tiles = $this->getJsonData(); +// $tiles = self::getJsonData(); // // foreach($historicTileIds as $id) { // if (!isset($tiles[$id]['faction'])) { diff --git a/data/factions.json b/data/factions.json index a854251..cb4fa36 100644 --- a/data/factions.json +++ b/data/factions.json @@ -178,238 +178,238 @@ "Augurs of Ilyxum": { "id": "ilyxum", "name": "Augurs of Ilyxum", - "homesystem": "0", + "homesystem": "4215", "wiki": "https://twilight-imperium.fandom.com/wiki/Augurs_of_Ilyxum_(UNOFFICIAL)", "set": "discordant" }, "Celdauri Trade Confederation": { "id": "celdauri", "name": "Celdauri Trade Confederation", - "homesystem": "0", + "homesystem": "4218", "wiki": "https://twilight-imperium.fandom.com/wiki/Celdauri_Trade_Confederation_(UNOFFICIAL)", "set": "discordant" }, "Dih-Mohn Flotilla": { "id": "dihmohn", "name": "Dih-Mohn Flotilla", - "homesystem": "0", + "homesystem": "4210", "wiki": "https://twilight-imperium.fandom.com/wiki/Dih-Mohn_Flotilla_(UNOFFICIAL)", "set": "discordant" }, "Florzen Profiteers": { "id": "florzen", "name": "Florzen Profiteers", - "homesystem": "0", + "homesystem": "4217", "wiki": "https://twilight-imperium.fandom.com/wiki/Florzen_Profiteers_(UNOFFICIAL)", "set": "discordant" }, "Free Systems Compact": { "id": "freesystems", "name": "Free Systems Compact", - "homesystem": "0", + "homesystem": "4222", "wiki": "https://twilight-imperium.fandom.com/wiki/Free_Systems_Compact_(UNOFFICIAL)", "set": "discordant" }, "Ghemina Raiders": { "id": "ghemina", "name": "Ghemina Raiders", - "homesystem": "0", + "homesystem": "4212", "wiki": "https://twilight-imperium.fandom.com/wiki/Ghemina_Raiders_(UNOFFICIAL)", "set": "discordant" }, "Glimmer of Mortheus": { "id": "mortheus", "name": "Glimmer of Mortheus", - "homesystem": "0", + "homesystem": "4214", "wiki": "https://twilight-imperium.fandom.com/wiki/Glimmer_of_Mortheus_(UNOFFICIAL)", "set": "discordant" }, "Kollecc Society": { "id": "kollecc", "name": "Kollecc Society", - "homesystem": "0", + "homesystem": "4202", "wiki": "https://twilight-imperium.fandom.com/wiki/Kollecc_Society_(UNOFFICIAL)", "set": "discordant" }, "Kortali Tribunal": { "id": "kortali", "name": "Kortali Tribunal", - "homesystem": "0", + "homesystem": "4220", "wiki": "https://twilight-imperium.fandom.com/wiki/Kortali_Tribunal_(UNOFFICIAL)", "set": "discordant" }, "Li-Zho Dynasty": { "id": "lizho", "name": "Li-Zho Dynasty", - "homesystem": "0", + "homesystem": "4223", "wiki": "https://twilight-imperium.fandom.com/wiki/Li-Zho_Dynasty_(UNOFFICIAL)", "set": "discordant" }, "L'Tokk Khrask": { "id": "khrask", "name": "L'Tokk Khrask", - "homesystem": "0", + "homesystem": "4201", "wiki": "https://twilight-imperium.fandom.com/wiki/L%27tokk_Khrask_(UNOFFICIAL)", "set": "discordant" }, "Mirveda Protectorate": { "id": "mirveda", "name": "Mirveda Protectorate", - "homesystem": "0", + "homesystem": "4219", "wiki": "https://twilight-imperium.fandom.com/wiki/Mirveda_Protectorate_(UNOFFICIAL)", "set": "discordant" }, "Myko-Mentori": { "id": "myko", "name": "Myko-Mentori", - "homesystem": "0", + "homesystem": "4206", "wiki": "https://twilight-imperium.fandom.com/wiki/Myko-Mentori_(UNOFFICIAL)", "set": "discordant" }, "Nivyn Star Kings": { "id": "nivyn", "name": "Nivyn Star Kings", - "homesystem": "0", + "homesystem": "4211", "wiki": "https://twilight-imperium.fandom.com/wiki/Nivyn_Star_Kings_(UNOFFICIAL)", "set": "discordant" }, "Olradin League": { "id": "olradin", "name": "Olradin League", - "homesystem": "0", + "homesystem": "4205", "wiki": "https://twilight-imperium.fandom.com/wiki/Olradin_League_(UNOFFICIAL)", "set": "discordant" }, "Roh'Dhna Mechatronics": { "id": "rohdina", "name": "Roh'Dhna Mechatronics", - "homesystem": "0", + "homesystem": "4208", "wiki": "https://twilight-imperium.fandom.com/wiki/Roh%27Dhna_Mechatronics_(UNOFFICIAL)", "set": "discordant" }, "Savages of Cymiae": { "id": "cymiae", "name": "Savages of Cymiae", - "homesystem": "0", + "homesystem": "4203", "wiki": "https://twilight-imperium.fandom.com/wiki/Savages_of_Cymiae_(UNOFFICIAL)", "set": "discordant" }, "Shipwrights of Axis": { "id": "axis", "name": "Shipwrights of Axis", - "homesystem": "0", + "homesystem": "4204", "wiki": "https://twilight-imperium.fandom.com/wiki/Shipwrights_of_Axis_(UNOFFICIAL)", "set": "discordant" }, "Tnelis Syndicate": { "id": "tnelis", "name": "Tnelis Syndicate", - "homesystem": "0", + "homesystem": "4207", "wiki": "https://twilight-imperium.fandom.com/wiki/Tnelis_Syndicate_(UNOFFICIAL)", "set": "discordant" }, "Vaden Banking Clans": { "id": "vaden", "name": "Vaden Banking Clans", - "homesystem": "0", + "homesystem": "4213", "wiki": "https://twilight-imperium.fandom.com/wiki/Vaden_Banking_Clans_(UNOFFICIAL)", "set": "discordant" }, "Vaylerian Scourge": { "id": "vaylerian", "name": "Vaylerian Scourge", - "homesystem": "0", + "homesystem": "4209", "wiki": "https://twilight-imperium.fandom.com/wiki/Vaylerian_Scourge_(UNOFFICIAL)", "set": "discordant" }, "Veldyr Sovereignty": { "id": "veldyr", "name": "Veldyr Sovereignty", - "homesystem": "0", + "homesystem": "4200", "wiki": "https://twilight-imperium.fandom.com/wiki/Veldyr_Sovereignty_(UNOFFICIAL)", "set": "discordant" }, "Zealots of Rhodun": { "id": "rhodun", "name": "Zealots of Rhodun", - "homesystem": "0", + "homesystem": "4221", "wiki": "https://twilight-imperium.fandom.com/wiki/Zealots_of_Rhodun_(UNOFFICIAL)", "set": "discordant" }, "Zelian Purifier": { "id": "zelian", "name": "Zelian Purifier", - "homesystem": "0", + "homesystem": "4216", "wiki": "https://twilight-imperium.fandom.com/wiki/Zelian_Purifier_(UNOFFICIAL)", "set": "discordant" }, "Bentor Conglomerate": { "id": "bentor", "name": "Bentor Conglomerate", - "homesystem": "0", + "homesystem": "4230", "wiki": "https://twilight-imperium.fandom.com/wiki/Bentor_Conglomerate_(UNOFFICIAL)", "set": "discordantexp" }, "Berserkers of Kjalengard": { "id": "kjalengard", "name": "Berserkers of Kjalengard", - "homesystem": "0", + "homesystem": "4235", "wiki": "https://twilight-imperium.fandom.com/wiki/Berserkers_of_Kjalengard_(UNOFFICIAL)", "set": "discordantexp" }, "Cheiran Hordes": { "id": "cheiran", "name": "Cheiran Hordes", - "homesystem": "0", + "homesystem": "4234", "wiki": "https://twilight-imperium.fandom.com/wiki/Cheiran_Hordes_(UNOFFICIAL)", "set": "discordantexp" }, "Edyn Mandate": { "id": "edyn", "name": "Edyn Mandate", - "homesystem": "0", + "homesystem": "4236", "wiki": "https://twilight-imperium.fandom.com/wiki/Edyn_Mandate_(UNOFFICIAL)", "set": "discordantexp" }, "Ghoti Wayfarers": { "id": "ghoti", "name": "Ghoti Wayfarers", - "homesystem": "0", + "homesystem": "4227", "wiki": "https://twilight-imperium.fandom.com/wiki/Ghoti_Wayfarers_(UNOFFICIAL)", "set": "discordantexp" }, "Gledge Union": { "id": "gledge", "name": "Gledge Union", - "homesystem": "0", + "homesystem": "4228", "wiki": "https://twilight-imperium.fandom.com/wiki/Gledge_Union_(UNOFFICIAL)", "set": "discordantexp" }, "Kyro Sodality": { "id": "kyro", "name": "Kyro Sodality", - "homesystem": "0", + "homesystem": "4229", "wiki": "https://twilight-imperium.fandom.com/wiki/Kyro_Sodality_(UNOFFICIAL)", "set": "discordantexp" }, "Lanefir Remnants": { "id": "lanefir", "name": "Lanefir Remnants", - "homesystem": "0", + "homesystem": "4232", "wiki": "https://twilight-imperium.fandom.com/wiki/Lanefir_Remnants_(UNOFFICIAL)", "set": "discordantexp" }, "The Monks of Kolume": { "id": "kolume", "name": "The Monks of Kolume", - "homesystem": "0", + "homesystem": "4233", "wiki": "https://twilight-imperium.fandom.com/wiki/Monks_of_Kolume_(UNOFFICIAL)", "set": "discordantexp" }, "Nokar Sellships": { "id": "nokar", "name": "Nokar Sellships", - "homesystem": "0", + "homesystem": "4231", "wiki": "https://twilight-imperium.fandom.com/wiki/Nokar_Sellships_(UNOFFICIAL)", "set": "discordantexp" }, diff --git a/data/tile-selection.json b/data/tile-selection.json index 8f19a88..822f9ec 100644 --- a/data/tile-selection.json +++ b/data/tile-selection.json @@ -1,26 +1,22 @@ { - "tiers": { + "BaseGame": { "high": [28, 29, 30, 32, 33, 35, 36, 38], "mid": [26, 27, 31, 34, 37], - "low": [19, 20, 21, 22, 23, 24, 25], - "red": [39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50] + "low": [19, 20, 21, 22, 23, 24, 25] }, - "pokTiers": { + "PoK": { "high": [69, 70, 71, 75 ], "mid": [64, 65, 66, 72, 73, 74, 76], - "low": [59, 60, 61, 62, 63], - "red": [67, 68, 77, 78, 79, 80] + "low": [59, 60, 61, 62, 63] }, - "DSTiers": { + "DSPlus": { "high": [4261, 4262, 4263, 4264, 4266, 4268], "mid": [4253, 4254, 4255, 4256, 4257, 4258, 4259, 4260, 4267], - "low": [4265], - "red": [4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276] + "low": [4265] }, - "TETiers": { + "TE": { "high": [110, 103, 97, 106, 101, 108], "mid": [105, 107, 109, 111, 99, 98], - "low": [104, 102, 100], - "red": [116, 115, 114, 113, 117] + "low": [104, 102, 100] } } diff --git a/data/tiles.json b/data/tiles.json index 8ea112c..6781d98 100644 --- a/data/tiles.json +++ b/data/tiles.json @@ -12,7 +12,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "2": { "type": "green", @@ -27,7 +28,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "3": { "type": "green", @@ -42,7 +44,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "4": { "type": "green", @@ -57,7 +60,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "5": { "type": "green", @@ -72,7 +76,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "6": { "type": "green", @@ -87,7 +92,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "7": { "type": "green", @@ -102,7 +108,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "8": { "type": "green", @@ -117,7 +124,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "9": { "type": "green", @@ -140,7 +148,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "10": { "type": "green", @@ -163,7 +172,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "11": { "type": "green", @@ -186,7 +196,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "12": { "type": "green", @@ -209,7 +220,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "13": { "type": "green", @@ -232,7 +244,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "14": { "type": "green", @@ -255,7 +268,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "15": { "type": "green", @@ -278,7 +292,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "16": { "type": "green", @@ -309,13 +324,15 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "17": { "type": "green", "faction": "The Ghosts of Creuss", "wormhole": "delta", - "planets": [] + "planets": [], + "set": "BaseGame" }, "18": { "type": "blue", @@ -329,7 +346,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "19": { "type": "blue", @@ -345,7 +363,8 @@ "cybernetic" ] } - ] + ], + "set": "BaseGame" }, "20": { "type": "blue", @@ -359,7 +378,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "21": { "type": "blue", @@ -375,7 +395,8 @@ "propulsion" ] } - ] + ], + "set": "BaseGame" }, "22": { "type": "blue", @@ -391,7 +412,8 @@ "biotic" ] } - ] + ], + "set": "BaseGame" }, "23": { "type": "blue", @@ -405,7 +427,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "24": { "type": "blue", @@ -421,7 +444,8 @@ "warfare" ] } - ] + ], + "set": "BaseGame" }, "25": { "type": "blue", @@ -435,7 +459,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "26": { "type": "blue", @@ -449,7 +474,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "27": { "type": "blue", @@ -473,7 +499,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "28": { "type": "blue", @@ -495,7 +522,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "29": { "type": "blue", @@ -517,7 +545,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "30": { "type": "blue", @@ -539,7 +568,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "31": { "type": "blue", @@ -563,7 +593,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "32": { "type": "blue", @@ -585,7 +616,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "33": { "type": "blue", @@ -607,7 +639,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "34": { "type": "blue", @@ -631,7 +664,8 @@ "propulsion" ] } - ] + ], + "set": "BaseGame" }, "35": { "type": "blue", @@ -653,7 +687,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "36": { "type": "blue", @@ -675,7 +710,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "37": { "type": "blue", @@ -699,7 +735,8 @@ "warfare" ] } - ] + ], + "set": "BaseGame" }, "38": { "type": "blue", @@ -721,79 +758,92 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "39": { "type": "red", "wormhole": "alpha", "anomaly": null, - "planets": [] + "planets": [], + "set": "BaseGame" }, "40": { "type": "red", "wormhole": "beta", "anomaly": null, - "planets": [] + "planets": [], + "set": "BaseGame" }, "41": { "type": "red", "wormhole": null, "anomaly": "gravity-rift", - "planets": [] + "planets": [], + "set": "BaseGame" }, "42": { "type": "red", "wormhole": null, "anomaly": "nebula", - "planets": [] + "planets": [], + "set": "BaseGame" }, "43": { "type": "red", "wormhole": null, "anomaly": "supernova", - "planets": [] + "planets": [], + "set": "BaseGame" }, "44": { "type": "red", "wormhole": null, "anomaly": "asteroid-field", - "planets": [] + "planets": [], + "set": "BaseGame" }, "45": { "type": "red", "wormhole": null, "anomaly": "asteroid-field", - "planets": [] + "planets": [], + "set": "BaseGame" }, "46": { "type": "red", "wormhole": null, "anomaly": null, - "planets": [] + "planets": [], + "set": "BaseGame" }, "47": { "type": "red", "wormhole": null, "anomaly": null, - "planets": [] + "planets": [], + "set": "BaseGame" }, "48": { "type": "red", "wormhole": null, "anomaly": null, - "planets": [] + "planets": [], + "set": "BaseGame" }, "49": { "type": "red", "wormhole": null, "anomaly": null, - "planets": [] + "planets": [], + "set": "BaseGame" }, "50": { "type": "red", "wormhole": null, "anomaly": null, - "planets": [] + "planets": [], + "set": "BaseGame" }, "51": { "type": "green", @@ -807,7 +857,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "BaseGame" }, "52": { "type": "green", @@ -822,7 +873,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "53": { "type": "green", @@ -837,7 +889,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "54": { "type": "green", @@ -852,7 +905,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "55": { "type": "green", @@ -867,7 +921,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "56": { "type": "green", @@ -882,7 +937,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "57": { "type": "green", @@ -905,7 +961,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "58": { "type": "green", @@ -936,7 +993,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "59": { "type": "blue", @@ -952,7 +1010,8 @@ "propulsion" ] } - ] + ], + "set": "PoK" }, "60": { "type": "blue", @@ -966,7 +1025,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "61": { "type": "blue", @@ -982,7 +1042,8 @@ "warfare" ] } - ] + ], + "set": "PoK" }, "62": { "type": "blue", @@ -998,7 +1059,8 @@ "cybernetic" ] } - ] + ], + "set": "PoK" }, "63": { "type": "blue", @@ -1014,7 +1076,8 @@ "biotic" ] } - ] + ], + "set": "PoK" }, "64": { "type": "blue", @@ -1028,7 +1091,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "65": { "type": "blue", @@ -1042,7 +1106,8 @@ "legendary": "You may exhaust this card at the end of your turn to place up to 2 infantry from your reinforcements on any planet you control", "specialties": [] } - ] + ], + "set": "PoK" }, "66": { "type": "blue", @@ -1056,7 +1121,8 @@ "legendary": "You may exhaust this card at the end of your turn to place 1 mech from your reinforcements on any planet you control, or draw 1 action card", "specialties": [] } - ] + ], + "set": "PoK" }, "67": { "type": "red", @@ -1071,7 +1137,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "68": { "type": "red", @@ -1086,7 +1153,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "69": { "type": "blue", @@ -1108,7 +1176,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "70": { "type": "blue", @@ -1130,7 +1199,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "71": { "type": "blue", @@ -1152,7 +1222,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "72": { "type": "blue", @@ -1176,7 +1247,8 @@ "warfare" ] } - ] + ], + "set": "PoK" }, "73": { "type": "blue", @@ -1200,7 +1272,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "74": { "type": "blue", @@ -1224,7 +1297,8 @@ "propulsion" ] } - ] + ], + "set": "PoK" }, "75": { "type": "blue", @@ -1254,7 +1328,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "PoK" }, "76": { "type": "blue", @@ -1286,37 +1361,43 @@ "biotic" ] } - ] + ], + "set": "PoK" }, "77": { "type": "red", "wormhole": null, "anomaly": null, - "planets": [] + "planets": [], + "set": "PoK" }, "78": { "type": "red", "wormhole": null, "anomaly": null, - "planets": [] + "planets": [], + "set": "PoK" }, "79": { "type": "red", "wormhole": "alpha", "anomaly": "asteroid-field", - "planets": [] + "planets": [], + "set": "PoK" }, "80": { "type": "red", "wormhole": null, "anomaly": "supernova", - "planets": [] + "planets": [], + "set": "PoK" }, "81": { "type": "red", "wormhole": null, "anomaly": "muaat-supernova", - "planets": [] + "planets": [], + "set": "PoK" }, "82": { "type": "blue", @@ -1330,7 +1411,8 @@ "legendary": "You may exhaust this card at the end of your turn to gain 2 trade goods or convert all of your commodities into trade goods", "specialties": [] } - ] + ], + "set": "PoK" }, "83A": { "type": "hyperlane", @@ -1341,7 +1423,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "83B": { "type": "hyperlane", @@ -1360,7 +1443,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "84A": { "type": "hyperlane", @@ -1371,7 +1455,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "84B": { "type": "hyperlane", @@ -1390,7 +1475,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "85A": { "type": "hyperlane", @@ -1401,7 +1487,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "85B": { "type": "hyperlane", @@ -1420,7 +1507,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "86A": { "type": "hyperlane", @@ -1431,7 +1519,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "86B": { "type": "hyperlane", @@ -1450,7 +1539,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "87A": { "type": "hyperlane", @@ -1469,7 +1559,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "87B": { "type": "hyperlane", @@ -1484,7 +1575,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "88A": { "type": "hyperlane", @@ -1503,7 +1595,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "88B": { "type": "hyperlane", @@ -1522,7 +1615,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "89A": { "type": "hyperlane", @@ -1541,7 +1635,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "89B": { "type": "hyperlane", @@ -1556,7 +1651,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "90A": { "type": "hyperlane", @@ -1571,7 +1667,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "90B": { "type": "hyperlane", @@ -1586,7 +1683,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "91A": { "type": "hyperlane", @@ -1605,7 +1703,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "91B": { "type": "hyperlane", @@ -1620,7 +1719,8 @@ ] ], "wormhole": null, - "planets": [] + "planets": [], + "set": "PoK" }, "92": { "type": "green", @@ -1643,7 +1743,8 @@ "resources": 1, "influence": 2 } - ] + ], + "set": "TE" }, "93": { "type": "green", @@ -1666,13 +1767,15 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "94": { "type": "green", "faction": "The Crimson Rebellion", "wormhole": "epsilon", - "planets": [] + "planets": [], + "set": "TE" }, "95": { "type": "green", @@ -1687,7 +1790,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "96a": { "type": "green", @@ -1710,7 +1814,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "96b": { "type": "green", @@ -1733,7 +1838,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "97": { "type": "blue", @@ -1749,7 +1855,8 @@ "biotic" ] } - ] + ], + "set": "TE" }, "98": { "type": "blue", @@ -1763,7 +1870,8 @@ "legendary": "You may exhaust this card when you pass to place 1 action card from the discard pile faceup on this card; you can purge cards on this card to play them as if they were in your hand.", "specialties": [] } - ] + ], + "set": "TE" }, "99": { "type": "blue", @@ -1777,7 +1885,8 @@ "legendary": "You may exhaust this card at the end of your turn to ready another component that isn't a strategy card.", "specialties": [] } - ] + ], + "set": "TE" }, "100": { "type": "blue", @@ -1793,7 +1902,8 @@ "propulsion" ] } - ] + ], + "set": "TE" }, "101": { "type": "blue", @@ -1813,7 +1923,8 @@ "warfare" ] } - ] + ], + "set": "TE" }, "102": { "type": "blue", @@ -1829,7 +1940,8 @@ "propulsion" ] } - ] + ], + "set": "TE" }, "103": { "type": "blue", @@ -1846,7 +1958,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "104": { "type": "blue", @@ -1863,7 +1976,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "105": { "type": "blue", @@ -1892,7 +2006,8 @@ "biotic" ] } - ] + ], + "set": "TE" }, "106": { "type": "blue", @@ -1914,7 +2029,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "107": { "type": "blue", @@ -1939,7 +2055,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "108": { "type": "blue", @@ -1961,7 +2078,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "109": { "type": "blue", @@ -1982,7 +2100,8 @@ "resources": 1, "influence": 1 } - ] + ], + "set": "TE" }, "110": { "type": "blue", @@ -2012,7 +2131,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "111": { "type": "blue", @@ -2036,7 +2156,8 @@ "resources": 1, "influence": 1 } - ] + ], + "set": "TE" }, "112": { "type": "blue", @@ -2051,19 +2172,22 @@ "legendary": "You may exhaust this card and discard 1 secret objective at the end of your turn to draw 1 secret objective.", "specialties": [] } - ] + ], + "set": "TE" }, "113": { "type": "red", "wormhole": "beta", "anomaly": "gravity rift", - "planets": [] + "planets": [], + "set": "TE" }, "114": { "type": "red", "wormhole": null, "anomaly": "entropic scar", - "planets": [] + "planets": [], + "set": "TE" }, "115": { "type": "red", @@ -2080,7 +2204,8 @@ "warfare" ] } - ] + ], + "set": "TE" }, "116": { "type": "red", @@ -2095,7 +2220,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "117": { "type": "red", @@ -2107,7 +2233,8 @@ "resources": 1, "influence": 1 } - ] + ], + "set": "TE" }, "118": { "type": "green", @@ -2121,11 +2248,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "TE" }, "4200": { "type": "green", - "faction": "The Veldyr Conglomerate", + "faction": "Veldyr Sovereignty", "wormhole": null, "planets": [ { @@ -2136,11 +2264,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4222": { "type": "green", - "faction": "The Free Systems Compact", + "faction": "Free Systems Compact", "wormhole": null, "planets": [ { @@ -2167,11 +2296,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4223": { "type": "green", - "faction": "The Li-Zho Dynasty", + "faction": "Li-Zho Dynasty", "wormhole": null, "planets": [ { @@ -2198,11 +2328,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4201": { "type": "green", - "faction": "The L'Tokk Khrask", + "faction": "L'Tokk Khrask", "wormhole": null, "planets": [ { @@ -2213,11 +2344,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4212": { "type": "green", - "faction": "The Ghemina Raiders", + "faction": "Ghemina Raiders", "wormhole": null, "planets": [ { @@ -2236,11 +2368,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4213": { "type": "green", - "faction": "The Vaden Banking Clans", + "faction": "Vaden Banking Clans", "wormhole": null, "planets": [ { @@ -2259,11 +2392,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4214": { "type": "green", - "faction": "The Glimmer of Mortheus", + "faction": "Glimmer of Mortheus", "wormhole": null, "planets": [ { @@ -2283,11 +2417,12 @@ "anomaly": "nebula", "specialties": [] } - ] + ], + "set": "DS" }, "4215": { "type": "green", - "faction": "The Augurs of Ilyxum", + "faction": "Augurs of Ilyxum", "wormhole": null, "planets": [ { @@ -2306,11 +2441,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4204": { "type": "green", - "faction": "The Shipwrights of Axis", + "faction": "Shipwrights of Axis", "wormhole": null, "planets": [ { @@ -2321,11 +2457,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4205": { "type": "green", - "faction": "The Olradin League", + "faction": "Olradin League", "wormhole": null, "planets": [ { @@ -2336,11 +2473,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4206": { "type": "green", - "faction": "The Myko-Mentori", + "faction": "Myko-Mentori", "wormhole": null, "planets": [ { @@ -2351,11 +2489,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4207": { "type": "green", - "faction": "The Tnelis Syndicate", + "faction": "Tnelis Syndicate", "wormhole": null, "planets": [ { @@ -2366,11 +2505,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4203": { "type": "green", - "faction": "The Savages of Cymiae", + "faction": "Savages of Cymiae", "wormhole": null, "planets": [ { @@ -2381,7 +2521,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4208": { "type": "green", @@ -2396,11 +2537,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4216": { "type": "green", - "faction": "The Zelian Purifier", + "faction": "Zelian Purifier", "wormhole": null, "planets": [ { @@ -2420,11 +2562,12 @@ "anomaly": "asteroid-field", "specialties": [] } - ] + ], + "set": "DS" }, "4209": { "type": "green", - "faction": "The Vaylerian Scourge", + "faction": "Vaylerian Scourge", "wormhole": null, "planets": [ { @@ -2435,11 +2578,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4217": { "type": "green", - "faction": "The Florzen Profiteers", + "faction": "Florzen Profiteers", "wormhole": null, "planets": [ { @@ -2458,11 +2602,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4210": { "type": "green", - "faction": "The Dih-Mohn Flotilla", + "faction": "Dih-Mohn Flotilla", "wormhole": null, "planets": [ { @@ -2473,11 +2618,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4218": { "type": "green", - "faction": "The Celdauri Trade Confederation", + "faction": "Celdauri Trade Confederation", "wormhole": null, "planets": [ { @@ -2496,11 +2642,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4211": { "type": "green", - "faction": "The Nivyn Star Kings", + "faction": "Nivyn Star Kings", "wormhole": null, "planets": [ { @@ -2512,11 +2659,12 @@ "anomaly": "gravity-rift", "specialties": [] } - ] + ], + "set": "DS" }, "4219": { "type": "green", - "faction": "The Mirveda Protectorate", + "faction": "Mirveda Protectorate", "wormhole": null, "planets": [ { @@ -2535,11 +2683,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4220": { "type": "green", - "faction": "The Kortali Tribunal", + "faction": "Kortali Tribunal", "wormhole": null, "planets": [ { @@ -2558,11 +2707,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4202": { "type": "green", - "faction": "The Kollecc Society", + "faction": "Kollecc Society", "wormhole": null, "planets": [ { @@ -2573,11 +2723,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4221": { "type": "green", - "faction": "The Zealots of Rhodun", + "faction": "Zealots of Rhodun", "wormhole": null, "planets": [ { @@ -2596,23 +2747,26 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DS" }, "4224": { "type": "red", "wormhole": null, "anomaly": "zelian-asteroid-field", - "planets": [] + "planets": [], + "set": "DS" }, "4225": { "type": "red", "wormhole": null, "anomaly": "myko-cataclysm", - "planets": [] + "planets": [], + "set": "DS" }, "4230": { "type": "green", - "faction": "The Bentor Conglomerate", + "faction": "Bentor Conglomerate", "wormhole": null, "planets": [ { @@ -2631,11 +2785,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4231": { "type": "green", - "faction": "The Nokar Sellships", + "faction": "Nokar Sellships", "wormhole": null, "planets": [ { @@ -2654,11 +2809,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4228": { "type": "green", - "faction": "The Gledge Union", + "faction": "Gledge Union", "wormhole": null, "planets": [ { @@ -2669,11 +2825,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4232": { "type": "green", - "faction": "The Lanefir Remnants", + "faction": "Lanefir Remnants", "wormhole": null, "planets": [ { @@ -2692,11 +2849,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4229": { "type": "green", - "faction": "The Kyro Sodality", + "faction": "Kyro Sodality", "wormhole": null, "planets": [ { @@ -2707,13 +2865,15 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4227": { "type": "green", - "faction": "The Ghoti Wayfarers", + "faction": "Ghoti Wayfarers", "wormhole": null, - "planets": [] + "planets": [], + "set": "DSPlus" }, "4233": { "type": "green", @@ -2736,11 +2896,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4234": { "type": "green", - "faction": "The Cheiran Hordes", + "faction": "Cheiran Hordes", "wormhole": null, "planets": [ { @@ -2759,11 +2920,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4236": { "type": "green", - "faction": "The Edyn Mandate", + "faction": "Edyn Mandate", "wormhole": null, "planets": [ { @@ -2790,11 +2952,12 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4235": { "type": "green", - "faction": "The Berserkers of Kjalengard", + "faction": "Berserkers of Kjalengard", "wormhole": null, "planets": [ { @@ -2813,7 +2976,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4253": { "type": "blue", @@ -2827,7 +2991,8 @@ "legendary": "You may exhaust this card at the end of your turn to place 1 cruiser from your reinforcements in any system that contains 1 or more of your ships.", "specialties": [] } - ] + ], + "set": "DSPlus" }, "4254": { "type": "blue", @@ -2841,7 +3006,8 @@ "legendary": "You may exhaust this card at the end of your turn to place 1 frontier token in a system that does not contain a planet.", "specialties": [] } - ] + ], + "set": "DSPlus" }, "4255": { "type": "blue", @@ -2855,7 +3021,8 @@ "legendary": "After an agenda is revealed, you may exhaust this card to predict aloud an outcome of that agenda. If your prediction is correct, draw 1 secret objective.", "specialties": [] } - ] + ], + "set": "DSPlus" }, "4256": { "type": "blue", @@ -2869,7 +3036,8 @@ "legendary": "You may exhaust this card at the end of your turn and purge a non-faction, non-unit upgrade technology you own to gain 1 technology with the same number of prerequisites.", "specialties": [] } - ] + ], + "set": "DSPlus" }, "4257": { "type": "blue", @@ -2883,7 +3051,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4258": { "type": "blue", @@ -2897,7 +3066,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4259": { "type": "blue", @@ -2911,7 +3081,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4260": { "type": "blue", @@ -2925,7 +3096,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4261": { "type": "blue", @@ -2949,7 +3121,8 @@ "cybernetic" ] } - ] + ], + "set": "DSPlus" }, "4262": { "type": "blue", @@ -2973,7 +3146,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4263": { "type": "blue", @@ -2999,7 +3173,8 @@ "biotic" ] } - ] + ], + "set": "DSPlus" }, "4264": { "type": "blue", @@ -3021,7 +3196,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4265": { "type": "blue", @@ -3043,7 +3219,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4266": { "type": "blue", @@ -3065,7 +3242,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4267": { "type": "blue", @@ -3095,7 +3273,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4268": { "type": "blue", @@ -3125,7 +3304,8 @@ "legendary": false, "specialties": [] } - ] + ], + "set": "DSPlus" }, "4269": { "type": "red", @@ -3140,46 +3320,54 @@ "legendary": "You may exhaust this card at the end of your turn to remove 1 of your ships from the game board and place that unit in an adjacent system that does not contain another player\u2019s ships.", "specialties": [] } - ] + ], + "set": "DSPlus" }, "4270": { "type": "red", "wormhole": null, - "planets": [] + "planets": [], + "set": "DSPlus" }, "4271": { "type": "red", "wormhole": null, - "planets": [] + "planets": [], + "set": "DSPlus" }, "4272": { "type": "red", "wormhole": "beta", "anomaly": "nebula", - "planets": [] + "planets": [], + "set": "DSPlus" }, "4273": { "type": "red", "wormhole": null, "anomaly": "asteroid-nebula", - "planets": [] + "planets": [], + "set": "DSPlus" }, "4274": { "type": "red", "wormhole": null, "anomaly": "asteroid-rift", - "planets": [] + "planets": [], + "set": "DSPlus" }, "4275": { "type": "red", "wormhole": "gamma", "anomaly": "gravity rift", - "planets": [] + "planets": [], + "set": "DSPlus" }, "4276": { "type": "red", "wormhole": "alpha-beta", "anomaly": "supernova", - "planets": [] + "planets": [], + "set": "DSPlus" } } diff --git a/deploy/app/caddy/Caddyfile b/deploy/app/caddy/Caddyfile index 087b64b..c971d03 100644 --- a/deploy/app/caddy/Caddyfile +++ b/deploy/app/caddy/Caddyfile @@ -1,28 +1,37 @@ -:80 { +(common_config) { + root /app/public log { output stdout } header { - X-Frame-Options DENY - Referrer-Policy no-referrer-when-downgrade - Access-Control-Allow-Origin * - } + X-Frame-Options DENY + Referrer-Policy no-referrer-when-downgrade + Access-Control-Allow-Origin * + } @options method OPTIONS respond @options 204 @svg { - file - path *.svg - } + file + path *.svg + } header @svg Content-Security-Policy "script-src 'none'" - php_fastcgi localhost:9000 # Adjust to your setup + php_fastcgi localhost:9000 file_server encode zstd gzip root * /code tls internal -} \ No newline at end of file +} + +:80 { + import common_config +} +milty.localhost { + tls internal + import common_config +} diff --git a/docker-compose.yml b/docker-compose.yml index 5aa83c5..44bf133 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,13 +7,10 @@ services: restart: unless-stopped tty: true working_dir: /code - networks: - - backend ports: - - "${DOCKER_HTTP_PORT:-80}:80" + - "80:80" + - "443:443" volumes: - ./:/code:delegated - ./deploy/app/php/php.ini:/usr/local/etc/php/conf.d/php.ini -networks: - backend: - driver: bridge \ No newline at end of file + - ./deploy/app/Caddy/Caddyfile:/etc/caddy/Caddyfile \ No newline at end of file diff --git a/index.php b/index.php index 4fd3054..116fb9d 100644 --- a/index.php +++ b/index.php @@ -1,3 +1,5 @@ run(); +?> \ No newline at end of file diff --git a/phpunit.xml b/phpunit.xml index 3a7d9a2..1a6addd 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -29,5 +29,6 @@ + diff --git a/templates/generate.php b/templates/generate.php index 665edd6..72c24d8 100644 --- a/templates/generate.php +++ b/templates/generate.php @@ -6,7 +6,7 @@ TI4 - Milty Draft - + @@ -456,8 +456,8 @@ } - - + + From 4ac087052c41ae43ec5f32e9ddf3b83d051dc08e Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Tue, 23 Dec 2025 13:49:19 +0100 Subject: [PATCH 20/34] Start replacing the application logic with the refactored version --- app/Application.php | 1 + app/{Draft.php => DeprecatedDraft.php} | 2 +- app/Draft/Draft.php | 54 ++- app/Draft/DraftTest.php | 30 +- app/Draft/Generators/DraftGenerator.php | 106 ++++++ app/Draft/Generators/DraftGeneratorTest.php | 93 +++++ app/Draft/Player.php | 16 +- app/Draft/Repository/DraftRepository.php | 1 + app/Draft/Repository/FakeDraftRepository.php | 11 + app/Draft/Repository/LocalDraftRepository.php | 7 +- .../Repository/LocalDraftRepositoryTest.php | 59 +++ app/Draft/Repository/S3DraftRepository.php | 25 +- .../Repository/S3DraftRepositoryTest.php | 23 ++ app/Draft/Secrets.php | 9 +- app/Draft/Settings.php | 94 ++++- app/Draft/Slice.php | 1 + app/Http/ErrorResponse.php | 21 ++ app/Http/ErrorResponseTest.php | 2 +- app/Http/HtmlResponse.php | 5 + app/Http/HttpRequest.php | 2 +- app/Http/HttpRequestTest.php | 4 +- app/Http/HttpResponse.php | 2 + app/Http/JsonResponse.php | 5 + app/Http/JsonResponseTest.php | 2 +- app/Http/RequestHandler.php | 5 + .../HandleGenerateDraftRequest.php | 14 +- .../RequestHandlers/HandleGetDraftRequest.php | 15 +- .../HandleViewDraftRequest.php | 12 +- .../HandleViewDraftRequestTest.php | 50 +++ app/Testing/TestDrafts.php | 7 + app/TwilightImperium/Edition.php | 11 + app/TwilightImperium/Faction.php | 15 +- app/TwilightImperium/Tile.php | 2 +- app/TwilightImperium/Wormhole.php | 10 + app/api/claim.php | 2 +- app/api/data.php | 2 +- app/api/generate.php | 6 +- app/api/pick.php | 2 +- app/api/restore.php | 2 +- app/api/undo.php | 2 +- app/helpers.php | 38 +- app/routes.php | 4 +- js/draft.js | 2 +- js/main.js | 1 + phpunit.xml | 2 + templates/draft.php | 344 ++++++++---------- templates/error.php | 55 +++ 47 files changed, 902 insertions(+), 276 deletions(-) rename app/{Draft.php => DeprecatedDraft.php} (99%) create mode 100644 app/Draft/Generators/DraftGenerator.php create mode 100644 app/Draft/Generators/DraftGeneratorTest.php create mode 100644 app/Draft/Repository/FakeDraftRepository.php create mode 100644 app/Draft/Repository/LocalDraftRepositoryTest.php create mode 100644 app/Draft/Repository/S3DraftRepositoryTest.php create mode 100644 app/Http/RequestHandlers/HandleViewDraftRequestTest.php create mode 100644 templates/error.php diff --git a/app/Application.php b/app/Application.php index 65c1c80..fa3265e 100644 --- a/app/Application.php +++ b/app/Application.php @@ -34,6 +34,7 @@ public function run() $response = $this->handleIncomingRequest(); http_response_code($response->code); + header('Content-type: ' . $response->getContentType()); echo $response->getBody(); exit; diff --git a/app/Draft.php b/app/DeprecatedDraft.php similarity index 99% rename from app/Draft.php rename to app/DeprecatedDraft.php index 0846b73..5ab76df 100644 --- a/app/Draft.php +++ b/app/DeprecatedDraft.php @@ -7,7 +7,7 @@ /** * @deprecated */ -class Draft implements \JsonSerializable +class DeprecatedDraft implements \JsonSerializable { private const SEED_OFFSET_PLAYER_ORDER = 2; diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php index 4e93292..325b83b 100644 --- a/app/Draft/Draft.php +++ b/app/Draft/Draft.php @@ -4,6 +4,8 @@ use App\Draft\Generators\FactionPoolGenerator; use App\Draft\Generators\SlicePoolGenerator; +use App\TwilightImperium\Faction; +use App\TwilightImperium\Tile; class Draft { @@ -14,9 +16,9 @@ public function __construct( public array $players, public Settings $settings, public Secrets $secrets, - /** @var array $slices */ - public array $slices, - /** @var array $factionPool */ + /** @var array $slicePool */ + public array $slicePool, + /** @var array $factionPool */ public array $factionPool, /** @var array $log */ public array $log = [], @@ -41,13 +43,40 @@ public static function fromJson($data) $players, Settings::fromJson($data['config']), Secrets::fromJson($data['secrets']), - [], - $data['factions'], + self::slicesFromJson($data['slices']), + self::factionsFromJson($data['factions']), array_map(fn ($logData) => Pick::fromJson($logData), $data['draft']['log']), PlayerId::fromString($data['draft']['current']) ); } + /** + * @return array + */ + private static function slicesFromJson($slicesData): array + { + $allTiles = Tile::all(); + return array_map(function (array $sliceData) use ($allTiles) { + $tiles = array_map( + fn (string|int $tileId) => $allTiles[$tileId], + $sliceData['tiles'] + ); + return new Slice($tiles); + }, $slicesData); + } + + + /** + * @return array + */ + private static function factionsFromJson($factionNames): array + { + $allFactions = Faction::all(); + return array_map(function (string $name) use ($allFactions) { + return $allFactions[$name]; + }, $factionNames); + } + public function toFileContent(): string { return json_encode($this->toArray(true)); @@ -64,7 +93,8 @@ public function toArray($includeSecrets = false): array 'log' => array_map(fn (Pick $pick) => $pick->toArray(), $this->log), 'current' => $this->currentPlayerId->value ], - 'factions' => $this->factionPool + 'factions' => array_map(fn (Faction $f) => $f->name, $this->factionPool), + 'slices' => array_map(fn (Slice $s) => ['tiles' => $s->tileIds()], $this->slicePool), ]; if ($includeSecrets) { @@ -94,5 +124,17 @@ public static function createFromSettings(Settings $settings) ); } + public function determineCurrentPlayer(): PlayerId + { + $doneSteps = count($this->log); + $snakeDraft = array_merge(array_keys($this->players), array_keys(array_reverse($this->players))); + return PlayerId::fromString($snakeDraft[$doneSteps % count($snakeDraft)]); + } + + public function canRegenerate(): bool + { + return empty($this->log); + } + } \ No newline at end of file diff --git a/app/Draft/DraftTest.php b/app/Draft/DraftTest.php index b84fa99..4911511 100644 --- a/app/Draft/DraftTest.php +++ b/app/Draft/DraftTest.php @@ -5,6 +5,8 @@ use App\Testing\Factories\DraftSettingsFactory; use App\Testing\TestCase; use App\Testing\TestDrafts; +use App\TwilightImperium\Faction; +use App\TwilightImperium\Tile; use PHPUnit\Framework\Attributes\DataProviderExternal; use PHPUnit\Framework\Attributes\Test; @@ -24,8 +26,11 @@ public function ìtCanBeInitialisedFromJson($data) $this->assertSame($data['config']['name'], (string) $draft->settings->name); $this->assertSame($draft->id, $data['id']); $this->assertSame($draft->isDone, $data['done']); + + $factionPoolNames = array_map(fn (Faction $f) => $f->name, $draft->factionPool); + foreach($data['factions'] as $faction) { - $this->assertContains($faction, $draft->factionPool); + $this->assertContains($faction, $factionPoolNames); } $this->assertSame($draft->currentPlayerId->value, $data['draft']['current']); } @@ -33,6 +38,8 @@ public function ìtCanBeInitialisedFromJson($data) #[Test] public function itCanBeConvertedToArray() { + $factions = Faction::all(); + $tiles = Tile::all(); $player = new Player( PlayerId::fromString("player_123"), "Alice" @@ -45,11 +52,19 @@ public function itCanBeConvertedToArray() new Secrets( 'secret123', ), - [], [ - "Mahact", - "Vulraith", - "Xxcha" + new Slice([ + $tiles["64"], + $tiles["33"], + $tiles["42"], + $tiles["67"], + $tiles["59"], + ]), + ], + [ + $factions['The Barony of Letnev'], + $factions['The Embers of Muaat'], + $factions['The Clan of Saar'] ], [new Pick($player->id, PickCategory::FACTION, "Vulraith")], $player->id @@ -64,7 +79,10 @@ public function itCanBeConvertedToArray() $this->assertSame($player->id->value, $data['draft']['current']); $this->assertSame("Vulraith", $data['draft']['log'][0]['value']); foreach($draft->factionPool as $faction) { - $this->assertContains($faction, $data['factions']); + $this->assertContains($faction->name, $data['factions']); + } + foreach($draft->slicePool as $slice) { + $this->assertContains($slice->tileIds(), $data['slices']); } } } \ No newline at end of file diff --git a/app/Draft/Generators/DraftGenerator.php b/app/Draft/Generators/DraftGenerator.php new file mode 100644 index 0000000..1523dfd --- /dev/null +++ b/app/Draft/Generators/DraftGenerator.php @@ -0,0 +1,106 @@ +slicePoolGenerator = new SlicePoolGenerator($this->settings); + $this->factionPoolGenerator = new FactionPoolGenerator($this->settings); + } + + public function generate(): Draft + { + $players = $this->generatePlayerData(); + + return new Draft( + DraftId::generate(), + false, + $players, + $this->settings, + $this->generateSecrets(), + $this->slicePoolGenerator->generate(), + $this->factionPoolGenerator->generate(), + [], + PlayerId::fromString(array_key_first($players)) + ); + } + + protected function generateSecrets(): Secrets + { + return new Secrets(Secrets::generatePassword()); + } + + + + /** + * @return array + */ + protected function generateTeamNames(): array + { + return array_slice(['A', 'B', 'C', 'D'], 0, count($this->playerNames) / 2); + } + + /** + * @return array + */ + public function generatePlayerData(): array + { + $players = []; + foreach ($this->settings->playerNames as $name) { + $p = Player::create($name); + $players[$p->id->value] = $p; + } + + if ($this->settings->allianceMode) { + $teamNames = $this->generateTeamNames(); + + if ($this->settings->allianceTeamMode == AllianceTeamMode::RANDOM) { + shuffle($players); + } + + for ($i = 0; $i < count($players); $i+=2) { + $teamName = $teamNames[$i/2]; + + $players[] = $players[$i]->putInTeam($teamName); + $players[] = $players[$i + 1]->putInTeam($teamName); + } + + } + + if (!$this->settings->presetDraftOrder) { + shuffle($players); + } + + return $players; + } + + /** + * @return array + */ + protected function generateTeamPlayerData(): array + { + $teams = $this->generateTeamNames(); + + $players = []; + foreach ($this->settings->playerNames as $name) { + $p = Player::create($name); + $players[$p->id->value] = $p; + } + return $players; + } +} \ No newline at end of file diff --git a/app/Draft/Generators/DraftGeneratorTest.php b/app/Draft/Generators/DraftGeneratorTest.php new file mode 100644 index 0000000..495cfbc --- /dev/null +++ b/app/Draft/Generators/DraftGeneratorTest.php @@ -0,0 +1,93 @@ + 4, + ]); + $generator = new DraftGenerator($settings); + + $draft = $generator->generate(); + + $this->assertNotEmpty($draft->slicePool); + $this->assertNotEmpty($draft->factionPool); + $this->assertNotNull($draft->currentPlayerId); + + unset($generator); + } + + #[Test] + public function itCanGeneratePlayerData() + { + $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David']; + $settings = DraftSettingsFactory::make([ + 'playerNames' => $originalPlayerNames, + ]); + $generator = new DraftGenerator($settings); + + $draft = $generator->generate(); + + $playerIds = []; + $playerNames = []; + foreach($draft->players as $player) { + $playerIds[] = $player->id->value; + $playerNames[] = $player->name; + $this->assertFalse($player->claimed); + $this->assertNull($player->pickedFaction); + $this->assertNull($player->pickedSlice); + $this->assertNull($player->pickedPosition); + } + + $this->assertCount(count($originalPlayerNames), array_unique($playerIds)); + $this->assertCount(count($originalPlayerNames), array_unique($playerNames)); + + unset($generator); + } + + #[Test] + public function itCanGeneratePlayerDataInPresetOrder() + { + $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David']; + $settings = DraftSettingsFactory::make([ + 'playerNames' => $originalPlayerNames, + 'presetDraftOrder' => true + ]); + $generator = new DraftGenerator($settings); + + $draft = $generator->generate(); + + $playerNames = []; + foreach($draft->players as $player) { + $playerNames[] = $player->name; + } + + $this->assertSame($originalPlayerNames, $playerNames); + unset($generator); + } + + #[Test] + public function itCanGeneratePlayerDataForAlliances() + { + $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David', 'Ellis', '']; + $settings = DraftSettingsFactory::make([ + 'playerNames' => $originalPlayerNames, + 'allianceMode' => true, + 'allianceTeamMode' => AllianceTeamMode::PRESET, + ]); + + + + } + +} \ No newline at end of file diff --git a/app/Draft/Player.php b/app/Draft/Player.php index cc727c7..fea934b 100644 --- a/app/Draft/Player.php +++ b/app/Draft/Player.php @@ -31,7 +31,7 @@ public static function fromJson($playerData): self ); } - public static function create(string $name, ?string $team = null) + public static function create(string $name) { return new self( PlayerId::generate(), @@ -39,7 +39,19 @@ public static function create(string $name, ?string $team = null) false, null, null, - null, + null + ); + } + + public function putInTeam(string $team): Player + { + return new self( + $this->id, + $this->name, + $this->claimed, + $this->pickedPosition, + $this->pickedFaction, + $this->pickedSlice, $team ); } diff --git a/app/Draft/Repository/DraftRepository.php b/app/Draft/Repository/DraftRepository.php index cfaa42c..f4abf20 100644 --- a/app/Draft/Repository/DraftRepository.php +++ b/app/Draft/Repository/DraftRepository.php @@ -8,4 +8,5 @@ interface DraftRepository { public function load(string $id): Draft; public function save(Draft $draft); + public function delete(string $id); } \ No newline at end of file diff --git a/app/Draft/Repository/FakeDraftRepository.php b/app/Draft/Repository/FakeDraftRepository.php new file mode 100644 index 0000000..40ef601 --- /dev/null +++ b/app/Draft/Repository/FakeDraftRepository.php @@ -0,0 +1,11 @@ +pathToDraft($draft->id), $draft->toFileContent()); } + + public function delete(string $id) + { + unlink($this->pathToDraft($id)); + } } \ No newline at end of file diff --git a/app/Draft/Repository/LocalDraftRepositoryTest.php b/app/Draft/Repository/LocalDraftRepositoryTest.php new file mode 100644 index 0000000..f5b4b79 --- /dev/null +++ b/app/Draft/Repository/LocalDraftRepositoryTest.php @@ -0,0 +1,59 @@ +save($d); + + $this->draftsToCleanUp[] = $d->id; + + $draftPath = 'tmp/test-drafts/draft_' . $d->id . '.json'; + + $this->assertFileExists($draftPath); + $content = json_decode(file_get_contents($draftPath)); + + $this->assertSame($content->id, $d->id); + $this->assertSame($content->draft->current, $d->currentPlayerId->value); + } + + #[Test] + #[DataProviderExternal(TestDrafts::class, 'provideSingleTestDraft')] + public function itCanLoadADraft($data) + { + $draftPath = 'tmp/test-drafts/draft_' . $data['id'] . '.json'; + file_put_contents($draftPath, json_encode($data)); + $this->draftsToCleanUp[] = $data['id']; + $repository = new LocalDraftRepository(); + + $draft = $repository->load($data['id']); + + $this->assertSame($draft->id, $data['id']); + $this->assertSame($draft->currentPlayerId->value, $data['draft']['current']); + } + + #[After] + protected function cleanupAfterTests() + { + $r = new LocalDraftRepository(); + foreach ($this->draftsToCleanUp as $id) { + $r->delete($id); + } + } +} \ No newline at end of file diff --git a/app/Draft/Repository/S3DraftRepository.php b/app/Draft/Repository/S3DraftRepository.php index 4812006..a0b81f5 100644 --- a/app/Draft/Repository/S3DraftRepository.php +++ b/app/Draft/Repository/S3DraftRepository.php @@ -3,6 +3,8 @@ namespace App\Draft\Repository; use App\Draft\Draft; +use App\Draft\Exceptions\DraftRepositoryException; +use Aws\S3\Exception\S3Exception; use Aws\S3\S3Client; class S3DraftRepository implements DraftRepository @@ -25,25 +27,42 @@ public function __construct() $this->bucket = env('BUCKET'); } + protected function draftKey(string $id): string + { + return 'draft_' . $id . '.json'; + } + public function load(string $id): Draft { + if (!$this->client->doesObjectExist($this->bucket, $this->draftKey($id))) { + throw DraftRepositoryException::notFound($id); + } + $file = $this->client->getObject([ 'Bucket' => $this->bucket, - 'Key' => 'draft_' . $id . '.json', + 'Key' => $this->draftKey($id), ]); $rawDraft = (string) $file['Body']; - return Draft::fromJson($rawDraft); + return Draft::fromJson(json_decode($rawDraft, true)); } public function save(Draft $draft) { $this->client->putObject([ 'Bucket' => $this->bucket, - 'Key' => 'draft_' . $draft->id . '.json', + 'Key' => $this->draftKey($draft->id), 'Body' => $draft->toFileContent(), 'ACL' => 'private' ]); } + + public function delete(string $id) + { + $this->client->deleteObject([ + 'Bucket' => $this->bucket, + 'Key' => $this->draftKey($id), + ]); + } } \ No newline at end of file diff --git a/app/Draft/Repository/S3DraftRepositoryTest.php b/app/Draft/Repository/S3DraftRepositoryTest.php new file mode 100644 index 0000000..4160d51 --- /dev/null +++ b/app/Draft/Repository/S3DraftRepositoryTest.php @@ -0,0 +1,23 @@ +expectNotToPerformAssertions(); + } +} \ No newline at end of file diff --git a/app/Draft/Secrets.php b/app/Draft/Secrets.php index 6e726e0..85b75c6 100644 --- a/app/Draft/Secrets.php +++ b/app/Draft/Secrets.php @@ -10,11 +10,11 @@ class Secrets private const ADMIN_SECRET_KEY = 'admin_pass'; public function __construct( - private readonly string $adminSecret, + public readonly string $adminSecret, /** * @var array $playerSecrets */ - private array $playerSecrets = [] + public array $playerSecrets = [] ) { } @@ -46,9 +46,4 @@ public static function fromJson($data): self array_filter($data, fn (string $key) => $key != self::ADMIN_SECRET_KEY, ARRAY_FILTER_USE_KEY) ); } - - public static function new(): self - { - return new self(self::generatePassword()); - } } \ No newline at end of file diff --git a/app/Draft/Settings.php b/app/Draft/Settings.php index bb21b83..7fcb75c 100644 --- a/app/Draft/Settings.php +++ b/app/Draft/Settings.php @@ -3,6 +3,7 @@ namespace App\Draft; use App\Draft\Exceptions\InvalidDraftSettingsException; +use App\Http\HttpRequest; use App\TwilightImperium\AllianceTeamMode; use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; @@ -149,6 +150,7 @@ protected function validateTiles() { $maxSlices = min(floor($blueTiles/3), floor($redTiles/2)); + if ($this->numberOfSlices > $maxSlices) { throw InvalidDraftSettingsException::notEnoughTilesForSlices($maxSlices); } @@ -201,8 +203,8 @@ public static function fromJson(array $data): self new Seed($data['seed'] ?? null), $data['num_slices'], $data['num_factions'], - self::tileSetsFromJson($data), - self::factionSetsFromJson($data), + self::tileSetsFromPayload($data), + self::factionSetsFromPayload($data), $data['include_keleres'], $data['min_wormholes'], $data['max_1_wormhole'], @@ -224,7 +226,7 @@ public static function fromJson(array $data): self * @param $data * @return array */ - private static function tileSetsFromJson($data): array + private static function tileSetsFromPayload($data): array { $tilesets = []; @@ -233,10 +235,10 @@ private static function tileSetsFromJson($data): array if ($data['include_pok']) { $tilesets[] = Edition::PROPHECY_OF_KINGS; } - if ($data['include_ds_tiles']) { + if ($data['include_ds_tiles'] ?? false) { $tilesets[] = Edition::DISCORDANT_STARS_PLUS; } - if ($data['include_te_tiles']) { + if ($data['include_te_tiles'] ?? false) { $tilesets[] = Edition::THUNDERS_EDGE; } @@ -247,7 +249,7 @@ private static function tileSetsFromJson($data): array * @param $data * @return array */ - private static function factionSetsFromJson($data): array + private static function factionSetsFromPayload($data): array { $tilesets = []; @@ -257,16 +259,90 @@ private static function factionSetsFromJson($data): array if ($data['include_pok_factions']) { $tilesets[] = Edition::PROPHECY_OF_KINGS; } - if ($data['include_discordant']) { + if ($data['include_discordant'] ?? false) { $tilesets[] = Edition::DISCORDANT_STARS; } - if ($data['include_discordantexp']) { + if ($data['include_discordantexp'] ?? false) { $tilesets[] = Edition::DISCORDANT_STARS_PLUS; } - if ($data['include_te_factions']) { + if ($data['include_te_factions'] ?? false) { $tilesets[] = Edition::THUNDERS_EDGE; } return $tilesets; } + + public function factionSetNames() + { + return array_map(fn (\App\TwilightImperium\Edition $e) => $e->fullName(), $this->factionSets); + } + + public function tileSetNames() + { + return array_map(fn (\App\TwilightImperium\Edition $e) => $e->fullName(), $this->tileSets); + } + + public static function fromRequest(HttpRequest $request): self + { + + $playerNames = []; + for ($i = 0; $i < $request->get('num_players'); $i++) { + $playerName = trim($request->get('players')[$i]); + + if ($playerName != '') { + $playerNames[] = $playerName; + } + } + + $allianceMode = (bool) $request->get('alliance_on', false); + + $customSlices = []; + if ($request->get('custom_slices', '') != '') { + $sliceData = explode("\n", get('custom_slices')); + foreach ($sliceData as $s) { + $slice = []; + $t = explode(',', $s); + foreach ($t as $tile) { + $tile = trim($tile); + $slice[] = $tile; + } + $customSlices[] = $slice; + } + } + + return new self( + $playerNames, + $request->get('preset_draft_order') == 'on', + new Name($request->get('name')), + new Seed($request->get('seed') != null ? (int) $request->get('seed') : null), + (int) $request->get('num_slices'), + (int) $request->get('num_factions'), + self::tileSetsFromPayload([ + 'include_pok' => $request->get('include_pok') == 'on', + 'include_ds_tiles' => $request->get('include_ds_tiles') == 'on', + 'include_te_tiles' => $request->get('include_te_tiles') == 'on', + ]), + self::factionSetsFromPayload([ + 'include_base_factions' => $request->get('include_base_factions') == 'on', + 'include_pok_factions' => $request->get('include_pok_factions') == 'on', + 'include_te_factions' => $request->get('include_te_factions') == 'on', + 'include_discordant' => $request->get('include_discordant') == 'on', + 'include_discordantexp' => $request->get('include_discordantexp') == 'on', + ]), + $request->get('include_keleres') == 'on', + $request->get('wormholes', 0) == 1, + $request->get('max_wormhole') == 'on', + (int) $request->get('min_legendaries'), + (float) $request->get('min_inf'), + (float) $request->get('min_res'), + (float) $request->get('min_total'), + (float) $request->get('max_total'), + $request->get('custom_factions') ?? [], + $customSlices, + $allianceMode, + $allianceMode ? AllianceTeamMode::from($request->get('alliance_teams')) : null, + $allianceMode ? AllianceTeamPosition::from($request->get('alliance_teams_position')) : null, + $allianceMode ? $request->get('force_double_picks') == 'on' : null, + ); + } } \ No newline at end of file diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php index 99fcc0f..2a73584 100644 --- a/app/Draft/Slice.php +++ b/app/Draft/Slice.php @@ -63,6 +63,7 @@ function __construct( public function toJson(): array { + // @refactor so that tile ids just get imported from json and then populated from those tiles return [ 'tiles' => array_map(fn(Tile $tile) => $tile->id, $this->tiles), 'specialties' => $this->specialties, diff --git a/app/Http/ErrorResponse.php b/app/Http/ErrorResponse.php index f4b15c2..88eac79 100644 --- a/app/Http/ErrorResponse.php +++ b/app/Http/ErrorResponse.php @@ -7,9 +7,30 @@ class ErrorResponse extends JsonResponse public function __construct( protected string $error, public int $code = 500, + public bool $showErrorPage = false ) { parent::__construct([ "error" => $this->error ], $code); } + + public function getBody(): string + { + if ($this->showErrorPage) { + $error = $this->error; + return include 'templates/error.php'; + } else { + // return json + return parent::getBody(); + } + } + + public function getContentType(): string + { + if ($this->showErrorPage) { + return include 'text/html'; + } else { + return parent::getContentType(); + } + } } \ No newline at end of file diff --git a/app/Http/ErrorResponseTest.php b/app/Http/ErrorResponseTest.php index 339a4b6..4498a3f 100644 --- a/app/Http/ErrorResponseTest.php +++ b/app/Http/ErrorResponseTest.php @@ -13,6 +13,6 @@ public function itReturnsTheErrorAsJson() { $this->assertSame(json_encode([ "error" => "foo" - ]), (string) $response); + ]), $response->getBody()); } } \ No newline at end of file diff --git a/app/Http/HtmlResponse.php b/app/Http/HtmlResponse.php index f1391f0..7ea69e7 100644 --- a/app/Http/HtmlResponse.php +++ b/app/Http/HtmlResponse.php @@ -20,4 +20,9 @@ public function getBody(): string { return $this->html; } + + public function getContentType(): string + { + return 'text/html; charset=UTF-8'; + } } \ No newline at end of file diff --git a/app/Http/HttpRequest.php b/app/Http/HttpRequest.php index 5ff2b1f..57fc087 100644 --- a/app/Http/HttpRequest.php +++ b/app/Http/HttpRequest.php @@ -20,7 +20,7 @@ public static function fromRequest($urlParameters = []): self ); } - public function get($key, $defaultValue = null) + public function get($key, $defaultValue = null): ?string { if (isset($this->urlParameters[$key])) { return $this->urlParameters[$key]; diff --git a/app/Http/HttpRequestTest.php b/app/Http/HttpRequestTest.php index aa5ea91..11897e7 100644 --- a/app/Http/HttpRequestTest.php +++ b/app/Http/HttpRequestTest.php @@ -38,14 +38,14 @@ public static function requestParameters(): iterable #[Test] public function itCanRetrieveParameters(string $param, array $get, array $post, $expectedValue) { - $request = new HttpRequest($get, $post); + $request = new HttpRequest($get, $post, []); $this->assertSame($expectedValue, $request->get($param)); } #[Test] public function itCanReturnDefaultValueForParameter() { - $request = new HttpRequest([], []); + $request = new HttpRequest([], [], []); $this->assertSame("bar", $request->get("foo", "bar")); } diff --git a/app/Http/HttpResponse.php b/app/Http/HttpResponse.php index 2f2a6db..0bbc4c5 100644 --- a/app/Http/HttpResponse.php +++ b/app/Http/HttpResponse.php @@ -9,5 +9,7 @@ public function __construct( ) { } + abstract public function getBody(): string; + abstract public function getContentType(): string; } \ No newline at end of file diff --git a/app/Http/JsonResponse.php b/app/Http/JsonResponse.php index bfd6708..417c260 100644 --- a/app/Http/JsonResponse.php +++ b/app/Http/JsonResponse.php @@ -20,4 +20,9 @@ public function getBody(): string { return json_encode($this->data); } + + public function getContentType(): string + { + return 'application/json'; + } } \ No newline at end of file diff --git a/app/Http/JsonResponseTest.php b/app/Http/JsonResponseTest.php index c0f3e3f..276baed 100644 --- a/app/Http/JsonResponseTest.php +++ b/app/Http/JsonResponseTest.php @@ -13,6 +13,6 @@ public function itReturnsTheDataAsJson() { "foo" => "bar" ]; $response = new JsonResponse($data); - $this->assertSame(json_encode($data), (string) $response); + $this->assertSame(json_encode($data), $response->getBody()); } } \ No newline at end of file diff --git a/app/Http/RequestHandler.php b/app/Http/RequestHandler.php index 31c4373..ff20e90 100644 --- a/app/Http/RequestHandler.php +++ b/app/Http/RequestHandler.php @@ -15,4 +15,9 @@ protected function error(string $error): ErrorResponse { return new ErrorResponse($error); } + + public function json($data = [], $code = 200): JsonResponse + { + return new JsonResponse($data, $code); + } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php index e99c011..00986d4 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php @@ -2,6 +2,8 @@ namespace App\Http\RequestHandlers; +use App\Draft\Generators\DraftGenerator; +use App\Draft\Settings; use App\Http\HttpResponse; use App\Http\RequestHandler; @@ -9,6 +11,16 @@ class HandleGenerateDraftRequest extends RequestHandler { public function handle(): HttpResponse { - // TODO: Implement handle() method. + $settings = Settings::fromRequest($this->request); + dd($settings); + + $draft = (new DraftGenerator($settings))->generate(); + + app()->repository->save($draft); + + return $this->json([ + 'id' => $draft->id, + 'admin' => $draft->secrets->adminSecret + ]); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleGetDraftRequest.php b/app/Http/RequestHandlers/HandleGetDraftRequest.php index bffd59f..6c30ff6 100644 --- a/app/Http/RequestHandlers/HandleGetDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGetDraftRequest.php @@ -2,19 +2,26 @@ namespace App\Http\RequestHandlers; +use App\Draft\Exceptions\DraftRepositoryException; +use App\Http\ErrorResponse; use App\Http\HtmlResponse; use App\Http\HttpRequest; use App\Http\HttpResponse; +use App\Http\JsonResponse; use App\Http\RequestHandler; class HandleGetDraftRequest extends RequestHandler { public function handle(): HttpResponse { - // @todo do better - define('DRAFT_ID', $this->request->get('id')); - return new HtmlResponse( - require_once 'templates/draft.php' + try { + $draft = app()->repository->load($this->request->get('id')); + } catch (DraftRepositoryException $e) { + return new ErrorResponse('Draft not found', 404); + } + + return new JsonResponse( + $draft->toArray() ); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequest.php b/app/Http/RequestHandlers/HandleViewDraftRequest.php index 489f8be..460813b 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequest.php @@ -2,6 +2,8 @@ namespace App\Http\RequestHandlers; +use App\Draft\Exceptions\DraftRepositoryException; +use App\Http\ErrorResponse; use App\Http\HtmlResponse; use App\Http\HttpRequest; use App\Http\HttpResponse; @@ -11,10 +13,14 @@ class HandleViewDraftRequest extends RequestHandler { public function handle(): HttpResponse { - // @todo do better - define('DRAFT_ID', $this->request->get('id')); + try { + $draft = app()->repository->load($this->request->get('id')); + } catch (DraftRepositoryException $e) { + return new ErrorResponse('Draft not found', 404, true); + } + return new HtmlResponse( - require_once 'templates/draft.php' + include 'templates/draft.php' ); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php new file mode 100644 index 0000000..0b3a4f7 --- /dev/null +++ b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php @@ -0,0 +1,50 @@ +assertIsConfiguredAsHandlerForRoute('/d/123'); + } + + #[Test] + #[DataProviderExternal(TestDrafts::class, 'provideTestDrafts')] + public function itDisplaysADraft($data) + { + $draft = Draft::fromJson($data); + + app()->repository->save($draft); + + $handler = new HandleViewDraftRequest(new HttpRequest([], [], ['id' => (string) $draft->id])); + $response = $handler->handle(); + + + + // cleanup + app()->repository->delete($draft->id); + dd($response); + } + + #[Test] + public function itReturnsAnErrorWhenDraftIsNotFound() + { + // @todo + } + +} \ No newline at end of file diff --git a/app/Testing/TestDrafts.php b/app/Testing/TestDrafts.php index 12b3b35..168fa1c 100644 --- a/app/Testing/TestDrafts.php +++ b/app/Testing/TestDrafts.php @@ -20,4 +20,11 @@ public static function provideTestDrafts(): iterable ]; } } + + public static function provideSingleTestDraft(): iterable + { + yield "When using a finished draft" => [ + 'data' => self::loadDraftByFilename(self::FINISHED_ALL_CHECKBOXES->value) + ]; + } } \ No newline at end of file diff --git a/app/TwilightImperium/Edition.php b/app/TwilightImperium/Edition.php index 0e01c6e..6fa2a1c 100644 --- a/app/TwilightImperium/Edition.php +++ b/app/TwilightImperium/Edition.php @@ -12,6 +12,17 @@ enum Edition: string // @todo merge DS and DS plus? case DISCORDANT_STARS_PLUS = "DSPlus"; + public function fullName(): string + { + return match($this) { + Edition::BASE_GAME => "Base Game", + Edition::PROPHECY_OF_KINGS => "Prophecy of Kings", + Edition::THUNDERS_EDGE => "Thunder's Edge", + Edition::DISCORDANT_STARS => "Discordant Stars", + Edition::DISCORDANT_STARS_PLUS => "Discordant Stars Plus", + }; + } + /** * For now, only discordant stars doesn't have a dedicated tileset, but that might change * diff --git a/app/TwilightImperium/Faction.php b/app/TwilightImperium/Faction.php index b684800..77cc9c2 100644 --- a/app/TwilightImperium/Faction.php +++ b/app/TwilightImperium/Faction.php @@ -13,7 +13,7 @@ public function __construct( public readonly string $id, public readonly string $homeSystemTileNumber, public readonly string $linkToWiki, - public readonly Edition $edition + public readonly Edition $edition, ) { } @@ -47,6 +47,19 @@ private static function editionFromFactionJson($factionEdition): Edition "keleres" => Edition::THUNDERS_EDGE, "discordant" => Edition::DISCORDANT_STARS, "discordantexp" => Edition::DISCORDANT_STARS_PLUS, + default => throw new \Exception("Faction has invalid set") }; } + + /** + * @todo fix this mess + */ + public function homesystem(): string + { + if(in_array($this->edition, [Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS])) { + return 'DS_' . $this->id; + } else { + return $this->homeSystemTileNumber; + } + } } \ No newline at end of file diff --git a/app/TwilightImperium/Tile.php b/app/TwilightImperium/Tile.php index 8cda675..7d3578a 100644 --- a/app/TwilightImperium/Tile.php +++ b/app/TwilightImperium/Tile.php @@ -108,7 +108,7 @@ public static function countSpecials(array $tiles) } /** - * @return string, TileTier + * @return array */ public static function tierData(): array { diff --git a/app/TwilightImperium/Wormhole.php b/app/TwilightImperium/Wormhole.php index 9b0c911..2b6ed24 100644 --- a/app/TwilightImperium/Wormhole.php +++ b/app/TwilightImperium/Wormhole.php @@ -10,6 +10,16 @@ enum Wormhole: string case DELTA = "delta"; case EPSILON = "epsilon"; + public function symbol(): string + { + return match($this) { + self::ALPHA => "α", + self::BETA => "β", + self::GAMMA => "γ", + self::DELTA => "δ", + self::EPSILON => "&eplison;", + }; + } /** * @todo refactor tiles.json to use arrays instead of a single string diff --git a/app/api/claim.php b/app/api/claim.php index b3b38d2..4bc7e41 100644 --- a/app/api/claim.php +++ b/app/api/claim.php @@ -1,6 +1,6 @@ isAdminPass(get('admin'))) return_error('You are not allowed to do this'); if (!empty($draft->log())) return_error('Draft already in progress'); @@ -20,7 +20,7 @@ ]); } else { $config = new GeneratorConfig(true); - $draft = Draft::createFromConfig($config); + $draft = DeprecatedDraft::createFromConfig($config); $draft->save(); return_data([ 'id' => $draft->getId(), diff --git a/app/api/pick.php b/app/api/pick.php index 4ec956a..97b9e8d 100644 --- a/app/api/pick.php +++ b/app/api/pick.php @@ -6,7 +6,7 @@ $category = get('category'); $value = get('value'); -$draft = \App\Draft::load($id); +$draft = \App\DeprecatedDraft::load($id); $is_admin = $draft->isAdminPass(get('admin')); if ($draft == null) return_error('draft not found'); diff --git a/app/api/restore.php b/app/api/restore.php index b701aeb..0ca54f3 100644 --- a/app/api/restore.php +++ b/app/api/restore.php @@ -1,6 +1,6 @@ isAdminPass($secret)) { diff --git a/app/api/undo.php b/app/api/undo.php index c25f6f4..4e6f2f6 100644 --- a/app/api/undo.php +++ b/app/api/undo.php @@ -1,6 +1,6 @@ isAdminPass(get('admin')); diff --git a/app/helpers.php b/app/helpers.php index 6aac472..baceaa3 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -30,29 +30,43 @@ function dd(...$variables) if (!function_exists('e')) { - function e($condition, $yes, $no = '') + function e($condition, $yes, $no = ''): void { if ($condition) echo $yes; else echo $no; } } + +if (!function_exists('yesno')) { + /** + * return "yes" or "no" based on condition + * + * @param $condition + * @return void + */ + function yesno($condition): string + { + return $condition ? "yes" : "no"; + } +} + if (!function_exists('env')) { - function env($key, $defaultValue = null) + function env($key, $defaultValue = null): ?string { return $_ENV[$key] ?? $defaultValue; } } if (!function_exists('get')) { - function get($key, $default = null) + function get($key, $default = null): string { return $_GET[$key] ?? $default; } } if (!function_exists('url')) { - function url($uri) + function url($uri): string { return env('URL', 'https://milty.shenanigans.be/') . $uri; } @@ -60,7 +74,7 @@ function url($uri) if (!function_exists('ordinal')) { - function ordinal($number) + function ordinal($number): string { $ends = array('th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th'); if ((($number % 100) >= 11) && (($number % 100) <= 13)) @@ -70,20 +84,6 @@ function ordinal($number) } } -function abort($code, $message = null) { - http_response_code($code); - switch($code) { - case 404: - die($message ?? 'Not found'); - default: - if(!$_ENV['DEBUG']) { - die('Something went wrong'); - } else { - die($message ?? 'Something went wrong'); - } - } -} - if (! function_exists('class_uses_recursive')) { /** diff --git a/app/routes.php b/app/routes.php index 866fe53..32cf24c 100644 --- a/app/routes.php +++ b/app/routes.php @@ -4,10 +4,10 @@ '/' => \App\Http\RequestHandlers\HandleViewFormRequest::class, '/d/{id}' => \App\Http\RequestHandlers\HandleViewDraftRequest::class, '/api/generate' => \App\Http\RequestHandlers\HandleGenerateDraftRequest::class, - '/api/draft/{id}/regenerate' => \App\Http\RequestHandlers\HandleGenerateDraftRequest::class, + '/api/draft/{id}/regenerate' => \App\Http\RequestHandlers\HandleRegenerateDraftRequest::class, '/api/draft/{id}/pick' => \App\Http\RequestHandlers\HandlePickRequest::class, '/api/draft/{id}/claim' => \App\Http\RequestHandlers\HandleClaimPlayerRequest::class, '/api/draft/{id}/restore' => \App\Http\RequestHandlers\HandleRestoreClaimRequest::class, '/api/draft/{id}/undo' => \App\Http\RequestHandlers\HandleUndoRequest::class, - '/api/data/{id}' => \App\Http\RequestHandlers\HandleGetDraftRequest::class, + '/api/draft/{id}' => \App\Http\RequestHandlers\HandleGetDraftRequest::class, ]; diff --git a/js/draft.js b/js/draft.js index fdda6d5..4534048 100644 --- a/js/draft.js +++ b/js/draft.js @@ -340,7 +340,7 @@ function refreshData() { $('#error-popup').show(); loading(false); } else { - window.draft = resp.draft; + window.draft = resp; refresh(); // if we're looking at the map, regen it diff --git a/js/main.js b/js/main.js index 6849268..0cf69b5 100644 --- a/js/main.js +++ b/js/main.js @@ -58,6 +58,7 @@ $(document).ready(function () { formData.append(values[i].name, values[i].value); } + // @todo json body const request = new XMLHttpRequest(); request.open("POST", routes.generate); request.onreadystatechange = function () { diff --git a/phpunit.xml b/phpunit.xml index 1a6addd..6c4b087 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -30,5 +30,7 @@ + + diff --git a/templates/draft.php b/templates/draft.php index 2c881e7..b6318eb 100644 --- a/templates/draft.php +++ b/templates/draft.php @@ -1,20 +1,15 @@ - - - <?= $draft ? $draft->name() . ' | ' : '' ?>TI4 - Milty Draft - + <?= $draft->settings->name ?> | TI4 - Milty Draft + @@ -33,13 +28,8 @@
- - -

name() ?>

-

Milty Draft

- -

Milty Draft

- +

settings->name ?>

+

Milty Draft

- -

Draft not found. (or something else went wrong)

- -
-

It's x's turn to draft something. You are the admin so you can do this for them.

-
-
-

This draft is over. View map

-
+
+

It's x's turn to draft something. You are the admin so you can do this for them.

+
+
+

This draft is over. View map

+
- log())) : ?> -

- Something not quite right? Untill the first draft-pick is done you can regenerate the draft options. -

- - -
- players()) as $i => $player) : ?> -
-

[Team ' . $player['team'] . ']' : '' ?>

- - you -

- Slice: ?
- Faction: ?
- Position: ? -

-

- - -

-
- -
+ canRegenerate()) : ?> +

+ Something not quite right? Untill the first draft-pick is done you can regenerate the draft options. +

+ -
-

Factions

-
- factions() as $f) : ?> - - - -
-
-
- -
- [reference] - [wiki]
- - -
+
+ players) as $i => $player) : ?> +
+

name ?> team ? '[Team ' . $player->team . ']' : '' ?>

+ + you +

+ Slice: ?
+ Faction: ?
+ Position: ? +

+

+ + +

+
+ +
+
+

Factions

+
+ factionPool as $faction) : ?> +
+
+
+ + name ?>
+ [reference] + [wiki]
+ +
- -
+ +
+
-
-

Slices

-
- slices() as $slice_id => $slice) : ?> -
-
-
- $tile) : ?> - - - - -
+
+
+

Slices

+
+ slicePool as $sliceId => $slice) : ?> +
+
+
+ tiles as $i => $tile) : ?> + + + +
+
+ +
+

Slice

+ +
+ specialties as $s) : ?> + <?= $s->value ?> + + -
-

Slice

- -
- - <?= $s ?> - - - - - - - - - - α - - β - - α - β - - γ - - -
- -

- Total: - - -

- -

- Optimal: - - -

- -

- - -

+ legendaryPlanets as $l) : ?> + + + + wormholes as $w) : ?> + symbol() ?> +
+ +

+ Total: + totalResources ?> + totalInfluence ?> +

+ +

+ Optimal: + optimalResources ?> + optimalInfluence ?> +

+ +

+ + +

- -
+
+
+
-
-

Positions

-
- players()); $i++) : ?> -
- - - SPEAKER - - - - +
+

Positions

+
+ players); $i++) : ?> +
+ + + SPEAKER + + + + - - -
- -
+ + +
+
+
- - - +
- config(); ?>
- log())) : ?> + canRegenerate()) : ?>

- +

@@ -228,75 +200,55 @@

Configuration used

- players()) ?> + players) ?>

- preset_draft_order == true, 'yes', 'no') ?> + settings->presetDraftOrder) ?>

- num_slices ?> + settings->numberOfSlices ?>

- num_factions ?> + settings->numberOfFactions ?>

- include_pok, 'yes', 'no') ?> + ", $draft->settings->factionSetNames()) ?>

- include_ds_tiles, 'yes', 'no') ?> + ", $draft->settings->tileSetNames()) ?>

- include_te_tiles, 'yes', 'no') ?> + settings->includeCouncilKeleresFaction) ?>

- include_base_factions, 'yes', 'no') ?> + settings->minimumTwoAlphaAndBetaWormholes) ?>

- include_pok_factions, 'yes', 'no') ?> + settings->minimumLegendaryPlanets ?>

- include_keleres, 'yes', 'no') ?> -

-

- include_te_factions, 'yes', 'no') ?> -

-

- include_discordant, 'yes', 'no') ?> -

-

- include_discordantexp, 'yes', 'no') ?> -

- min_legendaries)) : ?> -

- min_wormholes ?> -

-

- min_legendaries ?> -

- -

- max_1_wormhole) && $config->max_1_wormhole, 'yes', 'no') ?> + settings->maxOneWormholesPerSlice) ?>

- minimum_optimal_influence ?> + settings->minimumOptimalInfluence ?>

- minimum_optimal_resources ?> + settings->minimumOptimalResources ?>

- minimum_optimal_total ?> + settings->minimumOptimalTotal ?>

- maximum_optimal_total ?> + settings->maximumOptimalTotal ?>

- custom_factions != null) : ?> - custom_factions) ?> + settings->customFactions != null) : ?> + settings->customFactions) ?> no @@ -304,8 +256,8 @@

- custom_slices != null) : ?> - custom_slices as $slice) : ?> + settings->customSlices != null) : ?> + settings->customSlices as $slice) : ?>
@@ -314,27 +266,27 @@

- seed ?> + settings->seed->getValue() ?>

- slices() as $slice_id => $slice) : ?> -
+ slicePool as $slice_id => $slice) : ?> + tileIds()); ?>

- alliance) : ?> + settings->allianceMode) : ?>

Alliance Configuration

- alliance["alliance_teams"] ?? "") ?> + settings->allianceTeamMode->value) ?>

- alliance["alliance_teams_position"] ?? "") ?> + settings->allianceTeamPosition->value) ?>

- alliance["force_double_picks"], 'Yes', 'No') ?> + settings->allianceForceDoublePicks) ?>

@@ -480,7 +432,7 @@ "pick": "", "regenerate": "", "tile_images": "", - "data": "", + "data": "id) ?>", "undo": "", "restore": "" } diff --git a/templates/error.php b/templates/error.php new file mode 100644 index 0000000..7a3dd28 --- /dev/null +++ b/templates/error.php @@ -0,0 +1,55 @@ + + + + + + + + TI4 - Milty Draft | Something went wrong + + + + + + + + + + + + + + + + + + +
+ +

Milty Draft

+ +
+ +
+
+

Draft not found. (or something else went wrong)

+
+
+ +
+
+ + + + + + From 72e26151db609c25a7fe9cdac0086cb06f49f83f Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Tue, 23 Dec 2025 14:05:26 +0100 Subject: [PATCH 21/34] Better way to render html templates --- app/ApplicationTest.php | 2 +- app/Draft/DraftTest.php | 2 +- app/Http/RequestHandler.php | 10 ++++++++++ app/Http/RequestHandlers/HandleTestRequest.php | 15 --------------- app/Http/RequestHandlers/HandleUndoRequest.php | 6 +----- .../RequestHandlers/HandleViewDraftRequest.php | 8 ++++++-- .../HandleViewDraftRequestTest.php | 3 +-- .../RequestHandlers/HandleViewFormRequest.php | 4 +--- templates/draft.php | 6 +++--- 9 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 app/Http/RequestHandlers/HandleTestRequest.php diff --git a/app/ApplicationTest.php b/app/ApplicationTest.php index 779e2fb..1f14508 100644 --- a/app/ApplicationTest.php +++ b/app/ApplicationTest.php @@ -33,7 +33,7 @@ public static function allRoutes() ]; yield "For fetching draft data" => [ - 'route' => '/api/data/1234', + 'route' => '/api/draft/1234', 'handler' => HandleGetDraftRequest::class ]; diff --git a/app/Draft/DraftTest.php b/app/Draft/DraftTest.php index 4911511..5837a0c 100644 --- a/app/Draft/DraftTest.php +++ b/app/Draft/DraftTest.php @@ -82,7 +82,7 @@ public function itCanBeConvertedToArray() $this->assertContains($faction->name, $data['factions']); } foreach($draft->slicePool as $slice) { - $this->assertContains($slice->tileIds(), $data['slices']); + $this->assertContains(['tiles' => $slice->tileIds()], $data['slices']); } } } \ No newline at end of file diff --git a/app/Http/RequestHandler.php b/app/Http/RequestHandler.php index ff20e90..0ff78d3 100644 --- a/app/Http/RequestHandler.php +++ b/app/Http/RequestHandler.php @@ -16,6 +16,16 @@ protected function error(string $error): ErrorResponse return new ErrorResponse($error); } + public function html($template, $data = [], $code = 200): HtmlResponse + { + ob_start(); + extract($data); + include $template; + $html = ob_get_clean(); + + return new HtmlResponse($html, $code); + } + public function json($data = [], $code = 200): JsonResponse { return new JsonResponse($data, $code); diff --git a/app/Http/RequestHandlers/HandleTestRequest.php b/app/Http/RequestHandlers/HandleTestRequest.php deleted file mode 100644 index 20137fe..0000000 --- a/app/Http/RequestHandlers/HandleTestRequest.php +++ /dev/null @@ -1,15 +0,0 @@ -request->get('id')); - return new HtmlResponse( - require_once 'templates/draft.php' - ); + // @todo } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequest.php b/app/Http/RequestHandlers/HandleViewDraftRequest.php index 460813b..f19dc11 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequest.php @@ -19,8 +19,12 @@ public function handle(): HttpResponse return new ErrorResponse('Draft not found', 404, true); } - return new HtmlResponse( - include 'templates/draft.php' + + return $this->html( + 'templates/draft.php', + [ + 'draft' => $draft + ] ); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php index 0b3a4f7..b4aba6e 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php @@ -34,11 +34,10 @@ public function itDisplaysADraft($data) $handler = new HandleViewDraftRequest(new HttpRequest([], [], ['id' => (string) $draft->id])); $response = $handler->handle(); - + $this->assertSame($response->code, 200); // cleanup app()->repository->delete($draft->id); - dd($response); } #[Test] diff --git a/app/Http/RequestHandlers/HandleViewFormRequest.php b/app/Http/RequestHandlers/HandleViewFormRequest.php index db19446..c4cfb9b 100644 --- a/app/Http/RequestHandlers/HandleViewFormRequest.php +++ b/app/Http/RequestHandlers/HandleViewFormRequest.php @@ -10,8 +10,6 @@ class HandleViewFormRequest extends RequestHandler { public function handle(): HttpResponse { - return new HtmlResponse( - require_once 'templates/generate.php' - ); + return $this->html('templates/generate.php'); } } \ No newline at end of file diff --git a/templates/draft.php b/templates/draft.php index b6318eb..ea37463 100644 --- a/templates/draft.php +++ b/templates/draft.php @@ -437,9 +437,9 @@ "restore": "" } - - - + + + From 966ae5c67d2b0ff45ca7550f05571d215563457c Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Wed, 24 Dec 2025 09:43:34 +0100 Subject: [PATCH 22/34] Change up slice generation and somehow fix the whole thing, hurray! --- app/Application.php | 4 +- .../Exceptions/InvalidSliceException.php | 21 --- app/Draft/Generators/DraftGenerator.php | 17 +- app/Draft/Generators/DraftGeneratorTest.php | 26 ++- app/Draft/Generators/SlicePoolGenerator.php | 160 ++++++++---------- .../Generators/SlicePoolGeneratorTest.php | 31 ++-- app/Draft/Generators/TilePool.php | 51 ++++++ app/Draft/Slice.php | 22 ++- app/Draft/SliceTest.php | 54 +++--- app/Generator.php | 2 +- app/Http/ErrorResponse.php | 7 +- app/Http/HtmlResponse.php | 11 ++ .../HandleTestGeneratorRequest.php | 23 +++ app/TwilightImperium/Faction.php | 5 + app/TwilightImperium/Tile.php | 46 +++-- app/helpers.php | 17 +- app/routes.php | 1 + bootstrap/boot.php | 1 + deploy/app/caddy/Caddyfile | 1 - deploy/app/php/php.ini | 2 +- deploy/app/setup.sh | 3 +- index.php | 2 + templates/error.php | 12 +- 23 files changed, 310 insertions(+), 209 deletions(-) delete mode 100644 app/Draft/Exceptions/InvalidSliceException.php create mode 100644 app/Draft/Generators/TilePool.php create mode 100644 app/Http/RequestHandlers/HandleTestGeneratorRequest.php diff --git a/app/Application.php b/app/Application.php index fa3265e..efe13e2 100644 --- a/app/Application.php +++ b/app/Application.php @@ -11,6 +11,7 @@ use App\Http\RequestHandler; use App\Http\Route; use App\Http\RouteMatch; +use Clockwork\Clockwork; /** * Unsure why I did this from scratch. I was on a bit of a refactoring roll and I couldn't resist. @@ -37,6 +38,7 @@ public function run() header('Content-type: ' . $response->getContentType()); echo $response->getBody(); + exit; } @@ -45,7 +47,7 @@ private function handleIncomingRequest(): HttpResponse try { $handler = $this->handlerForRequest($_SERVER['REQUEST_URI']); if ($handler == null) { - return new ErrorResponse("Not found", 404); + return new ErrorResponse("Page not found", 404, true); } else { return $handler->handle(); } diff --git a/app/Draft/Exceptions/InvalidSliceException.php b/app/Draft/Exceptions/InvalidSliceException.php deleted file mode 100644 index 21236cc..0000000 --- a/app/Draft/Exceptions/InvalidSliceException.php +++ /dev/null @@ -1,21 +0,0 @@ -playerNames) / 2); + return array_slice(['A', 'B', 'C', 'D'], 0, count($this->settings->playerNames) / 2); } /** @@ -68,18 +69,22 @@ public function generatePlayerData(): array if ($this->settings->allianceMode) { $teamNames = $this->generateTeamNames(); + $teamPlayers = []; if ($this->settings->allianceTeamMode == AllianceTeamMode::RANDOM) { shuffle($players); } - for ($i = 0; $i < count($players); $i+=2) { - $teamName = $teamNames[$i/2]; + var_dump($players); - $players[] = $players[$i]->putInTeam($teamName); - $players[] = $players[$i + 1]->putInTeam($teamName); + for ($i = 0; $i < count($players); $i++) { + $teamName = $teamNames[(int) floor($i/2)]; + + $player = array_shift($players); + $teamPlayers[$player->id->value] = $player->putInTeam($teamName); } + $players = $teamPlayers; } if (!$this->settings->presetDraftOrder) { diff --git a/app/Draft/Generators/DraftGeneratorTest.php b/app/Draft/Generators/DraftGeneratorTest.php index 495cfbc..22b346f 100644 --- a/app/Draft/Generators/DraftGeneratorTest.php +++ b/app/Draft/Generators/DraftGeneratorTest.php @@ -2,6 +2,7 @@ namespace App\Draft\Generators; +use App\Draft\Player; use App\Testing\Factories\DraftSettingsFactory; use App\Testing\TestCase; use App\TwilightImperium\AllianceTeamMode; @@ -18,6 +19,7 @@ public function itCanGenerateADraftBasedOnSettings() ]); $generator = new DraftGenerator($settings); + $draft = $generator->generate(); $this->assertNotEmpty($draft->slicePool); @@ -79,15 +81,33 @@ public function itCanGeneratePlayerDataInPresetOrder() #[Test] public function itCanGeneratePlayerDataForAlliances() { - $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David', 'Ellis', '']; + $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David', 'Elliot', 'Frank']; $settings = DraftSettingsFactory::make([ 'playerNames' => $originalPlayerNames, 'allianceMode' => true, 'allianceTeamMode' => AllianceTeamMode::PRESET, + 'presetDraftOrder' => true ]); + $generator = new DraftGenerator($settings); + $draft = $generator->generate(); - - + /** + * @var array $players + */ + $players = array_values($draft->players); + + $this->assertSame('Alice', $players[0]->name); + $this->assertSame('A', $players[0]->team); + $this->assertSame('Bob', $players[1]->name); + $this->assertSame('A', $players[1]->team); + $this->assertSame('Christine', $players[2]->name); + $this->assertSame('B', $players[2]->team); + $this->assertSame('David', $players[3]->name); + $this->assertSame('B', $players[3]->team); + $this->assertSame('Elliot', $players[4]->name); + $this->assertSame('C', $players[4]->team); + $this->assertSame('Frank', $players[5]->name); + $this->assertSame('C', $players[5]->team); } } \ No newline at end of file diff --git a/app/Draft/Generators/SlicePoolGenerator.php b/app/Draft/Generators/SlicePoolGenerator.php index 3c50691..22dbc35 100644 --- a/app/Draft/Generators/SlicePoolGenerator.php +++ b/app/Draft/Generators/SlicePoolGenerator.php @@ -4,6 +4,7 @@ use App\Draft\Exceptions\InvalidDraftSettingsException; use App\Draft\Exceptions\InvalidSliceException; +use App\Draft\Seed; use App\Draft\Settings; use App\Draft\Slice; use App\TwilightImperium\Tile; @@ -15,7 +16,8 @@ */ class SlicePoolGenerator { - const MAX_TRIES = 4000; + const MAX_TILE_SELECTION_TRIES = 100; + const MAX_SLICES_FROM_SELECTION_TRIES = 1000; /** * @var array $tileData @@ -24,14 +26,7 @@ class SlicePoolGenerator /** @var array $allGatheredTiles */ private readonly array $allGatheredTiles; - /** @var array $gatheredHighTierTiles */ - private array $gatheredHighTierTiles; - /** @var array $gatheredMediumTierTiles */ - private array $gatheredMediumTierTiles; - /** @var array $gatheredLowTierTiles */ - private array $gatheredLowTierTiles; - /** @var array $gatheredRedTiles */ - private array $gatheredRedTiles; + private readonly TilePool $gatheredTiles; public int $tries; @@ -58,24 +53,26 @@ public function __construct( foreach($this->allGatheredTiles as $tile) { switch($tile->tier) { case TileTier::HIGH: - $highTier[] = $tile; + $highTier[] = $tile->id; break; case TileTier::MEDIUM: - $midTier[] = $tile; + $midTier[] = $tile->id; break; case TileTier::LOW: - $lowTier[] = $tile; + $lowTier[] = $tile->id; break; case TileTier::RED: - $redTier[] = $tile; + $redTier[] = $tile->id; break; }; } - $this->gatheredHighTierTiles = $highTier; - $this->gatheredMediumTierTiles = $midTier; - $this->gatheredLowTierTiles = $lowTier; - $this->gatheredRedTiles = $redTier; + $this->gatheredTiles = new TilePool( + $highTier, + $midTier, + $lowTier, + $redTier + ); } /** @@ -90,78 +87,92 @@ public function generate(): array } } - - private function attemptToGenerate(int $previousTries = 0): array + private function attemptToGenerate($previousTries = 0): array { - if ($previousTries > self::MAX_TRIES) { + $slices = []; + + if ($previousTries > self::MAX_TILE_SELECTION_TRIES) { throw InvalidDraftSettingsException::cannotGenerateSlices(); } $this->settings->seed->setForSlices($previousTries); + $this->gatheredTiles->shuffle(); + $tilePool = $this->gatheredTiles->slice($this->settings->numberOfSlices); - shuffle($this->gatheredHighTierTiles); - shuffle($this->gatheredMediumTierTiles); - shuffle($this->gatheredLowTierTiles); - shuffle($this->gatheredRedTiles); + $tilePoolIsValid = $this->validateTileSelection($tilePool->allIds()); - // we need one high, medium, low and 2 red tier tiles per slice - $highTier = array_slice($this->gatheredHighTierTiles, 0, $this->settings->numberOfSlices); - $midTier = array_slice($this->gatheredMediumTierTiles, 0, $this->settings->numberOfSlices); - $lowTier = array_slice($this->gatheredLowTierTiles, 0, $this->settings->numberOfSlices); - $redTier = array_slice($this->gatheredRedTiles, 0, $this->settings->numberOfSlices * 2); - - $validSelection = $this->validateTileSelection(array_merge( - $highTier, - $midTier, - $lowTier, - $redTier - )); + if (!$tilePoolIsValid) { + return $this->attemptToGenerate($previousTries + 1); + } - if (!$validSelection) { + $validSlicesFromPool = $this->makeSlicesFromPool($tilePool); + if (empty($validSlicesFromPool)) { + unset($validSlicesFromPool); return $this->attemptToGenerate($previousTries + 1); + } else { + return $validSlicesFromPool; + } + } + + private function makeSlicesFromPool(TilePool $pool, $previousTries = 0): array + { + if ($previousTries > self::MAX_SLICES_FROM_SELECTION_TRIES) { + return []; } + $this->settings->seed->setForSlices($previousTries); + $pool->shuffle(); + $slices = []; + for ($i = 0; $i < $this->settings->numberOfSlices; $i++) { $slice = new Slice([ - $highTier[$i], - $midTier[$i], - $lowTier[$i], - $redTier[$i * 2], - $redTier[($i * 2) + 1] + $this->tileData[$pool->highTier[$i]], + $this->tileData[$pool->midTier[$i]], + $this->tileData[$pool->lowTier[$i]], + $this->tileData[$pool->redTier[$i * 2]], + $this->tileData[$pool->redTier[($i * 2) + 1]] ]); - try { - $slice->validate( - $this->settings->minimumOptimalInfluence, - $this->settings->minimumOptimalResources, - $this->settings->minimumOptimalTotal, - $this->settings->maximumOptimalTotal, - $this->settings->maxOneWormholesPerSlice ? 1 : null - ); - $slice->arrange($this->settings->seed); - - // if we didn't run into any exceptions here: it's a good slice! - $slices[] = $slice; - } catch (InvalidSliceException $invalidSlice) { - return $this->attemptToGenerate($previousTries + 1); + + $sliceIsValid = $slice->validate( + $this->settings->minimumOptimalInfluence, + $this->settings->minimumOptimalResources, + $this->settings->minimumOptimalTotal, + $this->settings->maximumOptimalTotal, + $this->settings->maxOneWormholesPerSlice + ); + + if (!$sliceIsValid) { + unset($slice); + unset($slices); + return $this->makeSlicesFromPool($pool, $previousTries + 1); + } + + if(!$slice->arrange($this->settings->seed)) { + unset($slice); + unset($slices); + return $this->makeSlicesFromPool($pool, $previousTries); } + + $slices[] = $slice; } - $this->tries = $previousTries; return $slices; } /** - * @param array $tiles + * @param array $tileIds * @return bool */ - private function validateTileSelection(array $tiles): bool + private function validateTileSelection(array $tileIds): bool { + $tileInfo = array_map(fn (string $id) => $this->tileData[$id], $tileIds); + $alphaWormholeCount = 0; $betaWormholeCount = 0; $legendaryPlanetCount = 0; - foreach($tiles as $t) { + foreach($tileInfo as $t) { if ($t->hasWormhole(Wormhole::ALPHA)) { $alphaWormholeCount++; } @@ -198,41 +209,16 @@ private function slicesFromCustomSlices(): array }, $this->settings->customSlices); } - /** - * @param array $tiles - * @return array - */ - private function pluckTileIds(array $tiles): array - { - return array_map(fn(Tile $t) => $t->id, $tiles); - } - /** * Debug and test methods */ - - public function gatheredTilesIds(): array - { - return $this->pluckTileIds($this->allGatheredTiles); - } - public function gatheredTiles(): array { return $this->allGatheredTiles; } - public function gatheredTileTierIds(): array - { - return array_map(fn (array $tier) => $this->pluckTileIds($tier), $this->gatheredTileTiers()); - } - - public function gatheredTileTiers(): array + public function gatheredTileTiers(): TilePool { - return [ - TileTier::HIGH->value => $this->gatheredHighTierTiles, - TileTier::MEDIUM->value => $this->gatheredMediumTierTiles, - TileTier::LOW->value => $this->gatheredLowTierTiles, - TileTier::RED->value => $this->gatheredRedTiles, - ]; + return $this->gatheredTiles; } } \ No newline at end of file diff --git a/app/Draft/Generators/SlicePoolGeneratorTest.php b/app/Draft/Generators/SlicePoolGeneratorTest.php index 3392cd8..351d13c 100644 --- a/app/Draft/Generators/SlicePoolGeneratorTest.php +++ b/app/Draft/Generators/SlicePoolGeneratorTest.php @@ -27,7 +27,7 @@ public function itGathersTheCorrectTiles($sets) $tiles = $generator->gatheredTiles(); $tiers = $generator->gatheredTileTiers(); - $combinedTiers = count($tiers["high"]) + count($tiers["mid"]) + count($tiers["low"]) + count($tiers["red"]); + $combinedTiers = count($tiers->allIds()); $this->assertSame(count($tiles), $combinedTiers); foreach($tiles as $t) { @@ -38,16 +38,6 @@ public function itGathersTheCorrectTiles($sets) $this->assertNotEquals($t->planets[0]->name, "Mallice"); } } - - foreach($generator->gatheredTileTierIds() as $key => $tier) { - foreach ($tier as $tileId) { - foreach($generator->gatheredTileTierIds() as $key2 => $tier2) { - if ($key != $key2) { - $this->assertNotContains($tileId, $tier2); - } - } - } - } } #[Test] @@ -64,6 +54,7 @@ public function itCanGenerateValidSlicesBasedOnSets($sets) ]); $generator = new SlicePoolGenerator($settings); + $slices = $generator->generate(); $tileIds = array_reduce( @@ -81,7 +72,8 @@ public function itCanGenerateValidSlicesBasedOnSets($sets) $settings->minimumOptimalInfluence, $settings->minimumOptimalResources, $settings->minimumOptimalTotal, - $settings->maximumOptimalTotal + $settings->maximumOptimalTotal, + $settings->maxOneWormholesPerSlice )); } } @@ -128,18 +120,19 @@ public function itGeneratesTheSameSlicesFromSameSeed() 'minimumOptimalTotal' => 9, 'maximumOptimalTotal' => 13, ]); + $generator = new SlicePoolGenerator($settings); - $pregeneratedSlices = [ - ["64", "33", "42", "67", "59"], - ["29", "66", "20", "39", "47"], - ["27", "32", "79", "68", "19"], - ["35", "37", "22", "40", "50"], - ]; $slices = $generator->generate(); + $generatedSlices = array_map(fn (Slice $slice) => $slice->tileIds(), $slices); + + $secondGenerator = new SlicePoolGenerator($settings); + + $slices = $secondGenerator->generate(); + foreach($slices as $sliceIndex => $slice) { - $this->assertSame($pregeneratedSlices[$sliceIndex], $slice->tileIds()); + $this->assertSame($generatedSlices[$sliceIndex], $slice->tileIds()); } } diff --git a/app/Draft/Generators/TilePool.php b/app/Draft/Generators/TilePool.php new file mode 100644 index 0000000..65f070a --- /dev/null +++ b/app/Draft/Generators/TilePool.php @@ -0,0 +1,51 @@ + $highTier */ + public array $highTier, + /** @var array $midTier */ + public array $midTier, + /** @var array $lowTier */ + public array $lowTier, + /** @var array $redTier */ + public array $redTier, + ) { + } + + public function shuffle(): void + { + shuffle($this->highTier); + shuffle($this->midTier); + shuffle($this->lowTier); + shuffle($this->redTier); + } + + public function slice(int $numberOfSlices): TilePool + { + return new TilePool( + array_slice($this->highTier, 0, $numberOfSlices), + array_slice($this->midTier, 0, $numberOfSlices), + array_slice($this->lowTier, 0, $numberOfSlices), + array_slice($this->redTier, 0, $numberOfSlices * 2) + ); + } + + /** + * @return array + */ + public function allIds(): array + { + return array_merge($this->highTier, $this->midTier, $this->lowTier, $this->redTier); + } + + public function slices(): array + { + + } +} \ No newline at end of file diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php index 2a73584..d525e87 100644 --- a/app/Draft/Slice.php +++ b/app/Draft/Slice.php @@ -9,9 +9,8 @@ class Slice { - protected const MAX_ARRANGEMENT_TRIES = 12; + protected const MAX_ARRANGEMENT_TRIES = 100; - protected array $tileArrangement; /** * @var array */ @@ -82,21 +81,19 @@ public function toJson(): array /** * @todo don't use countSpecials - * - * @throws InvalidSliceException */ public function validate( float $minimumOptimalInfluence, float $minimumOptimalResources, float $minimumOptimalTotal, float $maximumOptimalTotal, - ?int $maxWormholes = null + bool $maxOneWormhole ): bool { $specialCount = Tile::countSpecials($this->tiles); // can't have 2 alpha, beta or legendary planets if ($specialCount['alpha'] > 1 || $specialCount['beta'] > 1 || $specialCount['legendary'] > 1) { - throw InvalidSliceException::doesNotMeetRequirements("Too many wormholes or legendary planets"); + return false; } // has the right minimum optimal values? @@ -104,11 +101,11 @@ public function validate( $this->optimalInfluence < $minimumOptimalInfluence || $this->optimalResources < $minimumOptimalResources ) { - throw InvalidSliceException::doesNotMeetRequirements("Minimal influence/resources too low"); + return false; } - if ($maxWormholes != null && $specialCount['alpha'] + $specialCount['beta'] > $maxWormholes) { - throw InvalidSliceException::doesNotMeetRequirements("More than allowed number of wormholes"); + if ($maxOneWormhole && $specialCount['alpha'] + $specialCount['beta'] > 1) { + return false; } // has the right total optimal value? (not too much, not too little) @@ -116,13 +113,13 @@ public function validate( $this->optimalTotal < $minimumOptimalTotal || $this->optimalTotal > $maximumOptimalTotal ) { - throw InvalidSliceException::doesNotMeetRequirements("Optimal values too high or low"); + return false; } return true; } - public function arrange(Seed $seed): void { + public function arrange(Seed $seed): bool { $tries = 0; while (!$this->tileArrangementIsValid()) { $seed->setForSlices($tries); @@ -130,9 +127,10 @@ public function arrange(Seed $seed): void { $tries++; if ($tries > self::MAX_ARRANGEMENT_TRIES) { - throw InvalidSliceException::hasNoValidArrangement(); + return false; } } + return true; } /** diff --git a/app/Draft/SliceTest.php b/app/Draft/SliceTest.php index a195b73..5467954 100644 --- a/app/Draft/SliceTest.php +++ b/app/Draft/SliceTest.php @@ -94,15 +94,13 @@ public static function tileConfigurations(): iterable #[Test] public function itCanArrangeTiles(array $tiles, bool $canBeArranged) { - if (!$canBeArranged) { - $this->expectException(InvalidSliceException::class); - } $slice = new Slice($tiles); $seed = new Seed(1); - $slice->arrange($seed); + $arranged = $slice->arrange($seed); - $this->assertTrue($slice->tileArrangementIsValid()); + $this->assertSame($canBeArranged, $arranged); + $this->assertSame($canBeArranged, $slice->tileArrangementIsValid()); } #[Test] @@ -116,9 +114,9 @@ public function itWontAllowSlicesWithTooManyWormholes() TileFactory::make(), ]); - $this->expectException(InvalidSliceException::class); + $valid = $slice->validate(0, 0, 0, 0, true); - $slice->validate(0, 0, 0, 0, null); + $this->assertFalse($valid); } #[Test] @@ -132,9 +130,9 @@ public function itWontAllowSlicesWithTooManyLegendaryPlanets() TileFactory::make(), ]); - $this->expectException(InvalidSliceException::class); + $valid = $slice->validate(0, 0, 0, 0, false); - $slice->validate(0, 0, 0, 0, null); + $this->assertFalse($valid); } #[Test] @@ -148,9 +146,9 @@ public function itCanValidateMaxWormholes() TileFactory::make(), ]); - $this->expectException(InvalidSliceException::class); + $valid = $slice->validate(0, 0, 0, 0, true); - $slice->validate(0, 0, 0, 0, 1); + $this->assertFalse($valid); } #[Test] @@ -174,15 +172,15 @@ public function itCanValidateMinimumOptimalInfluence() TileFactory::make(), ]); - $this->expectException(InvalidSliceException::class); - - $slice->validate( + $valid = $slice->validate( 2, 0, 0, 0, - 1 + false ); + + $this->assertFalse($valid); } #[Test] @@ -206,14 +204,14 @@ public function itCanValidateMinimumOptimalResources() TileFactory::make(), ]); - $this->expectException(InvalidSliceException::class); - - $slice->validate( + $valid = $slice->validate( 0, 3, 0, 0, + false ); + $this->assertFalse($valid); } #[Test] @@ -237,14 +235,15 @@ public function itCanValidateMinimumOptimalTotal() TileFactory::make(), ]); - $this->expectException(InvalidSliceException::class); - - $slice->validate( + $valid = $slice->validate( 0, 0, 5, - 0 + 0, + false ); + + $this->assertFalse($valid); } #[Test] @@ -273,14 +272,14 @@ public function itCanValidateMaximumOptimalTotal() TileFactory::make(), ]); - $this->expectException(InvalidSliceException::class); - - $slice->validate( + $valid = $slice->validate( 0, 0, 0, - 4 + 4, + false ); + $this->assertFalse($valid); } @@ -318,7 +317,8 @@ public function itCanValidateAValidSlice() 1, 3, 5, - 7 + 7, + false ); $this->assertTrue($valid); diff --git a/app/Generator.php b/app/Generator.php index ce9801c..c4a4663 100644 --- a/app/Generator.php +++ b/app/Generator.php @@ -112,7 +112,7 @@ private static function slicesFromTiles($tiles, $config, $previous_tries = 0) $config->minimum_optimal_resources, $config->minimum_optimal_total, $config->maximum_optimal_total, - $config->max_1_wormhole ? 1 : null + $config->max_1_wormhole ); $slice->arrange(); } catch (InvalidSliceException $e) { diff --git a/app/Http/ErrorResponse.php b/app/Http/ErrorResponse.php index 88eac79..73b691c 100644 --- a/app/Http/ErrorResponse.php +++ b/app/Http/ErrorResponse.php @@ -17,8 +17,9 @@ public function __construct( public function getBody(): string { if ($this->showErrorPage) { - $error = $this->error; - return include 'templates/error.php'; + return HtmlResponse::renderTemplate('templates/error.php', [ + 'error' => $this->error + ]); } else { // return json return parent::getBody(); @@ -28,7 +29,7 @@ public function getBody(): string public function getContentType(): string { if ($this->showErrorPage) { - return include 'text/html'; + return 'text/html'; } else { return parent::getContentType(); } diff --git a/app/Http/HtmlResponse.php b/app/Http/HtmlResponse.php index 7ea69e7..b83749b 100644 --- a/app/Http/HtmlResponse.php +++ b/app/Http/HtmlResponse.php @@ -21,6 +21,17 @@ public function getBody(): string return $this->html; } + /** + * @todo put this somewhere else + */ + public static function renderTemplate($template, $data): string + { + ob_start(); + extract($data); + include $template; + return ob_get_clean(); + } + public function getContentType(): string { return 'text/html; charset=UTF-8'; diff --git a/app/Http/RequestHandlers/HandleTestGeneratorRequest.php b/app/Http/RequestHandlers/HandleTestGeneratorRequest.php new file mode 100644 index 0000000..d7bdad5 --- /dev/null +++ b/app/Http/RequestHandlers/HandleTestGeneratorRequest.php @@ -0,0 +1,23 @@ +generate(); + + return $this->json([ + 'settings' => $settings->toArray() + ]); + } +} \ No newline at end of file diff --git a/app/TwilightImperium/Faction.php b/app/TwilightImperium/Faction.php index 77cc9c2..9429332 100644 --- a/app/TwilightImperium/Faction.php +++ b/app/TwilightImperium/Faction.php @@ -8,6 +8,11 @@ */ class Faction { + /** + * @var array $allFactionData + */ + private static array $allFactionData; + public function __construct( public readonly string $name, public readonly string $id, diff --git a/app/TwilightImperium/Tile.php b/app/TwilightImperium/Tile.php index 7d3578a..c0c1082 100644 --- a/app/TwilightImperium/Tile.php +++ b/app/TwilightImperium/Tile.php @@ -11,6 +11,11 @@ class Tile public float $optimalResources = 0; public float $optimalTotal = 0; + /** + * @var array $allTileData + */ + private static array $allTileData; + public function __construct( public string $id, public TileType $tileType, @@ -131,25 +136,30 @@ public static function tierData(): array */ public static function all(): array { - $allTileData = json_decode(file_get_contents('data/tiles.json'), true); - $tileTiers = self::tierData(); - $tiles = []; - - // merge tier and tile data - // We're keeping it in separate files for maintainability - foreach ($allTileData as $tileId => $tileData) { - $isMecRexOrMallice = count($tileData['planets']) > 0 && - ($tileData['planets'][0]['name'] == "Mecatol Rex" || $tileData['planets'][0]['name'] == "Mallice"); - - $tier = match($tileData['type']) { - "red" => TileTier::RED, - "blue" => $isMecRexOrMallice ? TileTier::NONE : $tileTiers[$tileId], - default => TileTier::NONE - }; - - $tiles[$tileId] = Tile::fromJsonData($tileId, $tier, $tileData); + if (!isset(self::$allTileData)) { + $allTileData = json_decode(file_get_contents('data/tiles.json'), true); + $tileTiers = self::tierData(); + /** @var array $tiles */ + $tiles = []; + + // merge tier and tile data + // We're keeping it in separate files for maintainability + foreach ($allTileData as $tileId => $tileData) { + $isMecRexOrMallice = count($tileData['planets']) > 0 && + ($tileData['planets'][0]['name'] == "Mecatol Rex" || $tileData['planets'][0]['name'] == "Mallice"); + + $tier = match($tileData['type']) { + "red" => TileTier::RED, + "blue" => $isMecRexOrMallice ? TileTier::NONE : $tileTiers[$tileId], + default => TileTier::NONE + }; + + $tiles[$tileId] = Tile::fromJsonData($tileId, $tier, $tileData); + } + + self::$allTileData = $tiles; } - return $tiles; + return self::$allTileData; } } diff --git a/app/helpers.php b/app/helpers.php index baceaa3..77e0317 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1,10 +1,12 @@ '; - var_dump($var); + foreach($variables as $v) { + var_dump($v); + } echo ''; } } @@ -58,6 +60,17 @@ function env($key, $defaultValue = null): ?string } } + +if (!function_exists('human_filesize')) { + function human_filesize($bytes, $dec = 2): string { + + $size = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); + $factor = floor((strlen($bytes) - 1) / 3); + if ($factor == 0) $dec = 0; + return sprintf("%.{$dec}f %s", $bytes / (1024 ** $factor), $size[$factor]); + } +} + if (!function_exists('get')) { function get($key, $default = null): string { diff --git a/app/routes.php b/app/routes.php index 32cf24c..92b5146 100644 --- a/app/routes.php +++ b/app/routes.php @@ -10,4 +10,5 @@ '/api/draft/{id}/restore' => \App\Http\RequestHandlers\HandleRestoreClaimRequest::class, '/api/draft/{id}/undo' => \App\Http\RequestHandlers\HandleUndoRequest::class, '/api/draft/{id}' => \App\Http\RequestHandlers\HandleGetDraftRequest::class, + '/test' => \App\Http\RequestHandlers\HandleTestGeneratorRequest::class, ]; diff --git a/bootstrap/boot.php b/bootstrap/boot.php index 26fe095..267e43b 100644 --- a/bootstrap/boot.php +++ b/bootstrap/boot.php @@ -6,6 +6,7 @@ require_once 'vendor/autoload.php'; + try { $dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . '/../'); $dotenv->load(); diff --git a/deploy/app/caddy/Caddyfile b/deploy/app/caddy/Caddyfile index c971d03..48af454 100644 --- a/deploy/app/caddy/Caddyfile +++ b/deploy/app/caddy/Caddyfile @@ -32,6 +32,5 @@ import common_config } milty.localhost { - tls internal import common_config } diff --git a/deploy/app/php/php.ini b/deploy/app/php/php.ini index 32ca442..0caf0b0 100644 --- a/deploy/app/php/php.ini +++ b/deploy/app/php/php.ini @@ -1,2 +1,2 @@ post_max_size = 100M -upload_max_filesize = 1000M +upload_max_filesize = 1000M \ No newline at end of file diff --git a/deploy/app/setup.sh b/deploy/app/setup.sh index ecd0393..f6a82b6 100755 --- a/deploy/app/setup.sh +++ b/deploy/app/setup.sh @@ -13,4 +13,5 @@ apk --update --no-cache add \ g++ \ git \ libtool \ - make + make \ + linux-headers diff --git a/index.php b/index.php index 116fb9d..a094fbc 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,7 @@ run(); ?> \ No newline at end of file diff --git a/templates/error.php b/templates/error.php index 7a3dd28..384f462 100644 --- a/templates/error.php +++ b/templates/error.php @@ -32,24 +32,24 @@ -
+
-

Draft not found. (or something else went wrong)

+

+

+ Back to Homesystem +

- - - From 9ee7ffa2f81781cd033eecb04a6601425ab3a055 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Wed, 24 Dec 2025 14:20:10 +0100 Subject: [PATCH 23/34] Add handler for generate draft and tests to handle all the input --- app/Application.php | 2 - .../InvalidDraftSettingsException.php | 6 + app/Draft/Generators/DraftGenerator.php | 6 +- app/Draft/Generators/DraftGeneratorTest.php | 6 +- app/Draft/Generators/SlicePoolGenerator.php | 4 +- .../Generators/SlicePoolGeneratorTest.php | 19 ++ app/Draft/Settings.php | 72 +---- app/Draft/SettingsTest.php | 11 + app/Http/HttpRequest.php | 2 +- .../HandleGenerateDraftRequest.php | 90 +++++- .../HandleGenerateDraftRequestTest.php | 273 ++++++++++++++++++ .../HandleViewDraftRequest.php | 1 - .../HandleViewDraftRequestTest.php | 10 +- app/Testing/RequestHandlerTestCase.php | 14 + img/tiles/ST_EMPTY.png | Bin 0 -> 8493 bytes 15 files changed, 429 insertions(+), 87 deletions(-) create mode 100644 app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php create mode 100644 img/tiles/ST_EMPTY.png diff --git a/app/Application.php b/app/Application.php index efe13e2..11c4f10 100644 --- a/app/Application.php +++ b/app/Application.php @@ -37,8 +37,6 @@ public function run() http_response_code($response->code); header('Content-type: ' . $response->getContentType()); echo $response->getBody(); - - exit; } diff --git a/app/Draft/Exceptions/InvalidDraftSettingsException.php b/app/Draft/Exceptions/InvalidDraftSettingsException.php index 677b8b0..15bc1ba 100644 --- a/app/Draft/Exceptions/InvalidDraftSettingsException.php +++ b/app/Draft/Exceptions/InvalidDraftSettingsException.php @@ -6,6 +6,12 @@ class InvalidDraftSettingsException extends \Exception { + + public static function notAllPlayerNamesAreFilled(): self + { + return new self("Not all player names are filled in"); + } + public static function playerNamesNotUnique(): self { return new self("Player names are not unique"); diff --git a/app/Draft/Generators/DraftGenerator.php b/app/Draft/Generators/DraftGenerator.php index ed69849..643facf 100644 --- a/app/Draft/Generators/DraftGenerator.php +++ b/app/Draft/Generators/DraftGenerator.php @@ -75,12 +75,8 @@ public function generatePlayerData(): array shuffle($players); } - var_dump($players); - - for ($i = 0; $i < count($players); $i++) { + foreach(array_values($players) as $i => $player) { $teamName = $teamNames[(int) floor($i/2)]; - - $player = array_shift($players); $teamPlayers[$player->id->value] = $player->putInTeam($teamName); } diff --git a/app/Draft/Generators/DraftGeneratorTest.php b/app/Draft/Generators/DraftGeneratorTest.php index 22b346f..1209c0e 100644 --- a/app/Draft/Generators/DraftGeneratorTest.php +++ b/app/Draft/Generators/DraftGeneratorTest.php @@ -10,7 +10,7 @@ class DraftGeneratorTest extends TestCase { - #[Test] + // #[Test] public function itCanGenerateADraftBasedOnSettings() { // don't have to check slices and factions, that's tested in their respective generators @@ -29,7 +29,7 @@ public function itCanGenerateADraftBasedOnSettings() unset($generator); } - #[Test] + // #[Test] public function itCanGeneratePlayerData() { $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David']; @@ -57,7 +57,7 @@ public function itCanGeneratePlayerData() unset($generator); } - #[Test] + // #[Test] public function itCanGeneratePlayerDataInPresetOrder() { $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David']; diff --git a/app/Draft/Generators/SlicePoolGenerator.php b/app/Draft/Generators/SlicePoolGenerator.php index 22dbc35..74e521e 100644 --- a/app/Draft/Generators/SlicePoolGenerator.php +++ b/app/Draft/Generators/SlicePoolGenerator.php @@ -3,8 +3,6 @@ namespace App\Draft\Generators; use App\Draft\Exceptions\InvalidDraftSettingsException; -use App\Draft\Exceptions\InvalidSliceException; -use App\Draft\Seed; use App\Draft\Settings; use App\Draft\Slice; use App\TwilightImperium\Tile; @@ -17,7 +15,7 @@ class SlicePoolGenerator { const MAX_TILE_SELECTION_TRIES = 100; - const MAX_SLICES_FROM_SELECTION_TRIES = 1000; + const MAX_SLICES_FROM_SELECTION_TRIES = 400; /** * @var array $tileData diff --git a/app/Draft/Generators/SlicePoolGeneratorTest.php b/app/Draft/Generators/SlicePoolGeneratorTest.php index 351d13c..c249c11 100644 --- a/app/Draft/Generators/SlicePoolGeneratorTest.php +++ b/app/Draft/Generators/SlicePoolGeneratorTest.php @@ -136,6 +136,25 @@ public function itGeneratesTheSameSlicesFromSameSeed() } } + #[Test] + public function itCanGenerateSlicesForDifficultSettings() + { + $settings = DraftSettingsFactory::make([ + 'numberOfSlices' => 8, + 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE], + 'maxOneWormholePerSlice' => true, + 'minimumLegendaryPlanets' => 2, + 'minimumTwoAlphaBetaWormholes' => true, + 'minimumOptimalTotal' => 10, + 'maximumOptimalTotal' => 13, + ]); + + $generator = new SlicePoolGenerator($settings); + $generator->generate(); + + $this->expectNotToPerformAssertions(); + } + #[Test] public function itCanGenerateSlicesWithMinimumTwoAlphaAndBetaWormholes() { diff --git a/app/Draft/Settings.php b/app/Draft/Settings.php index 7fcb75c..8161571 100644 --- a/app/Draft/Settings.php +++ b/app/Draft/Settings.php @@ -121,6 +121,10 @@ public function validate(): bool protected function validatePlayers(): bool { + if (count(array_filter($this->playerNames)) != count($this->playerNames)) { + throw InvalidDraftSettingsException::notAllPlayerNamesAreFilled(); + } + if (count(array_unique($this->playerNames)) != count($this->playerNames)) { throw InvalidDraftSettingsException::playerNamesNotUnique(); } @@ -226,7 +230,7 @@ public static function fromJson(array $data): self * @param $data * @return array */ - private static function tileSetsFromPayload($data): array + public static function tileSetsFromPayload($data): array { $tilesets = []; @@ -249,7 +253,7 @@ private static function tileSetsFromPayload($data): array * @param $data * @return array */ - private static function factionSetsFromPayload($data): array + public static function factionSetsFromPayload($data): array { $tilesets = []; @@ -281,68 +285,4 @@ public function tileSetNames() { return array_map(fn (\App\TwilightImperium\Edition $e) => $e->fullName(), $this->tileSets); } - - public static function fromRequest(HttpRequest $request): self - { - - $playerNames = []; - for ($i = 0; $i < $request->get('num_players'); $i++) { - $playerName = trim($request->get('players')[$i]); - - if ($playerName != '') { - $playerNames[] = $playerName; - } - } - - $allianceMode = (bool) $request->get('alliance_on', false); - - $customSlices = []; - if ($request->get('custom_slices', '') != '') { - $sliceData = explode("\n", get('custom_slices')); - foreach ($sliceData as $s) { - $slice = []; - $t = explode(',', $s); - foreach ($t as $tile) { - $tile = trim($tile); - $slice[] = $tile; - } - $customSlices[] = $slice; - } - } - - return new self( - $playerNames, - $request->get('preset_draft_order') == 'on', - new Name($request->get('name')), - new Seed($request->get('seed') != null ? (int) $request->get('seed') : null), - (int) $request->get('num_slices'), - (int) $request->get('num_factions'), - self::tileSetsFromPayload([ - 'include_pok' => $request->get('include_pok') == 'on', - 'include_ds_tiles' => $request->get('include_ds_tiles') == 'on', - 'include_te_tiles' => $request->get('include_te_tiles') == 'on', - ]), - self::factionSetsFromPayload([ - 'include_base_factions' => $request->get('include_base_factions') == 'on', - 'include_pok_factions' => $request->get('include_pok_factions') == 'on', - 'include_te_factions' => $request->get('include_te_factions') == 'on', - 'include_discordant' => $request->get('include_discordant') == 'on', - 'include_discordantexp' => $request->get('include_discordantexp') == 'on', - ]), - $request->get('include_keleres') == 'on', - $request->get('wormholes', 0) == 1, - $request->get('max_wormhole') == 'on', - (int) $request->get('min_legendaries'), - (float) $request->get('min_inf'), - (float) $request->get('min_res'), - (float) $request->get('min_total'), - (float) $request->get('max_total'), - $request->get('custom_factions') ?? [], - $customSlices, - $allianceMode, - $allianceMode ? AllianceTeamMode::from($request->get('alliance_teams')) : null, - $allianceMode ? AllianceTeamPosition::from($request->get('alliance_teams_position')) : null, - $allianceMode ? $request->get('force_double_picks') == 'on' : null, - ); - } } \ No newline at end of file diff --git a/app/Draft/SettingsTest.php b/app/Draft/SettingsTest.php index 2c17c79..dd34af3 100644 --- a/app/Draft/SettingsTest.php +++ b/app/Draft/SettingsTest.php @@ -177,6 +177,17 @@ public function itValidatesOptimalMaximum() { $draft->validate(); } + #[Test] + public function itValidatesPlayerNamesNotEmpty() { + $draft = DraftSettingsFactory::make([ + 'playerNames' => ['Alice', 'Bob', '', ''], + ]); + + $this->expectException(InvalidDraftSettingsException::class); + $this->expectExceptionMessage(InvalidDraftSettingsException::notAllPlayerNamesAreFilled()->getMessage()); + $draft->validate(); + } + #[Test] public function itValidatesMinimumLegendaryPlanets() { $draft = DraftSettingsFactory::make([ diff --git a/app/Http/HttpRequest.php b/app/Http/HttpRequest.php index 57fc087..5ff2b1f 100644 --- a/app/Http/HttpRequest.php +++ b/app/Http/HttpRequest.php @@ -20,7 +20,7 @@ public static function fromRequest($urlParameters = []): self ); } - public function get($key, $defaultValue = null): ?string + public function get($key, $defaultValue = null) { if (isset($this->urlParameters[$key])) { return $this->urlParameters[$key]; diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php index 00986d4..ee4cada 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php @@ -2,19 +2,39 @@ namespace App\Http\RequestHandlers; +use App\Draft\Exceptions\InvalidDraftSettingsException; use App\Draft\Generators\DraftGenerator; +use App\Draft\Name; +use App\Draft\Seed; use App\Draft\Settings; +use App\Http\ErrorResponse; +use App\Http\HttpRequest; use App\Http\HttpResponse; use App\Http\RequestHandler; +use App\TwilightImperium\AllianceTeamMode; +use App\TwilightImperium\AllianceTeamPosition; class HandleGenerateDraftRequest extends RequestHandler { + private Settings $settings; + + public function __construct(HttpRequest $request) + { + parent::__construct($request); + // parse settings from request + $this->settings = $this->settingsFromRequest(); + } + + public function handle(): HttpResponse { - $settings = Settings::fromRequest($this->request); - dd($settings); + try { + $this->settings->validate(); + } catch (InvalidDraftSettingsException $e) { + return new ErrorResponse($e->getMessage(), 400); + } - $draft = (new DraftGenerator($settings))->generate(); + $draft = (new DraftGenerator($this->settingsFromRequest()))->generate(); app()->repository->save($draft); @@ -23,4 +43,68 @@ public function handle(): HttpResponse 'admin' => $draft->secrets->adminSecret ]); } + + private function settingsFromRequest(): Settings + { + $playerNames = []; + for ($i = 0; $i < $this->request->get('num_players'); $i++) { + $playerNames[] = trim($this->request->get('player')[$i] ?? ''); + } + + $allianceMode = (bool) $this->request->get('alliance_on', false); + + $customSlices = []; + if ($this->request->get('custom_slices', '') != '') { + $sliceData = explode("\n", $this->request->get('custom_slices')); + foreach ($sliceData as $s) { + $slice = []; + $t = explode(',', $s); + foreach ($t as $tile) { + $tile = trim($tile); + $slice[] = $tile; + } + $customSlices[] = $slice; + } + } + + return new Settings( + $playerNames, + $this->request->get('preset_draft_order') == 'on', + new Name($this->request->get('name')), + new Seed($this->request->get('seed') != null ? (int) $this->request->get('seed') : null), + (int) $this->request->get('num_slices'), + (int) $this->request->get('num_factions'), + Settings::tileSetsFromPayload([ + 'include_pok' => $this->request->get('include_pok') == 'on', + 'include_ds_tiles' => $this->request->get('include_ds_tiles') == 'on', + 'include_te_tiles' => $this->request->get('include_te_tiles') == 'on', + ]), + Settings::factionSetsFromPayload([ + 'include_base_factions' => $this->request->get('include_base_factions') == 'on', + 'include_pok_factions' => $this->request->get('include_pok_factions') == 'on', + 'include_te_factions' => $this->request->get('include_te_factions') == 'on', + 'include_discordant' => $this->request->get('include_discordant') == 'on', + 'include_discordantexp' => $this->request->get('include_discordantexp') == 'on', + ]), + $this->request->get('include_keleres') == 'on', + $this->request->get('wormholes', 0) == 1, + $this->request->get('max_wormhole') == 'on', + (int) $this->request->get('min_legendaries'), + (float) $this->request->get('min_inf'), + (float) $this->request->get('min_res'), + (float) $this->request->get('min_total'), + (float) $this->request->get('max_total'), + $this->request->get('custom_factions') ?? [], + $customSlices, + $allianceMode, + $allianceMode ? AllianceTeamMode::from($this->request->get('alliance_teams')) : null, + $allianceMode ? AllianceTeamPosition::from($this->request->get('alliance_teams_position')) : null, + $allianceMode ? $this->request->get('force_double_picks') == 'on' : null, + ); + } + + /** used for tests */ + public function settingValue($field) { + return $this->settings->$field; + } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php new file mode 100644 index 0000000..2d8b41b --- /dev/null +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php @@ -0,0 +1,273 @@ +handleRequest([], [ + 'seed' => -1 + ]); + + $this->assertSame($response->code, 400); + $this->assertJsonResponseSame(['error' => InvalidDraftSettingsException::invalidSeed()->getMessage()], $response); + } + + public static function settingsPayload() + { + yield 'Player Names' => [ + 'postData' => [ + 'num_players' => 4, + 'player' => [ + 'John', 'Paul', 'George', 'Ringo' + ] + ], + 'field' => 'playerNames', + 'expected' => ['John', 'Paul', 'George', 'Ringo'], + 'expectedWhenNotSet' => [] + ]; + yield 'Player Names containing empties' => [ + 'postData' => [ + 'num_players' => 6, + 'player' => [ + 'John', 'Paul', 'George', 'Ringo', '', '' + ] + ], + 'field' => 'playerNames', + 'expected' => ['John', 'Paul', 'George', 'Ringo', '', ''], + 'expectedWhenNotSet' => [] + ]; + yield 'Alliance Mode' => [ + 'postData' => [ + 'alliance_on' => true, + 'alliance_teams' => AllianceTeamMode::RANDOM->value, + 'alliance_teams_position' => AllianceTeamPosition::NONE->value, + ], + 'field' => 'allianceMode', + 'expected' => true, + 'expectedWhenNotSet' => false, + ]; + yield 'Custom Slices' => [ + 'postData' => [ + 'custom_slices' => "1,2,3,4,5\n6,7,8,9,10\n11,12,13,14,15" + ], + 'field' => 'customSlices', + 'expected' => [ + ['1', '2', '3', '4', '5'], + ['6', '7', '8', '9', '10'], + ['11', '12', '13', '14', '15'], + ], + 'expectedWhenNotSet' => [], + ]; + yield 'Preset Draft Order' => [ + 'postData' => [ + 'preset_draft_order' => 'on' + ], + 'field' => 'presetDraftOrder', + 'expected' => true, + 'expectedWhenNotSet' => false + ]; + yield 'Number of slices' => [ + 'postData' => [ + 'num_slices' => '8' + ], + 'field' => 'numberOfSlices', + 'expected' => 8, + 'expectedWhenNotSet' => 0 + ]; + yield 'Number of factions' => [ + 'postData' => [ + 'num_factions' => '7' + ], + 'field' => 'numberOfFactions', + 'expected' => 7, + 'expectedWhenNotSet' => 0 + ]; + yield 'Tile set POK' => [ + 'postData' => [ + 'include_pok' => 'on' + ], + 'field' => 'tileSets', + 'expected' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS], + 'expectedWhenNotSet' => [Edition::BASE_GAME] + ]; + yield 'Tile set DS' => [ + 'postData' => [ + 'include_ds_tiles' => 'on' + ], + 'field' => 'tileSets', + 'expected' => [Edition::BASE_GAME, Edition::DISCORDANT_STARS_PLUS], + 'expectedWhenNotSet' => [Edition::BASE_GAME] + ]; + yield 'Tile set TE' => [ + 'postData' => [ + 'include_te_tiles' => 'on' + ], + 'field' => 'tileSets', + 'expected' => [Edition::BASE_GAME, Edition::THUNDERS_EDGE], + 'expectedWhenNotSet' => [Edition::BASE_GAME] + ]; + yield 'Faction set basegame' => [ + 'postData' => [ + 'include_base_factions' => 'on' + ], + 'field' => 'factionSets', + 'expected' => [Edition::BASE_GAME], + 'expectedWhenNotSet' => [] + ]; + yield 'Faction set pok' => [ + 'postData' => [ + 'include_pok_factions' => 'on' + ], + 'field' => 'factionSets', + 'expected' => [Edition::PROPHECY_OF_KINGS], + 'expectedWhenNotSet' => [] + ]; + yield 'Faction set te' => [ + 'postData' => [ + 'include_te_factions' => 'on' + ], + 'field' => 'factionSets', + 'expected' => [Edition::THUNDERS_EDGE], + 'expectedWhenNotSet' => [] + ]; + yield 'Faction set ds' => [ + 'postData' => [ + 'include_discordant' => 'on' + ], + 'field' => 'factionSets', + 'expected' => [Edition::DISCORDANT_STARS], + 'expectedWhenNotSet' => [] + ]; + yield 'Faction set ds+' => [ + 'postData' => [ + 'include_discordantexp' => 'on' + ], + 'field' => 'factionSets', + 'expected' => [Edition::DISCORDANT_STARS_PLUS], + 'expectedWhenNotSet' => [] + ]; + yield 'Council Keleres' => [ + 'postData' => [ + 'include_keleres' => 'on' + ], + 'field' => 'includeCouncilKeleresFaction', + 'expected' => true, + 'expectedWhenNotSet' => false + ]; + yield 'Minimum legendary planets' => [ + 'postData' => [ + 'min_legendaries' => '1' + ], + 'field' => 'minimumLegendaryPlanets', + 'expected' => 1, + 'expectedWhenNotSet' => 0 + ]; + yield 'Minimum optimal Influence' => [ + 'postData' => [ + 'min_inf' => '4.5' + ], + 'field' => 'minimumOptimalInfluence', + 'expected' => 4.5, + 'expectedWhenNotSet' => 0.0 + ]; + yield 'Minimum optimal Resources' => [ + 'postData' => [ + 'min_res' => '3' + ], + 'field' => 'minimumOptimalResources', + 'expected' => 3.0, + 'expectedWhenNotSet' => 0.0 + ]; + yield 'Minimum optimal total' => [ + 'postData' => [ + 'min_total' => '7.3' + ], + 'field' => 'minimumOptimalTotal', + 'expected' => 7.3, + 'expectedWhenNotSet' => 0.0 + ]; + yield 'Maximum optimal total' => [ + 'postData' => [ + 'min_total' => '13' + ], + 'field' => 'minimumOptimalTotal', + 'expected' => 13.0, + 'expectedWhenNotSet' => 0.0 + ]; + yield 'Custom Factions' => [ + 'postData' => [ + 'custom_factions' => ['Xxcha', 'Keleres'] + ], + 'field' => 'customFactions', + 'expected' => ['Xxcha', 'Keleres'], + 'expectedWhenNotSet' => [] + ]; + yield 'Alliance Team Mode' => [ + 'postData' => [ + 'alliance_on' => true, + 'alliance_teams' => 'random', + 'alliance_teams_position' => 'neighbors' + ], + 'field' => 'allianceTeamMode', + 'expected' => AllianceTeamMode::RANDOM, + 'expectedWhenNotSet' => null + ]; + yield 'Alliance Team Position' => [ + 'postData' => [ + 'alliance_on' => true, + 'alliance_teams' => 'random', + 'alliance_teams_position' => 'neighbors' + ], + 'field' => 'allianceTeamPosition', + 'expected' => AllianceTeamPosition::NEIGHBORS, + 'expectedWhenNotSet' => null + ]; + yield 'Alliance Force double picks' => [ + 'postData' => [ + 'alliance_on' => true, + 'force_double_picks' => 'on', + 'alliance_teams' => 'random', + 'alliance_teams_position' => 'neighbors' + ], + 'field' => 'allianceForceDoublePicks', + 'expected' => true, + 'expectedWhenNotSet' => null + ]; + } + + #[Test] + #[DataProvider('settingsPayload')] + public function itParsesSettingsFromRequest($postData, $field, $expected, $expectedWhenNotSet) + { + $handler = new HandleGenerateDraftRequest(new HttpRequest( + [], + $postData, + [], + )); + + $this->assertSame($expected, $handler->settingValue($field)); + } + + + #[Test] + #[DataProvider('settingsPayload')] + public function itParsesSettingsFromRequestWhenNotSet($postData, $field, $expected, $expectedWhenNotSet) + { + $handler = new HandleGenerateDraftRequest(new HttpRequest([], [], [])); + $this->assertSame($expectedWhenNotSet, $handler->settingValue($field)); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequest.php b/app/Http/RequestHandlers/HandleViewDraftRequest.php index f19dc11..6936dcc 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequest.php @@ -19,7 +19,6 @@ public function handle(): HttpResponse return new ErrorResponse('Draft not found', 404, true); } - return $this->html( 'templates/draft.php', [ diff --git a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php index b4aba6e..0a1d78d 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php @@ -3,6 +3,8 @@ namespace App\Http\RequestHandlers; use App\Draft\Draft; +use App\Http\ErrorResponse; +use App\Http\HtmlResponse; use App\Http\HttpRequest; use App\Testing\MakesHttpRequests; use App\Testing\RequestHandlerTestCase; @@ -13,8 +15,6 @@ class HandleViewDraftRequestTest extends RequestHandlerTestCase { - use MakesHttpRequests; - protected string $requestHandlerClass = HandleViewDraftRequest::class; #[Test] @@ -34,6 +34,7 @@ public function itDisplaysADraft($data) $handler = new HandleViewDraftRequest(new HttpRequest([], [], ['id' => (string) $draft->id])); $response = $handler->handle(); + $this->assertInstanceOf(HtmlResponse::class, $response); $this->assertSame($response->code, 200); // cleanup @@ -43,7 +44,10 @@ public function itDisplaysADraft($data) #[Test] public function itReturnsAnErrorWhenDraftIsNotFound() { - // @todo + $handler = new HandleViewDraftRequest(new HttpRequest([], [], ['id' => '1234'])); + $response = $handler->handle(); + $this->assertInstanceOf(ErrorResponse::class, $response); + $this->assertSame($response->code, 404); } } \ No newline at end of file diff --git a/app/Testing/RequestHandlerTestCase.php b/app/Testing/RequestHandlerTestCase.php index e71897d..d4b117a 100644 --- a/app/Testing/RequestHandlerTestCase.php +++ b/app/Testing/RequestHandlerTestCase.php @@ -3,6 +3,9 @@ namespace App\Testing; use App\Application; +use App\Http\HttpRequest; +use App\Http\HttpResponse; +use App\Http\RequestHandlers\HandleViewDraftRequest; use PHPUnit\Framework\Attributes\After; use PHPUnit\Framework\Attributes\Before; use \PHPUnit\Framework\TestCase as BaseTestCase; @@ -30,4 +33,15 @@ public function assertIsConfiguredAsHandlerForRoute($route) $determinedHandler = $this->application->handlerForRequest($route); $this->assertInstanceOf($this->requestHandlerClass, $determinedHandler); } + + public function handleRequest($getParameters = [], $postParameters = [], $urlParameters = []): HttpResponse + { + $handler = new $this->requestHandlerClass(new HttpRequest($getParameters, $postParameters, $urlParameters)); + return $handler->handle(); + } + + public function assertJsonResponseSame(array $expected, HttpResponse $response) + { + $this->assertSame($expected, json_decode($response->getBody(), true)); + } } \ No newline at end of file diff --git a/img/tiles/ST_EMPTY.png b/img/tiles/ST_EMPTY.png new file mode 100644 index 0000000000000000000000000000000000000000..d708fd7adab92c3ba5ac2b4f0c122f59ce4fb5a8 GIT binary patch literal 8493 zcmaKQXH?VQvi1*<-jv>}sPq;}=tU5eCL%>zLI@CAAoOYkrAkqn^xmWxEP!-GnsgKh zT{=i;0s#c^jpv;IdGCk2ZdS5Z_UxHwW=~nO_r#hQ-Jzx8paKAZR$uS7DF6_;6Mm`` zWCV(&q2)FJP-!EywN3Q3wfVeINGF6l8~_4mavua(rkt>-EuO&X&9$)mbs6qY00F^j zioUB>MOR+}(5F`!G`gR~P?<9^U(3;Z_&H*NN-sBNx!_i#vu0e(qxgq5io3jX#(JOoThYYKdf%_`U0ome#m4u1X3Zfe6UFb>}*#aiyb{2yIm_bB7q+N(%TVS|-zLKmc^6me?S`r$`KF^DqvP@EMR4NR79DueA4i z)~H7WbPS{oW!xK=Wok?t|9zQ%`ICE{7L--^suSg^Ku$)sAfw&}iNP=p0C1d* zbzUl}CvU8;F0DIlxbGcx7hSsTBL&p>4;C+5o)cdIt{RQ(&DgK4O_F%^5@Gz>-72kt z8FRp8@yu3sma^ax)oAcpe30UW22Wn0NuLTg7Zo-2j*vrPtJF%o+8@~^fn{u?iGX2m z&_~l3xB2_imKnAl%N+2g|E5d{parUu^(tehtAxZ=cWt6M{K+7hZO+_lJK@SB0+%9+`g3%13+zpv&pxZs}kp zhLYXZpt;_ma#f3L70pFe$d<0jZq}iMz48G=!clN7Yw7CyPH9EjjqeOLPqw{S$slZb zpV(TWD6eStQ7}UJm13?rBw_`IDOfWTuLwZ(KrhiHd|NS0_XWE9P$k5bTCOi_^#p&4 zqnN-6HX6T@XZ!eM;x6J^?ntLTd3&Ga8?m3p#|mDKxSj%^F<%h9Ejqo(ZH(hRk1D#p zsC?|+rk^hm7MBP^k4e)xJ)ef!Jdf6a#9DIP=w*SeS<0Cw$-%fS75tewJMy4=6xWI4 z(Tq3>yQfz_xkn@?-?22X)UFW13BG4&qOhQhd@B9vra(%C@q3|QhO^Is4oY>&mb%q9 zcKLbu^Mvef(lOen=v}Alf4OQz#V?dBqff2xrZ=l6Uh<$sZTu=C$Kb|xvPb{ID#crL zHDAVyhGhC=Z-67k}R(JX{B;>1OA%eRSgK9WZ#V>DyjZIgU!V=M9~ zfQB}THnLaG;TF3adkA|uTLZgfra>9$*Nn_QGpQ*V&P?Z5^skT)Ek*Dmq0BG7Fr+D^ znWu%PZM-&n=<`s0BIq@>S=B@ODm(MAGTn#oOjar>zp+$JRB}ITu9UAGHVrUMG8wsV zU)*N@JK`6N_HEQN-GV5+Vl!An4|@VXOOFivz*1`xWlpj!=Jv|a!TRkP&cL7aoYP-2 z#NdIp&ugb@rx#AS>)t~|bUk(7_rcRScZd0hX@^6^NyOE~>n2@moNB^r6lQ{F+GZSf zP&+I;+cSH9Ubz~%V!6jk9!e*EluhzY_nV$I&H9b}Q2Pqo4%(tT{&GyWH9vOe*yE`9 znDxirBVQ4;xYZ=n~gViqn%ge z0$J6Zs*zj{)u09VoSO>N0U^)h)}ZY3%)1-@(B?vAJq&bw4fIH-7x*6`jxqwd64!|iUh)7#hJOa@1CR2!a?kwWfwVP_ z-KOymUyqBko3rO?raivR52|*DRh=73WOMf0cB$@Z9_^o4E_)BIzOwkhJr+ zv$8vH8S&N2} z)`}OEg6v@Z$$18oopTn;8e{%Kk<0vu^Ow}%4FjIZYl%@K6pL5Gk!5EFTZ8o!G2idF z$29UH*fUwr!kC0bWL``Bxc~lvuea}s*ktvp)wy$P;z3g7^N-52uJtH?=W17XQ+F6H zyAj>^y75V1^r_B427@o-b;_OC)z8?^s^p}%W!84!3S!VZV24ltVO>0f)SPUd9L<6natOFbMTJ;`%lU;PW z{Bb5o9l;XXnv5}N#Js~c23j3_7iiaMW)X~kz#1SSZEM=(7>L*(4;ye9c$@y)WZBa6 z;ZN6~xu1!qk>jPM+M*E_ptQ=={sGV0qemZM%+NH)hkLFW6V~RBMOf49tG%i#YELn` zjqA%6M)nh-$3Y%5GYfYczU*x4ZI^6&R-ah4zq#A$syQ(lwNG2ad62NiY434&!M8Bj z^*C|p{m_>o5;>^cj`d)D_3Y0=`C@!(p>AjxmXq&vSPAXINUYYHME%dxZ#*$TQ5j-T&dl! zTD;h!K((-SZ}WL^F1H=`owkNQ;d|06Fuz{8B#XR)+*_&#XR8q@E9H*mdAUaFs^2o_ zf=&!BGTm(N+qODukL0Pd`tBMu*q`(tE^H*(?zeay37k003N_rTQLRw9Fltvt5(_3Mmd4&LGM{S?vx8R@d3-=m|9&bv(g^EG;D{LbK=2|-=K zgrrq=&%JeAM_vZ6oyZLh|J4;W-*C zbd7MUWcSsv^nHMI@(qBZ;DDwh(gDt=?*Vm&o5G=vLEimv6#yWKLYP_lS{fQC!H^yj z(7!wqfgWB2X#h}B5A=e<+~B@^4sd6Lr>ekSbGrZ^!ckSgLe5ai&`TTcg3t>_!5;)0 znZbhHU|>f9bu~VfKqUfz2izCR7wF;c>7x{=D)28{CBpx|WJv+Of3f(wsS5ntC`&^V zK5Zll&Zi(DBMy_2lHyYUOGrD&%Rv>u4j?f;87UbVNhx_rX<2a@86_!c!k6zq9|3|w zl%tc9>22Nrs3WXY1zdc6y_6&+0|Ejh0%RqSC}&A&Fc>T;B_k;#BTnED_X+a!g$9ay z`Uw7ma2xIeLm|9;5lBzIzlcx=q@S;<0KwRQpTfh-(D1*&o<9Ha6~Swgflx0=X$dJw z50Ae``xm#5uPOZhoAJML`{03zvt9OFJsS#6eJbMRBOCoPxNc6i7-MBtm-r{rlh2AT0h{TyRf9MWG0#BNH@J1^^7Z`nNUB0%vgZC+}=0 z{DAK@A(~9FbUjC|!Ln?(@9@zy8Za#PV-M&vFNn@Ee!?7#Wm2U1k8T8$!#Y5mS14{v zmQe}z+08jySE$UN?+Tyi9EQodL9Xo0hfGaBLbm(h?Lw@IDAfnNT@w>bHIr~JS8}UJ070QKgq>yZ{m~-3_KoCnMwYOtRsp zrSiAfNnLSAKs1)YLxq30$DW1jIHJSFNRQd?X^PX0cz*y%X-MmzUGLpCg+|RYyAhz` z$#E1joBOEo(^yLS6o zd|!2Y_Sak^Z5FCZS-UG$^%cb>NU$#@(I91(zXK=nGNQDOE(CEY(W^EN++*0`R2!+Y z6B)#8vqb;k5vP^Pm_VS6IZ2!4y}w+njRQXM;nP(mnw_-|j;QON)4$G!&-#`@rUaS} zf-H$A-VPdf)^?xu%cxb%Tq4Hr@Q^mkM3?mMTrCJzH%RFUxsMU`j%CvDSXQv0KV-(; zh}-$G@mDlHk|lhcWT+Wr$b&D27{fm>X;g916+w)JvZ{C`X-8jM zE(b(_Zef*CnM`Oa|5&l@^ZG!ncNs|Inz`7wij0y^G$GdNEyF2fx4t|B<5S2;L+;gS zI!PkXMV|}#Js)_=S2_MJuuwS9heYHKb6PY<@Rzlhj&4Z8N>thpP%gKLYOmWwiN2 zEM)qs`l$)8Qcv)<{V!S)B}BJYr=4?@DotI8>&+D&CD9o@np*qcSE>EQKB>U?chALWNpW%=vFd_RXX&R89%x#Q43DYTs$pLadr# zq~(EpYDBBbmLF}{2V^240GBc0O(7gpqucE(=eMx)tnoNwg}lNk2SLL-OB9Ew#%hrxX$}5=)3WTao3p$pO#s zu-0hqFtYHE`^FHz|uJ-0Fa(s=t2D zwk27!P7B5iHb~0i0x@23(vl7`%E^rY`Sr?|3FEe=t(Z+?F*(FAv>EZ=@j!i)>fMdlDOU)I+` zrmm;2<{+LEF~=H(-x0+gH_n|Bi%e$bP1^=84!#kU#VMNkBzTj4 zyS@v5V}hwVDCTNrf1qKQE_uQ71~MX?KCg(UuCT7wu&#uRY()258%1yavO1#sF;0!Q zLZD)9XfPUm@h*u_ZMN)0y*MBNRb!iEB~%bMIg~ZJmd&z~Q0`J)dBcTZ30Y5cx{b~9 z)B11hcw--&^B^ET?FZGe{#Mv3G>l0yPRZj3JmP8#LPW9gBd2dbMrdMODwXxR#iLHU zT%~Xt)lt!d*>LH5@%Kcqb;lR(DLJSv!?s_R7Il6gCU!(TB+i7H^LH;GcfA$@YfyzHez$dv5V3J_by;w=6 z_RqNvo0l79?k!9=$*2>^NjXg+HrR81*hM?bq(JW5p@T4mG(I&~vC>Z`q3AZr8P0 z;vi8ynCEiFe}LSHEN``i72J_<`SC2vX0pLJF@Mc+{TH$7+jA{j>#1^fe3sd6VLNcx z7zj0;iI3nem(N+wB35OV#mxk0$ot(}WvxWpy#?grZuswQ1il-P#l5oP{r-rU#AKVK zugMwfU9j7J{iOB@G)9?{)2DiGnI^;!^^!(P%-dy;$5s>@UD`ish~|$?AN$~bwfY@o zo0XVmqLMmg(ufK74wbW+MMP5H^aE+x`+H6CL@fPa2Nz64!V)i`Hhd7=FN@1B={Gk- z7dDGM45V?GAXQHMtu!r1e5z|;XOU)!p&vXz>igV84|O|brIj+{|kZtjhS=kd3&86SCo_^gn0+wQk*F2aGY-H0$1fx{51lA#g2*1Ov-8=gfv)^AIN^qdNO z#l?WjAslN;g-7VOUqzSMD!O$pOyD>QnCo7wzp|q8cUQL;MgldB?lTds$Sj8-O5j86 z>{z+s1I&u>n#>uo%Y^y4ef?Y(4|CWD6{7c^-Je#2=IfoX$~Ghv8pXrbx8|&wagE5< zqziyakZ!xxYak*_BT;mXtU%HG%T!x7t9z9e@CEd1;HlE(S~Ga~B_rB_5Ueg(THoRZ z)>sXQtG_ddq0b;kFLTSkBtd(cV2GI90Va3!Qjj_oe)cC|(vndGSrnxQx$@UmdL z3~IE4>dTc6?Q>mi`UHR@Xd>r|eNXo9PNV)C9O&`SPk&`M^JTwb2(qyQ;!r#5AA$}e zetRaKuaXx~$@`QZ;uazMBeP#?>&usIkqn@RPp&!&m9D?~?t@ z8g4v&2a_OD)NKQw0iuG?#@#0ZpDqP(iKRL ztOY_t{&=_av0j3EEx?Is+US|?xa2>N+>2U@@vl#AhUo%XUKUxnX#IQQSk3%v=-`?G z?~%mIas(BA0GyX$jGmcO8Ttd-iIr{ma#KS*Jfp1TSS9Z#XZXt-&3sAe*61&xc`Fu( zc=64{VT?8?>X$}1kqG1LhskE)GQ z*J^7Z(ame@klpFyu6N;Mfs~R*_Y>E^bSXY)p^yB%QC96P??1D~b0`0L4h%}*>s9Jf zC2d?g6Rq$GKk2022}v%n4ILC6Fn-b`2fl_}?-li6!hI*Y-r;+hx;`hTmUl?|`AKWY zx?xS&5{{qrfr}GkISYJbe@i;L%FzjJ&&1{Sf zha{5Nu%eMcO1<0PJ2Qs zmuaI`;uaww(6n&xQZ2KTm-k|DSlXhOSy%S+Ay9s!c?UY|)ymlGb_6$R2rN4nTfl#Y=My8x?l_45=0|%k3 z)c!GQg7(c(9YE-dl_n*7h|MASsc#{KckL0eD(gv2e(fQtE^TN`^LWVvW)1tW91g6a zqU&at;wG^9j@&2I?j-&>Vdf^?H917TS#05RQ5MU}A$MBn>0|qZ=h5sp>IBXUlLG*? zQ8Gd?%3JqzueQw2{o8(Yb3maN$x&yGVVmVwQsubgKOcKE=x?_t>soXqJUUJGmKh43 z;@HHDnCfhR((N!^kES>`F_y0{g1$=5n0H=kXK@LWjmmjPe{Ykw3;ebmooH3BCa96| zxhC1Z;dt4D1sCuj!GnUxb>Aqow}R~NiXSH=P#eu;AjZRw*;dG1^i*6zTfQkMh^Pb|r0g=oC|o-7 zO_$1{2};SIXP*le5KXP0YIWv~5Xw*{9nI1DYUSDZ;%bFp|MTO&1>qOt44(>EN=Q_G zIXc3!9MZ#LQinY`aA#fEtkBjEyVYw=pcDp<1|lsMa22qAzfmHS(v1hvo(+l0>2tJT zym3kw9k70_z3$JQjD`J*Nd2}EMG}#Hlc@zSLWcSN3>mZ}SJ zw<-OzTAIRODe~Ka6RMcU=4tlV5>}wY!QswI2I11UaIfi%C_dgWfIi^2_VZwr^zwz= zzy*3|tGjbyCC}!$<@(76S1(6K2TPuTs#Ss1k1?It9utC$wb8og?m#sAF>ZMd9!i`Y zOX8<)iWy*{=gn8peFC!T3AmT9Hd+zQy5+gT)aN-=S82@aGS?N)bW^W-&>M3=6?yEM znEeZ1$dV0}+}_`4Do3hYJ*n*0ZE`z5?d(x)h2)p_M@BI|w`I%u01jX5rI-J4pc7x- zwVhzgmP&7$l>I3oIQ+m6RL{#xx|>fA`29&G6+}B#@(|VNu)-I!1D}g&B-*Z!+P+ zgA@!OVR&Gn+Q^ptl_>;Yxlsa{zxPTEUzKiwdQreA#9uCnEbs|Zx~GtJaxKtZk2f%e z^gNfVU2d}QkgVYq1T;z=2Fvn2CTZGw0qU5|))vQ(as9A^@hELS;Sb*&Lrb1Uf)_x$ zg+9x-Is%w*OLc{0O+s`tZDAF>;hUt&JZiOv0f5rV6aL4iFSZxkVNVOni#Qiy+D7Pz z-0>*FbDxB1ufFi6MrU3OqexpS*{#X1{gj0M9^pc_Hc64HTFF6Z{K)0{zL0UCJJz3p zlklot80R(xbYeY2PY93fR&nDS0~ZC?$2NYsAxtn08@j@10hKgZ4dERbA0)W7PA-I* zGw;m1TYYk2z)>J4jR>~lX!8&wojuaY@;y?v6DjcK^to`(;@XO4$D8pOHl1m5@{Al* z66D{#wdBoWCXb(!pryi_ewJx>E+OJz?EXbfP?YgQLKv-kA#GJy3K`K?P{L_{%dIL&`L{3b`w;y%ZR=SW(1Zz++;gmi* zWo?uaT3!|AsL%rAR;(atwsKrT-Wp;1&JTfVux&PD}8q@Yf-`+fwQQ$Z+0Ab zaGnnW7XYNq-Um<57kxqnm@(QTLcQU_Sn>Gc&vvO~SpMGxFo9~@TXP-wKZz}T1X;?3 zA@4{~hks29F=_MlI*D^X1iHrN4MY?xG(JS%CVoRYNncy8$JC^+K5*_pDHrL(#=LA;@#V@oa-6IM8dYzWEIdIH*RTcs1*d40V Date: Wed, 24 Dec 2025 16:03:45 +0100 Subject: [PATCH 24/34] I lost track of what I was doing --- app/Application.php | 1 + app/Draft/Draft.php | 20 --------- app/Draft/Generators/DraftGenerator.php | 13 +++--- app/Draft/Generators/DraftGeneratorTest.php | 12 ++---- app/Http/HtmlResponse.php | 4 +- app/Http/HttpRequest.php | 1 + app/Http/JsonResponse.php | 2 + app/Http/RequestHandler.php | 4 +- .../RequestHandlers/DraftRequestHandler.php | 21 ++++++++++ .../HandleClaimPlayerRequest.php | 9 ++++ .../HandleClaimPlayerRequestTest.php | 33 ++++++++++++++- .../HandleGenerateDraftRequestTest.php | 13 +++--- .../RequestHandlers/HandleGetDraftRequest.php | 2 - .../HandleGetDraftRequestTest.php | 41 +++++++++++++++++++ .../HandleViewDraftRequest.php | 10 ++--- .../HandleViewDraftRequestTest.php | 33 ++++++--------- .../HandleViewFormRequestTest.php | 12 +++++- app/Testing/MakesHttpRequests.php | 24 ----------- app/Testing/RequestHandlerTestCase.php | 20 ++++++++- app/Testing/TestCase.php | 2 - app/Testing/TestResponse.php | 22 ---------- app/Testing/UsesTestDraft.php | 33 +++++++++++++++ app/routes.php | 10 ++--- js/draft.js | 3 -- 24 files changed, 215 insertions(+), 130 deletions(-) create mode 100644 app/Http/RequestHandlers/DraftRequestHandler.php create mode 100644 app/Http/RequestHandlers/HandleGetDraftRequestTest.php delete mode 100644 app/Testing/MakesHttpRequests.php delete mode 100644 app/Testing/TestResponse.php create mode 100644 app/Testing/UsesTestDraft.php diff --git a/app/Application.php b/app/Application.php index 11c4f10..e808651 100644 --- a/app/Application.php +++ b/app/Application.php @@ -2,6 +2,7 @@ namespace App; +use App\Draft\Exceptions\DraftRepositoryException; use App\Draft\Repository\DraftRepository; use App\Draft\Repository\LocalDraftRepository; use App\Draft\Repository\S3DraftRepository; diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php index 325b83b..603e1e4 100644 --- a/app/Draft/Draft.php +++ b/app/Draft/Draft.php @@ -104,26 +104,6 @@ public function toArray($includeSecrets = false): array return $data; } - public static function createFromSettings(Settings $settings) - { - $factionPooLGenerator = new FactionPoolGenerator($settings); - $slicePoolGenerator = new SlicePoolGenerator($settings); - - return new self( - DraftId::generate(), - false, - // @todo - [], - $settings, - Secrets::new(), - $slicePoolGenerator->generate(), - $factionPooLGenerator->generate(), - [], - // @todo - null - ); - } - public function determineCurrentPlayer(): PlayerId { $doneSteps = count($this->log); diff --git a/app/Draft/Generators/DraftGenerator.php b/app/Draft/Generators/DraftGenerator.php index 643facf..e29a882 100644 --- a/app/Draft/Generators/DraftGenerator.php +++ b/app/Draft/Generators/DraftGenerator.php @@ -62,7 +62,14 @@ protected function generateTeamNames(): array public function generatePlayerData(): array { $players = []; - foreach ($this->settings->playerNames as $name) { + + $playerNames = [...$this->settings->playerNames]; + + if (!$this->settings->presetDraftOrder) { + shuffle($playerNames); + } + + foreach ($playerNames as $name) { $p = Player::create($name); $players[$p->id->value] = $p; } @@ -83,10 +90,6 @@ public function generatePlayerData(): array $players = $teamPlayers; } - if (!$this->settings->presetDraftOrder) { - shuffle($players); - } - return $players; } diff --git a/app/Draft/Generators/DraftGeneratorTest.php b/app/Draft/Generators/DraftGeneratorTest.php index 1209c0e..a6ecb4f 100644 --- a/app/Draft/Generators/DraftGeneratorTest.php +++ b/app/Draft/Generators/DraftGeneratorTest.php @@ -10,7 +10,7 @@ class DraftGeneratorTest extends TestCase { - // #[Test] + #[Test] public function itCanGenerateADraftBasedOnSettings() { // don't have to check slices and factions, that's tested in their respective generators @@ -24,12 +24,10 @@ public function itCanGenerateADraftBasedOnSettings() $this->assertNotEmpty($draft->slicePool); $this->assertNotEmpty($draft->factionPool); - $this->assertNotNull($draft->currentPlayerId); - - unset($generator); + $this->assertEquals($draft->currentPlayerId, array_values($draft->players)[0]->id); } - // #[Test] + #[Test] public function itCanGeneratePlayerData() { $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David']; @@ -53,11 +51,9 @@ public function itCanGeneratePlayerData() $this->assertCount(count($originalPlayerNames), array_unique($playerIds)); $this->assertCount(count($originalPlayerNames), array_unique($playerNames)); - - unset($generator); } - // #[Test] + #[Test] public function itCanGeneratePlayerDataInPresetOrder() { $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David']; diff --git a/app/Http/HtmlResponse.php b/app/Http/HtmlResponse.php index b83749b..4e1ac81 100644 --- a/app/Http/HtmlResponse.php +++ b/app/Http/HtmlResponse.php @@ -4,6 +4,8 @@ class HtmlResponse extends HttpResponse { + const CONTENT_TYPE = 'text/html; charset=UTF-8'; + public function __construct( protected string $html, public int $code = 200 @@ -34,6 +36,6 @@ public static function renderTemplate($template, $data): string public function getContentType(): string { - return 'text/html; charset=UTF-8'; + return self::CONTENT_TYPE; } } \ No newline at end of file diff --git a/app/Http/HttpRequest.php b/app/Http/HttpRequest.php index 5ff2b1f..5915f67 100644 --- a/app/Http/HttpRequest.php +++ b/app/Http/HttpRequest.php @@ -33,4 +33,5 @@ public function get($key, $defaultValue = null) } return $defaultValue; } + } \ No newline at end of file diff --git a/app/Http/JsonResponse.php b/app/Http/JsonResponse.php index 417c260..e067e0d 100644 --- a/app/Http/JsonResponse.php +++ b/app/Http/JsonResponse.php @@ -4,6 +4,8 @@ class JsonResponse extends HttpResponse { + public const CONTENT_TYPE = 'application/json'; + public function __construct( protected array $data, public int $code = 200 diff --git a/app/Http/RequestHandler.php b/app/Http/RequestHandler.php index 0ff78d3..4cb5583 100644 --- a/app/Http/RequestHandler.php +++ b/app/Http/RequestHandler.php @@ -11,9 +11,9 @@ public function __construct( public abstract function handle(): HttpResponse; - protected function error(string $error): ErrorResponse + protected function error(string $error, $code = 500, $showErrorPage = false): ErrorResponse { - return new ErrorResponse($error); + return new ErrorResponse($error, $code, $showErrorPage); } public function html($template, $data = [], $code = 200): HtmlResponse diff --git a/app/Http/RequestHandlers/DraftRequestHandler.php b/app/Http/RequestHandlers/DraftRequestHandler.php new file mode 100644 index 0000000..debb923 --- /dev/null +++ b/app/Http/RequestHandlers/DraftRequestHandler.php @@ -0,0 +1,21 @@ +repository->load($this->request->get($urlKey)); + } catch (DraftRepositoryException $e) { + return null; + } + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleClaimPlayerRequest.php b/app/Http/RequestHandlers/HandleClaimPlayerRequest.php index 64936a4..c777ab6 100644 --- a/app/Http/RequestHandlers/HandleClaimPlayerRequest.php +++ b/app/Http/RequestHandlers/HandleClaimPlayerRequest.php @@ -3,6 +3,8 @@ namespace App\Http\RequestHandlers; use App\Draft\Draft; +use App\Draft\Exceptions\DraftRepositoryException; +use App\Http\ErrorResponse; use App\Http\HttpResponse; use App\Http\RequestHandler; @@ -10,6 +12,13 @@ class HandleClaimPlayerRequest extends RequestHandler { public function handle(): HttpResponse { + try { + $draft = app()->repository->load($this->request->get('id')); + + + } catch (DraftRepositoryException $e) { + return new ErrorResponse('Draft not found', 404); + } } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php b/app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php index 355eb6b..0a5276d 100644 --- a/app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php +++ b/app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php @@ -2,13 +2,11 @@ namespace App\Http\RequestHandlers; -use App\Testing\MakesHttpRequests; use App\Testing\RequestHandlerTestCase; use PHPUnit\Framework\Attributes\Test; class HandleClaimPlayerRequestTest extends RequestHandlerTestCase { - use MakesHttpRequests; protected string $requestHandlerClass = HandleClaimPlayerRequest::class; @@ -17,4 +15,35 @@ public function itIsConfiguredAsRouteHandler() { $this->assertIsConfiguredAsHandlerForRoute('/api/draft/123/claim'); } + + + #[Test] + public function itReturnsJson() + { + $response = $this->handleRequest([], [], ['id' => '123']); + $this->assertResponseOk($response); + $this->assertResponseJson($response); + } + + #[Test] + public function itReturnsErrorIfDraftNotFound() + { + + $response = $this->handleRequest([], [], ['id' => '123']); + $this->assertResponseOk($response); + $this->assertResponseJson($response); + $this->assertJsonResponseSame(['error' => 'Draft not found'], $response); + } + + #[Test] + public function itReturnsErrorIfPlayerAlreadyClaimed() + { + + } + + #[Test] + public function itCanClaimAPlayer() + { + + } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php index 2d8b41b..913f76d 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php @@ -15,6 +15,13 @@ class HandleGenerateDraftRequestTest extends RequestHandlerTestCase { protected string $requestHandlerClass = HandleGenerateDraftRequest::class; + + #[Test] + public function itIsConfiguredAsRouteHandler() + { + $this->assertIsConfiguredAsHandlerForRoute('/api/generate'); + } + #[Test] public function itReturnsErrorWhenSettingsAreInvalid() { @@ -253,11 +260,7 @@ public static function settingsPayload() #[DataProvider('settingsPayload')] public function itParsesSettingsFromRequest($postData, $field, $expected, $expectedWhenNotSet) { - $handler = new HandleGenerateDraftRequest(new HttpRequest( - [], - $postData, - [], - )); + $handler = new HandleGenerateDraftRequest(new HttpRequest([], $postData, [])); $this->assertSame($expected, $handler->settingValue($field)); } diff --git a/app/Http/RequestHandlers/HandleGetDraftRequest.php b/app/Http/RequestHandlers/HandleGetDraftRequest.php index 6c30ff6..85f7c03 100644 --- a/app/Http/RequestHandlers/HandleGetDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGetDraftRequest.php @@ -4,8 +4,6 @@ use App\Draft\Exceptions\DraftRepositoryException; use App\Http\ErrorResponse; -use App\Http\HtmlResponse; -use App\Http\HttpRequest; use App\Http\HttpResponse; use App\Http\JsonResponse; use App\Http\RequestHandler; diff --git a/app/Http/RequestHandlers/HandleGetDraftRequestTest.php b/app/Http/RequestHandlers/HandleGetDraftRequestTest.php new file mode 100644 index 0000000..4512511 --- /dev/null +++ b/app/Http/RequestHandlers/HandleGetDraftRequestTest.php @@ -0,0 +1,41 @@ +assertIsConfiguredAsHandlerForRoute('/api/draft/123'); + } + + #[Test] + public function itReturnsErrorIfDraftNotFound() + { + $response = $this->handleRequest(['id' => '12344']); + + $this->assertSame(404, $response->code); + $this->assertResponseJson($response); + $this->assertJsonResponseSame(['error' => 'Draft not found'], $response); + } + + #[Test] + public function itCanReturnDraftData() + { + $response = $this->handleRequest(['id' => $this->testDraft->id]); + + $this->assertSame(200, $response->code); + $this->assertResponseJson($response); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequest.php b/app/Http/RequestHandlers/HandleViewDraftRequest.php index 6936dcc..18581b8 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequest.php @@ -9,14 +9,14 @@ use App\Http\HttpResponse; use App\Http\RequestHandler; -class HandleViewDraftRequest extends RequestHandler +class HandleViewDraftRequest extends DraftRequestHandler { public function handle(): HttpResponse { - try { - $draft = app()->repository->load($this->request->get('id')); - } catch (DraftRepositoryException $e) { - return new ErrorResponse('Draft not found', 404, true); + $draft = $this->loadDraftByUrlId(); + + if ($draft == null) { + return $this->error('Draft not found', 404, true); } return $this->html( diff --git a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php index 0a1d78d..ac4f31b 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php @@ -2,19 +2,16 @@ namespace App\Http\RequestHandlers; -use App\Draft\Draft; -use App\Http\ErrorResponse; use App\Http\HtmlResponse; use App\Http\HttpRequest; -use App\Testing\MakesHttpRequests; use App\Testing\RequestHandlerTestCase; -use App\Testing\TestCase; -use App\Testing\TestDrafts; -use PHPUnit\Framework\Attributes\DataProviderExternal; +use App\Testing\UsesTestDraft; use PHPUnit\Framework\Attributes\Test; class HandleViewDraftRequestTest extends RequestHandlerTestCase { + use UsesTestDraft; + protected string $requestHandlerClass = HandleViewDraftRequest::class; #[Test] @@ -24,30 +21,24 @@ public function itIsConfiguredAsRouteHandler() } #[Test] - #[DataProviderExternal(TestDrafts::class, 'provideTestDrafts')] - public function itDisplaysADraft($data) + public function itCanFetchDraft() { - $draft = Draft::fromJson($data); - - app()->repository->save($draft); + $handler = new HandleViewDraftRequest(new HttpRequest([], ['id' => $this->testDraft->id], [])); - $handler = new HandleViewDraftRequest(new HttpRequest([], [], ['id' => (string) $draft->id])); $response = $handler->handle(); - $this->assertInstanceOf(HtmlResponse::class, $response); - $this->assertSame($response->code, 200); - - // cleanup - app()->repository->delete($draft->id); + $this->assertSame(200, $response->code); + $this->assertNotSame(HtmlResponse::CONTENT_TYPE, $response->code); } #[Test] - public function itReturnsAnErrorWhenDraftIsNotFound() + public function itShowsAnErrorPageWhenDraftIsNotFound() { - $handler = new HandleViewDraftRequest(new HttpRequest([], [], ['id' => '1234'])); + $handler = new HandleViewDraftRequest(new HttpRequest([], ['id' => '123'], [])); $response = $handler->handle(); - $this->assertInstanceOf(ErrorResponse::class, $response); - $this->assertSame($response->code, 404); + + $this->assertSame(404, $response->code); + $this->assertNotSame(HtmlResponse::CONTENT_TYPE, $response->code); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewFormRequestTest.php b/app/Http/RequestHandlers/HandleViewFormRequestTest.php index 46cd54d..9616140 100644 --- a/app/Http/RequestHandlers/HandleViewFormRequestTest.php +++ b/app/Http/RequestHandlers/HandleViewFormRequestTest.php @@ -2,13 +2,11 @@ namespace App\Http\RequestHandlers; -use App\Testing\MakesHttpRequests; use App\Testing\RequestHandlerTestCase; use PHPUnit\Framework\Attributes\Test; class HandleViewFormRequestTest extends RequestHandlerTestCase { - use MakesHttpRequests; protected string $requestHandlerClass = HandleViewFormRequest::class; @@ -17,4 +15,14 @@ public function itIsConfiguredAsRouteHandler() { $this->assertIsConfiguredAsHandlerForRoute('/'); } + + + #[Test] + public function itReturnsTheForm() + { + $response = $this->handleRequest(); + + $this->assertResponseHtml($response); + $this->assertResponseOk($response); + } } \ No newline at end of file diff --git a/app/Testing/MakesHttpRequests.php b/app/Testing/MakesHttpRequests.php deleted file mode 100644 index 253246a..0000000 --- a/app/Testing/MakesHttpRequests.php +++ /dev/null @@ -1,24 +0,0 @@ -request($method, $url); - - return new TestResponse($response); - } - - public function get($url): TestResponse - { - return $this->call('GET', $url); - } - - public function post($url, $data): TestResponse - { - return $this->call('GET', $url, $data); - } -} \ No newline at end of file diff --git a/app/Testing/RequestHandlerTestCase.php b/app/Testing/RequestHandlerTestCase.php index d4b117a..20d59f5 100644 --- a/app/Testing/RequestHandlerTestCase.php +++ b/app/Testing/RequestHandlerTestCase.php @@ -3,9 +3,11 @@ namespace App\Testing; use App\Application; +use App\Draft\Draft; +use App\Http\HtmlResponse; use App\Http\HttpRequest; use App\Http\HttpResponse; -use App\Http\RequestHandlers\HandleViewDraftRequest; +use App\Http\JsonResponse; use PHPUnit\Framework\Attributes\After; use PHPUnit\Framework\Attributes\Before; use \PHPUnit\Framework\TestCase as BaseTestCase; @@ -16,6 +18,7 @@ abstract class RequestHandlerTestCase extends BaseTestCase private Application $application; + #[Before] public function setupApplication() { @@ -44,4 +47,19 @@ public function assertJsonResponseSame(array $expected, HttpResponse $response) { $this->assertSame($expected, json_decode($response->getBody(), true)); } + + public function assertResponseJson(HttpResponse $response) + { + $this->assertSame(JsonResponse::CONTENT_TYPE, $response->getContentType()); + } + + public function assertResponseHtml(HttpResponse $response) + { + $this->assertSame(HtmlResponse::CONTENT_TYPE, $response->getContentType()); + } + + public function assertResponseOk(HttpResponse $response) + { + $this->assertSame(200, $response->code); + } } \ No newline at end of file diff --git a/app/Testing/TestCase.php b/app/Testing/TestCase.php index 53acb19..24777e2 100644 --- a/app/Testing/TestCase.php +++ b/app/Testing/TestCase.php @@ -2,8 +2,6 @@ namespace App\Testing; -use App\Application; -use PHPUnit\Framework\Attributes\Before; use \PHPUnit\Framework\TestCase as BaseTestCase; class TestCase extends BaseTestCase diff --git a/app/Testing/TestResponse.php b/app/Testing/TestResponse.php deleted file mode 100644 index fc858b7..0000000 --- a/app/Testing/TestResponse.php +++ /dev/null @@ -1,22 +0,0 @@ -response->getStatusCode(), 200); - } -} \ No newline at end of file diff --git a/app/Testing/UsesTestDraft.php b/app/Testing/UsesTestDraft.php new file mode 100644 index 0000000..34bfc14 --- /dev/null +++ b/app/Testing/UsesTestDraft.php @@ -0,0 +1,33 @@ +testDraft = (new DraftGenerator($settings))->generate(); + app()->repository->save($this->testDraft); + } + + + #[After] + public function deleteTestDraft() + { + app()->repository->delete($this->testDraft->id); + unset($this->testDraft); + } +} \ No newline at end of file diff --git a/app/routes.php b/app/routes.php index 92b5146..a4fd194 100644 --- a/app/routes.php +++ b/app/routes.php @@ -4,11 +4,11 @@ '/' => \App\Http\RequestHandlers\HandleViewFormRequest::class, '/d/{id}' => \App\Http\RequestHandlers\HandleViewDraftRequest::class, '/api/generate' => \App\Http\RequestHandlers\HandleGenerateDraftRequest::class, - '/api/draft/{id}/regenerate' => \App\Http\RequestHandlers\HandleRegenerateDraftRequest::class, - '/api/draft/{id}/pick' => \App\Http\RequestHandlers\HandlePickRequest::class, - '/api/draft/{id}/claim' => \App\Http\RequestHandlers\HandleClaimPlayerRequest::class, - '/api/draft/{id}/restore' => \App\Http\RequestHandlers\HandleRestoreClaimRequest::class, - '/api/draft/{id}/undo' => \App\Http\RequestHandlers\HandleUndoRequest::class, + '/api/regenerate' => \App\Http\RequestHandlers\HandleRegenerateDraftRequest::class, + '/api/pick' => \App\Http\RequestHandlers\HandlePickRequest::class, + '/api/claim' => \App\Http\RequestHandlers\HandleClaimPlayerRequest::class, + '/api/restore' => \App\Http\RequestHandlers\HandleRestoreClaimRequest::class, + '/api/undo' => \App\Http\RequestHandlers\HandleUndoRequest::class, '/api/draft/{id}' => \App\Http\RequestHandlers\HandleGetDraftRequest::class, '/test' => \App\Http\RequestHandlers\HandleTestGeneratorRequest::class, ]; diff --git a/js/draft.js b/js/draft.js index 4534048..26ca4af 100644 --- a/js/draft.js +++ b/js/draft.js @@ -331,9 +331,6 @@ function refreshData() { type: "GET", url: window.routes.data, dataType: 'json', - data: { - 'draft': draft.id, - }, success: function (resp) { if (resp.error) { $('#error-message').html(resp.error); From 26336cc5eaf67bf35c1f1087938d725390e97171 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 26 Dec 2025 13:44:00 +0100 Subject: [PATCH 25/34] Use command handling pattern, implement some more request handlers End is in sight here... --- .gitignore | 1 + .php-cs-fixer.php | 57 +++++++++++++++ app/Application.php | 28 ++++++- app/ApplicationTest.php | 14 ++-- app/Draft/Commands/ClaimPlayer.php | 29 ++++++++ app/Draft/Commands/ClaimPlayerTest.php | 55 ++++++++++++++ .../GenerateDraft.php} | 24 +++--- .../GenerateDraftTest.php} | 24 +++--- .../GenerateFactionPool.php} | 7 +- .../GenerateFactionPoolTest.php} | 22 +++--- .../GenerateSlicePool.php} | 19 ++--- .../GenerateSlicePoolTest.php} | 46 ++++++------ app/Draft/Commands/UnclaimPlayer.php | 28 +++++++ app/Draft/Commands/UnclaimPlayerTest.php | 57 +++++++++++++++ app/Draft/Draft.php | 8 +- .../Exceptions/InvalidClaimException.php | 14 ++++ app/Draft/Player.php | 35 +++++++++ app/Draft/Secrets.php | 34 ++++++++- app/Draft/SecretsTest.php | 6 +- app/Draft/{Generators => }/TilePool.php | 4 +- .../HandleClaimOrUnclaimPlayerRequest.php | 47 ++++++++++++ .../HandleClaimOrUnclaimPlayerRequestTest.php | 66 +++++++++++++++++ .../HandleClaimPlayerRequest.php | 24 ------ .../HandleClaimPlayerRequestTest.php | 49 ------------- .../HandleGenerateDraftRequest.php | 4 +- .../HandleGenerateDraftRequestTest.php | 29 +++++++- .../HandleRestoreClaimRequest.php | 30 +++++++- .../HandleRestoreClaimRequestTest.php | 73 +++++++++++++++++++ .../HandleTestGeneratorRequest.php | 23 ------ app/Shared/Command.php | 8 ++ app/Shared/IdStringBehavior.php | 11 ++- app/Shared/InvalidIdStringExcepion.php | 11 +++ app/Testing/DispatcherSpy.php | 22 ++++++ app/Testing/FakesCommands.php | 46 ++++++++++++ app/Testing/RequestHandlerTestCase.php | 26 ++++++- app/Testing/UsesTestDraft.php | 19 ++++- app/TwilightImperium/SpaceStationTest.php | 2 - app/api/claim.php | 24 ------ app/helpers.php | 8 ++ app/routes.php | 3 +- composer.json | 5 +- 41 files changed, 809 insertions(+), 233 deletions(-) create mode 100644 .php-cs-fixer.php create mode 100644 app/Draft/Commands/ClaimPlayer.php create mode 100644 app/Draft/Commands/ClaimPlayerTest.php rename app/Draft/{Generators/DraftGenerator.php => Commands/GenerateDraft.php} (79%) rename app/Draft/{Generators/DraftGeneratorTest.php => Commands/GenerateDraftTest.php} (87%) rename app/Draft/{Generators/FactionPoolGenerator.php => Commands/GenerateFactionPool.php} (92%) rename app/Draft/{Generators/FactionPoolGeneratorTest.php => Commands/GenerateFactionPoolTest.php} (80%) rename app/Draft/{Generators/SlicePoolGenerator.php => Commands/GenerateSlicePool.php} (94%) rename app/Draft/{Generators/SlicePoolGeneratorTest.php => Commands/GenerateSlicePoolTest.php} (86%) create mode 100644 app/Draft/Commands/UnclaimPlayer.php create mode 100644 app/Draft/Commands/UnclaimPlayerTest.php create mode 100644 app/Draft/Exceptions/InvalidClaimException.php rename app/Draft/{Generators => }/TilePool.php (94%) create mode 100644 app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequest.php create mode 100644 app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php delete mode 100644 app/Http/RequestHandlers/HandleClaimPlayerRequest.php delete mode 100644 app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php create mode 100644 app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php delete mode 100644 app/Http/RequestHandlers/HandleTestGeneratorRequest.php create mode 100644 app/Shared/Command.php create mode 100644 app/Shared/InvalidIdStringExcepion.php create mode 100644 app/Testing/DispatcherSpy.php create mode 100644 app/Testing/FakesCommands.php delete mode 100644 app/api/claim.php diff --git a/.gitignore b/.gitignore index cd581ed..d447c49 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ supervisord.log supervisord.pid tmp .phpunit.cache +.php-cs-fixer.cache diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 0000000..042b638 --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,57 @@ +in([ + __DIR__ . '/app', + ]) + ->name('*.php') + ->ignoreDotFiles(true) + ->ignoreVCS(true); + +return (new Config()) + ->setParallelConfig(ParallelConfigFactory::detect()) + ->setRiskyAllowed(true) + ->setRules([ + 'array_syntax' => ['syntax' => 'short'], + 'ordered_imports' => [ + 'imports_order' => ['class', 'function', 'const'], + 'sort_algorithm' => 'alpha', + ], + 'fully_qualified_strict_types' => [ + 'phpdoc_tags' => [], + ], + 'no_unused_imports' => true, + 'blank_line_after_opening_tag' => true, + 'declare_strict_types' => true, + 'not_operator_with_successor_space' => true, + 'trailing_comma_in_multiline' => [ + 'elements' => ['arguments', 'arrays', 'match', 'parameters'], + ], + 'phpdoc_scalar' => true, + 'unary_operator_spaces' => true, + 'binary_operator_spaces' => true, + 'blank_line_before_statement' => [ + 'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'], + ], + 'no_extra_blank_lines' => [ + 'tokens' => ['parenthesis_brace_block', 'return', 'square_brace_block', 'extra'], + ], + 'phpdoc_single_line_var_spacing' => true, + 'phpdoc_var_without_name' => true, + 'method_argument_space' => [ + 'on_multiline' => 'ensure_fully_multiline', + 'keep_multiple_spaces_after_comma' => true, + ], + 'void_return' => true, + 'single_quote' => true, + 'multiline_promoted_properties' => [ + 'minimum_number_of_parameters' => 1, + ], + ]) + ->setFinder($finder); diff --git a/app/Application.php b/app/Application.php index e808651..d8e3d0d 100644 --- a/app/Application.php +++ b/app/Application.php @@ -2,7 +2,6 @@ namespace App; -use App\Draft\Exceptions\DraftRepositoryException; use App\Draft\Repository\DraftRepository; use App\Draft\Repository\LocalDraftRepository; use App\Draft\Repository\S3DraftRepository; @@ -12,7 +11,8 @@ use App\Http\RequestHandler; use App\Http\Route; use App\Http\RouteMatch; -use Clockwork\Clockwork; +use App\Shared\Command; +use App\Testing\DispatcherSpy; /** * Unsure why I did this from scratch. I was on a bit of a refactoring roll and I couldn't resist. @@ -22,6 +22,9 @@ class Application public readonly DraftRepository $repository; private static self $instance; + public bool $spyOnDispatcher = false; + public DispatcherSpy $spy; + public function __construct() { if (env('STORAGE', ' local') == 'spaces') { @@ -93,6 +96,27 @@ public function handlerForRequest(string $requestUri): ?RequestHandler } } + public function spyOnDispatcher($commandReturnValue = null) + { + $this->spyOnDispatcher = true; + $this->spy = new DispatcherSpy($commandReturnValue); + } + + public function dontSpyOnDispatcher() + { + $this->spyOnDispatcher = false; + unset($this->spy); + } + + public function handle(Command $command) + { + if ($this->spyOnDispatcher) { + return $this->spy->handle($command); + } else { + return $command->handle(); + } + } + public static function getInstance(): self { if (!isset(self::$instance)) { diff --git a/app/ApplicationTest.php b/app/ApplicationTest.php index 1f14508..3bba635 100644 --- a/app/ApplicationTest.php +++ b/app/ApplicationTest.php @@ -2,7 +2,7 @@ namespace App; -use App\Http\RequestHandlers\HandleClaimPlayerRequest; +use App\Http\RequestHandlers\HandleClaimOrUnclaimPlayerRequest; use App\Http\RequestHandlers\HandleGenerateDraftRequest; use App\Http\RequestHandlers\HandleGetDraftRequest; use App\Http\RequestHandlers\HandlePickRequest; @@ -43,27 +43,27 @@ public static function allRoutes() ]; yield "For making a pick" => [ - 'route' => '/api/draft/1234/pick', + 'route' => '/api/pick', 'handler' => HandlePickRequest::class ]; yield "For claiming a player" => [ - 'route' => '/api/draft/1234/claim', - 'handler' => HandleClaimPlayerRequest::class + 'route' => '/api/claim', + 'handler' => HandleClaimOrUnclaimPlayerRequest::class ]; yield "For restoring a claim" => [ - 'route' => '/api/draft/1234/restore', + 'route' => '/api/restore', 'handler' => HandleRestoreClaimRequest::class ]; yield "For undoing a pick" => [ - 'route' => '/api/draft/1234/undo', + 'route' => '/api/undo', 'handler' => HandleUndoRequest::class ]; yield "For regenerating a draft" => [ - 'route' => '/api/draft/1234/regenerate', + 'route' => '/api/regenerate', 'handler' => HandleRegenerateDraftRequest::class ]; } diff --git a/app/Draft/Commands/ClaimPlayer.php b/app/Draft/Commands/ClaimPlayer.php new file mode 100644 index 0000000..a31c89f --- /dev/null +++ b/app/Draft/Commands/ClaimPlayer.php @@ -0,0 +1,29 @@ +draft->playerById($this->playerId); + $this->draft->players[$this->playerId->value] = $player->claim(); + $secret = $this->draft->secrets->generateSecretForPlayer($this->playerId); + + app()->repository->save($this->draft); + + return $secret; + } +} \ No newline at end of file diff --git a/app/Draft/Commands/ClaimPlayerTest.php b/app/Draft/Commands/ClaimPlayerTest.php new file mode 100644 index 0000000..30b82e1 --- /dev/null +++ b/app/Draft/Commands/ClaimPlayerTest.php @@ -0,0 +1,55 @@ +testDraft->players)); + + $claimPlayer = new ClaimPlayer($this->testDraft, $playerId); + + $secret = $claimPlayer->handle(); + + // check to see if changes were saved + $this->reloadDraft(); + + $this->assertTrue($this->testDraft->playerById($playerId)->claimed); + $this->assertTrue($this->testDraft->secrets->checkPlayerSecret($playerId, $secret)); + } + + #[Test] + public function itThrowsAnErrorIfPlayerIsNotPartOfDraft() + { + $playerId = PlayerId::fromString('123'); + + $this->expectException(\Exception::class); + $claimPlayer = new ClaimPlayer($this->testDraft, $playerId); + $claimPlayer->handle(); + } + + + #[Test] + public function itThrowsAnErrorIfPlayerIsAlreadyClaimed() + { + $playerId = PlayerId::fromString(array_key_first($this->testDraft->players)); + + $claimPlayer = new ClaimPlayer($this->testDraft, $playerId); + $claimPlayer->handle(); + + $this->expectException(InvalidClaimException::class); + $claimPlayer->handle(); + } + + +} \ No newline at end of file diff --git a/app/Draft/Generators/DraftGenerator.php b/app/Draft/Commands/GenerateDraft.php similarity index 79% rename from app/Draft/Generators/DraftGenerator.php rename to app/Draft/Commands/GenerateDraft.php index e29a882..feb61fb 100644 --- a/app/Draft/Generators/DraftGenerator.php +++ b/app/Draft/Commands/GenerateDraft.php @@ -1,6 +1,6 @@ slicePoolGenerator = new SlicePoolGenerator($this->settings); - $this->factionPoolGenerator = new FactionPoolGenerator($this->settings); } - public function generate(): Draft + public function handle(): Draft { $players = $this->generatePlayerData(); + // not going through dispatch method because if we're faking it then that sucks + $slices = (new GenerateSlicePool($this->settings))->handle(); + $factions = (new GenerateFactionPool($this->settings))->handle(); + return new Draft( DraftId::generate(), false, $players, $this->settings, $this->generateSecrets(), - $this->slicePoolGenerator->generate(), - $this->factionPoolGenerator->generate(), + $slices, + $factions, [], PlayerId::fromString(array_key_first($players)) ); @@ -43,7 +42,7 @@ public function generate(): Draft protected function generateSecrets(): Secrets { - return new Secrets(Secrets::generatePassword()); + return new Secrets(Secrets::generateSecret()); } @@ -61,6 +60,7 @@ protected function generateTeamNames(): array */ public function generatePlayerData(): array { + /** @var array $players */ $players = []; $playerNames = [...$this->settings->playerNames]; diff --git a/app/Draft/Generators/DraftGeneratorTest.php b/app/Draft/Commands/GenerateDraftTest.php similarity index 87% rename from app/Draft/Generators/DraftGeneratorTest.php rename to app/Draft/Commands/GenerateDraftTest.php index a6ecb4f..e40da6e 100644 --- a/app/Draft/Generators/DraftGeneratorTest.php +++ b/app/Draft/Commands/GenerateDraftTest.php @@ -1,6 +1,6 @@ 4, ]); - $generator = new DraftGenerator($settings); - - - $draft = $generator->generate(); + $generator = new GenerateDraft($settings); + $draft = $generator->handle(); $this->assertNotEmpty($draft->slicePool); $this->assertNotEmpty($draft->factionPool); @@ -34,9 +32,8 @@ public function itCanGeneratePlayerData() $settings = DraftSettingsFactory::make([ 'playerNames' => $originalPlayerNames, ]); - $generator = new DraftGenerator($settings); - - $draft = $generator->generate(); + $generator = new GenerateDraft($settings); + $draft = $generator->handle(); $playerIds = []; $playerNames = []; @@ -61,9 +58,9 @@ public function itCanGeneratePlayerDataInPresetOrder() 'playerNames' => $originalPlayerNames, 'presetDraftOrder' => true ]); - $generator = new DraftGenerator($settings); + $generator = new GenerateDraft($settings); - $draft = $generator->generate(); + $draft = $generator->handle(); $playerNames = []; foreach($draft->players as $player) { @@ -84,8 +81,8 @@ public function itCanGeneratePlayerDataForAlliances() 'allianceTeamMode' => AllianceTeamMode::PRESET, 'presetDraftOrder' => true ]); - $generator = new DraftGenerator($settings); - $draft = $generator->generate(); + $generator = new GenerateDraft($settings); + $draft = $generator->handle(); /** * @var array $players @@ -105,5 +102,4 @@ public function itCanGeneratePlayerDataForAlliances() $this->assertSame('Frank', $players[5]->name); $this->assertSame('C', $players[5]->team); } - } \ No newline at end of file diff --git a/app/Draft/Generators/FactionPoolGenerator.php b/app/Draft/Commands/GenerateFactionPool.php similarity index 92% rename from app/Draft/Generators/FactionPoolGenerator.php rename to app/Draft/Commands/GenerateFactionPool.php index 2770143..18cba70 100644 --- a/app/Draft/Generators/FactionPoolGenerator.php +++ b/app/Draft/Commands/GenerateFactionPool.php @@ -1,14 +1,15 @@ */ - public function generate(): array + public function handle(): array { $this->settings->seed->setForFactions(); $factionsFromSets = $this->gatherFactionsFromSelectedSets(); diff --git a/app/Draft/Generators/FactionPoolGeneratorTest.php b/app/Draft/Commands/GenerateFactionPoolTest.php similarity index 80% rename from app/Draft/Generators/FactionPoolGeneratorTest.php rename to app/Draft/Commands/GenerateFactionPoolTest.php index 01814bd..d6efc65 100644 --- a/app/Draft/Generators/FactionPoolGeneratorTest.php +++ b/app/Draft/Commands/GenerateFactionPoolTest.php @@ -1,29 +1,27 @@ $sets, 'numberOfFactions' => 10 ])); - $choices = $generator->generate(); + $choices = $generator->handle(); $choicesNames = array_map(fn (Faction $faction) => $faction->name, $choices); $this->assertCount(10, $choices); @@ -42,13 +40,13 @@ public function itUsesOnlyCustomFactionsWhenEnoughAreProvided() "The Emirates of Hacan", "The Ghosts of Creuss", ]; - $generator = new FactionPoolGenerator(DraftSettingsFactory::make([ + $generator = new GenerateFactionPool(DraftSettingsFactory::make([ 'customFactions' => $customFactions, 'factionSets' => [Edition::BASE_GAME], 'numberOfFactions' => 3 ])); - $choices = $generator->generate(); + $choices = $generator->handle(); $this->assertCount(3, $choices); foreach($choices as $choice) { @@ -59,7 +57,7 @@ public function itUsesOnlyCustomFactionsWhenEnoughAreProvided() #[Test] public function itGeneratesTheSameFactionsFromTheSameSeed() { - $generator = new FactionPoolGenerator(DraftSettingsFactory::make([ + $generator = new GenerateFactionPool(DraftSettingsFactory::make([ 'seed' => 123, 'factionSets' => [Edition::BASE_GAME], 'numberOfFactions' => 3 @@ -70,7 +68,7 @@ public function itGeneratesTheSameFactionsFromTheSameSeed() 'The Yssaril Tribes' ]; - $choices = $generator->generate(); + $choices = $generator->handle(); foreach($previouslyGeneratedChoices as $i => $name) { $this->assertSame($name, $choices[$i]->name); @@ -85,13 +83,13 @@ public function itTakesFromSetsWhenNotEnoughCustomFactionsAreProvided() 'The Emirates of Hacan', 'The Yssaril Tribes' ]; - $generator = new FactionPoolGenerator(DraftSettingsFactory::make([ + $generator = new GenerateFactionPool(DraftSettingsFactory::make([ 'factionSets' => [Edition::BASE_GAME], 'customFactions' => $customFactions, 'numberOfFactions' => 10 ])); - $choices = $generator->generate(); + $choices = $generator->handle(); $choicesNames = array_map(fn (Faction $faction) => $faction->name, $choices); foreach($customFactions as $f) { diff --git a/app/Draft/Generators/SlicePoolGenerator.php b/app/Draft/Commands/GenerateSlicePool.php similarity index 94% rename from app/Draft/Generators/SlicePoolGenerator.php rename to app/Draft/Commands/GenerateSlicePool.php index 74e521e..77d893e 100644 --- a/app/Draft/Generators/SlicePoolGenerator.php +++ b/app/Draft/Commands/GenerateSlicePool.php @@ -1,18 +1,17 @@ - */ - public function generate(): array + /** @return array */ + public function handle(): array { if (!empty($this->settings->customSlices)) { return $this->slicesFromCustomSlices(); @@ -187,8 +184,8 @@ private function validateTileSelection(array $tileIds): bool } if ( - $this->settings->minimumTwoAlphaAndBetaWormholes && - ($alphaWormholeCount < 2 || $betaWormholeCount < 2) + $this->settings->minimumTwoAlphaAndBetaWormholes && + ($alphaWormholeCount < 2 || $betaWormholeCount < 2) ) { return false; } diff --git a/app/Draft/Generators/SlicePoolGeneratorTest.php b/app/Draft/Commands/GenerateSlicePoolTest.php similarity index 86% rename from app/Draft/Generators/SlicePoolGeneratorTest.php rename to app/Draft/Commands/GenerateSlicePoolTest.php index c249c11..1e52b57 100644 --- a/app/Draft/Generators/SlicePoolGeneratorTest.php +++ b/app/Draft/Commands/GenerateSlicePoolTest.php @@ -1,6 +1,6 @@ $sets, ]); - $generator = new SlicePoolGenerator($settings); + $generator = new GenerateSlicePool($settings); $tiles = $generator->gatheredTiles(); $tiers = $generator->gatheredTileTiers(); @@ -52,10 +52,10 @@ public function itCanGenerateValidSlicesBasedOnSets($sets) 'minimumLegendaryPlanets' => 0, 'minimumTwoAlphaBetaWormholes' => false, ]); - $generator = new SlicePoolGenerator($settings); + $generator = new GenerateSlicePool($settings); - $slices = $generator->generate(); + $slices = $generator->handle(); $tileIds = array_reduce( $slices, @@ -89,9 +89,9 @@ public function itDoesNotReuseTiles($sets) 'minimumLegendaryPlanets' => 0, 'minimumTwoAlphaBetaWormholes' => false, ]); - $generator = new SlicePoolGenerator($settings); + $generator = new GenerateSlicePool($settings); - $slices = $generator->generate(); + $slices = $generator->handle(); $tileIds = array_reduce( $slices, @@ -121,15 +121,15 @@ public function itGeneratesTheSameSlicesFromSameSeed() 'maximumOptimalTotal' => 13, ]); - $generator = new SlicePoolGenerator($settings); + $generator = new GenerateSlicePool($settings); - $slices = $generator->generate(); + $slices = $generator->handle(); $generatedSlices = array_map(fn (Slice $slice) => $slice->tileIds(), $slices); - $secondGenerator = new SlicePoolGenerator($settings); + $secondGenerator = new GenerateSlicePool($settings); - $slices = $secondGenerator->generate(); + $slices = $secondGenerator->handle(); foreach($slices as $sliceIndex => $slice) { $this->assertSame($generatedSlices[$sliceIndex], $slice->tileIds()); @@ -149,8 +149,8 @@ public function itCanGenerateSlicesForDifficultSettings() 'maximumOptimalTotal' => 13, ]); - $generator = new SlicePoolGenerator($settings); - $generator->generate(); + $generator = new GenerateSlicePool($settings); + $generator->handle(); $this->expectNotToPerformAssertions(); } @@ -167,9 +167,9 @@ public function itCanGenerateSlicesWithMinimumTwoAlphaAndBetaWormholes() $this->assertTrue($settings->minimumTwoAlphaAndBetaWormholes); - $generator = new SlicePoolGenerator($settings); + $generator = new GenerateSlicePool($settings); - $slices = $generator->generate(); + $slices = $generator->handle(); $alphaWormholeCount = 0; @@ -195,9 +195,9 @@ public function itCanGenerateSlicesWithMinimumAmountOfLegendaryPlanets() 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS], 'minimumLegendaryPlanets' => 1, ]); - $generator = new SlicePoolGenerator($settings); + $generator = new GenerateSlicePool($settings); - $slices = $generator->generate(); + $slices = $generator->handle(); $legendaryPlanetCount = 0; foreach($slices as $slice) { @@ -217,9 +217,9 @@ public function itCanGenerateSlicesWithMaxOneWormholePerSlice() 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::DISCORDANT_STARS], 'maxOneWormholePerSlice' => true, ]); - $generator = new SlicePoolGenerator($settings); + $generator = new GenerateSlicePool($settings); - $slices = $generator->generate(); + $slices = $generator->handle(); foreach($slices as $slice) { $this->assertLessThanOrEqual(1, count($slice->wormholes)); @@ -236,13 +236,13 @@ public function itCanReturnCustomSlices() ["35", "37", "22", "40", "50"], ]; - $generator = new SlicePoolGenerator(DraftSettingsFactory::make([ + $generator = new GenerateSlicePool(DraftSettingsFactory::make([ 'numberOfSlices' => 4, 'customSlices' => $customSlices ])); - $slices = $generator->generate(); + $slices = $generator->handle(); foreach($slices as $sliceIndex => $slice) { $this->assertSame($customSlices[$sliceIndex], $slice->tileIds()); @@ -253,7 +253,7 @@ public function itCanReturnCustomSlices() #[Test] public function itGivesUpIfSettingsAreImpossible() { - $generator = new SlicePoolGenerator(DraftSettingsFactory::make([ + $generator = new GenerateSlicePool(DraftSettingsFactory::make([ 'numberOfSlices' => 4, 'minimumOptimalInfluence' => 40 ])); @@ -261,6 +261,6 @@ public function itGivesUpIfSettingsAreImpossible() $this->expectException(InvalidDraftSettingsException::class); $this->expectExceptionMessage(InvalidDraftSettingsException::cannotGenerateSlices()->getMessage()); - $generator->generate(); + $generator->handle(); } } \ No newline at end of file diff --git a/app/Draft/Commands/UnclaimPlayer.php b/app/Draft/Commands/UnclaimPlayer.php new file mode 100644 index 0000000..3ad32b1 --- /dev/null +++ b/app/Draft/Commands/UnclaimPlayer.php @@ -0,0 +1,28 @@ +player = $this->draft->playerById($this->playerId); + } + + public function handle(): void + { + $this->draft->players[$this->playerId->value] = $this->player->unclaim(); + $this->draft->secrets->removeSecretForPlayer($this->playerId); + + app()->repository->save($this->draft); + } +} \ No newline at end of file diff --git a/app/Draft/Commands/UnclaimPlayerTest.php b/app/Draft/Commands/UnclaimPlayerTest.php new file mode 100644 index 0000000..7a08211 --- /dev/null +++ b/app/Draft/Commands/UnclaimPlayerTest.php @@ -0,0 +1,57 @@ +testDraft->players)); + + $this->testDraft->players[$playerId->value] = $this->testDraft->playerById($playerId)->claim(); + $this->testDraft->secrets->generateSecretForPlayer($playerId); + + $unclaimPlayer = new UnclaimPlayer($this->testDraft, $playerId); + $unclaimPlayer->handle(); + + // check to see if changes were saved + $this->reloadDraft(); + + $this->assertFalse($this->testDraft->playerById($playerId)->claimed); + $this->assertNull($this->testDraft->secrets->secretById($playerId)); + + } + + #[Test] + public function itThrowsAnErrorIfPlayerIsNotPartOfDraft() + { + $playerId = PlayerId::fromString('123'); + + $this->expectException(\Exception::class); + $claimPlayer = new ClaimPlayer($this->testDraft, $playerId); + $claimPlayer->handle(); + } + + + #[Test] + public function itThrowsAnErrorIfPlayerIsNotClaimed() + { + $playerId = PlayerId::fromString(array_key_first($this->testDraft->players)); + + $unclaim = new UnclaimPlayer($this->testDraft, $playerId); + + $this->expectException(InvalidClaimException::class); + $unclaim->handle(); + } + + +} \ No newline at end of file diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php index 603e1e4..ea62e26 100644 --- a/app/Draft/Draft.php +++ b/app/Draft/Draft.php @@ -2,14 +2,13 @@ namespace App\Draft; -use App\Draft\Generators\FactionPoolGenerator; -use App\Draft\Generators\SlicePoolGenerator; use App\TwilightImperium\Faction; use App\TwilightImperium\Tile; class Draft { public function __construct( + // @todo implement DraftId value object public string $id, public bool $isDone, /** @var array $players */ @@ -116,5 +115,10 @@ public function canRegenerate(): bool return empty($this->log); } + public function playerById(PlayerId $id): Player + { + return $this->players[$id->value] ?? throw new \Exception('Player not found in draft'); + } + } \ No newline at end of file diff --git a/app/Draft/Exceptions/InvalidClaimException.php b/app/Draft/Exceptions/InvalidClaimException.php new file mode 100644 index 0000000..f5969c0 --- /dev/null +++ b/app/Draft/Exceptions/InvalidClaimException.php @@ -0,0 +1,14 @@ +claimed) { + throw InvalidClaimException::playerNotClaimed(); + } + + return new self( + $this->id, + $this->name, + false, + $this->pickedPosition, + $this->pickedFaction, + $this->pickedSlice, + $this->team + ); + } + + public function claim(): Player + { + if ($this->claimed) { + throw InvalidClaimException::playerAlreadyClaimed(); + } + + return new self( + $this->id, + $this->name, + true, + $this->pickedPosition, + $this->pickedFaction, + $this->pickedSlice, + $this->team + ); + } + public function toArray(): array { return [ diff --git a/app/Draft/Secrets.php b/app/Draft/Secrets.php index 85b75c6..156ec44 100644 --- a/app/Draft/Secrets.php +++ b/app/Draft/Secrets.php @@ -26,17 +26,45 @@ public function toArray(): array ]; } - public static function generatePassword(): string + public static function generateSecret(): string { return base64_encode(random_bytes(16)); } + public function generateSecretForPlayer(PlayerId $playerId): string + { + $secret = self::generateSecret(); + $this->playerSecrets[$playerId->value] = $secret; + return $secret; + } + + public function removeSecretForPlayer(PlayerId $playerId) + { + unset($this->playerSecrets[$playerId->value]); + } + + public function secretById(PlayerId $playerId): ?string + { + return $this->playerSecrets[$playerId->value] ?? null; + } + public function checkAdminSecret($secret): bool { return $secret == $this->adminSecret; } - public function checkPlayerSecret($id, $secret): bool { - return isset($this->playerSecrets[$id]) && $secret == $this->playerSecrets[$id]; + public function playerIdBySecret(string $secret): ?PlayerId { + foreach($this->playerSecrets as $key => $playerSecret) { + if ($playerSecret == $secret) { + return PlayerId::fromString($key); + } + } + + return null; + } + + + public function checkPlayerSecret(PlayerId $id, string $secret): bool { + return isset($this->playerSecrets[$id->value]) && $secret == $this->playerSecrets[$id->value]; } public static function fromJson($data): self diff --git a/app/Draft/SecretsTest.php b/app/Draft/SecretsTest.php index f5b6821..09682f2 100644 --- a/app/Draft/SecretsTest.php +++ b/app/Draft/SecretsTest.php @@ -12,7 +12,7 @@ public function itGeneratesRandomSecretsEvenIfSeedIsSet() { $previouslyGenerated = "kOFY/yBXdhP5cC97tlxPhQ=="; mt_srand(123); - $secret = Secrets::generatePassword(); + $secret = Secrets::generateSecret(); $this->assertNotSame($previouslyGenerated, $secret); } @@ -29,8 +29,8 @@ public function itCanBeInitiatedFromJson() $secret = Secrets::fromJson($secretData); $this->assertTrue($secret->checkAdminSecret('secret124')); - $this->assertTrue($secret->checkPlayerSecret('player_1', 'secret456')); - $this->assertTrue($secret->checkPlayerSecret('player_3', 'secret789')); + $this->assertTrue($secret->checkPlayerSecret(PlayerId::fromString('player_1'), 'secret456')); + $this->assertTrue($secret->checkPlayerSecret(PlayerId::fromString('player_3'), 'secret789')); } #[Test] diff --git a/app/Draft/Generators/TilePool.php b/app/Draft/TilePool.php similarity index 94% rename from app/Draft/Generators/TilePool.php rename to app/Draft/TilePool.php index 65f070a..8199215 100644 --- a/app/Draft/Generators/TilePool.php +++ b/app/Draft/TilePool.php @@ -1,8 +1,6 @@ loadDraftByUrlId('draft'); + + if ($draft == null) { + return $this->error('Draft not found', 404); + } + + $playerId = PlayerId::fromString($this->request->get('player')); + $unclaim = $this->request->get('unclaim') == 1; + + $player = $draft->playerById($playerId); + + if ($unclaim) { + dispatch(new UnclaimPlayer($draft, $playerId)); + } else { + $secret = dispatch(new ClaimPlayer($draft, $playerId)); + } + + return $this->json([ + 'draft' => $draft->toArray(), + 'player' => $playerId->value, + 'success' => true, + 'secret' => $unclaim ? null : $secret + ]); + + } catch (DraftRepositoryException $e) { + return new ErrorResponse('Draft not found', 404); + } + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php b/app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php new file mode 100644 index 0000000..67c39d6 --- /dev/null +++ b/app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php @@ -0,0 +1,66 @@ +assertIsConfiguredAsHandlerForRoute('/api/claim'); + } + + #[Test] + public function itReturnsJson() + { + $response = $this->handleRequest(['draft' => $this->testDraft->id, 'player' => array_keys($this->testDraft->players)[0]]); + $this->assertResponseOk($response); + $this->assertResponseJson($response); + } + + #[Test] + public function itReturnsErrorIfDraftNotFound() + { + + $response = $this->handleRequest(['draft' => '123', 'player' => '123']); + $this->assertResponseNotFound($response); + $this->assertResponseJson($response); + $this->assertJsonResponseSame(['error' => 'Draft not found'], $response); + } + + + #[Test] + public function itCanClaimAPlayer() + { + $this->setExpectedReturnValue('1234'); + $playerId = array_keys($this->testDraft->players)[0]; + $this->handleRequest(['draft' => $this->testDraft->id, 'player' => $playerId]); + $this->assertCommandWasDispatchedWith(ClaimPlayer::class, function (ClaimPlayer $cmd) use ($playerId) { + $this->assertSame($this->testDraft->id, $cmd->draft->id); + $this->assertSame($playerId, $cmd->playerId->value); + }); + } + + + #[Test] + public function itCanUnclaimAPlayer() + { + $playerId = array_keys($this->testDraft->players)[0]; + $this->handleRequest(['draft' => $this->testDraft->id, 'player' => $playerId, 'unclaim' => 1]); + $this->assertCommandWasDispatchedWith(UnclaimPlayer::class, function (UnclaimPlayer $cmd) use ($playerId) { + $this->assertSame($this->testDraft->id, $cmd->draft->id); + $this->assertSame($playerId, $cmd->playerId->value); + }); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleClaimPlayerRequest.php b/app/Http/RequestHandlers/HandleClaimPlayerRequest.php deleted file mode 100644 index c777ab6..0000000 --- a/app/Http/RequestHandlers/HandleClaimPlayerRequest.php +++ /dev/null @@ -1,24 +0,0 @@ -repository->load($this->request->get('id')); - - - - } catch (DraftRepositoryException $e) { - return new ErrorResponse('Draft not found', 404); - } - } -} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php b/app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php deleted file mode 100644 index 0a5276d..0000000 --- a/app/Http/RequestHandlers/HandleClaimPlayerRequestTest.php +++ /dev/null @@ -1,49 +0,0 @@ -assertIsConfiguredAsHandlerForRoute('/api/draft/123/claim'); - } - - - #[Test] - public function itReturnsJson() - { - $response = $this->handleRequest([], [], ['id' => '123']); - $this->assertResponseOk($response); - $this->assertResponseJson($response); - } - - #[Test] - public function itReturnsErrorIfDraftNotFound() - { - - $response = $this->handleRequest([], [], ['id' => '123']); - $this->assertResponseOk($response); - $this->assertResponseJson($response); - $this->assertJsonResponseSame(['error' => 'Draft not found'], $response); - } - - #[Test] - public function itReturnsErrorIfPlayerAlreadyClaimed() - { - - } - - #[Test] - public function itCanClaimAPlayer() - { - - } -} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php index ee4cada..5be3ca8 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php @@ -2,8 +2,8 @@ namespace App\Http\RequestHandlers; +use App\Draft\Commands\GenerateDraft; use App\Draft\Exceptions\InvalidDraftSettingsException; -use App\Draft\Generators\DraftGenerator; use App\Draft\Name; use App\Draft\Seed; use App\Draft\Settings; @@ -34,7 +34,7 @@ public function handle(): HttpResponse return new ErrorResponse($e->getMessage(), 400); } - $draft = (new DraftGenerator($this->settingsFromRequest()))->generate(); + $draft = dispatch(new GenerateDraft($this->settingsFromRequest())); app()->repository->save($draft); diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php index 913f76d..f633e82 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php @@ -2,9 +2,12 @@ namespace App\Http\RequestHandlers; +use App\Draft\Commands\GenerateDraft; use App\Draft\Exceptions\InvalidDraftSettingsException; use App\Http\HttpRequest; +use App\Testing\FakesCommands; use App\Testing\RequestHandlerTestCase; +use App\Testing\UsesTestDraft; use App\TwilightImperium\AllianceTeamMode; use App\TwilightImperium\AllianceTeamPosition; use App\TwilightImperium\Edition; @@ -13,8 +16,10 @@ class HandleGenerateDraftRequestTest extends RequestHandlerTestCase { - protected string $requestHandlerClass = HandleGenerateDraftRequest::class; + use FakesCommands; + use UsesTestDraft; + protected string $requestHandlerClass = HandleGenerateDraftRequest::class; #[Test] public function itIsConfiguredAsRouteHandler() @@ -273,4 +278,26 @@ public function itParsesSettingsFromRequestWhenNotSet($postData, $field, $expect $handler = new HandleGenerateDraftRequest(new HttpRequest([], [], [])); $this->assertSame($expectedWhenNotSet, $handler->settingValue($field)); } + + + #[Test] + public function itGeneratesADraft() + { + $this->setExpectedReturnValue($this->testDraft); + + $response = $this->handleRequest([ + 'num_players' => 4, + 'player' => ['John', 'Paul', 'George', 'Ringo'], + 'include_pok' => true, + 'num_slices' => 4, + 'num_factions' => 4, + 'include_pok_factions' => true, + 'include_base_factions' => true, + ]);; + + $this->assertCommandWasDispatched(GenerateDraft::class); + + $this->assertResponseOk($response); + $this->assertResponseJson($response); + } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleRestoreClaimRequest.php b/app/Http/RequestHandlers/HandleRestoreClaimRequest.php index 61db3b6..d857c43 100644 --- a/app/Http/RequestHandlers/HandleRestoreClaimRequest.php +++ b/app/Http/RequestHandlers/HandleRestoreClaimRequest.php @@ -5,10 +5,36 @@ use App\Http\HttpResponse; use App\Http\RequestHandler; -class HandleRestoreClaimRequest extends RequestHandler +class HandleRestoreClaimRequest extends DraftRequestHandler { public function handle(): HttpResponse { - // TODO: Implement handle() method. + $draft = $this->loadDraftByUrlId('draft'); + + // @todo this should be in some shared thing for all DraftRequestHandlers + if ($draft == null) { + return $this->error('Draft not found', 404); + } + + $secret = $this->request->get('secret', ''); + + if ($draft->secrets->checkAdminSecret($secret)) { + return $this->json([ + 'admin' => $secret, + 'success' => true + ]); + } + + $playerId = $draft->secrets->playerIdBySecret($secret); + + if ($playerId == null) { + return $this->error('No player with that secret', 403); + } else { + return $this->json([ + 'player' => $playerId->value, + 'secret' => $secret, + 'success' => true + ]); + } } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php b/app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php new file mode 100644 index 0000000..772e540 --- /dev/null +++ b/app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php @@ -0,0 +1,73 @@ +assertIsConfiguredAsHandlerForRoute('/api/restore'); + } + + #[Test] + public function itReturnsJson() + { + $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => $this->testDraft->secrets->adminSecret]); + $this->assertResponseOk($response); + $this->assertResponseJson($response); + } + + #[Test] + public function itCanRestoreAnAdminClaim() + { + $adminSecret = $this->testDraft->secrets->adminSecret; + $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => $adminSecret]); + $this->assertResponseOk($response); + $this->assertJsonResponseSame([ + 'admin' => $adminSecret, + 'success' => true + ], $response); + } + + #[Test] + public function itCanRestoreAPlayerClaim() + { + $playerId = array_keys($this->testDraft->players)[0]; + + (new ClaimPlayer($this->testDraft, PlayerId::fromString($playerId)))->handle(); + + $playerSecret = $this->testDraft->secrets->playerSecrets[$playerId]; + $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => $playerSecret]); + $this->assertResponseOk($response); + $this->assertJsonResponseSame([ + 'player' => $playerId, + 'secret' => $playerSecret, + 'success' => true + ], $response); + } + + #[Test] + public function itThrowsAnErrorIfDraftDoesntExist() + { + $response = $this->handleRequest(['draft' => '1234', 'secret' => "blabla"]); + $this->assertResponseNotFound($response); + } + + #[Test] + public function itThrowsAnErrorIfNoPlayerWasFound() + { + $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => "blabla"]); + $this->assertForbidden($response); + } +} \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleTestGeneratorRequest.php b/app/Http/RequestHandlers/HandleTestGeneratorRequest.php deleted file mode 100644 index d7bdad5..0000000 --- a/app/Http/RequestHandlers/HandleTestGeneratorRequest.php +++ /dev/null @@ -1,23 +0,0 @@ -generate(); - - return $this->json([ - 'settings' => $settings->toArray() - ]); - } -} \ No newline at end of file diff --git a/app/Shared/Command.php b/app/Shared/Command.php new file mode 100644 index 0000000..21bf1ac --- /dev/null +++ b/app/Shared/Command.php @@ -0,0 +1,8 @@ +value) == '') { + throw InvalidIdStringExcepion::emptyId(self::class); + } + } public static function fromString(string $value): self { - return new self($value); + return new self(trim($value)); } public function __toString(): string diff --git a/app/Shared/InvalidIdStringExcepion.php b/app/Shared/InvalidIdStringExcepion.php new file mode 100644 index 0000000..fabebfa --- /dev/null +++ b/app/Shared/InvalidIdStringExcepion.php @@ -0,0 +1,11 @@ +dispatchedCommands[] = $command; + return $this->commandReturnValue; + } +} \ No newline at end of file diff --git a/app/Testing/FakesCommands.php b/app/Testing/FakesCommands.php new file mode 100644 index 0000000..abb7a30 --- /dev/null +++ b/app/Testing/FakesCommands.php @@ -0,0 +1,46 @@ +spyOnDispatcher(); + } + + #[After] + public function teardownSpy() + { + app()->dontSpyOnDispatcher(); + } + + public function setExpectedReturnValue($return = null) + { + app()->spyOnDispatcher($return); + } + + public function assertCommandWasDispatched($class, $times = 1) + { + $dispatched = array_filter( + app()->spy->dispatchedCommands, + fn (Command $cmd) => get_class($cmd) == $class + ); + Assert::assertSame($times, count($dispatched)); + } + + public function assertCommandWasDispatchedWith($class, $callback, $times = 1) + { + $dispatched = array_filter( + app()->spy->dispatchedCommands, + $callback + ); + } +} \ No newline at end of file diff --git a/app/Testing/RequestHandlerTestCase.php b/app/Testing/RequestHandlerTestCase.php index 20d59f5..3a90ce9 100644 --- a/app/Testing/RequestHandlerTestCase.php +++ b/app/Testing/RequestHandlerTestCase.php @@ -48,18 +48,38 @@ public function assertJsonResponseSame(array $expected, HttpResponse $response) $this->assertSame($expected, json_decode($response->getBody(), true)); } + public function assertResponseContentType(string $expected, HttpResponse $response) + { + $this->assertSame($expected, $response->getContentType()); + } + public function assertResponseJson(HttpResponse $response) { - $this->assertSame(JsonResponse::CONTENT_TYPE, $response->getContentType()); + $this->assertResponseContentType(JsonResponse::CONTENT_TYPE, $response); } public function assertResponseHtml(HttpResponse $response) { - $this->assertSame(HtmlResponse::CONTENT_TYPE, $response->getContentType()); + $this->assertResponseContentType(HtmlResponse::CONTENT_TYPE, $response); + } + + public function assertResponseCode(int $expected, HttpResponse $response) + { + $this->assertSame($expected, $response->code); } public function assertResponseOk(HttpResponse $response) { - $this->assertSame(200, $response->code); + $this->assertResponseCode(200, $response); + } + + public function assertResponseNotFound(HttpResponse $response) + { + $this->assertResponseCode(404, $response); + } + + public function assertForbidden(HttpResponse $response) + { + $this->assertResponseCode(403, $response); } } \ No newline at end of file diff --git a/app/Testing/UsesTestDraft.php b/app/Testing/UsesTestDraft.php index 34bfc14..d96cd42 100644 --- a/app/Testing/UsesTestDraft.php +++ b/app/Testing/UsesTestDraft.php @@ -2,9 +2,11 @@ namespace App\Testing; +use App\Draft\Commands\GenerateDraft; use App\Draft\Draft; use App\Draft\Generators\DraftGenerator; use App\Testing\Factories\DraftSettingsFactory; +use App\TwilightImperium\Edition; use PHPUnit\Framework\Attributes\After; use PHPUnit\Framework\Attributes\Before; @@ -16,13 +18,26 @@ trait UsesTestDraft protected function setupTestDraft($settings = null) { if ($settings == null) { - $settings = DraftSettingsFactory::make(); + // make a standard-ass draft. We should test edge cases separately + $settings = DraftSettingsFactory::make([ + 'num_players' => 6, + 'tileSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE], + 'factionSets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE], + 'minimumTwoAlphaBetaWormholes' => false, + 'minimumLegendaryPlanets' => 0, + 'maxOneWormholePerSlice' => true, + ]); } - $this->testDraft = (new DraftGenerator($settings))->generate(); + $this->testDraft = (new GenerateDraft($settings))->handle(); app()->repository->save($this->testDraft); } + public function reloadDraft() + { + $this->testDraft = app()->repository->load($this->testDraft->id); + } + #[After] public function deleteTestDraft() diff --git a/app/TwilightImperium/SpaceStationTest.php b/app/TwilightImperium/SpaceStationTest.php index 945b8a4..d653c20 100644 --- a/app/TwilightImperium/SpaceStationTest.php +++ b/app/TwilightImperium/SpaceStationTest.php @@ -2,9 +2,7 @@ namespace App\TwilightImperium; -use App\Testing\FakesData; use App\Testing\TestCase; -use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; class SpaceStationTest extends TestCase diff --git a/app/api/claim.php b/app/api/claim.php deleted file mode 100644 index 4bc7e41..0000000 --- a/app/api/claim.php +++ /dev/null @@ -1,24 +0,0 @@ -isPlayerSecret($playerId, get('secret')) && !$draft->isAdminPass(get('admin'))) return_error('You are not allowed to do this!'); - $result = $draft->unclaim($playerId); -} else { - $result = $draft->claim($playerId); -} - -$data = [ - 'draft' => $draft, - 'player' => $playerId, - 'success' => $result -]; - -if ($unclaim == false) { - $data['secret'] = $draft->getPlayerSecret($playerId); -} - -return_data($data); diff --git a/app/helpers.php b/app/helpers.php index 77e0317..b3eb6c5 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -19,6 +19,14 @@ function app():\App\Application } } + +if (!function_exists('dispatch')) { + function dispatch(\App\Shared\Command $command): mixed + { + return app()->handle($command); + } +} + if (!function_exists('dd')) { function dd(...$variables) { diff --git a/app/routes.php b/app/routes.php index a4fd194..3606227 100644 --- a/app/routes.php +++ b/app/routes.php @@ -6,9 +6,8 @@ '/api/generate' => \App\Http\RequestHandlers\HandleGenerateDraftRequest::class, '/api/regenerate' => \App\Http\RequestHandlers\HandleRegenerateDraftRequest::class, '/api/pick' => \App\Http\RequestHandlers\HandlePickRequest::class, - '/api/claim' => \App\Http\RequestHandlers\HandleClaimPlayerRequest::class, + '/api/claim' => \App\Http\RequestHandlers\HandleClaimOrUnclaimPlayerRequest::class, '/api/restore' => \App\Http\RequestHandlers\HandleRestoreClaimRequest::class, '/api/undo' => \App\Http\RequestHandlers\HandleUndoRequest::class, '/api/draft/{id}' => \App\Http\RequestHandlers\HandleGetDraftRequest::class, - '/test' => \App\Http\RequestHandlers\HandleTestGeneratorRequest::class, ]; diff --git a/composer.json b/composer.json index 96375fb..5be925b 100644 --- a/composer.json +++ b/composer.json @@ -19,11 +19,14 @@ "Composer\\Config::disableProcessTimeout", "vendor/bin/paratest -p12 --passthru-php=\"'-d' 'memory_limit=2G'\"" ], + "cs:check": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --verbose --dry-run", + "cs:fix": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --verbose", "phpunit": "vendor/bin/phpunit $1" }, "require-dev": { "phpstan/phpstan": "^2.1", "brianium/paratest": "^7.8", - "fakerphp/faker": "^1.24" + "fakerphp/faker": "^1.24", + "friendsofphp/php-cs-fixer": "^3.92" } } From 052429c5f4aa172467d7f55e731d8d6211ae40ae Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Fri, 26 Dec 2025 13:48:27 +0100 Subject: [PATCH 26/34] CS fixes --- app/Application.php | 18 +- app/ApplicationTest.php | 40 +- app/DeprecatedDraft.php | 73 ++-- app/Draft/Commands/ClaimPlayer.php | 5 +- app/Draft/Commands/ClaimPlayerTest.php | 10 +- app/Draft/Commands/GenerateDraft.php | 13 +- app/Draft/Commands/GenerateDraftTest.php | 14 +- app/Draft/Commands/GenerateFactionPool.php | 9 +- .../Commands/GenerateFactionPoolTest.php | 30 +- app/Draft/Commands/GenerateSlicePool.php | 34 +- app/Draft/Commands/GenerateSlicePoolTest.php | 50 ++- app/Draft/Commands/UnclaimPlayer.php | 4 +- app/Draft/Commands/UnclaimPlayerTest.php | 10 +- app/Draft/Draft.php | 17 +- app/Draft/DraftId.php | 2 + app/Draft/DraftTest.php | 32 +- .../Exceptions/DraftRepositoryException.php | 2 + .../Exceptions/InvalidClaimException.php | 2 + .../InvalidDraftSettingsException.php | 27 +- app/Draft/Exceptions/InvalidPickException.php | 4 +- app/Draft/Name.php | 6 +- app/Draft/Pick.php | 6 +- app/Draft/PickCategory.php | 8 +- app/Draft/PickTest.php | 40 +- app/Draft/Player.php | 14 +- app/Draft/PlayerId.php | 2 + app/Draft/PlayerTest.php | 62 ++-- app/Draft/Repository/DraftRepository.php | 2 + app/Draft/Repository/FakeDraftRepository.php | 2 + app/Draft/Repository/LocalDraftRepository.php | 8 +- .../Repository/LocalDraftRepositoryTest.php | 8 +- app/Draft/Repository/S3DraftRepository.php | 25 +- .../Repository/S3DraftRepositoryTest.php | 9 +- app/Draft/Secrets.php | 12 +- app/Draft/SecretsTest.php | 12 +- app/Draft/Seed.php | 8 +- app/Draft/SeedTest.php | 18 +- app/Draft/Settings.php | 27 +- app/Draft/SettingsTest.php | 132 +++---- app/Draft/Slice.php | 12 +- app/Draft/SliceTest.php | 123 +++--- app/Draft/TilePool.php | 4 +- app/Generator.php | 51 ++- app/GeneratorConfig.php | 44 +-- app/Http/ErrorResponse.php | 8 +- app/Http/ErrorResponseTest.php | 8 +- app/Http/HtmlResponse.php | 5 +- app/Http/HttpRequest.php | 7 +- app/Http/HttpRequestTest.php | 56 +-- app/Http/HttpResponse.php | 4 +- app/Http/JsonResponse.php | 4 +- app/Http/JsonResponseTest.php | 6 +- app/Http/RequestHandler.php | 4 +- .../RequestHandlers/DraftRequestHandler.php | 4 +- .../HandleClaimOrUnclaimPlayerRequest.php | 6 +- .../HandleClaimOrUnclaimPlayerRequestTest.php | 18 +- .../HandleGenerateDraftRequest.php | 5 +- .../HandleGenerateDraftRequestTest.php | 114 +++--- .../RequestHandlers/HandleGetDraftRequest.php | 4 +- .../HandleGetDraftRequestTest.php | 10 +- .../RequestHandlers/HandlePickRequest.php | 2 + .../HandleRegenerateDraftRequest.php | 2 + .../HandleRestoreClaimRequest.php | 7 +- .../HandleRestoreClaimRequestTest.php | 22 +- .../RequestHandlers/HandleUndoRequest.php | 4 +- .../HandleViewDraftRequest.php | 13 +- .../HandleViewDraftRequestTest.php | 8 +- .../RequestHandlers/HandleViewFormRequest.php | 3 +- .../HandleViewFormRequestTest.php | 7 +- app/Http/Route.php | 8 +- app/Http/RouteMatch.php | 4 +- app/Http/RouteTest.php | 10 +- app/Shared/Command.php | 2 + app/Shared/IdStringBehavior.php | 2 + app/Shared/InvalidIdStringExcepion.php | 2 + app/Testing/DispatcherSpy.php | 6 +- .../Factories/DraftSettingsFactory.php | 8 +- app/Testing/Factories/PlanetFactory.php | 5 +- app/Testing/Factories/TileFactory.php | 8 +- app/Testing/FakesCommands.php | 16 +- app/Testing/FakesData.php | 6 +- app/Testing/RequestHandlerTestCase.php | 29 +- app/Testing/TestCase.php | 2 + app/Testing/TestDrafts.php | 14 +- app/Testing/TestSets.php | 30 +- app/Testing/UsesTestDraft.php | 10 +- app/TwilightImperium/AllianceTeamMode.php | 6 +- app/TwilightImperium/AllianceTeamModeTest.php | 8 +- app/TwilightImperium/AllianceTeamPosition.php | 8 +- .../AllianceTeamPositionTest.php | 10 +- app/TwilightImperium/Edition.php | 25 +- app/TwilightImperium/EditionTest.php | 14 +- app/TwilightImperium/Faction.php | 19 +- app/TwilightImperium/FactionTest.php | 5 +- app/TwilightImperium/Planet.php | 12 +- app/TwilightImperium/PlanetTest.php | 141 +++---- app/TwilightImperium/PlanetTrait.php | 8 +- app/TwilightImperium/SpaceObject.php | 4 +- app/TwilightImperium/SpaceObjectTest.php | 40 +- app/TwilightImperium/SpaceStation.php | 6 +- app/TwilightImperium/SpaceStationTest.php | 10 +- app/TwilightImperium/TechSpecialties.php | 10 +- app/TwilightImperium/Tile.php | 22 +- app/TwilightImperium/TileTest.php | 350 +++++++++--------- app/TwilightImperium/TileTier.php | 12 +- app/TwilightImperium/TileType.php | 10 +- app/TwilightImperium/Wormhole.php | 31 +- app/TwilightImperium/WormholeTest.php | 24 +- app/api/data.php | 6 +- app/api/generate.php | 16 +- app/api/pick.php | 10 +- app/api/restore.php | 11 +- app/api/undo.php | 10 +- app/helpers.php | 51 ++- app/routes.php | 20 +- 115 files changed, 1301 insertions(+), 1122 deletions(-) diff --git a/app/Application.php b/app/Application.php index d8e3d0d..9fc6639 100644 --- a/app/Application.php +++ b/app/Application.php @@ -1,5 +1,7 @@ handleIncomingRequest(); @@ -49,7 +51,7 @@ private function handleIncomingRequest(): HttpResponse try { $handler = $this->handlerForRequest($_SERVER['REQUEST_URI']); if ($handler == null) { - return new ErrorResponse("Page not found", 404, true); + return new ErrorResponse('Page not found', 404, true); } else { return $handler->handle(); } @@ -77,7 +79,7 @@ private function matchToRoute(string $path): ?RouteMatch public function handlerForRequest(string $requestUri): ?RequestHandler { - $requestChunks = explode("?", $requestUri); + $requestChunks = explode('?', $requestUri); $match = $this->matchToRoute($requestChunks[0]); @@ -88,21 +90,21 @@ public function handlerForRequest(string $requestUri): ?RequestHandler $handler = new $match->requestHandlerClass($request); - if (!$handler instanceof RequestHandler) { - throw new \Exception("Handler does not implement RequestHandler"); + if (! $handler instanceof RequestHandler) { + throw new \Exception('Handler does not implement RequestHandler'); } return $handler; } } - public function spyOnDispatcher($commandReturnValue = null) + public function spyOnDispatcher($commandReturnValue = null): void { $this->spyOnDispatcher = true; $this->spy = new DispatcherSpy($commandReturnValue); } - public function dontSpyOnDispatcher() + public function dontSpyOnDispatcher(): void { $this->spyOnDispatcher = false; unset($this->spy); @@ -119,7 +121,7 @@ public function handle(Command $command) public static function getInstance(): self { - if (!isset(self::$instance)) { + if (! isset(self::$instance)) { self::$instance = new Application(); } diff --git a/app/ApplicationTest.php b/app/ApplicationTest.php index 3bba635..264e3d3 100644 --- a/app/ApplicationTest.php +++ b/app/ApplicationTest.php @@ -1,5 +1,7 @@ [ + yield 'For viewing the form' => [ 'route' => '/', - 'handler' => HandleViewFormRequest::class + 'handler' => HandleViewFormRequest::class, ]; - yield "For viewing a draft" => [ + yield 'For viewing a draft' => [ 'route' => '/d/1234', - 'handler' => HandleViewDraftRequest::class + 'handler' => HandleViewDraftRequest::class, ]; - yield "For fetching draft data" => [ + yield 'For fetching draft data' => [ 'route' => '/api/draft/1234', - 'handler' => HandleGetDraftRequest::class + 'handler' => HandleGetDraftRequest::class, ]; - yield "For generating a draft" => [ + yield 'For generating a draft' => [ 'route' => '/api/generate', - 'handler' => HandleGenerateDraftRequest::class + 'handler' => HandleGenerateDraftRequest::class, ]; - yield "For making a pick" => [ + yield 'For making a pick' => [ 'route' => '/api/pick', - 'handler' => HandlePickRequest::class + 'handler' => HandlePickRequest::class, ]; - yield "For claiming a player" => [ + yield 'For claiming a player' => [ 'route' => '/api/claim', - 'handler' => HandleClaimOrUnclaimPlayerRequest::class + 'handler' => HandleClaimOrUnclaimPlayerRequest::class, ]; - yield "For restoring a claim" => [ + yield 'For restoring a claim' => [ 'route' => '/api/restore', - 'handler' => HandleRestoreClaimRequest::class + 'handler' => HandleRestoreClaimRequest::class, ]; - yield "For undoing a pick" => [ + yield 'For undoing a pick' => [ 'route' => '/api/undo', - 'handler' => HandleUndoRequest::class + 'handler' => HandleUndoRequest::class, ]; - yield "For regenerating a draft" => [ + yield 'For regenerating a draft' => [ 'route' => '/api/regenerate', - 'handler' => HandleRegenerateDraftRequest::class + 'handler' => HandleRegenerateDraftRequest::class, ]; } #[Test] #[DataProvider('allRoutes')] - public function itHasHandlerForAllRoutes($route, $handler) + public function itHasHandlerForAllRoutes($route, $handler): void { $application = new Application(); $determinedHandler = $application->handlerForRequest($route); diff --git a/app/DeprecatedDraft.php b/app/DeprecatedDraft.php index 5ab76df..e2f2bde 100644 --- a/app/DeprecatedDraft.php +++ b/app/DeprecatedDraft.php @@ -1,5 +1,7 @@ draft = ($draft === [] ? [ 'players' => $this->generatePlayerData(), @@ -29,13 +31,13 @@ private function __construct( ] : $draft); $this->done = $this->isDone(); - $this->draft["current"] = $this->currentPlayer(); + $this->draft['current'] = $this->currentPlayer(); } public static function createFromConfig(GeneratorConfig $config) { $id = uniqid(); - $secrets = array("admin_pass" => md5(uniqid("", true))); + $secrets = ['admin_pass' => md5(uniqid('', true))]; $slices = Generator::slices($config); $factions = Generator::factions($config); @@ -53,10 +55,10 @@ private static function getS3Client() { $s3 = new \Aws\S3\S3Client([ 'version' => 'latest', - 'region' => 'us-east-1', + 'region' => 'us-east-1', 'endpoint' => 'https://' . $_ENV['REGION'] . '.digitaloceanspaces.com', 'credentials' => [ - 'key' => $_ENV['ACCESS_KEY'], + 'key' => $_ENV['ACCESS_KEY'], 'secret' => $_ENV['ACCESS_SECRET'], ], ]); @@ -66,7 +68,7 @@ private static function getS3Client() public static function load($id): self { - if (!$id) { + if (! $id) { throw new \Exception('Tried to load draft with no id'); } @@ -75,7 +77,7 @@ public static function load($id): self $path = $_ENV['STORAGE_PATH'] . '/' . 'draft_' . $id . '.json'; - if(!file_exists($path)) { + if(! file_exists($path)) { throw new \Exception('Draft not found'); } @@ -84,7 +86,7 @@ public static function load($id): self $s3 = self::getS3Client(); $file = $s3->getObject([ 'Bucket' => $_ENV['BUCKET'], - 'Key' => 'draft_' . $id . '.json', + 'Key' => 'draft_' . $id . '.json', ]); $rawDraft = (string) $file['Body']; @@ -92,9 +94,9 @@ public static function load($id): self $draft = json_decode($rawDraft, true); - $secrets = $draft["secrets"] ?: array("admin_pass" => $draft["admin_pass"]); + $secrets = $draft['secrets'] ?: ['admin_pass' => $draft['admin_pass']]; - return new self($id, $secrets, $draft["draft"], $draft["slices"], $draft["factions"], GeneratorConfig::fromArray($draft["config"]), $draft["name"]); + return new self($id, $secrets, $draft['draft'], $draft['slices'], $draft['factions'], GeneratorConfig::fromArray($draft['config']), $draft['name']); } catch (S3Exception $e) { abort(404, 'Draft not found'); } @@ -108,27 +110,27 @@ public function getId(): string public function getAdminPass(): string { - return $this->secrets["admin_pass"]; + return $this->secrets['admin_pass']; } public function isAdminPass(?string $pass): bool { - return ($pass ?: "") === $this->getAdminPass(); + return ($pass ?: '') === $this->getAdminPass(); } - public function getPlayerSecret($playerId = ""): string + public function getPlayerSecret($playerId = ''): string { - return $this->secrets[$playerId] ?: ""; + return $this->secrets[$playerId] ?: ''; } public function isPlayerSecret($playerId, $secret): bool { - return ($secret ?: "") === $this->getPlayerSecret($playerId); + return ($secret ?: '') === $this->getPlayerSecret($playerId); } public function getPlayerIdBySecret($secret): string { - return array_search($secret ?: "", $this->secrets); + return array_search($secret ?: '', $this->secrets); } public function name(): string @@ -155,6 +157,7 @@ public function currentPlayer(): string { $doneSteps = count($this->draft['log']); $snakeDraft = array_merge(array_keys($this->draft['players']), array_keys(array_reverse($this->draft['players']))); + return $snakeDraft[$doneSteps % count($snakeDraft)]; } @@ -173,22 +176,22 @@ public function isDone(): bool return count($this->log()) >= (count($this->players()) * 3); } - public function undoLastAction() + public function undoLastAction(): void { $last_log = array_pop($this->draft['log']); - $this->draft["players"][$last_log['player']][$last_log['category']] = null; + $this->draft['players'][$last_log['player']][$last_log['category']] = null; $this->draft['current'] = $last_log['player']; $this->save(); } - public function pick($player, $category, $value) + public function pick($player, $category, $value): void { $this->draft['log'][] = [ 'player' => $player, 'category' => $category, - 'value' => $value + 'value' => $value, ]; $this->draft['players'][$player][$category] = $value; @@ -202,21 +205,21 @@ public function pick($player, $category, $value) public function claim($player) { - if ($this->draft['players'][$player]["claimed"] == true) { + if ($this->draft['players'][$player]['claimed'] == true) { return_error('Already claimed'); } - $this->draft['players'][$player]["claimed"] = true; - $this->secrets[$player] = md5(uniqid("", true)); + $this->draft['players'][$player]['claimed'] = true; + $this->secrets[$player] = md5(uniqid('', true)); return $this->save(); } public function unclaim($player) { - if ($this->draft['players'][$player]["claimed"] == false) { + if ($this->draft['players'][$player]['claimed'] == false) { return_error('Already unclaimed'); } - $this->draft['players'][$player]["claimed"] = false; + $this->draft['players'][$player]['claimed'] = false; unset($this->secrets[$player]); return $this->save(); @@ -231,9 +234,9 @@ public function save() $result = $s3->putObject([ 'Bucket' => $_ENV['BUCKET'], - 'Key' => 'draft_' . $this->getId() . '.json', - 'Body' => (string) $this, - 'ACL' => 'private' + 'Key' => 'draft_' . $this->getId() . '.json', + 'Body' => (string) $this, + 'ACL' => 'private', ]); return $result; @@ -266,7 +269,7 @@ private function generatePlayerData() { $player_data = []; - $alliance_mode = $this->config->alliance != null; + $alliance_mode = $this->config->alliance != null; if ($this->config->seed !== null) { mt_srand($this->config->seed + self::SEED_OFFSET_PLAYER_ORDER); @@ -275,12 +278,11 @@ private function generatePlayerData() if ($alliance_mode) { $playerTeams = $this->generateTeams(); } else { - if(!$this->config->preset_draft_order || !isset($this->config->preset_draft_order)) { + if(! $this->config->preset_draft_order || ! isset($this->config->preset_draft_order)) { shuffle($this->config->players); } } - $player_names = $this->config->players; foreach ($player_names as $p) { @@ -294,7 +296,7 @@ private function generatePlayerData() 'position' => null, 'slice' => null, 'faction' => null, - 'team' => $alliance_mode ? $playerTeams[$p] : null + 'team' => $alliance_mode ? $playerTeams[$p] : null, ]; } @@ -305,7 +307,7 @@ private function generateTeams(): array { $teamNames = array_slice(['A', 'B', 'C', 'D'], 0, count($this->config->players) / 2); - if ($this->config->alliance["alliance_teams"] == 'random') { + if ($this->config->alliance['alliance_teams'] == 'random') { shuffle($this->config->players); } @@ -360,8 +362,9 @@ public function toArray(): array public function jsonSerialize(): array { $draft = $this->toArray(); - unset($draft["secrets"]); - unset($draft["admin_pass"]); + unset($draft['secrets']); + unset($draft['admin_pass']); + return $draft; } } diff --git a/app/Draft/Commands/ClaimPlayer.php b/app/Draft/Commands/ClaimPlayer.php index a31c89f..55e19b4 100644 --- a/app/Draft/Commands/ClaimPlayer.php +++ b/app/Draft/Commands/ClaimPlayer.php @@ -1,9 +1,10 @@ testDraft->players)); @@ -29,7 +31,7 @@ public function itCanClaimAPlayer() } #[Test] - public function itThrowsAnErrorIfPlayerIsNotPartOfDraft() + public function itThrowsAnErrorIfPlayerIsNotPartOfDraft(): void { $playerId = PlayerId::fromString('123'); @@ -38,9 +40,8 @@ public function itThrowsAnErrorIfPlayerIsNotPartOfDraft() $claimPlayer->handle(); } - #[Test] - public function itThrowsAnErrorIfPlayerIsAlreadyClaimed() + public function itThrowsAnErrorIfPlayerIsAlreadyClaimed(): void { $playerId = PlayerId::fromString(array_key_first($this->testDraft->players)); @@ -51,5 +52,4 @@ public function itThrowsAnErrorIfPlayerIsAlreadyClaimed() $claimPlayer->handle(); } - } \ No newline at end of file diff --git a/app/Draft/Commands/GenerateDraft.php b/app/Draft/Commands/GenerateDraft.php index feb61fb..7d28816 100644 --- a/app/Draft/Commands/GenerateDraft.php +++ b/app/Draft/Commands/GenerateDraft.php @@ -1,5 +1,7 @@ */ @@ -65,7 +65,7 @@ public function generatePlayerData(): array $playerNames = [...$this->settings->playerNames]; - if (!$this->settings->presetDraftOrder) { + if (! $this->settings->presetDraftOrder) { shuffle($playerNames); } @@ -83,7 +83,7 @@ public function generatePlayerData(): array } foreach(array_values($players) as $i => $player) { - $teamName = $teamNames[(int) floor($i/2)]; + $teamName = $teamNames[(int) floor($i / 2)]; $teamPlayers[$player->id->value] = $player->putInTeam($teamName); } @@ -105,6 +105,7 @@ protected function generateTeamPlayerData(): array $p = Player::create($name); $players[$p->id->value] = $p; } + return $players; } } \ No newline at end of file diff --git a/app/Draft/Commands/GenerateDraftTest.php b/app/Draft/Commands/GenerateDraftTest.php index e40da6e..45306b0 100644 --- a/app/Draft/Commands/GenerateDraftTest.php +++ b/app/Draft/Commands/GenerateDraftTest.php @@ -1,5 +1,7 @@ $originalPlayerNames, - 'presetDraftOrder' => true + 'presetDraftOrder' => true, ]); $generator = new GenerateDraft($settings); @@ -72,14 +74,14 @@ public function itCanGeneratePlayerDataInPresetOrder() } #[Test] - public function itCanGeneratePlayerDataForAlliances() + public function itCanGeneratePlayerDataForAlliances(): void { $originalPlayerNames = ['Alice', 'Bob', 'Christine', 'David', 'Elliot', 'Frank']; $settings = DraftSettingsFactory::make([ 'playerNames' => $originalPlayerNames, 'allianceMode' => true, 'allianceTeamMode' => AllianceTeamMode::PRESET, - 'presetDraftOrder' => true + 'presetDraftOrder' => true, ]); $generator = new GenerateDraft($settings); $draft = $generator->handle(); diff --git a/app/Draft/Commands/GenerateFactionPool.php b/app/Draft/Commands/GenerateFactionPool.php index 18cba70..433e414 100644 --- a/app/Draft/Commands/GenerateFactionPool.php +++ b/app/Draft/Commands/GenerateFactionPool.php @@ -1,5 +1,7 @@ factionData = Faction::all(); } @@ -29,7 +31,7 @@ public function handle(): array $gatheredFactions = []; - if (!empty($this->settings->customFactions)) { + if (! empty($this->settings->customFactions)) { foreach ($this->settings->customFactions as $f) { $gatheredFactions[] = $factionsFromSets[$f]; // take out the selected faction, so it doesn't get re-drawn in the next part @@ -46,6 +48,7 @@ public function handle(): array } shuffle($gatheredFactions); + return array_slice($gatheredFactions, 0, $this->settings->numberOfFactions); } @@ -55,7 +58,7 @@ private function gatherFactionsFromSelectedSets(): array $this->factionData, fn (Faction $faction) => in_array($faction->edition, $this->settings->factionSets) || - $faction->name == "The Council Keleres" && $this->settings->includeCouncilKeleresFaction + $faction->name == 'The Council Keleres' && $this->settings->includeCouncilKeleresFaction, ); } } \ No newline at end of file diff --git a/app/Draft/Commands/GenerateFactionPoolTest.php b/app/Draft/Commands/GenerateFactionPoolTest.php index d6efc65..e370eb4 100644 --- a/app/Draft/Commands/GenerateFactionPoolTest.php +++ b/app/Draft/Commands/GenerateFactionPoolTest.php @@ -1,5 +1,7 @@ $sets, - 'numberOfFactions' => 10 + 'numberOfFactions' => 10, ])); $choices = $generator->handle(); @@ -32,18 +34,18 @@ public function itCanGenerateChoicesFromFactionSets($sets) } #[Test] - public function itUsesOnlyCustomFactionsWhenEnoughAreProvided() + public function itUsesOnlyCustomFactionsWhenEnoughAreProvided(): void { $customFactions = [ - "The Barony of Letnev", - "The Clan of Saar", - "The Emirates of Hacan", - "The Ghosts of Creuss", + 'The Barony of Letnev', + 'The Clan of Saar', + 'The Emirates of Hacan', + 'The Ghosts of Creuss', ]; $generator = new GenerateFactionPool(DraftSettingsFactory::make([ 'customFactions' => $customFactions, 'factionSets' => [Edition::BASE_GAME], - 'numberOfFactions' => 3 + 'numberOfFactions' => 3, ])); $choices = $generator->handle(); @@ -55,17 +57,17 @@ public function itUsesOnlyCustomFactionsWhenEnoughAreProvided() } #[Test] - public function itGeneratesTheSameFactionsFromTheSameSeed() + public function itGeneratesTheSameFactionsFromTheSameSeed(): void { $generator = new GenerateFactionPool(DraftSettingsFactory::make([ 'seed' => 123, 'factionSets' => [Edition::BASE_GAME], - 'numberOfFactions' => 3 + 'numberOfFactions' => 3, ])); $previouslyGeneratedChoices = [ 'The Ghosts of Creuss', 'The Emirates of Hacan', - 'The Yssaril Tribes' + 'The Yssaril Tribes', ]; $choices = $generator->handle(); @@ -76,17 +78,17 @@ public function itGeneratesTheSameFactionsFromTheSameSeed() } #[Test] - public function itTakesFromSetsWhenNotEnoughCustomFactionsAreProvided() + public function itTakesFromSetsWhenNotEnoughCustomFactionsAreProvided(): void { $customFactions = [ 'The Ghosts of Creuss', 'The Emirates of Hacan', - 'The Yssaril Tribes' + 'The Yssaril Tribes', ]; $generator = new GenerateFactionPool(DraftSettingsFactory::make([ 'factionSets' => [Edition::BASE_GAME], 'customFactions' => $customFactions, - 'numberOfFactions' => 10 + 'numberOfFactions' => 10, ])); $choices = $generator->handle(); diff --git a/app/Draft/Commands/GenerateSlicePool.php b/app/Draft/Commands/GenerateSlicePool.php index 77d893e..2df6eab 100644 --- a/app/Draft/Commands/GenerateSlicePool.php +++ b/app/Draft/Commands/GenerateSlicePool.php @@ -1,5 +1,7 @@ $tileData + * @var array */ private readonly array $tileData; - /** @var array $allGatheredTiles */ + /** @var array */ private readonly array $allGatheredTiles; private readonly TilePool $gatheredTiles; public int $tries; public function __construct( - private readonly Settings $settings + private readonly Settings $settings, ) { $this->tileData = Tile::all(); @@ -38,7 +40,7 @@ public function __construct( fn (Tile $tile) => in_array($tile->edition, $this->settings->tileSets) && // tier none is mec rex and such... - $tile->tier != TileTier::NONE + $tile->tier != TileTier::NONE, ); // sort pre-selected tiles in tiers @@ -51,15 +53,19 @@ public function __construct( switch($tile->tier) { case TileTier::HIGH: $highTier[] = $tile->id; + break; case TileTier::MEDIUM: $midTier[] = $tile->id; + break; case TileTier::LOW: $lowTier[] = $tile->id; + break; case TileTier::RED: $redTier[] = $tile->id; + break; }; } @@ -68,14 +74,14 @@ public function __construct( $highTier, $midTier, $lowTier, - $redTier + $redTier, ); } /** @return array */ public function handle(): array { - if (!empty($this->settings->customSlices)) { + if (! empty($this->settings->customSlices)) { return $this->slicesFromCustomSlices(); } else { return $this->attemptToGenerate(); @@ -94,15 +100,16 @@ private function attemptToGenerate($previousTries = 0): array $this->gatheredTiles->shuffle(); $tilePool = $this->gatheredTiles->slice($this->settings->numberOfSlices); - $tilePoolIsValid = $this->validateTileSelection($tilePool->allIds()); + $tilePoolIsValid = $this->validateTileSelection($tilePool->allIds()); - if (!$tilePoolIsValid) { + if (! $tilePoolIsValid) { return $this->attemptToGenerate($previousTries + 1); } $validSlicesFromPool = $this->makeSlicesFromPool($tilePool); if (empty($validSlicesFromPool)) { unset($validSlicesFromPool); + return $this->attemptToGenerate($previousTries + 1); } else { return $validSlicesFromPool; @@ -126,7 +133,7 @@ private function makeSlicesFromPool(TilePool $pool, $previousTries = 0): array $this->tileData[$pool->midTier[$i]], $this->tileData[$pool->lowTier[$i]], $this->tileData[$pool->redTier[$i * 2]], - $this->tileData[$pool->redTier[($i * 2) + 1]] + $this->tileData[$pool->redTier[($i * 2) + 1]], ]); $sliceIsValid = $slice->validate( @@ -134,18 +141,20 @@ private function makeSlicesFromPool(TilePool $pool, $previousTries = 0): array $this->settings->minimumOptimalResources, $this->settings->minimumOptimalTotal, $this->settings->maximumOptimalTotal, - $this->settings->maxOneWormholesPerSlice + $this->settings->maxOneWormholesPerSlice, ); - if (!$sliceIsValid) { + if (! $sliceIsValid) { unset($slice); unset($slices); + return $this->makeSlicesFromPool($pool, $previousTries + 1); } - if(!$slice->arrange($this->settings->seed)) { + if(! $slice->arrange($this->settings->seed)) { unset($slice); unset($slices); + return $this->makeSlicesFromPool($pool, $previousTries); } @@ -200,6 +209,7 @@ private function slicesFromCustomSlices(): array { return array_map(function (array $sliceData) { $tileData = array_map(fn ($tileId) => $this->tileData[$tileId], $sliceData); + return new Slice($tileData); }, $this->settings->customSlices); } diff --git a/app/Draft/Commands/GenerateSlicePoolTest.php b/app/Draft/Commands/GenerateSlicePoolTest.php index 1e52b57..60599c9 100644 --- a/app/Draft/Commands/GenerateSlicePoolTest.php +++ b/app/Draft/Commands/GenerateSlicePoolTest.php @@ -1,5 +1,7 @@ $sets, @@ -33,16 +35,16 @@ public function itGathersTheCorrectTiles($sets) foreach($tiles as $t) { $this->assertContains($t->edition, $sets); $this->assertNotEquals($t->tileType, TileType::GREEN); - if (!empty($t->planets)) { - $this->assertNotEquals($t->planets[0]->name, "Mecatol Rex"); - $this->assertNotEquals($t->planets[0]->name, "Mallice"); + if (! empty($t->planets)) { + $this->assertNotEquals($t->planets[0]->name, 'Mecatol Rex'); + $this->assertNotEquals($t->planets[0]->name, 'Mallice'); } } } #[Test] #[DataProviderExternal(TestSets::class, 'setCombinations')] - public function itCanGenerateValidSlicesBasedOnSets($sets) + public function itCanGenerateValidSlicesBasedOnSets($sets): void { // we're doing this on easy mode so that the "Only base game" tile set has a decent chance of working $settings = DraftSettingsFactory::make([ @@ -54,14 +56,13 @@ public function itCanGenerateValidSlicesBasedOnSets($sets) ]); $generator = new GenerateSlicePool($settings); - $slices = $generator->handle(); $tileIds = array_reduce( $slices, fn ($allTiles, Slice $s) => array_merge( $allTiles, - array_map(fn (Tile $t) => $t->id, $s->tiles) + array_map(fn (Tile $t) => $t->id, $s->tiles), ), [], ); @@ -73,14 +74,14 @@ public function itCanGenerateValidSlicesBasedOnSets($sets) $settings->minimumOptimalResources, $settings->minimumOptimalTotal, $settings->maximumOptimalTotal, - $settings->maxOneWormholesPerSlice + $settings->maxOneWormholesPerSlice, )); } } #[Test] #[DataProviderExternal(TestSets::class, 'setCombinations')] - public function itDoesNotReuseTiles($sets) + public function itDoesNotReuseTiles($sets): void { $settings = DraftSettingsFactory::make([ 'numberOfSlices' => 4, @@ -97,7 +98,7 @@ public function itDoesNotReuseTiles($sets) $slices, fn($allTiles, Slice $s) => array_merge( $allTiles, - array_map(fn(Tile $t) => $t->id, $s->tiles) + array_map(fn(Tile $t) => $t->id, $s->tiles), ), [], ); @@ -106,7 +107,7 @@ public function itDoesNotReuseTiles($sets) } #[Test] - public function itGeneratesTheSameSlicesFromSameSeed() + public function itGeneratesTheSameSlicesFromSameSeed(): void { $settings = DraftSettingsFactory::make([ 'seed' => 123, @@ -137,7 +138,7 @@ public function itGeneratesTheSameSlicesFromSameSeed() } #[Test] - public function itCanGenerateSlicesForDifficultSettings() + public function itCanGenerateSlicesForDifficultSettings(): void { $settings = DraftSettingsFactory::make([ 'numberOfSlices' => 8, @@ -156,7 +157,7 @@ public function itCanGenerateSlicesForDifficultSettings() } #[Test] - public function itCanGenerateSlicesWithMinimumTwoAlphaAndBetaWormholes() + public function itCanGenerateSlicesWithMinimumTwoAlphaAndBetaWormholes(): void { $settings = DraftSettingsFactory::make([ 'numberOfSlices' => 6, @@ -171,7 +172,6 @@ public function itCanGenerateSlicesWithMinimumTwoAlphaAndBetaWormholes() $slices = $generator->handle(); - $alphaWormholeCount = 0; $betaWormholeCount = 0; foreach($slices as $slice) { @@ -188,7 +188,7 @@ public function itCanGenerateSlicesWithMinimumTwoAlphaAndBetaWormholes() } #[Test] - public function itCanGenerateSlicesWithMinimumAmountOfLegendaryPlanets() + public function itCanGenerateSlicesWithMinimumAmountOfLegendaryPlanets(): void { $settings = DraftSettingsFactory::make([ 'numberOfSlices' => 6, @@ -210,7 +210,7 @@ public function itCanGenerateSlicesWithMinimumAmountOfLegendaryPlanets() } #[Test] - public function itCanGenerateSlicesWithMaxOneWormholePerSlice() + public function itCanGenerateSlicesWithMaxOneWormholePerSlice(): void { $settings = DraftSettingsFactory::make([ 'numberOfSlices' => 6, @@ -227,21 +227,20 @@ public function itCanGenerateSlicesWithMaxOneWormholePerSlice() } #[Test] - public function itCanReturnCustomSlices() + public function itCanReturnCustomSlices(): void { $customSlices = [ - ["64", "33", "42", "67", "59"], - ["29", "66", "20", "39", "47"], - ["27", "32", "79", "68", "19"], - ["35", "37", "22", "40", "50"], + ['64', '33', '42', '67', '59'], + ['29', '66', '20', '39', '47'], + ['27', '32', '79', '68', '19'], + ['35', '37', '22', '40', '50'], ]; $generator = new GenerateSlicePool(DraftSettingsFactory::make([ 'numberOfSlices' => 4, - 'customSlices' => $customSlices + 'customSlices' => $customSlices, ])); - $slices = $generator->handle(); foreach($slices as $sliceIndex => $slice) { @@ -249,13 +248,12 @@ public function itCanReturnCustomSlices() } } - #[Test] - public function itGivesUpIfSettingsAreImpossible() + public function itGivesUpIfSettingsAreImpossible(): void { $generator = new GenerateSlicePool(DraftSettingsFactory::make([ 'numberOfSlices' => 4, - 'minimumOptimalInfluence' => 40 + 'minimumOptimalInfluence' => 40, ])); $this->expectException(InvalidDraftSettingsException::class); diff --git a/app/Draft/Commands/UnclaimPlayer.php b/app/Draft/Commands/UnclaimPlayer.php index 3ad32b1..1757f25 100644 --- a/app/Draft/Commands/UnclaimPlayer.php +++ b/app/Draft/Commands/UnclaimPlayer.php @@ -1,5 +1,7 @@ player = $this->draft->playerById($this->playerId); diff --git a/app/Draft/Commands/UnclaimPlayerTest.php b/app/Draft/Commands/UnclaimPlayerTest.php index 7a08211..4c9a716 100644 --- a/app/Draft/Commands/UnclaimPlayerTest.php +++ b/app/Draft/Commands/UnclaimPlayerTest.php @@ -1,5 +1,7 @@ testDraft->players)); @@ -32,7 +34,7 @@ public function itCanUnclaimAPlayer() } #[Test] - public function itThrowsAnErrorIfPlayerIsNotPartOfDraft() + public function itThrowsAnErrorIfPlayerIsNotPartOfDraft(): void { $playerId = PlayerId::fromString('123'); @@ -41,9 +43,8 @@ public function itThrowsAnErrorIfPlayerIsNotPartOfDraft() $claimPlayer->handle(); } - #[Test] - public function itThrowsAnErrorIfPlayerIsNotClaimed() + public function itThrowsAnErrorIfPlayerIsNotClaimed(): void { $playerId = PlayerId::fromString(array_key_first($this->testDraft->players)); @@ -53,5 +54,4 @@ public function itThrowsAnErrorIfPlayerIsNotClaimed() $unclaim->handle(); } - } \ No newline at end of file diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php index ea62e26..b071df6 100644 --- a/app/Draft/Draft.php +++ b/app/Draft/Draft.php @@ -1,5 +1,7 @@ id->value] = $player; + return $players; }, []); @@ -45,7 +48,7 @@ public static function fromJson($data) self::slicesFromJson($data['slices']), self::factionsFromJson($data['factions']), array_map(fn ($logData) => Pick::fromJson($logData), $data['draft']['log']), - PlayerId::fromString($data['draft']['current']) + PlayerId::fromString($data['draft']['current']), ); } @@ -55,22 +58,24 @@ public static function fromJson($data) private static function slicesFromJson($slicesData): array { $allTiles = Tile::all(); + return array_map(function (array $sliceData) use ($allTiles) { $tiles = array_map( fn (string|int $tileId) => $allTiles[$tileId], - $sliceData['tiles'] + $sliceData['tiles'], ); + return new Slice($tiles); }, $slicesData); } - /** * @return array */ private static function factionsFromJson($factionNames): array { $allFactions = Faction::all(); + return array_map(function (string $name) use ($allFactions) { return $allFactions[$name]; }, $factionNames); @@ -89,8 +94,8 @@ public function toArray($includeSecrets = false): array 'config' => $this->settings->toArray(), 'draft' => [ 'players' => array_map(fn (Player $player) => $player->toArray(), $this->players), - 'log' => array_map(fn (Pick $pick) => $pick->toArray(), $this->log), - 'current' => $this->currentPlayerId->value + 'log' => array_map(fn (Pick $pick) => $pick->toArray(), $this->log), + 'current' => $this->currentPlayerId->value, ], 'factions' => array_map(fn (Faction $f) => $f->name, $this->factionPool), 'slices' => array_map(fn (Slice $s) => ['tiles' => $s->tileIds()], $this->slicePool), @@ -107,6 +112,7 @@ public function determineCurrentPlayer(): PlayerId { $doneSteps = count($this->log); $snakeDraft = array_merge(array_keys($this->players), array_keys(array_reverse($this->players))); + return PlayerId::fromString($snakeDraft[$doneSteps % count($snakeDraft)]); } @@ -120,5 +126,4 @@ public function playerById(PlayerId $id): Player return $this->players[$id->value] ?? throw new \Exception('Player not found in draft'); } - } \ No newline at end of file diff --git a/app/Draft/DraftId.php b/app/Draft/DraftId.php index 94c1ebc..b79888f 100644 --- a/app/Draft/DraftId.php +++ b/app/Draft/DraftId.php @@ -1,5 +1,7 @@ id, PickCategory::FACTION, "Vulraith")], - $player->id + [new Pick($player->id, PickCategory::FACTION, 'Vulraith')], + $player->id, ); $data = $draft->toArray(); @@ -77,7 +79,7 @@ public function itCanBeConvertedToArray() $this->assertSame($draft->isDone, $data['done']); $this->assertSame($player->name, $data['draft']['players'][$player->id->value]['name']); $this->assertSame($player->id->value, $data['draft']['current']); - $this->assertSame("Vulraith", $data['draft']['log'][0]['value']); + $this->assertSame('Vulraith', $data['draft']['log'][0]['value']); foreach($draft->factionPool as $faction) { $this->assertContains($faction->name, $data['factions']); } diff --git a/app/Draft/Exceptions/DraftRepositoryException.php b/app/Draft/Exceptions/DraftRepositoryException.php index 7af9a76..46253c6 100644 --- a/app/Draft/Exceptions/DraftRepositoryException.php +++ b/app/Draft/Exceptions/DraftRepositoryException.php @@ -1,5 +1,7 @@ $this->playerId->value, 'category' => $this->category->value, - 'value' => $this->pickedOption + 'value' => $this->pickedOption, ]; } } \ No newline at end of file diff --git a/app/Draft/PickCategory.php b/app/Draft/PickCategory.php index 4a35b00..f3e491e 100644 --- a/app/Draft/PickCategory.php +++ b/app/Draft/PickCategory.php @@ -1,9 +1,11 @@ [ - "pickData" => [ - "player" => "1234", - "category" => "faction", - "value" => "Xxcha" - ] + yield 'For a faction pick' => [ + 'pickData' => [ + 'player' => '1234', + 'category' => 'faction', + 'value' => 'Xxcha', + ], ]; - yield "For a position pick" => [ - "pickData" => [ - "player" => "1234", - "category" => "position", - "value" => "4" - ] + yield 'For a position pick' => [ + 'pickData' => [ + 'player' => '1234', + 'category' => 'position', + 'value' => '4', + ], ]; - yield "For a slice pick" => [ - "pickData" => [ - "player" => "1234", - "category" => "slice", - "value" => "1" - ] + yield 'For a slice pick' => [ + 'pickData' => [ + 'player' => '1234', + 'category' => 'slice', + 'value' => '1', + ], ]; } #[Test] #[DataProvider('pickCases')] - public function itCanConvertFromJsonData($pickData) + public function itCanConvertFromJsonData($pickData): void { $pick = Pick::fromJson($pickData); diff --git a/app/Draft/Player.php b/app/Draft/Player.php index f3ffec3..202882c 100644 --- a/app/Draft/Player.php +++ b/app/Draft/Player.php @@ -1,5 +1,7 @@ pickedPosition, $this->pickedFaction, $this->pickedSlice, - $team + $team, ); } public function unclaim(): Player { - if (!$this->claimed) { + if (! $this->claimed) { throw InvalidClaimException::playerNotClaimed(); } @@ -70,7 +72,7 @@ public function unclaim(): Player $this->pickedPosition, $this->pickedFaction, $this->pickedSlice, - $this->team + $this->team, ); } @@ -87,7 +89,7 @@ public function claim(): Player $this->pickedPosition, $this->pickedFaction, $this->pickedSlice, - $this->team + $this->team, ); } diff --git a/app/Draft/PlayerId.php b/app/Draft/PlayerId.php index 926e8f1..781733b 100644 --- a/app/Draft/PlayerId.php +++ b/app/Draft/PlayerId.php @@ -1,5 +1,7 @@ assertTrue($player1->hasPickedPosition()); $this->assertFalse($player2->hasPickedPosition()); } #[Test] - public function itChecksIfPlayerHasPickedFaction() + public function itChecksIfPlayerHasPickedFaction(): void { - $player1 = new Player(PlayerId::fromString("1"), 'Alice', false, null, "Mahact"); - $player2 = new Player(PlayerId::fromString("2"), 'Bob'); + $player1 = new Player(PlayerId::fromString('1'), 'Alice', false, null, 'Mahact'); + $player2 = new Player(PlayerId::fromString('2'), 'Bob'); $this->assertTrue($player1->hasPickedFaction()); $this->assertFalse($player2->hasPickedFaction()); } #[Test] - public function itChecksIfPlayerHasPickedSlice() + public function itChecksIfPlayerHasPickedSlice(): void { - $player1 = new Player(PlayerId::fromString("1"), 'Alice', false, null, null, "1"); - $player2 = new Player(PlayerId::fromString("2"), 'Bob'); + $player1 = new Player(PlayerId::fromString('1'), 'Alice', false, null, null, '1'); + $player2 = new Player(PlayerId::fromString('2'), 'Bob'); $this->assertTrue($player1->hasPickedSlice()); $this->assertFalse($player2->hasPickedSlice()); } - #[Test] - public function itCanBeConvertedToAnArray() + public function itCanBeConvertedToAnArray(): void { $player1 = new Player( - PlayerId::fromString("1"), + PlayerId::fromString('1'), 'Alice', true, '2', - "Mahact", + 'Mahact', '3', - 'A' + 'A', ); - $player2 = new Player(PlayerId::fromString("2"), 'Bob'); + $player2 = new Player(PlayerId::fromString('2'), 'Bob'); $this->assertSame([ 'id' => '1', @@ -85,40 +86,40 @@ public function itCanBeConvertedToAnArray() 'position' => null, 'faction' => null, 'slice' => null, - 'team' => null + 'team' => null, ], $player2->toArray()); } public static function picks(): iterable { - yield "When picking slice" => [ + yield 'When picking slice' => [ 'category' => PickCategory::SLICE, ]; - yield "When picking position" => [ + yield 'When picking position' => [ 'category' => PickCategory::POSITION, ]; - yield "When picking faction" => [ + yield 'When picking faction' => [ 'category' => PickCategory::FACTION, ]; } #[Test] #[DataProvider('picks')] - public function itCanPickSomething($category) + public function itCanPickSomething($category): void { $player = new Player( - PlayerId::fromString("1"), + PlayerId::fromString('1'), 'Alice', true, $category == PickCategory::POSITION ? null : '2', - $category == PickCategory::FACTION ? null : "Mahact", + $category == PickCategory::FACTION ? null : 'Mahact', $category == PickCategory::SLICE ? null : '3', - 'A' + 'A', ); - $newPlayerVo = $player->pick($category, "some-value"); + $newPlayerVo = $player->pick($category, 'some-value'); $this->assertEquals($player->id, $newPlayerVo->id); $this->assertSame($player->name, $newPlayerVo->name); @@ -129,17 +130,20 @@ public function itCanPickSomething($category) case PickCategory::POSITION: $this->assertSame($player->pickedSlice, $newPlayerVo->pickedSlice); $this->assertSame($player->pickedFaction, $newPlayerVo->pickedFaction); - $this->assertSame("some-value", $newPlayerVo->pickedPosition); + $this->assertSame('some-value', $newPlayerVo->pickedPosition); + break; case PickCategory::FACTION: $this->assertSame($player->pickedSlice, $newPlayerVo->pickedSlice); $this->assertSame($player->pickedPosition, $newPlayerVo->pickedPosition); - $this->assertSame("some-value", $newPlayerVo->pickedFaction); + $this->assertSame('some-value', $newPlayerVo->pickedFaction); + break; case PickCategory::SLICE: $this->assertSame($player->pickedPosition, $newPlayerVo->pickedPosition); $this->assertSame($player->pickedFaction, $newPlayerVo->pickedFaction); - $this->assertSame("some-value", $newPlayerVo->pickedSlice); + $this->assertSame('some-value', $newPlayerVo->pickedSlice); + break; } } diff --git a/app/Draft/Repository/DraftRepository.php b/app/Draft/Repository/DraftRepository.php index f4abf20..0ef833d 100644 --- a/app/Draft/Repository/DraftRepository.php +++ b/app/Draft/Repository/DraftRepository.php @@ -1,5 +1,7 @@ pathToDraft($id); - if(!file_exists($path)) { + if(! file_exists($path)) { throw DraftRepositoryException::notFound($id); } @@ -32,12 +34,12 @@ public function load(string $id): Draft return Draft::fromJson($rawDraft); } - public function save(Draft $draft) + public function save(Draft $draft): void { file_put_contents($this->pathToDraft($draft->id), $draft->toFileContent()); } - public function delete(string $id) + public function delete(string $id): void { unlink($this->pathToDraft($id)); } diff --git a/app/Draft/Repository/LocalDraftRepositoryTest.php b/app/Draft/Repository/LocalDraftRepositoryTest.php index f5b4b79..4d0d7c7 100644 --- a/app/Draft/Repository/LocalDraftRepositoryTest.php +++ b/app/Draft/Repository/LocalDraftRepositoryTest.php @@ -1,5 +1,7 @@ draftsToCleanUp as $id) { diff --git a/app/Draft/Repository/S3DraftRepository.php b/app/Draft/Repository/S3DraftRepository.php index a0b81f5..83bcae4 100644 --- a/app/Draft/Repository/S3DraftRepository.php +++ b/app/Draft/Repository/S3DraftRepository.php @@ -1,10 +1,11 @@ client = new S3Client([ + $this->client = new S3Client([ 'version' => 'latest', // @todo fix this? - 'region' => 'us-east-1', + 'region' => 'us-east-1', 'endpoint' => 'https://' . env('REGION') . '.digitaloceanspaces.com', 'credentials' => [ - 'key' => env('ACCESS_KEY'), + 'key' => env('ACCESS_KEY'), 'secret' => env('ACCESS_SECRET'), ], ]); @@ -34,13 +35,13 @@ protected function draftKey(string $id): string public function load(string $id): Draft { - if (!$this->client->doesObjectExist($this->bucket, $this->draftKey($id))) { + if (! $this->client->doesObjectExist($this->bucket, $this->draftKey($id))) { throw DraftRepositoryException::notFound($id); } $file = $this->client->getObject([ 'Bucket' => $this->bucket, - 'Key' => $this->draftKey($id), + 'Key' => $this->draftKey($id), ]); $rawDraft = (string) $file['Body']; @@ -48,21 +49,21 @@ public function load(string $id): Draft return Draft::fromJson(json_decode($rawDraft, true)); } - public function save(Draft $draft) + public function save(Draft $draft): void { $this->client->putObject([ 'Bucket' => $this->bucket, - 'Key' => $this->draftKey($draft->id), - 'Body' => $draft->toFileContent(), - 'ACL' => 'private' + 'Key' => $this->draftKey($draft->id), + 'Body' => $draft->toFileContent(), + 'ACL' => 'private', ]); } - public function delete(string $id) + public function delete(string $id): void { $this->client->deleteObject([ 'Bucket' => $this->bucket, - 'Key' => $this->draftKey($id), + 'Key' => $this->draftKey($id), ]); } } \ No newline at end of file diff --git a/app/Draft/Repository/S3DraftRepositoryTest.php b/app/Draft/Repository/S3DraftRepositoryTest.php index 4160d51..9408d6e 100644 --- a/app/Draft/Repository/S3DraftRepositoryTest.php +++ b/app/Draft/Repository/S3DraftRepositoryTest.php @@ -1,13 +1,10 @@ expectNotToPerformAssertions(); } diff --git a/app/Draft/Secrets.php b/app/Draft/Secrets.php index 156ec44..3265f9d 100644 --- a/app/Draft/Secrets.php +++ b/app/Draft/Secrets.php @@ -1,5 +1,7 @@ $playerSecrets */ - public array $playerSecrets = [] + public array $playerSecrets = [], ) { } @@ -22,7 +24,7 @@ public function toArray(): array { return [ self::ADMIN_SECRET_KEY => $this->adminSecret, - ...$this->playerSecrets + ...$this->playerSecrets, ]; } @@ -35,10 +37,11 @@ public function generateSecretForPlayer(PlayerId $playerId): string { $secret = self::generateSecret(); $this->playerSecrets[$playerId->value] = $secret; + return $secret; } - public function removeSecretForPlayer(PlayerId $playerId) + public function removeSecretForPlayer(PlayerId $playerId): void { unset($this->playerSecrets[$playerId->value]); } @@ -62,7 +65,6 @@ public function playerIdBySecret(string $secret): ?PlayerId { return null; } - public function checkPlayerSecret(PlayerId $id, string $secret): bool { return isset($this->playerSecrets[$id->value]) && $secret == $this->playerSecrets[$id->value]; } @@ -71,7 +73,7 @@ public static function fromJson($data): self { return new self( $data[self::ADMIN_SECRET_KEY], - array_filter($data, fn (string $key) => $key != self::ADMIN_SECRET_KEY, ARRAY_FILTER_USE_KEY) + array_filter($data, fn (string $key) => $key != self::ADMIN_SECRET_KEY, ARRAY_FILTER_USE_KEY), ); } } \ No newline at end of file diff --git a/app/Draft/SecretsTest.php b/app/Draft/SecretsTest.php index 09682f2..e2fbc12 100644 --- a/app/Draft/SecretsTest.php +++ b/app/Draft/SecretsTest.php @@ -1,5 +1,7 @@ 'secret124', @@ -34,14 +36,14 @@ public function itCanBeInitiatedFromJson() } #[Test] - public function itCanBeConvertedToArray() + public function itCanBeConvertedToArray(): void { $secrets = new Secrets( 'secret124', [ 'player_1' => 'secret456', 'player_3' => 'secret789', - ] + ], ); $array = $secrets->toArray(); diff --git a/app/Draft/Seed.php b/app/Draft/Seed.php index 9e3b269..666cef7 100644 --- a/app/Draft/Seed.php +++ b/app/Draft/Seed.php @@ -1,5 +1,7 @@ seed; } - public function setForFactions() + public function setForFactions(): void { mt_srand($this->seed + self::OFFSET_FACTIONS); } - public function setForSlices($previousTries = 0) + public function setForSlices($previousTries = 0): void { mt_srand($this->seed + self::OFFSET_SLICES + $previousTries); } - public function setForPlayerOrder() + public function setForPlayerOrder(): void { mt_srand($this->seed + self::OFFSET_PLAYER_ORDER); } diff --git a/app/Draft/SeedTest.php b/app/Draft/SeedTest.php index bc4a814..369a3ce 100644 --- a/app/Draft/SeedTest.php +++ b/app/Draft/SeedTest.php @@ -1,5 +1,7 @@ assertIsInt($seed->getValue()); } #[Test] - public function itCanUseAUserSeed() + public function itCanUseAUserSeed(): void { $seed = new Seed(self::TEST_SEED); $this->assertSame(self::TEST_SEED, $seed->getValue()); } #[Test] - public function itCanSetTheFactionSeed() + public function itCanSetTheFactionSeed(): void { $seed = new Seed(self::TEST_SEED); $seed->setForFactions(); @@ -35,7 +37,7 @@ public function itCanSetTheFactionSeed() } #[Test] - public function itCanSetTheSliceSeed() + public function itCanSetTheSliceSeed(): void { $seed = new Seed(self::TEST_SEED); $seed->setForSlices(self::TEST_SLICE_TRIES); @@ -45,7 +47,7 @@ public function itCanSetTheSliceSeed() } #[Test] - public function itCanSetThePlayerOrderSeed() + public function itCanSetThePlayerOrderSeed(): void { $seed = new Seed(self::TEST_SEED); $seed->setForPlayerOrder(); @@ -55,20 +57,20 @@ public function itCanSetThePlayerOrderSeed() } #[Test] - public function arraysAreShuffledPredictablyWhenSeedIsSet() + public function arraysAreShuffledPredictablyWhenSeedIsSet(): void { $seed = new Seed(self::TEST_SEED); $seed->setForFactions(); $a = [ - "a", "b", "c", "d", "f", "e", "g" + 'a', 'b', 'c', 'd', 'f', 'e', 'g', ]; shuffle($a); // pre-calculated using TEST_SEED + factions $newOrder = [ - "a", "g", "e", "f", "d", "c", "b" + 'a', 'g', 'e', 'f', 'd', 'c', 'b', ]; foreach ($a as $idx => $value) { diff --git a/app/Draft/Settings.php b/app/Draft/Settings.php index 8161571..7e874f0 100644 --- a/app/Draft/Settings.php +++ b/app/Draft/Settings.php @@ -1,9 +1,10 @@ $this->includesFactionSet(Edition::DISCORDANT_STARS_PLUS), 'include_keleres' => $this->includeCouncilKeleresFaction, // slice settings + // @todo replace with minimumTwoAlphaAndBetaWormholes 'min_wormholes' => $this->minimumTwoAlphaAndBetaWormholes ? 2 : 0, 'max_1_wormhole' => $this->maxOneWormholesPerSlice, 'min_legendaries' => $this->minimumLegendaryPlanets, @@ -96,8 +98,8 @@ public function toArray() 'alliance' => $this->allianceMode ? [ 'alliance_teams' => $this->allianceTeamMode->value, 'alliance_teams_position' => $this->allianceTeamPosition->value, - 'force_double_picks' => $this->allianceForceDoublePicks - ] : null + 'force_double_picks' => $this->allianceForceDoublePicks, + ] : null, ]; } @@ -107,7 +109,7 @@ public function toArray() */ public function validate(): bool { - if (!$this->seed->isValid()) { + if (! $this->seed->isValid()) { throw InvalidDraftSettingsException::invalidSeed(); } @@ -144,7 +146,7 @@ protected function validatePlayers(): bool return true; } - protected function validateTiles() { + protected function validateTiles(): void { // @todo base this on tile-selection.json instead of constants // better yet: make a tileset php class that contain the data instead of loading json @@ -152,8 +154,7 @@ protected function validateTiles() { $redTiles = array_reduce($this->tileSets, fn ($sum, Edition $e) => $sum += $e->redTileCount(), 0); $legendaryPlanets = array_reduce($this->tileSets, fn ($sum, Edition $e) => $sum += $e->legendaryPlanetCount(), 0); - $maxSlices = min(floor($blueTiles/3), floor($redTiles/2)); - + $maxSlices = min(floor($blueTiles / 3), floor($redTiles / 2)); if ($this->numberOfSlices > $maxSlices) { throw InvalidDraftSettingsException::notEnoughTilesForSlices($maxSlices); @@ -172,7 +173,7 @@ protected function validateTiles() { } } - protected function validateFactions() + protected function validateFactions(): void { $factions = array_reduce($this->factionSets, fn ($sum, Edition $e) => $sum += $e->factionCount(), 0); if ($factions < $this->numberOfFactions) { @@ -182,7 +183,7 @@ protected function validateFactions() protected function validateCustomSlices(): bool { - if (!empty($this->customSlices)) { + if (! empty($this->customSlices)) { if (count($this->customSlices) < count($this->playerNames)) { throw InvalidDraftSettingsException::notEnoughCustomSlices(); } @@ -210,7 +211,7 @@ public static function fromJson(array $data): self self::tileSetsFromPayload($data), self::factionSetsFromPayload($data), $data['include_keleres'], - $data['min_wormholes'], + $data['min_wormholes'] == 2, $data['max_1_wormhole'], $data['min_legendaries'], (float) $data['minimum_optimal_influence'], @@ -278,11 +279,11 @@ public static function factionSetsFromPayload($data): array public function factionSetNames() { - return array_map(fn (\App\TwilightImperium\Edition $e) => $e->fullName(), $this->factionSets); + return array_map(fn (Edition $e) => $e->fullName(), $this->factionSets); } public function tileSetNames() { - return array_map(fn (\App\TwilightImperium\Edition $e) => $e->fullName(), $this->tileSets); + return array_map(fn (Edition $e) => $e->fullName(), $this->tileSets); } } \ No newline at end of file diff --git a/app/Draft/SettingsTest.php b/app/Draft/SettingsTest.php index dd34af3..7ce8516 100644 --- a/app/Draft/SettingsTest.php +++ b/app/Draft/SettingsTest.php @@ -1,5 +1,7 @@ toArray(); - $this->assertSame(["john", "mike", "suzy", "robin"], $array['players']); - $this->assertSame("Testgame", $array['name']); + $this->assertSame(['john', 'mike', 'suzy', 'robin'], $array['players']); + $this->assertSame('Testgame', $array['name']); $this->assertSame(5, $array['num_slices']); $this->assertSame(8, $array['num_factions']); $this->assertSame(true, $array['include_pok']); @@ -83,53 +85,53 @@ public function itCanBeConvertedToAnArray() $this->assertSame(18.3, $array['minimum_optimal_total']); $this->assertSame(29.0, $array['maximum_optimal_total']); $this->assertSame([ - "The Titans of Ul", - "Free Systems Compact" + 'The Titans of Ul', + 'Free Systems Compact', ], $array['custom_factions']); $this->assertSame([ [ - 1, 2, 3, 4, 5 - ] + 1, 2, 3, 4, 5, + ], ], $array['custom_slices']); $this->assertSame(123, $array['seed']); - $this->assertSame("random", $array['alliance']['alliance_teams']); - $this->assertSame("neighbors", $array['alliance']['alliance_teams_position']); + $this->assertSame('random', $array['alliance']['alliance_teams']); + $this->assertSame('neighbors', $array['alliance']['alliance_teams_position']); $this->assertSame(true, $array['alliance']['force_double_picks']); } public static function validationCases() { - yield "When player names are not unique" => [ - "data" => [ + yield 'When player names are not unique' => [ + 'data' => [ 'playerNames' => [ 'sam', 'sam', - 'kyle' - ] + 'kyle', + ], ], - 'exception' => InvalidDraftSettingsException::playerNamesNotUnique() + 'exception' => InvalidDraftSettingsException::playerNamesNotUnique(), ]; - yield "When not enough playerNames" => [ - "data" => [ + yield 'When not enough playerNames' => [ + 'data' => [ 'playerNames' => [ 'sam', - 'kyle' - ] + 'kyle', + ], ], - 'exception' => InvalidDraftSettingsException::notEnoughPlayers() + 'exception' => InvalidDraftSettingsException::notEnoughPlayers(), ]; - yield "When checking slice count" => [ - "data" => [ + yield 'When checking slice count' => [ + 'data' => [ 'numberOfPlayers' => 4, - 'numberOfSlices' => 3 + 'numberOfSlices' => 3, ], - 'exception' => InvalidDraftSettingsException::notEnoughSlicesForPlayers() + 'exception' => InvalidDraftSettingsException::notEnoughSlicesForPlayers(), ]; } - #[DataProvider("validationCases")] + #[DataProvider('validationCases')] #[Test] - public function itThrowsValidationErrors($data, \Exception $exception) + public function itThrowsValidationErrors($data, \Exception $exception): void { $draft = DraftSettingsFactory::make($data); @@ -139,11 +141,11 @@ public function itThrowsValidationErrors($data, \Exception $exception) } #[Test] - public function itValidatesFactionCount() + public function itValidatesFactionCount(): void { $draft = DraftSettingsFactory::make([ 'numberOfPlayers' => 4, - 'numberOfFactions' => 2 + 'numberOfFactions' => 2, ]); $this->expectException(InvalidDraftSettingsException::class); @@ -152,12 +154,12 @@ public function itValidatesFactionCount() } #[Test] - public function itValidatesNumberOfSlices() { + public function itValidatesNumberOfSlices(): void { $draft = DraftSettingsFactory::make([ 'numberOfSlices' => 7, 'tileSets' => [ - Edition::BASE_GAME - ] + Edition::BASE_GAME, + ], ]); $this->expectException(InvalidDraftSettingsException::class); @@ -166,7 +168,7 @@ public function itValidatesNumberOfSlices() { } #[Test] - public function itValidatesOptimalMaximum() { + public function itValidatesOptimalMaximum(): void { $draft = DraftSettingsFactory::make([ 'minimumOptimalTotal' => 7, 'maximumOptimalTotal' => 4, @@ -178,7 +180,7 @@ public function itValidatesOptimalMaximum() { } #[Test] - public function itValidatesPlayerNamesNotEmpty() { + public function itValidatesPlayerNamesNotEmpty(): void { $draft = DraftSettingsFactory::make([ 'playerNames' => ['Alice', 'Bob', '', ''], ]); @@ -189,13 +191,13 @@ public function itValidatesPlayerNamesNotEmpty() { } #[Test] - public function itValidatesMinimumLegendaryPlanets() { + public function itValidatesMinimumLegendaryPlanets(): void { $draft = DraftSettingsFactory::make([ 'minimumLegendaryPlanets' => 6, 'tileSets' => [ Edition::BASE_GAME, - Edition::THUNDERS_EDGE - ] + Edition::THUNDERS_EDGE, + ], ]); $this->expectException(InvalidDraftSettingsException::class); @@ -204,11 +206,11 @@ public function itValidatesMinimumLegendaryPlanets() { } #[Test] - public function itValidatesMinimumLegendaryPlanetsAgainstSlices() { + public function itValidatesMinimumLegendaryPlanetsAgainstSlices(): void { $draft = DraftSettingsFactory::make([ 'numberOfPlayers' => 5, 'minimumLegendaryPlanets' => 6, - 'numberOfSlices' => 5 + 'numberOfSlices' => 5, ]); $this->expectException(InvalidDraftSettingsException::class); @@ -218,25 +220,25 @@ public function itValidatesMinimumLegendaryPlanetsAgainstSlices() { public static function seedValues(): iterable { - yield "When seed is negative" => [ - "seed" => -1, - "valid" => false + yield 'When seed is negative' => [ + 'seed' => -1, + 'valid' => false, ]; - yield "When seed is too high" => [ - "seed" => Seed::MAX_VALUE + 12, - "valid" => false + yield 'When seed is too high' => [ + 'seed' => Seed::MAX_VALUE + 12, + 'valid' => false, ]; - yield "When seed is valid" => [ - "seed" => 50312, - "valid" => true + yield 'When seed is valid' => [ + 'seed' => 50312, + 'valid' => true, ]; } - #[DataProvider("seedValues")] + #[DataProvider('seedValues')] #[Test] - public function itValidatesSeed($seed, $valid) { + public function itValidatesSeed($seed, $valid): void { $draft = DraftSettingsFactory::make([ - 'seed' => $seed + 'seed' => $seed, ]); if ($valid) { @@ -250,12 +252,12 @@ public function itValidatesSeed($seed, $valid) { } #[Test] - public function itValidatesFactionSetCount() { + public function itValidatesFactionSetCount(): void { $draft = DraftSettingsFactory::make([ 'numberOfFactions' => 20, 'factionSets' => [ - Edition::BASE_GAME - ] + Edition::BASE_GAME, + ], ]); $this->expectException(InvalidDraftSettingsException::class); @@ -265,12 +267,12 @@ public function itValidatesFactionSetCount() { } #[Test] - public function itValidatesCustomSlices() { + public function itValidatesCustomSlices(): void { $draft = DraftSettingsFactory::make([ 'numberOfPlayers' => 5, 'customSlices' => [ - [1, 2, 3, 4, 5] - ] + [1, 2, 3, 4, 5], + ], ]); $this->expectException(InvalidDraftSettingsException::class); @@ -279,9 +281,9 @@ public function itValidatesCustomSlices() { $draft->validate(); } - #[DataProviderExternal(TestDrafts::class, "provideTestDrafts")] + #[DataProviderExternal(TestDrafts::class, 'provideTestDrafts')] #[Test] - public function itCanBeInstantiatedFromJson($data) { + public function itCanBeInstantiatedFromJson($data): void { $draftSettings = Settings::fromJson($data['config']); $this->assertSame($data['config']['name'], (string) $draftSettings->name); diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php index d525e87..1a4c351 100644 --- a/app/Draft/Slice.php +++ b/app/Draft/Slice.php @@ -1,5 +1,7 @@ tiles) != 5) { @@ -75,7 +77,7 @@ public function toJson(): array 'total_influence' => $this->totalInfluence, 'total_resources' => $this->totalResources, 'optimal_influence' => $this->optimalInfluence, - 'optimal_resources' => $this->optimalResources + 'optimal_resources' => $this->optimalResources, ]; } @@ -87,7 +89,7 @@ public function validate( float $minimumOptimalResources, float $minimumOptimalTotal, float $maximumOptimalTotal, - bool $maxOneWormhole + bool $maxOneWormhole, ): bool { $specialCount = Tile::countSpecials($this->tiles); @@ -121,7 +123,7 @@ public function validate( public function arrange(Seed $seed): bool { $tries = 0; - while (!$this->tileArrangementIsValid()) { + while (! $this->tileArrangementIsValid()) { $seed->setForSlices($tries); shuffle($this->tiles); $tries++; @@ -130,6 +132,7 @@ public function arrange(Seed $seed): bool { return false; } } + return true; } @@ -154,7 +157,6 @@ public function arrange(Seed $seed): bool { public function tileArrangementIsValid(): bool { - $neighbours = [[0, 1], [0, 3], [1, 2], [1, 3], [1, 4], [3, 4]]; foreach ($neighbours as $neighbouringPair) { diff --git a/app/Draft/SliceTest.php b/app/Draft/SliceTest.php index 5467954..6cb1dc5 100644 --- a/app/Draft/SliceTest.php +++ b/app/Draft/SliceTest.php @@ -1,8 +1,9 @@ 4, - 'influence' => 2 + 'influence' => 2, ]), // optimal: 4, 0 PlanetFactory::make([ 'resources' => 3, - 'influence' => 3 + 'influence' => 3, ]), // optimal: 1.5, 1.5 PlanetFactory::make([ 'resources' => 1, - 'influence' => 0 + 'influence' => 0, ]), // optimal: 1, 0 PlanetFactory::make([ 'resources' => 1, - 'influence' => 2 + 'influence' => 2, ]), // optimal: 0, 2 ]; @@ -40,7 +41,6 @@ public function itCalculatesTotalAndOptimalValues() $optimalInfluence = array_reduce($planets, fn ($sum, Planet $p) => $sum += $p->optimalInfluence); $optimalResources = array_reduce($planets, fn ($sum, Planet $p) => $sum += $p->optimalResources); - $slice = new Slice([ TileFactory::make([$planets[0], $planets[1]]), TileFactory::make([$planets[2], $planets[3]]), @@ -58,41 +58,41 @@ public function itCalculatesTotalAndOptimalValues() public static function tileConfigurations(): iterable { - yield "When it has no anomalies" => [ - "tiles" => [ + yield 'When it has no anomalies' => [ + 'tiles' => [ TileFactory::make([], [], null), TileFactory::make([], [], null), TileFactory::make([], [], null), TileFactory::make([], [], null), TileFactory::make([], [], null), ], - "canBeArranged" => true + 'canBeArranged' => true, ]; - yield "When it has some anomalies" => [ - "tiles" => [ - TileFactory::make([], [], "nebula"), - TileFactory::make([], [], "asteroid field"), + yield 'When it has some anomalies' => [ + 'tiles' => [ + TileFactory::make([], [], 'nebula'), + TileFactory::make([], [], 'asteroid field'), TileFactory::make([], [], null), TileFactory::make([], [], null), TileFactory::make([], [], null), ], - "canBeArranged" => true + 'canBeArranged' => true, ]; - yield "When it has too many anomalies" => [ - "tiles" => [ - TileFactory::make([], [], "nebula"), - TileFactory::make([], [], "asteroid field"), - TileFactory::make([], [], "gravity-rift"), - TileFactory::make([], [], "supernova"), + yield 'When it has too many anomalies' => [ + 'tiles' => [ + TileFactory::make([], [], 'nebula'), + TileFactory::make([], [], 'asteroid field'), + TileFactory::make([], [], 'gravity-rift'), + TileFactory::make([], [], 'supernova'), TileFactory::make([], [], null), ], - "canBeArranged" => false + 'canBeArranged' => false, ]; } - #[DataProvider("tileConfigurations")] + #[DataProvider('tileConfigurations')] #[Test] - public function itCanArrangeTiles(array $tiles, bool $canBeArranged) + public function itCanArrangeTiles(array $tiles, bool $canBeArranged): void { $slice = new Slice($tiles); $seed = new Seed(1); @@ -104,7 +104,7 @@ public function itCanArrangeTiles(array $tiles, bool $canBeArranged) } #[Test] - public function itWontAllowSlicesWithTooManyWormholes() + public function itWontAllowSlicesWithTooManyWormholes(): void { $slice = new Slice([ TileFactory::make([], [Wormhole::ALPHA]), @@ -120,7 +120,7 @@ public function itWontAllowSlicesWithTooManyWormholes() } #[Test] - public function itWontAllowSlicesWithTooManyLegendaryPlanets() + public function itWontAllowSlicesWithTooManyLegendaryPlanets(): void { $slice = new Slice([ TileFactory::make([PlanetFactory::make(['legendary' => 'Yes'])]), @@ -136,7 +136,7 @@ public function itWontAllowSlicesWithTooManyLegendaryPlanets() } #[Test] - public function itCanValidateMaxWormholes() + public function itCanValidateMaxWormholes(): void { $slice = new Slice([ TileFactory::make([], [Wormhole::ALPHA]), @@ -152,20 +152,20 @@ public function itCanValidateMaxWormholes() } #[Test] - public function itCanValidateMinimumOptimalInfluence() + public function itCanValidateMinimumOptimalInfluence(): void { $slice = new Slice([ TileFactory::make([ PlanetFactory::make([ 'influence' => 2, - 'resources' => 3 - ]) + 'resources' => 3, + ]), ]), TileFactory::make([ PlanetFactory::make([ 'influence' => 1, - 'resources' => 0 - ]) + 'resources' => 0, + ]), ]), TileFactory::make(), TileFactory::make(), @@ -177,27 +177,27 @@ public function itCanValidateMinimumOptimalInfluence() 0, 0, 0, - false + false, ); $this->assertFalse($valid); } #[Test] - public function itCanValidateMinimumOptimalResources() + public function itCanValidateMinimumOptimalResources(): void { $slice = new Slice([ TileFactory::make([ PlanetFactory::make([ 'influence' => 5, - 'resources' => 2 - ]) + 'resources' => 2, + ]), ]), TileFactory::make([ PlanetFactory::make([ 'influence' => 1, - 'resources' => 1 - ]) + 'resources' => 1, + ]), ]), TileFactory::make(), TileFactory::make(), @@ -209,26 +209,26 @@ public function itCanValidateMinimumOptimalResources() 3, 0, 0, - false + false, ); $this->assertFalse($valid); } #[Test] - public function itCanValidateMinimumOptimalTotal() + public function itCanValidateMinimumOptimalTotal(): void { $slice = new Slice([ TileFactory::make([ PlanetFactory::make([ 'influence' => 4, - 'resources' => 2 - ]) + 'resources' => 2, + ]), ]), TileFactory::make([ PlanetFactory::make([ 'influence' => 1, - 'resources' => 1 - ]) + 'resources' => 1, + ]), ]), TileFactory::make(), TileFactory::make(), @@ -240,33 +240,33 @@ public function itCanValidateMinimumOptimalTotal() 0, 5, 0, - false + false, ); $this->assertFalse($valid); } #[Test] - public function itCanValidateMaximumOptimalTotal() + public function itCanValidateMaximumOptimalTotal(): void { $slice = new Slice([ TileFactory::make([ PlanetFactory::make([ 'influence' => 2, - 'resources' => 4 - ]) + 'resources' => 4, + ]), ]), TileFactory::make([ PlanetFactory::make([ 'influence' => 2, - 'resources' => 1 - ]) + 'resources' => 1, + ]), ]), TileFactory::make([ PlanetFactory::make([ 'influence' => 3, - 'resources' => 1 - ]) + 'resources' => 1, + ]), ]), TileFactory::make(), TileFactory::make(), @@ -277,37 +277,36 @@ public function itCanValidateMaximumOptimalTotal() 0, 0, 4, - false + false, ); $this->assertFalse($valid); } - #[Test] - public function itCanValidateAValidSlice() + public function itCanValidateAValidSlice(): void { $slice = new Slice([ TileFactory::make([ PlanetFactory::make([ 'influence' => 2, 'resources' => 3, - ]) + ]), ]), TileFactory::make([ PlanetFactory::make([ 'influence' => 2, - 'resources' => 1 - ]) + 'resources' => 1, + ]), ]), TileFactory::make([ PlanetFactory::make([ 'influence' => 1, - 'resources' => 1 + 'resources' => 1, ]), PlanetFactory::make([ 'influence' => 1, - 'resources' => 1 - ]) + 'resources' => 1, + ]), ]), TileFactory::make(), TileFactory::make(), @@ -318,7 +317,7 @@ public function itCanValidateAValidSlice() 3, 5, 7, - false + false, ); $this->assertTrue($valid); diff --git a/app/Draft/TilePool.php b/app/Draft/TilePool.php index 8199215..e329a1b 100644 --- a/app/Draft/TilePool.php +++ b/app/Draft/TilePool.php @@ -1,5 +1,7 @@ highTier, 0, $numberOfSlices), array_slice($this->midTier, 0, $numberOfSlices), array_slice($this->lowTier, 0, $numberOfSlices), - array_slice($this->redTier, 0, $numberOfSlices * 2) + array_slice($this->redTier, 0, $numberOfSlices * 2), ); } diff --git a/app/Generator.php b/app/Generator.php index c4a4663..4eef3f5 100644 --- a/app/Generator.php +++ b/app/Generator.php @@ -1,5 +1,7 @@ 100) { - return_error("Selection contains no valid slices. This happens occasionally to valid configurations but it probably means that the parameters are impossible."); + return_error('Selection contains no valid slices. This happens occasionally to valid configurations but it probably means that the parameters are impossible.'); } if ($config->seed !== null) { @@ -90,10 +92,10 @@ private static function slicesFromTiles($tiles, $config, $previous_tries = 0) } // reshuffle - shuffle($tiles["high"]); - shuffle($tiles["mid"]); - shuffle($tiles["low"]); - shuffle($tiles["red"]); + shuffle($tiles['high']); + shuffle($tiles['mid']); + shuffle($tiles['low']); + shuffle($tiles['red']); for ($i = 0; $i < $config->num_slices; $i++) { // grab some tiles @@ -112,7 +114,7 @@ private static function slicesFromTiles($tiles, $config, $previous_tries = 0) $config->minimum_optimal_resources, $config->minimum_optimal_total, $config->maximum_optimal_total, - $config->max_1_wormhole + $config->max_1_wormhole, ); $slice->arrange(); } catch (InvalidSliceException $e) { @@ -126,7 +128,6 @@ private static function slicesFromTiles($tiles, $config, $previous_tries = 0) return $slices; } - /** * Make a tile selection based on tier-listing * @@ -140,7 +141,7 @@ private static function select_tiles($tiles, $config, $previous_tries = 0) $selection_valid = false; if ($previous_tries > 2000) { - return_error("Max. number of tries exceeded: no valid tile selection found"); + return_error('Max. number of tries exceeded: no valid tile selection found'); } if ($config->seed !== null && $previous_tries > 0) { @@ -153,20 +154,19 @@ private static function select_tiles($tiles, $config, $previous_tries = 0) shuffle($tiles['red']); $selection = [ - 'high' => array_slice($tiles["high"], 0, $config->num_slices), - 'mid' => array_slice($tiles["mid"], 0, $config->num_slices), - 'low' => array_slice($tiles["low"], 0, $config->num_slices), - 'red' => array_slice($tiles["red"], 0, $config->num_slices * 2), + 'high' => array_slice($tiles['high'], 0, $config->num_slices), + 'mid' => array_slice($tiles['mid'], 0, $config->num_slices), + 'low' => array_slice($tiles['low'], 0, $config->num_slices), + 'red' => array_slice($tiles['red'], 0, $config->num_slices * 2), ]; - - $all = array_merge($selection["high"], $selection["mid"], $selection["low"], $selection["red"]); + $all = array_merge($selection['high'], $selection['mid'], $selection['low'], $selection['red']); // check if the wormhole/legendary count is high enough $counts = Tile::countSpecials($all); // validate against minimums - if ($counts["alpha"] < $config->min_wormholes || $counts["beta"] < $config->min_wormholes || $counts["legendary"] < $config->min_legendaries) { + if ($counts['alpha'] < $config->min_wormholes || $counts['beta'] < $config->min_wormholes || $counts['legendary'] < $config->min_legendaries) { // try again return self::select_tiles($tiles, $config, $previous_tries + 1); } else { @@ -224,7 +224,6 @@ private static function gather_tiles($config) return $all_tiles; } - private static function import_faction_data() { return json_decode(file_get_contents('data/factions.json'), true); @@ -242,7 +241,6 @@ public static function factions($config) $possible_factions = self::filtered_factions($config); - if ($config->custom_factions != null) { $factions = []; @@ -255,20 +253,18 @@ public static function factions($config) while (count($factions) < $config->num_factions) { $f = $possible_factions[$i]; - if (!in_array($f, $factions)) { + if (! in_array($f, $factions)) { $factions[] = $f; } $i++; } - shuffle($factions); } else { $factions = $possible_factions; }; - return array_slice($factions, 0, $config->num_factions); } @@ -278,36 +274,35 @@ public static function filtered_factions($config) $faction_data = self::import_faction_data(); $factions = []; foreach ($faction_data as $faction => $data) { - if ($data["set"] == "base" && $config->include_base_factions) { + if ($data['set'] == 'base' && $config->include_base_factions) { $factions[] = $faction; } - if ($data["set"] == "pok" && $config->include_pok_factions) { + if ($data['set'] == 'pok' && $config->include_pok_factions) { $factions[] = $faction; } - if ($data["set"] == "keleres" && $config->include_keleres) { + if ($data['set'] == 'keleres' && $config->include_keleres) { $factions[] = $faction; } - if ($data["set"] == "discordant" && $config->include_discordant) { + if ($data['set'] == 'discordant' && $config->include_discordant) { $factions[] = $faction; } - if ($data["set"] == "discordantexp" && $config->include_discordantexp) { + if ($data['set'] == 'discordantexp' && $config->include_discordantexp) { $factions[] = $faction; } - if ($data["set"] == "te" && $config->include_te_factions) { + if ($data['set'] == 'te' && $config->include_te_factions) { $factions[] = $faction; } } shuffle($factions); + return $factions; } - private static function import_tile_data() { $data = json_decode(file_get_contents('data/tiles.json'), true); $tiles = []; - foreach ($data as $i => $tile_data) { $tiles[$i] = new Tile($i, $tile_data); } diff --git a/app/GeneratorConfig.php b/app/GeneratorConfig.php index 5953788..a561ce0 100644 --- a/app/GeneratorConfig.php +++ b/app/GeneratorConfig.php @@ -1,5 +1,7 @@ minimum_optimal_total = (float) get('min_total'); $this->maximum_optimal_total = (float) get('max_total'); - if (!empty(get('custom_factions', []))) { + if (! empty(get('custom_factions', []))) { $this->custom_factions = get('custom_factions'); } @@ -107,9 +109,9 @@ function __construct($get_values_from_request) if ((bool) get('alliance_on', false)) { $this->alliance = []; - $this->alliance["alliance_teams"] = get('alliance_teams'); - $this->alliance["alliance_teams_position"] = get('alliance_teams_position'); - $this->alliance["force_double_picks"] = get('force_double_picks') == 'true'; + $this->alliance['alliance_teams'] = get('alliance_teams'); + $this->alliance['alliance_teams_position'] = get('alliance_teams_position'); + $this->alliance['force_double_picks'] = get('force_double_picks') == 'true'; } $seed_input = get('seed', ''); @@ -141,24 +143,24 @@ private function validate(): void if (count($this->players) > count(array_filter($this->players))) return_error('Some player names are not filled out'); if (count(array_unique($this->players)) != count($this->players)) return_error('Players should all have unique names'); - $num_tiles = self::NUM_BASE_BLUE + $this->include_pok*self::NUM_POK_BLUE + $this->include_ds_tiles*self::NUM_DS_BLUE + $this->include_te_tiles*self::NUM_TE_BLUE; - $num_red = self::NUM_BASE_RED + $this->include_pok*self::NUM_POK_RED + $this->include_ds_tiles*self::NUM_DS_RED + $this->include_te_tiles*self::NUM_TE_RED; + $num_tiles = self::NUM_BASE_BLUE + $this->include_pok * self::NUM_POK_BLUE + $this->include_ds_tiles * self::NUM_DS_BLUE + $this->include_te_tiles * self::NUM_TE_BLUE; + $num_red = self::NUM_BASE_RED + $this->include_pok * self::NUM_POK_RED + $this->include_ds_tiles * self::NUM_DS_RED + $this->include_te_tiles * self::NUM_TE_RED; // maximum number of possible slices, 3 blue and 2 red tiles per slice - $max_slices = min(floor($num_tiles/3), floor($num_red/2)); + $max_slices = min(floor($num_tiles / 3), floor($num_red / 2)); if ($max_slices < $this->num_slices) return_error('Can only draft up to ' . $max_slices . ' slices with the selected tiles. (And by extension you can only do drafts up to ' . $max_slices . ' players)'); if (count($this->players) < 3) return_error('Please enter at least 3 players'); if ($this->num_factions < count($this->players)) return_error("Can't have less factions than players"); if ($this->num_slices < count($this->players)) return_error("Can't have less slices than players"); if ($this->maximum_optimal_total < $this->minimum_optimal_total) return_error("Maximum optimal can't be less than minimum"); - $max_legendaries = $this->include_pok*self::NUM_POK_LEGENDARIES + $this->include_ds_tiles*self::NUM_DS_LEGENDARIES + $this->include_te_tiles*self::NUM_TE_LEGENDARIES; + $max_legendaries = $this->include_pok * self::NUM_POK_LEGENDARIES + $this->include_ds_tiles * self::NUM_DS_LEGENDARIES + $this->include_te_tiles * self::NUM_TE_LEGENDARIES; if ($max_legendaries < $this->min_legendaries) return_error('Cannot include ' . $this->min_legendaries . ' legendaries, maximum number available is ' . $max_legendaries); if ($this->min_legendaries > $this->num_slices) return_error('Cannot include more legendaries than slices'); if ($this->seed !== null && ($this->seed < 1 || $this->seed > self::MAX_SEED_VALUE)) return_error('Seed must be between 1 and ' . self::MAX_SEED_VALUE); // Must include at least 1 of base, pok, discordant, or discordant expansion to have enough factions to use - if (!($this->include_base_factions || $this->include_pok_factions || $this->include_discordant || $this->include_discordantexp || $this->include_te_factions)) return_error("Not enough factions selected."); + if (! ($this->include_base_factions || $this->include_pok_factions || $this->include_discordant || $this->include_discordantexp || $this->include_te_factions)) return_error('Not enough factions selected.'); // if($this->custom_factions != null && count($this->custom_factions) < count($this->players)) return_error("Not enough custom factions for number of players"); if ($this->custom_slices != null) { - if (count($this->custom_slices) < count($this->players)) return_error("Not enough custom slices for number of players"); + if (count($this->custom_slices) < count($this->players)) return_error('Not enough custom slices for number of players'); foreach ($this->custom_slices as $s) { if (count($s) != 5) return_error('Some of the custom slices have the wrong number of tiles. (each should have five)'); } diff --git a/app/Http/ErrorResponse.php b/app/Http/ErrorResponse.php index 73b691c..4abee5a 100644 --- a/app/Http/ErrorResponse.php +++ b/app/Http/ErrorResponse.php @@ -1,5 +1,7 @@ $this->error + 'error' => $this->error, ], $code); } @@ -18,7 +20,7 @@ public function getBody(): string { if ($this->showErrorPage) { return HtmlResponse::renderTemplate('templates/error.php', [ - 'error' => $this->error + 'error' => $this->error, ]); } else { // return json diff --git a/app/Http/ErrorResponseTest.php b/app/Http/ErrorResponseTest.php index 4498a3f..d269920 100644 --- a/app/Http/ErrorResponseTest.php +++ b/app/Http/ErrorResponseTest.php @@ -1,5 +1,7 @@ assertSame(json_encode([ - "error" => "foo" + 'error' => 'foo', ]), $response->getBody()); } } \ No newline at end of file diff --git a/app/Http/HtmlResponse.php b/app/Http/HtmlResponse.php index 4e1ac81..1068b58 100644 --- a/app/Http/HtmlResponse.php +++ b/app/Http/HtmlResponse.php @@ -1,5 +1,7 @@ code); } @@ -31,6 +33,7 @@ public static function renderTemplate($template, $data): string ob_start(); extract($data); include $template; + return ob_get_clean(); } diff --git a/app/Http/HttpRequest.php b/app/Http/HttpRequest.php index 5915f67..b674aa7 100644 --- a/app/Http/HttpRequest.php +++ b/app/Http/HttpRequest.php @@ -1,5 +1,7 @@ postParameters[$key])) { return $this->postParameters[$key]; } + return $defaultValue; } diff --git a/app/Http/HttpRequestTest.php b/app/Http/HttpRequestTest.php index 11897e7..25dade5 100644 --- a/app/Http/HttpRequestTest.php +++ b/app/Http/HttpRequestTest.php @@ -1,5 +1,7 @@ [ - "param" => "key", - "get" => [ - "key" => "value" + yield 'When set in get' => [ + 'param' => 'key', + 'get' => [ + 'key' => 'value', ], - "post" => [], - "expectedValue" => "value" + 'post' => [], + 'expectedValue' => 'value', ]; - yield "When set in post" => [ - "param" => "key", - "post" => [ - "key" => "value" + yield 'When set in post' => [ + 'param' => 'key', + 'post' => [ + 'key' => 'value', ], - "get" => [], - "expectedValue" => "value" + 'get' => [], + 'expectedValue' => 'value', ]; - yield "When not set anywhere" => [ - "param" => "key", - "post" => [], - "get" => [], - "expectedValue" => null + yield 'When not set anywhere' => [ + 'param' => 'key', + 'post' => [], + 'get' => [], + 'expectedValue' => null, ]; } - #[DataProvider("requestParameters")] + #[DataProvider('requestParameters')] #[Test] - public function itCanRetrieveParameters(string $param, array $get, array $post, $expectedValue) + public function itCanRetrieveParameters(string $param, array $get, array $post, $expectedValue): void { $request = new HttpRequest($get, $post, []); $this->assertSame($expectedValue, $request->get($param)); } #[Test] - public function itCanReturnDefaultValueForParameter() + public function itCanReturnDefaultValueForParameter(): void { $request = new HttpRequest([], [], []); - $this->assertSame("bar", $request->get("foo", "bar")); + $this->assertSame('bar', $request->get('foo', 'bar')); } #[Test] - public function itCanBeInitialisedFromGetRequest() + public function itCanBeInitialisedFromGetRequest(): void { - $_GET["foo"] = "bar"; + $_GET['foo'] = 'bar'; $request = HttpRequest::fromRequest(); - $this->assertSame("bar", $request->get("foo")); + $this->assertSame('bar', $request->get('foo')); } #[Test] - public function itCanBeInitialisedFromPostRequest() + public function itCanBeInitialisedFromPostRequest(): void { - $_POST["foo"] = "bar"; + $_POST['foo'] = 'bar'; $request = HttpRequest::fromRequest(); - $this->assertSame("bar", $request->get("foo")); + $this->assertSame('bar', $request->get('foo')); } } \ No newline at end of file diff --git a/app/Http/HttpResponse.php b/app/Http/HttpResponse.php index 0bbc4c5..63f0ef1 100644 --- a/app/Http/HttpResponse.php +++ b/app/Http/HttpResponse.php @@ -1,11 +1,13 @@ code); } diff --git a/app/Http/JsonResponseTest.php b/app/Http/JsonResponseTest.php index 276baed..e3ef9d4 100644 --- a/app/Http/JsonResponseTest.php +++ b/app/Http/JsonResponseTest.php @@ -1,5 +1,7 @@ "bar" + 'foo' => 'bar', ]; $response = new JsonResponse($data); $this->assertSame(json_encode($data), $response->getBody()); diff --git a/app/Http/RequestHandler.php b/app/Http/RequestHandler.php index 4cb5583..d8e63eb 100644 --- a/app/Http/RequestHandler.php +++ b/app/Http/RequestHandler.php @@ -1,11 +1,13 @@ $draft->toArray(), 'player' => $playerId->value, 'success' => true, - 'secret' => $unclaim ? null : $secret + 'secret' => $unclaim ? null : $secret, ]); } catch (DraftRepositoryException $e) { diff --git a/app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php b/app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php index 67c39d6..b9871de 100644 --- a/app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php +++ b/app/Http/RequestHandlers/HandleClaimOrUnclaimPlayerRequestTest.php @@ -1,5 +1,7 @@ assertIsConfiguredAsHandlerForRoute('/api/claim'); } #[Test] - public function itReturnsJson() + public function itReturnsJson(): void { $response = $this->handleRequest(['draft' => $this->testDraft->id, 'player' => array_keys($this->testDraft->players)[0]]); $this->assertResponseOk($response); @@ -30,7 +32,7 @@ public function itReturnsJson() } #[Test] - public function itReturnsErrorIfDraftNotFound() + public function itReturnsErrorIfDraftNotFound(): void { $response = $this->handleRequest(['draft' => '123', 'player' => '123']); @@ -39,26 +41,24 @@ public function itReturnsErrorIfDraftNotFound() $this->assertJsonResponseSame(['error' => 'Draft not found'], $response); } - #[Test] - public function itCanClaimAPlayer() + public function itCanClaimAPlayer(): void { $this->setExpectedReturnValue('1234'); $playerId = array_keys($this->testDraft->players)[0]; $this->handleRequest(['draft' => $this->testDraft->id, 'player' => $playerId]); - $this->assertCommandWasDispatchedWith(ClaimPlayer::class, function (ClaimPlayer $cmd) use ($playerId) { + $this->assertCommandWasDispatchedWith(ClaimPlayer::class, function (ClaimPlayer $cmd) use ($playerId): void { $this->assertSame($this->testDraft->id, $cmd->draft->id); $this->assertSame($playerId, $cmd->playerId->value); }); } - #[Test] - public function itCanUnclaimAPlayer() + public function itCanUnclaimAPlayer(): void { $playerId = array_keys($this->testDraft->players)[0]; $this->handleRequest(['draft' => $this->testDraft->id, 'player' => $playerId, 'unclaim' => 1]); - $this->assertCommandWasDispatchedWith(UnclaimPlayer::class, function (UnclaimPlayer $cmd) use ($playerId) { + $this->assertCommandWasDispatchedWith(UnclaimPlayer::class, function (UnclaimPlayer $cmd) use ($playerId): void { $this->assertSame($this->testDraft->id, $cmd->draft->id); $this->assertSame($playerId, $cmd->playerId->value); }); diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php index 5be3ca8..8803610 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php @@ -1,5 +1,7 @@ settings = $this->settingsFromRequest(); } - public function handle(): HttpResponse { try { @@ -40,7 +41,7 @@ public function handle(): HttpResponse return $this->json([ 'id' => $draft->id, - 'admin' => $draft->secrets->adminSecret + 'admin' => $draft->secrets->adminSecret, ]); } diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php index f633e82..487800f 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php @@ -1,5 +1,7 @@ assertIsConfiguredAsHandlerForRoute('/api/generate'); } #[Test] - public function itReturnsErrorWhenSettingsAreInvalid() + public function itReturnsErrorWhenSettingsAreInvalid(): void { $response = $this->handleRequest([], [ - 'seed' => -1 + 'seed' => -1, ]); $this->assertSame($response->code, 400); @@ -44,23 +46,23 @@ public static function settingsPayload() 'postData' => [ 'num_players' => 4, 'player' => [ - 'John', 'Paul', 'George', 'Ringo' - ] + 'John', 'Paul', 'George', 'Ringo', + ], ], 'field' => 'playerNames', 'expected' => ['John', 'Paul', 'George', 'Ringo'], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Player Names containing empties' => [ 'postData' => [ 'num_players' => 6, 'player' => [ - 'John', 'Paul', 'George', 'Ringo', '', '' - ] + 'John', 'Paul', 'George', 'Ringo', '', '', + ], ], 'field' => 'playerNames', 'expected' => ['John', 'Paul', 'George', 'Ringo', '', ''], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Alliance Mode' => [ 'postData' => [ @@ -74,7 +76,7 @@ public static function settingsPayload() ]; yield 'Custom Slices' => [ 'postData' => [ - 'custom_slices' => "1,2,3,4,5\n6,7,8,9,10\n11,12,13,14,15" + 'custom_slices' => "1,2,3,4,5\n6,7,8,9,10\n11,12,13,14,15", ], 'field' => 'customSlices', 'expected' => [ @@ -86,202 +88,200 @@ public static function settingsPayload() ]; yield 'Preset Draft Order' => [ 'postData' => [ - 'preset_draft_order' => 'on' + 'preset_draft_order' => 'on', ], 'field' => 'presetDraftOrder', 'expected' => true, - 'expectedWhenNotSet' => false + 'expectedWhenNotSet' => false, ]; yield 'Number of slices' => [ 'postData' => [ - 'num_slices' => '8' + 'num_slices' => '8', ], 'field' => 'numberOfSlices', 'expected' => 8, - 'expectedWhenNotSet' => 0 + 'expectedWhenNotSet' => 0, ]; yield 'Number of factions' => [ 'postData' => [ - 'num_factions' => '7' + 'num_factions' => '7', ], 'field' => 'numberOfFactions', 'expected' => 7, - 'expectedWhenNotSet' => 0 + 'expectedWhenNotSet' => 0, ]; yield 'Tile set POK' => [ 'postData' => [ - 'include_pok' => 'on' + 'include_pok' => 'on', ], 'field' => 'tileSets', 'expected' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS], - 'expectedWhenNotSet' => [Edition::BASE_GAME] + 'expectedWhenNotSet' => [Edition::BASE_GAME], ]; yield 'Tile set DS' => [ 'postData' => [ - 'include_ds_tiles' => 'on' + 'include_ds_tiles' => 'on', ], 'field' => 'tileSets', 'expected' => [Edition::BASE_GAME, Edition::DISCORDANT_STARS_PLUS], - 'expectedWhenNotSet' => [Edition::BASE_GAME] + 'expectedWhenNotSet' => [Edition::BASE_GAME], ]; yield 'Tile set TE' => [ 'postData' => [ - 'include_te_tiles' => 'on' + 'include_te_tiles' => 'on', ], 'field' => 'tileSets', 'expected' => [Edition::BASE_GAME, Edition::THUNDERS_EDGE], - 'expectedWhenNotSet' => [Edition::BASE_GAME] + 'expectedWhenNotSet' => [Edition::BASE_GAME], ]; yield 'Faction set basegame' => [ 'postData' => [ - 'include_base_factions' => 'on' + 'include_base_factions' => 'on', ], 'field' => 'factionSets', 'expected' => [Edition::BASE_GAME], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Faction set pok' => [ 'postData' => [ - 'include_pok_factions' => 'on' + 'include_pok_factions' => 'on', ], 'field' => 'factionSets', 'expected' => [Edition::PROPHECY_OF_KINGS], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Faction set te' => [ 'postData' => [ - 'include_te_factions' => 'on' + 'include_te_factions' => 'on', ], 'field' => 'factionSets', 'expected' => [Edition::THUNDERS_EDGE], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Faction set ds' => [ 'postData' => [ - 'include_discordant' => 'on' + 'include_discordant' => 'on', ], 'field' => 'factionSets', 'expected' => [Edition::DISCORDANT_STARS], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Faction set ds+' => [ 'postData' => [ - 'include_discordantexp' => 'on' + 'include_discordantexp' => 'on', ], 'field' => 'factionSets', 'expected' => [Edition::DISCORDANT_STARS_PLUS], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Council Keleres' => [ 'postData' => [ - 'include_keleres' => 'on' + 'include_keleres' => 'on', ], 'field' => 'includeCouncilKeleresFaction', 'expected' => true, - 'expectedWhenNotSet' => false + 'expectedWhenNotSet' => false, ]; yield 'Minimum legendary planets' => [ 'postData' => [ - 'min_legendaries' => '1' + 'min_legendaries' => '1', ], 'field' => 'minimumLegendaryPlanets', 'expected' => 1, - 'expectedWhenNotSet' => 0 + 'expectedWhenNotSet' => 0, ]; yield 'Minimum optimal Influence' => [ 'postData' => [ - 'min_inf' => '4.5' + 'min_inf' => '4.5', ], 'field' => 'minimumOptimalInfluence', 'expected' => 4.5, - 'expectedWhenNotSet' => 0.0 + 'expectedWhenNotSet' => 0.0, ]; yield 'Minimum optimal Resources' => [ 'postData' => [ - 'min_res' => '3' + 'min_res' => '3', ], 'field' => 'minimumOptimalResources', 'expected' => 3.0, - 'expectedWhenNotSet' => 0.0 + 'expectedWhenNotSet' => 0.0, ]; yield 'Minimum optimal total' => [ 'postData' => [ - 'min_total' => '7.3' + 'min_total' => '7.3', ], 'field' => 'minimumOptimalTotal', 'expected' => 7.3, - 'expectedWhenNotSet' => 0.0 + 'expectedWhenNotSet' => 0.0, ]; yield 'Maximum optimal total' => [ 'postData' => [ - 'min_total' => '13' + 'min_total' => '13', ], 'field' => 'minimumOptimalTotal', 'expected' => 13.0, - 'expectedWhenNotSet' => 0.0 + 'expectedWhenNotSet' => 0.0, ]; yield 'Custom Factions' => [ 'postData' => [ - 'custom_factions' => ['Xxcha', 'Keleres'] + 'custom_factions' => ['Xxcha', 'Keleres'], ], 'field' => 'customFactions', 'expected' => ['Xxcha', 'Keleres'], - 'expectedWhenNotSet' => [] + 'expectedWhenNotSet' => [], ]; yield 'Alliance Team Mode' => [ 'postData' => [ 'alliance_on' => true, 'alliance_teams' => 'random', - 'alliance_teams_position' => 'neighbors' + 'alliance_teams_position' => 'neighbors', ], 'field' => 'allianceTeamMode', 'expected' => AllianceTeamMode::RANDOM, - 'expectedWhenNotSet' => null + 'expectedWhenNotSet' => null, ]; yield 'Alliance Team Position' => [ 'postData' => [ 'alliance_on' => true, 'alliance_teams' => 'random', - 'alliance_teams_position' => 'neighbors' + 'alliance_teams_position' => 'neighbors', ], 'field' => 'allianceTeamPosition', 'expected' => AllianceTeamPosition::NEIGHBORS, - 'expectedWhenNotSet' => null + 'expectedWhenNotSet' => null, ]; yield 'Alliance Force double picks' => [ 'postData' => [ 'alliance_on' => true, 'force_double_picks' => 'on', 'alliance_teams' => 'random', - 'alliance_teams_position' => 'neighbors' + 'alliance_teams_position' => 'neighbors', ], 'field' => 'allianceForceDoublePicks', 'expected' => true, - 'expectedWhenNotSet' => null + 'expectedWhenNotSet' => null, ]; } #[Test] #[DataProvider('settingsPayload')] - public function itParsesSettingsFromRequest($postData, $field, $expected, $expectedWhenNotSet) + public function itParsesSettingsFromRequest($postData, $field, $expected, $expectedWhenNotSet): void { $handler = new HandleGenerateDraftRequest(new HttpRequest([], $postData, [])); $this->assertSame($expected, $handler->settingValue($field)); } - #[Test] #[DataProvider('settingsPayload')] - public function itParsesSettingsFromRequestWhenNotSet($postData, $field, $expected, $expectedWhenNotSet) + public function itParsesSettingsFromRequestWhenNotSet($postData, $field, $expected, $expectedWhenNotSet): void { $handler = new HandleGenerateDraftRequest(new HttpRequest([], [], [])); $this->assertSame($expectedWhenNotSet, $handler->settingValue($field)); } - #[Test] - public function itGeneratesADraft() + public function itGeneratesADraft(): void { $this->setExpectedReturnValue($this->testDraft); diff --git a/app/Http/RequestHandlers/HandleGetDraftRequest.php b/app/Http/RequestHandlers/HandleGetDraftRequest.php index 85f7c03..bf98335 100644 --- a/app/Http/RequestHandlers/HandleGetDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGetDraftRequest.php @@ -1,5 +1,7 @@ toArray() + $draft->toArray(), ); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleGetDraftRequestTest.php b/app/Http/RequestHandlers/HandleGetDraftRequestTest.php index 4512511..f599fa9 100644 --- a/app/Http/RequestHandlers/HandleGetDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleGetDraftRequestTest.php @@ -1,9 +1,9 @@ assertIsConfiguredAsHandlerForRoute('/api/draft/123'); } #[Test] - public function itReturnsErrorIfDraftNotFound() + public function itReturnsErrorIfDraftNotFound(): void { $response = $this->handleRequest(['id' => '12344']); @@ -31,7 +31,7 @@ public function itReturnsErrorIfDraftNotFound() } #[Test] - public function itCanReturnDraftData() + public function itCanReturnDraftData(): void { $response = $this->handleRequest(['id' => $this->testDraft->id]); diff --git a/app/Http/RequestHandlers/HandlePickRequest.php b/app/Http/RequestHandlers/HandlePickRequest.php index ced3663..ad2f6e0 100644 --- a/app/Http/RequestHandlers/HandlePickRequest.php +++ b/app/Http/RequestHandlers/HandlePickRequest.php @@ -1,5 +1,7 @@ secrets->checkAdminSecret($secret)) { return $this->json([ 'admin' => $secret, - 'success' => true + 'success' => true, ]); } @@ -33,7 +34,7 @@ public function handle(): HttpResponse return $this->json([ 'player' => $playerId->value, 'secret' => $secret, - 'success' => true + 'success' => true, ]); } } diff --git a/app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php b/app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php index 772e540..04d5acd 100644 --- a/app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php +++ b/app/Http/RequestHandlers/HandleRestoreClaimRequestTest.php @@ -1,5 +1,7 @@ assertIsConfiguredAsHandlerForRoute('/api/restore'); } #[Test] - public function itReturnsJson() + public function itReturnsJson(): void { $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => $this->testDraft->secrets->adminSecret]); $this->assertResponseOk($response); @@ -29,19 +31,19 @@ public function itReturnsJson() } #[Test] - public function itCanRestoreAnAdminClaim() + public function itCanRestoreAnAdminClaim(): void { $adminSecret = $this->testDraft->secrets->adminSecret; $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => $adminSecret]); $this->assertResponseOk($response); $this->assertJsonResponseSame([ 'admin' => $adminSecret, - 'success' => true + 'success' => true, ], $response); } #[Test] - public function itCanRestoreAPlayerClaim() + public function itCanRestoreAPlayerClaim(): void { $playerId = array_keys($this->testDraft->players)[0]; @@ -53,21 +55,21 @@ public function itCanRestoreAPlayerClaim() $this->assertJsonResponseSame([ 'player' => $playerId, 'secret' => $playerSecret, - 'success' => true + 'success' => true, ], $response); } #[Test] - public function itThrowsAnErrorIfDraftDoesntExist() + public function itThrowsAnErrorIfDraftDoesntExist(): void { - $response = $this->handleRequest(['draft' => '1234', 'secret' => "blabla"]); + $response = $this->handleRequest(['draft' => '1234', 'secret' => 'blabla']); $this->assertResponseNotFound($response); } #[Test] - public function itThrowsAnErrorIfNoPlayerWasFound() + public function itThrowsAnErrorIfNoPlayerWasFound(): void { - $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => "blabla"]); + $response = $this->handleRequest(['draft' => $this->testDraft->id, 'secret' => 'blabla']); $this->assertForbidden($response); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleUndoRequest.php b/app/Http/RequestHandlers/HandleUndoRequest.php index f26f38a..bed75f5 100644 --- a/app/Http/RequestHandlers/HandleUndoRequest.php +++ b/app/Http/RequestHandlers/HandleUndoRequest.php @@ -1,9 +1,9 @@ html( 'templates/draft.php', - [ - 'draft' => $draft - ] + [ + 'draft' => $draft, + ], ); } } \ No newline at end of file diff --git a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php index ac4f31b..b4f9527 100644 --- a/app/Http/RequestHandlers/HandleViewDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleViewDraftRequestTest.php @@ -1,5 +1,7 @@ assertIsConfiguredAsHandlerForRoute('/d/123'); } #[Test] - public function itCanFetchDraft() + public function itCanFetchDraft(): void { $handler = new HandleViewDraftRequest(new HttpRequest([], ['id' => $this->testDraft->id], [])); @@ -32,7 +34,7 @@ public function itCanFetchDraft() } #[Test] - public function itShowsAnErrorPageWhenDraftIsNotFound() + public function itShowsAnErrorPageWhenDraftIsNotFound(): void { $handler = new HandleViewDraftRequest(new HttpRequest([], ['id' => '123'], [])); $response = $handler->handle(); diff --git a/app/Http/RequestHandlers/HandleViewFormRequest.php b/app/Http/RequestHandlers/HandleViewFormRequest.php index c4cfb9b..fc57f62 100644 --- a/app/Http/RequestHandlers/HandleViewFormRequest.php +++ b/app/Http/RequestHandlers/HandleViewFormRequest.php @@ -1,8 +1,9 @@ assertIsConfiguredAsHandlerForRoute('/'); } - #[Test] - public function itReturnsTheForm() + public function itReturnsTheForm(): void { $response = $this->handleRequest(); diff --git a/app/Http/Route.php b/app/Http/Route.php index fc955e4..22baaf7 100644 --- a/app/Http/Route.php +++ b/app/Http/Route.php @@ -1,5 +1,7 @@ routeChunks = explode('/', $this->route); } @@ -45,13 +47,13 @@ public function match(string $path): ?RouteMatch } } - if (!$allChunksMatch) { + if (! $allChunksMatch) { return null; } return new RouteMatch( $this->handlerClass, - $parameters + $parameters, ); } } \ No newline at end of file diff --git a/app/Http/RouteMatch.php b/app/Http/RouteMatch.php index c6dd0d5..f4b2d9b 100644 --- a/app/Http/RouteMatch.php +++ b/app/Http/RouteMatch.php @@ -1,12 +1,14 @@ dispatchedCommands[] = $command; + return $this->commandReturnValue; } } \ No newline at end of file diff --git a/app/Testing/Factories/DraftSettingsFactory.php b/app/Testing/Factories/DraftSettingsFactory.php index 0f90feb..c2af53c 100644 --- a/app/Testing/Factories/DraftSettingsFactory.php +++ b/app/Testing/Factories/DraftSettingsFactory.php @@ -1,5 +1,7 @@ boolean(), - $properties['maxOneWormholePerSlice'] ?? $faker->boolean(), $properties['minimumLegendaryPlanets'] ?? $faker->numberBetween(0, 1), $properties['minimumOptimalInfluence'] ?? 4, diff --git a/app/Testing/Factories/PlanetFactory.php b/app/Testing/Factories/PlanetFactory.php index f32ae98..afa7876 100644 --- a/app/Testing/Factories/PlanetFactory.php +++ b/app/Testing/Factories/PlanetFactory.php @@ -1,5 +1,7 @@ word(), $properties['resources'] ?? $faker->numberBetween(0, 4), @@ -22,7 +25,7 @@ public static function make(array $properties = []): Planet PlanetTrait::HAZARDOUS, PlanetTrait::CULTURAL, ], 1), - $properties['specialties'] ??$faker->randomElements([ + $properties['specialties'] ?? $faker->randomElements([ TechSpecialties::WARFARE, TechSpecialties::PROPULSION, TechSpecialties::CYBERNETIC, diff --git a/app/Testing/Factories/TileFactory.php b/app/Testing/Factories/TileFactory.php index 7689857..e4dba23 100644 --- a/app/Testing/Factories/TileFactory.php +++ b/app/Testing/Factories/TileFactory.php @@ -1,5 +1,7 @@ spyOnDispatcher(); } #[After] - public function teardownSpy() + public function teardownSpy(): void { app()->dontSpyOnDispatcher(); } - public function setExpectedReturnValue($return = null) + public function setExpectedReturnValue($return = null): void { app()->spyOnDispatcher($return); } - public function assertCommandWasDispatched($class, $times = 1) + public function assertCommandWasDispatched($class, $times = 1): void { $dispatched = array_filter( app()->spy->dispatchedCommands, - fn (Command $cmd) => get_class($cmd) == $class + fn (Command $cmd) => get_class($cmd) == $class, ); Assert::assertSame($times, count($dispatched)); } - public function assertCommandWasDispatchedWith($class, $callback, $times = 1) + public function assertCommandWasDispatchedWith($class, $callback, $times = 1): void { $dispatched = array_filter( app()->spy->dispatchedCommands, - $callback + $callback, ); } } \ No newline at end of file diff --git a/app/Testing/FakesData.php b/app/Testing/FakesData.php index 05a9f99..486bd11 100644 --- a/app/Testing/FakesData.php +++ b/app/Testing/FakesData.php @@ -1,5 +1,7 @@ faker = Factory::create(); } protected function faker(): Generator { - if (!isset($this->faker)) { + if (! isset($this->faker)) { $this->bootFaker(); } diff --git a/app/Testing/RequestHandlerTestCase.php b/app/Testing/RequestHandlerTestCase.php index 3a90ce9..41534d2 100644 --- a/app/Testing/RequestHandlerTestCase.php +++ b/app/Testing/RequestHandlerTestCase.php @@ -1,16 +1,17 @@ application = new Application(); } #[After] - public function unsetApplication() + public function unsetApplication(): void { unset($this->application); } - public function assertIsConfiguredAsHandlerForRoute($route) + public function assertIsConfiguredAsHandlerForRoute($route): void { $determinedHandler = $this->application->handlerForRequest($route); $this->assertInstanceOf($this->requestHandlerClass, $determinedHandler); @@ -40,45 +40,46 @@ public function assertIsConfiguredAsHandlerForRoute($route) public function handleRequest($getParameters = [], $postParameters = [], $urlParameters = []): HttpResponse { $handler = new $this->requestHandlerClass(new HttpRequest($getParameters, $postParameters, $urlParameters)); + return $handler->handle(); } - public function assertJsonResponseSame(array $expected, HttpResponse $response) + public function assertJsonResponseSame(array $expected, HttpResponse $response): void { $this->assertSame($expected, json_decode($response->getBody(), true)); } - public function assertResponseContentType(string $expected, HttpResponse $response) + public function assertResponseContentType(string $expected, HttpResponse $response): void { $this->assertSame($expected, $response->getContentType()); } - public function assertResponseJson(HttpResponse $response) + public function assertResponseJson(HttpResponse $response): void { $this->assertResponseContentType(JsonResponse::CONTENT_TYPE, $response); } - public function assertResponseHtml(HttpResponse $response) + public function assertResponseHtml(HttpResponse $response): void { $this->assertResponseContentType(HtmlResponse::CONTENT_TYPE, $response); } - public function assertResponseCode(int $expected, HttpResponse $response) + public function assertResponseCode(int $expected, HttpResponse $response): void { $this->assertSame($expected, $response->code); } - public function assertResponseOk(HttpResponse $response) + public function assertResponseOk(HttpResponse $response): void { $this->assertResponseCode(200, $response); } - public function assertResponseNotFound(HttpResponse $response) + public function assertResponseNotFound(HttpResponse $response): void { $this->assertResponseCode(404, $response); } - public function assertForbidden(HttpResponse $response) + public function assertForbidden(HttpResponse $response): void { $this->assertResponseCode(403, $response); } diff --git a/app/Testing/TestCase.php b/app/Testing/TestCase.php index 24777e2..4ceee47 100644 --- a/app/Testing/TestCase.php +++ b/app/Testing/TestCase.php @@ -1,5 +1,7 @@ name => [ - 'data' => self::loadDraftByFilename($case->value) + 'data' => self::loadDraftByFilename($case->value), ]; } } public static function provideSingleTestDraft(): iterable { - yield "When using a finished draft" => [ - 'data' => self::loadDraftByFilename(self::FINISHED_ALL_CHECKBOXES->value) + yield 'When using a finished draft' => [ + 'data' => self::loadDraftByFilename(self::FINISHED_ALL_CHECKBOXES->value), ]; } } \ No newline at end of file diff --git a/app/Testing/TestSets.php b/app/Testing/TestSets.php index b695f26..c4a7828 100644 --- a/app/Testing/TestSets.php +++ b/app/Testing/TestSets.php @@ -1,5 +1,7 @@ [ - 'sets' => [Edition::BASE_GAME] + yield 'For base game only' => [ + 'sets' => [Edition::BASE_GAME], ]; - yield "For base game + Discordant" => [ - 'sets' => [Edition::BASE_GAME, Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS] + yield 'For base game + Discordant' => [ + 'sets' => [Edition::BASE_GAME, Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS], ]; - yield "For base game + POK" => [ - 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS] + yield 'For base game + POK' => [ + 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS], ]; yield "For base game + Thunder's edge" => [ - 'sets' => [Edition::BASE_GAME, Edition::THUNDERS_EDGE] + 'sets' => [Edition::BASE_GAME, Edition::THUNDERS_EDGE], ]; - yield "For all official editions" => [ - 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE] + yield 'For all official editions' => [ + 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE], ]; - yield "For base game + POK + Discordant" => [ - 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS] + yield 'For base game + POK + Discordant' => [ + 'sets' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS], ]; - yield "For the whole shebang" => [ + yield 'For the whole shebang' => [ 'sets' => [ Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE, Edition::DISCORDANT_STARS, - Edition::DISCORDANT_STARS_PLUS - ] + Edition::DISCORDANT_STARS_PLUS, + ], ]; } } \ No newline at end of file diff --git a/app/Testing/UsesTestDraft.php b/app/Testing/UsesTestDraft.php index d96cd42..8b7c018 100644 --- a/app/Testing/UsesTestDraft.php +++ b/app/Testing/UsesTestDraft.php @@ -1,10 +1,11 @@ repository->save($this->testDraft); } - public function reloadDraft() + public function reloadDraft(): void { $this->testDraft = app()->repository->load($this->testDraft->id); } - #[After] - public function deleteTestDraft() + public function deleteTestDraft(): void { app()->repository->delete($this->testDraft->id); unset($this->testDraft); diff --git a/app/TwilightImperium/AllianceTeamMode.php b/app/TwilightImperium/AllianceTeamMode.php index 9ac704b..ce240f8 100644 --- a/app/TwilightImperium/AllianceTeamMode.php +++ b/app/TwilightImperium/AllianceTeamMode.php @@ -1,9 +1,11 @@ $mode->value, AllianceTeamMode::cases()); - $this->assertContains("random", $values); - $this->assertContains("preset", $values); + $this->assertContains('random', $values); + $this->assertContains('preset', $values); } } \ No newline at end of file diff --git a/app/TwilightImperium/AllianceTeamPosition.php b/app/TwilightImperium/AllianceTeamPosition.php index 9d7f23d..08024e3 100644 --- a/app/TwilightImperium/AllianceTeamPosition.php +++ b/app/TwilightImperium/AllianceTeamPosition.php @@ -1,10 +1,12 @@ $mode->value, AllianceTeamPosition::cases()); - $this->assertContains("neighbors", $values); - $this->assertContains("opposites", $values); - $this->assertContains("none", $values); + $this->assertContains('neighbors', $values); + $this->assertContains('opposites', $values); + $this->assertContains('none', $values); } } \ No newline at end of file diff --git a/app/TwilightImperium/Edition.php b/app/TwilightImperium/Edition.php index 6fa2a1c..8e80e0b 100644 --- a/app/TwilightImperium/Edition.php +++ b/app/TwilightImperium/Edition.php @@ -1,25 +1,27 @@ "Base Game", - Edition::PROPHECY_OF_KINGS => "Prophecy of Kings", + Edition::BASE_GAME => 'Base Game', + Edition::PROPHECY_OF_KINGS => 'Prophecy of Kings', Edition::THUNDERS_EDGE => "Thunder's Edge", - Edition::DISCORDANT_STARS => "Discordant Stars", - Edition::DISCORDANT_STARS_PLUS => "Discordant Stars Plus", + Edition::DISCORDANT_STARS => 'Discordant Stars', + Edition::DISCORDANT_STARS_PLUS => 'Discordant Stars Plus', }; } @@ -31,13 +33,13 @@ public function fullName(): string private static function editionsWithoutTiles(): array { return [ - self::DISCORDANT_STARS + self::DISCORDANT_STARS, ]; } public function hasValidTileSet(): bool { - return !in_array($this, self::editionsWithoutTiles()); + return ! in_array($this, self::editionsWithoutTiles()); } // @todo move to tileset class? @@ -74,7 +76,6 @@ public function legendaryPlanetCount(): int }; } - public function factionCount(): int { return match($this) { diff --git a/app/TwilightImperium/EditionTest.php b/app/TwilightImperium/EditionTest.php index ff77d78..3b7f7d7 100644 --- a/app/TwilightImperium/EditionTest.php +++ b/app/TwilightImperium/EditionTest.php @@ -1,5 +1,7 @@ assertSame(20, Edition::BASE_GAME->blueTileCount()); $this->assertSame(12, Edition::BASE_GAME->redTileCount()); @@ -29,7 +31,7 @@ public function itReturnsTheCorrectNumbersForBaseGame() } #[Test] - public function itReturnsTheCorrectNumbersForPoK() + public function itReturnsTheCorrectNumbersForPoK(): void { $this->assertSame(16, Edition::PROPHECY_OF_KINGS->blueTileCount()); $this->assertSame(6, Edition::PROPHECY_OF_KINGS->redTileCount()); @@ -38,7 +40,7 @@ public function itReturnsTheCorrectNumbersForPoK() } #[Test] - public function itReturnsTheCorrectNumbersForThundersEdge() + public function itReturnsTheCorrectNumbersForThundersEdge(): void { $this->assertSame(15, Edition::THUNDERS_EDGE->blueTileCount()); $this->assertSame(5, Edition::THUNDERS_EDGE->redTileCount()); @@ -47,7 +49,7 @@ public function itReturnsTheCorrectNumbersForThundersEdge() } #[Test] - public function itReturnsTheCorrectNumbersForDiscordantStars() + public function itReturnsTheCorrectNumbersForDiscordantStars(): void { $this->assertSame(0, Edition::DISCORDANT_STARS->blueTileCount()); $this->assertSame(0, Edition::DISCORDANT_STARS->redTileCount()); @@ -56,7 +58,7 @@ public function itReturnsTheCorrectNumbersForDiscordantStars() } #[Test] - public function itReturnsTheCorrectNumbersForDiscordantStarsPlus() + public function itReturnsTheCorrectNumbersForDiscordantStarsPlus(): void { $this->assertSame(16, Edition::DISCORDANT_STARS_PLUS->blueTileCount()); $this->assertSame(8, Edition::DISCORDANT_STARS_PLUS->redTileCount()); diff --git a/app/TwilightImperium/Faction.php b/app/TwilightImperium/Faction.php index 9429332..673908d 100644 --- a/app/TwilightImperium/Faction.php +++ b/app/TwilightImperium/Faction.php @@ -1,5 +1,7 @@ $allFactionData + * @var array */ private static array $allFactionData; @@ -39,6 +41,7 @@ public static function fromJson($data) public static function all(): array { $rawData = json_decode(file_get_contents('data/factions.json'), true); + return array_map(fn ($factionData) => self::fromJson($factionData), $rawData); } @@ -46,13 +49,13 @@ public static function all(): array private static function editionFromFactionJson($factionEdition): Edition { return match ($factionEdition) { - "base" => Edition::BASE_GAME, - "pok" => Edition::PROPHECY_OF_KINGS, - "te" => Edition::THUNDERS_EDGE, - "keleres" => Edition::THUNDERS_EDGE, - "discordant" => Edition::DISCORDANT_STARS, - "discordantexp" => Edition::DISCORDANT_STARS_PLUS, - default => throw new \Exception("Faction has invalid set") + 'base' => Edition::BASE_GAME, + 'pok' => Edition::PROPHECY_OF_KINGS, + 'te' => Edition::THUNDERS_EDGE, + 'keleres' => Edition::THUNDERS_EDGE, + 'discordant' => Edition::DISCORDANT_STARS, + 'discordantexp' => Edition::DISCORDANT_STARS_PLUS, + default => throw new \Exception('Faction has invalid set'), }; } diff --git a/app/TwilightImperium/FactionTest.php b/app/TwilightImperium/FactionTest.php index e2a57ad..5773880 100644 --- a/app/TwilightImperium/FactionTest.php +++ b/app/TwilightImperium/FactionTest.php @@ -1,10 +1,11 @@ */ - public array $specialties = [] + public array $specialties = [], ) { parent::__construct($resources, $influence); } @@ -30,8 +32,8 @@ public static function fromJsonData(array $data): self // @todo refactor tiles.json to use legendary: null instead of false ($data['legendary'] !== false) ? $data['legendary'] : null, self::traitsFromJsonData($data['trait']), - self::techSpecialtiesFromJsonData($data['specialties']) - ); + self::techSpecialtiesFromJsonData($data['specialties']), + ); } // @todo update the tiles.json so that all planets just have an array of traits @@ -47,7 +49,7 @@ private static function traitsFromJsonData(string|array|null $data): array // process array of traits, even if it's just one string return array_map( fn (string $str) => PlanetTrait::from($str), - is_array($data) ? $data : [$data] + is_array($data) ? $data : [$data], ); } } @@ -60,7 +62,7 @@ private static function techSpecialtiesFromJsonData(array $data): array { return array_map( fn (string $str) => TechSpecialties::from($str), - $data + $data, ); } diff --git a/app/TwilightImperium/PlanetTest.php b/app/TwilightImperium/PlanetTest.php index 71810a5..087e72e 100644 --- a/app/TwilightImperium/PlanetTest.php +++ b/app/TwilightImperium/PlanetTest.php @@ -1,5 +1,7 @@ [ + yield 'For a legendary planet' => [ 'planet' => new Planet( - "Legendplanet", + 'Legendplanet', 0, 0, - "Some string value" + 'Some string value', ), - 'expected' => true + 'expected' => true, ]; - yield "For a regular planet" => [ + yield 'For a regular planet' => [ 'planet' => new Planet( - "RegularJoePlanet", + 'RegularJoePlanet', 0, 0, - null + null, ), - 'expected' => false + 'expected' => false, ]; } public static function jsonData(): iterable { $baseJsonData = [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, + 'name' => 'Tinnes', + 'resources' => 2, + 'influence' => 1, ]; - yield "A planet without a legendary" => [ - "jsonData" => $baseJsonData + [ - "trait" => "hazardous", - "legendary" => false, - "specialties" => [ - "biotic", - "cybernetic" - ] + yield 'A planet without a legendary' => [ + 'jsonData' => $baseJsonData + [ + 'trait' => 'hazardous', + 'legendary' => false, + 'specialties' => [ + 'biotic', + 'cybernetic', + ], ], - "expectedLegendary" => null, - "expectedTraits" => [ - PlanetTrait::HAZARDOUS + 'expectedLegendary' => null, + 'expectedTraits' => [ + PlanetTrait::HAZARDOUS, ], - "expectedTechSpecialties" => [ + 'expectedTechSpecialties' => [ TechSpecialties::BIOTIC, - TechSpecialties::CYBERNETIC - ] + TechSpecialties::CYBERNETIC, + ], ]; - yield "A planet with a legendary" => [ - "jsonData" => $baseJsonData + [ - "trait" => "cultural", - "legendary" => "I am legend", - "specialties" => [ - "propulsion", - "warfare" - ] + yield 'A planet with a legendary' => [ + 'jsonData' => $baseJsonData + [ + 'trait' => 'cultural', + 'legendary' => 'I am legend', + 'specialties' => [ + 'propulsion', + 'warfare', + ], ], - "expectedLegendary" => "I am legend", - "expectedTraits" => [ - PlanetTrait::CULTURAL + 'expectedLegendary' => 'I am legend', + 'expectedTraits' => [ + PlanetTrait::CULTURAL, ], - "expectedTechSpecialties" => [ + 'expectedTechSpecialties' => [ TechSpecialties::PROPULSION, - TechSpecialties::WARFARE - ] + TechSpecialties::WARFARE, + ], ]; - yield "A planet with legendary false" => [ - "jsonData" => $baseJsonData + [ - "trait" => "industrial", - "legendary" => false, - "specialties" => [] + yield 'A planet with legendary false' => [ + 'jsonData' => $baseJsonData + [ + 'trait' => 'industrial', + 'legendary' => false, + 'specialties' => [], ], - "expectedLegendary" => null, - "expectedTraits" => [ - PlanetTrait::INDUSTRIAL + 'expectedLegendary' => null, + 'expectedTraits' => [ + PlanetTrait::INDUSTRIAL, ], - "expectedTechSpecialties" => [] + 'expectedTechSpecialties' => [], ]; - yield "A planet with multiple traits" => [ - "jsonData" => $baseJsonData + [ - "trait" => ["cultural", "hazardous"], - "legendary" => null, - "specialties" => [] + yield 'A planet with multiple traits' => [ + 'jsonData' => $baseJsonData + [ + 'trait' => ['cultural', 'hazardous'], + 'legendary' => null, + 'specialties' => [], ], - "expectedLegendary" => null, - "expectedTraits" => [ + 'expectedLegendary' => null, + 'expectedTraits' => [ PlanetTrait::CULTURAL, - PlanetTrait::HAZARDOUS + PlanetTrait::HAZARDOUS, ], - "expectedTechSpecialties" => [] + 'expectedTechSpecialties' => [], ]; - yield "A planet with no traits" => [ - "jsonData" => $baseJsonData + [ - "trait" => null, - "legendary" => null, - "specialties" => [] + yield 'A planet with no traits' => [ + 'jsonData' => $baseJsonData + [ + 'trait' => null, + 'legendary' => null, + 'specialties' => [], ], - "expectedLegendary" => null, - "expectedTraits" => [], - "expectedTechSpecialties" => [] + 'expectedLegendary' => null, + 'expectedTraits' => [], + 'expectedTechSpecialties' => [], ]; } - - #[DataProvider("jsonData")] + #[DataProvider('jsonData')] #[Test] public function itcanCreateAPlanetFromJsonData( array $jsonData, ?string $expectedLegendary, array $expectedTraits, array $expectedTechSpecialties, - ) { + ): void { $planet = Planet::fromJsonData($jsonData); $this->assertSame($jsonData['name'], $planet->name); @@ -131,9 +132,9 @@ public function itcanCreateAPlanetFromJsonData( $this->assertSame($expectedLegendary, $planet->legendary); } - #[DataProvider("planets")] + #[DataProvider('planets')] #[Test] - public function itExposesHasLegendaryMethod(Planet $planet, bool $expected) { + public function itExposesHasLegendaryMethod(Planet $planet, bool $expected): void { $this->assertSame($expected, $planet->isLegendary()); } } \ No newline at end of file diff --git a/app/TwilightImperium/PlanetTrait.php b/app/TwilightImperium/PlanetTrait.php index d246ce3..f8a9a21 100644 --- a/app/TwilightImperium/PlanetTrait.php +++ b/app/TwilightImperium/PlanetTrait.php @@ -1,10 +1,12 @@ influence > $this->resources) { diff --git a/app/TwilightImperium/SpaceObjectTest.php b/app/TwilightImperium/SpaceObjectTest.php index b656bc4..b62bace 100644 --- a/app/TwilightImperium/SpaceObjectTest.php +++ b/app/TwilightImperium/SpaceObjectTest.php @@ -1,5 +1,7 @@ [ - "resources" => 3, - "influence" => 1, - "expectedOptimalResources" => 3.0, - "expectedOptimalInfluence" => 0.0 + yield 'when resource value is higher than influence' => [ + 'resources' => 3, + 'influence' => 1, + 'expectedOptimalResources' => 3.0, + 'expectedOptimalInfluence' => 0.0, ]; - yield "when resource value is lower than influence" => [ - "resources" => 2, - "influence" => 4, - "expectedOptimalResources" => 0.0, - "expectedOptimalInfluence" => 4.0 + yield 'when resource value is lower than influence' => [ + 'resources' => 2, + 'influence' => 4, + 'expectedOptimalResources' => 0.0, + 'expectedOptimalInfluence' => 4.0, ]; - yield "when resource value equals influence" => [ - "resources" => 3, - "influence" => 3, - "expectedOptimalResources" => 1.5, - "expectedOptimalInfluence" => 1.5 + yield 'when resource value equals influence' => [ + 'resources' => 3, + 'influence' => 3, + 'expectedOptimalResources' => 1.5, + 'expectedOptimalInfluence' => 1.5, ]; } - #[DataProvider("values")] + #[DataProvider('values')] #[Test] public function itCalculatesOptimalValues( int $resources, int $influence, float $expectedOptimalResources, - float $expectedOptimalInfluence - ) + float $expectedOptimalInfluence, + ): void { $entity = new SpaceObject( $resources, - $influence + $influence, ); $this->assertSame($expectedOptimalResources, $entity->optimalResources); diff --git a/app/TwilightImperium/SpaceStation.php b/app/TwilightImperium/SpaceStation.php index c986ca5..fd15ba3 100644 --- a/app/TwilightImperium/SpaceStation.php +++ b/app/TwilightImperium/SpaceStation.php @@ -1,5 +1,7 @@ "Oluz Station", - "resources" => 1, - "influence" => 1, + 'name' => 'Oluz Station', + 'resources' => 1, + 'influence' => 1, ]; $spaceStation = SpaceStation::fromJsonData($jsonData); diff --git a/app/TwilightImperium/TechSpecialties.php b/app/TwilightImperium/TechSpecialties.php index c769c3c..6807018 100644 --- a/app/TwilightImperium/TechSpecialties.php +++ b/app/TwilightImperium/TechSpecialties.php @@ -1,14 +1,16 @@ $allTileData + * @var array */ private static array $allTileData; @@ -51,7 +52,7 @@ public function __construct( public static function fromJsonData( string $id, TileTier $tier, - array $data + array $data, ): self { return new self( $id, @@ -85,7 +86,6 @@ function hasLegendaryPlanet() return false; } - /** * @todo deprecate * @@ -95,7 +95,7 @@ function hasLegendaryPlanet() public static function countSpecials(array $tiles) { $count = [ - "legendary" => 0 + 'legendary' => 0, ]; foreach(Wormhole::cases() as $wormhole) { $count[$wormhole->value] = 0; @@ -106,7 +106,7 @@ public static function countSpecials(array $tiles) $count[$w->value]++ ]; - if ($tile->hasLegendaryPlanet()) $count["legendary"]++; + if ($tile->hasLegendaryPlanet()) $count['legendary']++; } return $count; @@ -136,7 +136,7 @@ public static function tierData(): array */ public static function all(): array { - if (!isset(self::$allTileData)) { + if (! isset(self::$allTileData)) { $allTileData = json_decode(file_get_contents('data/tiles.json'), true); $tileTiers = self::tierData(); /** @var array $tiles */ @@ -146,15 +146,15 @@ public static function all(): array // We're keeping it in separate files for maintainability foreach ($allTileData as $tileId => $tileData) { $isMecRexOrMallice = count($tileData['planets']) > 0 && - ($tileData['planets'][0]['name'] == "Mecatol Rex" || $tileData['planets'][0]['name'] == "Mallice"); + ($tileData['planets'][0]['name'] == 'Mecatol Rex' || $tileData['planets'][0]['name'] == 'Mallice'); $tier = match($tileData['type']) { - "red" => TileTier::RED, - "blue" => $isMecRexOrMallice ? TileTier::NONE : $tileTiers[$tileId], - default => TileTier::NONE + 'red' => TileTier::RED, + 'blue' => $isMecRexOrMallice ? TileTier::NONE : $tileTiers[$tileId], + default => TileTier::NONE, }; - $tiles[$tileId] = Tile::fromJsonData($tileId, $tier, $tileData); + $tiles[$tileId] = Tile::fromJsonData((string) $tileId, $tier, $tileData); } self::$allTileData = $tiles; diff --git a/app/TwilightImperium/TileTest.php b/app/TwilightImperium/TileTest.php index d4aaec2..f2873d3 100644 --- a/app/TwilightImperium/TileTest.php +++ b/app/TwilightImperium/TileTest.php @@ -1,5 +1,7 @@ assertSame(7.0, $tile->optimalTotal); } - public static function jsonData() { - yield "For a regular tile" => [ - "jsonData" => [ - "type" => "red", - "wormhole" => null, - "anomaly" => null, - "planets" => [], - "stations" => [], - "set" => Edition::BASE_GAME->value + yield 'For a regular tile' => [ + 'jsonData' => [ + 'type' => 'red', + 'wormhole' => null, + 'anomaly' => null, + 'planets' => [], + 'stations' => [], + 'set' => Edition::BASE_GAME->value, ], - "expectedWormholes" => [], + 'expectedWormholes' => [], ]; - yield "For a tile with a wormhole" => [ - "jsonData" => [ - "type" => "blue", - "wormhole" => "gamma", - "anomaly" => null, - "planets" => [], - "stations" => [], - "set" => Edition::PROPHECY_OF_KINGS->value + yield 'For a tile with a wormhole' => [ + 'jsonData' => [ + 'type' => 'blue', + 'wormhole' => 'gamma', + 'anomaly' => null, + 'planets' => [], + 'stations' => [], + 'set' => Edition::PROPHECY_OF_KINGS->value, ], - "expectedWormholes" => [Wormhole::GAMMA], + 'expectedWormholes' => [Wormhole::GAMMA], ]; - yield "For a tile with an anomaly" => [ - "jsonData" => [ - "type" => "green", - "wormhole" => null, - "anomaly" => "nebula", - "planets" => [], - "stations" => [], - "set" => Edition::THUNDERS_EDGE->value + yield 'For a tile with an anomaly' => [ + 'jsonData' => [ + 'type' => 'green', + 'wormhole' => null, + 'anomaly' => 'nebula', + 'planets' => [], + 'stations' => [], + 'set' => Edition::THUNDERS_EDGE->value, ], - "expectedWormholes" => [], + 'expectedWormholes' => [], ]; - yield "For a tile with no stations property" => [ - "jsonData" => [ - "type" => "red", - "wormhole" => null, - "anomaly" => null, - "planets" => [], - "set" => Edition::DISCORDANT_STARS->value + yield 'For a tile with no stations property' => [ + 'jsonData' => [ + 'type' => 'red', + 'wormhole' => null, + 'anomaly' => null, + 'planets' => [], + 'set' => Edition::DISCORDANT_STARS->value, ], - "expectedWormholes" => [], + 'expectedWormholes' => [], ]; - yield "For a tile with planets" => [ - "jsonData" => [ - "type" => "red", - "wormhole" => null, - "anomaly" => null, - "planets" => [ + yield 'For a tile with planets' => [ + 'jsonData' => [ + 'type' => 'red', + 'wormhole' => null, + 'anomaly' => null, + 'planets' => [ [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, - "trait" => "hazardous", - "legendary" => false, - "specialties" => [] + 'name' => 'Tinnes', + 'resources' => 2, + 'influence' => 1, + 'trait' => 'hazardous', + 'legendary' => false, + 'specialties' => [], ], [ - "name" => "Tinnes 2", - "resources" => 1, - "influence" => 1, - "trait" => "industrial", - "legendary" => false, - "specialties" => [] - ] + 'name' => 'Tinnes 2', + 'resources' => 1, + 'influence' => 1, + 'trait' => 'industrial', + 'legendary' => false, + 'specialties' => [], + ], ], - "set" => Edition::DISCORDANT_STARS_PLUS->value + 'set' => Edition::DISCORDANT_STARS_PLUS->value, ], - "expectedWormholes" => [], + 'expectedWormholes' => [], ]; - yield "For a tile with stations" => [ - "jsonData" => [ - "type" => "red", - "wormhole" => null, - "anomaly" => null, - "planets" => [], - "stations" => [ + yield 'For a tile with stations' => [ + 'jsonData' => [ + 'type' => 'red', + 'wormhole' => null, + 'anomaly' => null, + 'planets' => [], + 'stations' => [ [ - "name" => "Tinnes", - "resources" => 2, - "influence" => 1, + 'name' => 'Tinnes', + 'resources' => 2, + 'influence' => 1, ], [ - "name" => "Tinnes 2", - "resources" => 1, - "influence" => 1, - ] + 'name' => 'Tinnes 2', + 'resources' => 1, + 'influence' => 1, + ], ], - "set" => Edition::THUNDERS_EDGE->value + 'set' => Edition::THUNDERS_EDGE->value, ], - "expectedWormholes" => [], + 'expectedWormholes' => [], ]; - yield "For a tile with hyperlanes" => [ - "jsonData" => [ - "type" => "red", - "wormhole" => null, - "anomaly" => null, - "planets" => [], - "hyperlanes" => [ + yield 'For a tile with hyperlanes' => [ + 'jsonData' => [ + 'type' => 'red', + 'wormhole' => null, + 'anomaly' => null, + 'planets' => [], + 'hyperlanes' => [ [ 0, - 3 + 3, ], [ 0, - 2 + 2, ], ], - "set" => Edition::PROPHECY_OF_KINGS->value + 'set' => Edition::PROPHECY_OF_KINGS->value, ], - "expectedWormholes" => [], + 'expectedWormholes' => [], ]; } - #[DataProvider("jsonData")] + #[DataProvider('jsonData')] #[Test] - public function itCanBeInitializedFromJsonData(array $jsonData, array $expectedWormholes) { - $id = "tile-id"; + public function itCanBeInitializedFromJsonData(array $jsonData, array $expectedWormholes): void { + $id = 'tile-id'; - $tile = Tile::fromJsonData($id,TileTier::MEDIUM, $jsonData); + $tile = Tile::fromJsonData($id, TileTier::MEDIUM, $jsonData); $this->assertSame($id, $tile->id); $this->assertSame($jsonData['anomaly'], $tile->anomaly); $this->assertSame($jsonData['hyperlanes'] ?? [], $tile->hyperlanes); $this->assertSame($expectedWormholes, $tile->wormholes); } - public static function anomalies() { - yield "When tile has anomaly" => [ - "anomaly" => "nebula", - "expected" => true + yield 'When tile has anomaly' => [ + 'anomaly' => 'nebula', + 'expected' => true, ]; - yield "When tile has no anomaly" => [ - "anomaly" => null, - "expected" => false + yield 'When tile has no anomaly' => [ + 'anomaly' => null, + 'expected' => false, ]; } - #[DataProvider("anomalies")] + #[DataProvider('anomalies')] #[Test] - public function itCanCheckForAnomalies(?string $anomaly, bool $expected) { + public function itCanCheckForAnomalies(?string $anomaly, bool $expected): void { $tile = TileFactory::make([], [], $anomaly); $this->assertSame($expected, $tile->hasAnomaly()); } public static function wormholeTiles() { - yield "When tile has wormhole" => [ - "lookingFor" => Wormhole::ALPHA, - "hasWormholes" => [Wormhole::ALPHA], - "expected" => true + yield 'When tile has wormhole' => [ + 'lookingFor' => Wormhole::ALPHA, + 'hasWormholes' => [Wormhole::ALPHA], + 'expected' => true, ]; - yield "When tile has multiple wormholes" => [ - "lookingFor" => Wormhole::BETA, - "hasWormholes" => [Wormhole::ALPHA, Wormhole::BETA], - "expected" => true + yield 'When tile has multiple wormholes' => [ + 'lookingFor' => Wormhole::BETA, + 'hasWormholes' => [Wormhole::ALPHA, Wormhole::BETA], + 'expected' => true, ]; - yield "When tile does not have wormhole" => [ - "lookingFor" => Wormhole::EPSILON, - "hasWormholes" => [Wormhole::GAMMA], - "expected" => false + yield 'When tile does not have wormhole' => [ + 'lookingFor' => Wormhole::EPSILON, + 'hasWormholes' => [Wormhole::GAMMA], + 'expected' => false, ]; - yield "When tile has no wormholes" => [ - "lookingFor" => Wormhole::DELTA, - "hasWormholes" => [], - "expected" => false + yield 'When tile has no wormholes' => [ + 'lookingFor' => Wormhole::DELTA, + 'hasWormholes' => [], + 'expected' => false, ]; } #[DataProvider('wormholeTiles')] #[Test] - public function itCanCheckForWormholes(Wormhole $lookingFor, array $hasWormholes, bool $expected) { + public function itCanCheckForWormholes(Wormhole $lookingFor, array $hasWormholes, bool $expected): void { $tile = TileFactory::make([], $hasWormholes); $this->assertSame($expected, $tile->hasWormhole($lookingFor)); } #[Test] - public function itCanCheckForLegendaryPlanets() { - $regularPlanet = new Planet("regular", 1, 1); - $legendaryPlanet = new Planet("legendary", 3, 3, "Legend has it..."); + public function itCanCheckForLegendaryPlanets(): void { + $regularPlanet = new Planet('regular', 1, 1); + $legendaryPlanet = new Planet('legendary', 3, 3, 'Legend has it...'); $tileWithLegendary = TileFactory::make([ $regularPlanet, - $legendaryPlanet + $legendaryPlanet, ]); $tileWithoutLegendary = TileFactory::make([ - $regularPlanet + $regularPlanet, ]); $this->assertTrue($tileWithLegendary->hasLegendaryPlanet()); @@ -224,86 +224,86 @@ public function itCanCheckForLegendaryPlanets() { public static function tiles() { - yield "When tile has nothing special" => [ - "tile" => TileFactory::make(), - "expected" => [ - "alpha" => 0, - "beta" => 0, - "legendary" => 0 - ] + yield 'When tile has nothing special' => [ + 'tile' => TileFactory::make(), + 'expected' => [ + 'alpha' => 0, + 'beta' => 0, + 'legendary' => 0, + ], ]; - yield "When tile has wormhole" => [ - "tile" => TileFactory::make([], [Wormhole::ALPHA]), - "expected" => [ - "alpha" => 1, - "beta" => 0, - "legendary" => 0 - ] + yield 'When tile has wormhole' => [ + 'tile' => TileFactory::make([], [Wormhole::ALPHA]), + 'expected' => [ + 'alpha' => 1, + 'beta' => 0, + 'legendary' => 0, + ], ]; - yield "When tile has multiple wormholes" => [ - "tile" => TileFactory::make([], [Wormhole::ALPHA, Wormhole::BETA]), - "expected" => [ - "alpha" => 1, - "beta" => 1, - "legendary" => 0 - ] + yield 'When tile has multiple wormholes' => [ + 'tile' => TileFactory::make([], [Wormhole::ALPHA, Wormhole::BETA]), + 'expected' => [ + 'alpha' => 1, + 'beta' => 1, + 'legendary' => 0, + ], ]; - yield "When tile has legendary planet" => [ - "tile" => TileFactory::make([ - new Planet("test", 0, 0, "yes") + yield 'When tile has legendary planet' => [ + 'tile' => TileFactory::make([ + new Planet('test', 0, 0, 'yes'), ]), - "expected" => [ - "alpha" => 0, - "beta" => 0, - "legendary" => 1 - ] + 'expected' => [ + 'alpha' => 0, + 'beta' => 0, + 'legendary' => 1, + ], ]; - yield "When tile has wormhole and legendary" => [ - "tile" => TileFactory::make( - [new Planet("test", 0, 0, "yes")], - [Wormhole::BETA] + yield 'When tile has wormhole and legendary' => [ + 'tile' => TileFactory::make( + [new Planet('test', 0, 0, 'yes')], + [Wormhole::BETA], ), - "expected" => [ - "alpha" => 0, - "beta" => 1, - "legendary" => 1 - ] + 'expected' => [ + 'alpha' => 0, + 'beta' => 1, + 'legendary' => 1, + ], ]; } - #[DataProvider("tiles")] + #[DataProvider('tiles')] #[Test] - public function itCanCountSpecials(Tile $tile, array $expected) { - $count = Tile::countSpecials([$tile]); - $this->assertSame($expected["alpha"], $count["alpha"]); - $this->assertSame($expected["beta"], $count["beta"]); - $this->assertSame($expected["legendary"], $count["legendary"]); + public function itCanCountSpecials(Tile $tile, array $expected): void { + $count = Tile::countSpecials([$tile]); + $this->assertSame($expected['alpha'], $count['alpha']); + $this->assertSame($expected['beta'], $count['beta']); + $this->assertSame($expected['legendary'], $count['legendary']); } // just to be sure - #[DataProvider("tiles")] + #[DataProvider('tiles')] #[Test] - public function itCanCountSpecialsForMultipleTiles(Tile $tile, array $expected) { - $count = Tile::countSpecials([$tile, $tile]); - $this->assertSame($expected["alpha"] * 2, $count["alpha"]); - $this->assertSame($expected["beta"] * 2, $count["beta"]); - $this->assertSame($expected["legendary"] * 2, $count["legendary"]); + public function itCanCountSpecialsForMultipleTiles(Tile $tile, array $expected): void { + $count = Tile::countSpecials([$tile, $tile]); + $this->assertSame($expected['alpha'] * 2, $count['alpha']); + $this->assertSame($expected['beta'] * 2, $count['beta']); + $this->assertSame($expected['legendary'] * 2, $count['legendary']); } public static function allJsonTiles(): iterable { $tileJsonData = json_decode(file_get_contents('data/tiles.json'), true); foreach($tileJsonData as $key => $tileData) { - yield "Tile #" . $key => [ + yield 'Tile #' . $key => [ 'key' => $key, - 'tileData' => $tileData + 'tileData' => $tileData, ]; } } #[Test] #[DataProvider('allJsonTiles')] - public function tilesCanBeFetchedFromJson($key, $tileData) + public function tilesCanBeFetchedFromJson($key, $tileData): void { $tiles = Tile::all(); $this->assertArrayHasKey($key, $tiles); diff --git a/app/TwilightImperium/TileTier.php b/app/TwilightImperium/TileTier.php index 0759d56..cf18a72 100644 --- a/app/TwilightImperium/TileTier.php +++ b/app/TwilightImperium/TileTier.php @@ -1,5 +1,7 @@ "α", - self::BETA => "β", - self::GAMMA => "γ", - self::DELTA => "δ", - self::EPSILON => "&eplison;", + self::ALPHA => 'α', + self::BETA => 'β', + self::GAMMA => 'γ', + self::DELTA => 'δ', + self::EPSILON => '&eplison;', }; } @@ -30,13 +32,12 @@ public function symbol(): string public static function fromJsonData(?string $wormhole): array { if ($wormhole == null) return []; - - if ($wormhole == "alpha-beta") { + if ($wormhole == 'alpha-beta') { return [ self::ALPHA, - self::BETA + self::BETA, ]; - } if ($wormhole == "all") { + } if ($wormhole == 'all') { // Mallice return [ self::ALPHA, @@ -45,7 +46,7 @@ public static function fromJsonData(?string $wormhole): array ]; } else { return [ - self::from($wormhole) + self::from($wormhole), ]; } } diff --git a/app/TwilightImperium/WormholeTest.php b/app/TwilightImperium/WormholeTest.php index 210c9b1..f58622b 100644 --- a/app/TwilightImperium/WormholeTest.php +++ b/app/TwilightImperium/WormholeTest.php @@ -1,5 +1,7 @@ [ - "wormhole" => "alpha", - "expected" => [Wormhole::ALPHA] + yield 'When slice has 1 wormhole' => [ + 'wormhole' => 'alpha', + 'expected' => [Wormhole::ALPHA], ]; - yield "When slice has multiple wormholes" => [ - "wormhole" => "alpha-beta", - "expected" => [Wormhole::ALPHA, Wormhole::BETA] + yield 'When slice has multiple wormholes' => [ + 'wormhole' => 'alpha-beta', + 'expected' => [Wormhole::ALPHA, Wormhole::BETA], ]; - yield "When slice has no wormholes" => [ - "wormhole" => null, - "expected" => [] + yield 'When slice has no wormholes' => [ + 'wormhole' => null, + 'expected' => [], ]; } - #[DataProvider("jsonData")] + #[DataProvider('jsonData')] #[Test] - public function itCanGetWormholesFromJsonData(?string $wormhole, array $expected) + public function itCanGetWormholesFromJsonData(?string $wormhole, array $expected): void { $this->assertSame($expected, Wormhole::fromJsonData($wormhole)); } diff --git a/app/api/data.php b/app/api/data.php index 6e89e4a..9c7dc78 100644 --- a/app/api/data.php +++ b/app/api/data.php @@ -1,10 +1,12 @@ $draft, - 'success' => true + 'success' => true, ]); diff --git a/app/api/generate.php b/app/api/generate.php index d4c80be..eeaad77 100644 --- a/app/api/generate.php +++ b/app/api/generate.php @@ -1,22 +1,24 @@ isAdminPass(get('admin'))) return_error('You are not allowed to do this'); - if (!empty($draft->log())) return_error('Draft already in progress'); + if (! $draft->isAdminPass(get('admin'))) return_error('You are not allowed to do this'); + if (! empty($draft->log())) return_error('Draft already in progress'); - $regen_slices = get('shuffle_slices', "false") == "true"; - $regen_factions = get('shuffle_factions', "false") == "true"; - $regen_order = get('shuffle_order', "false") == "true"; + $regen_slices = get('shuffle_slices', 'false') == 'true'; + $regen_factions = get('shuffle_factions', 'false') == 'true'; + $regen_order = get('shuffle_order', 'false') == 'true'; $draft->regenerate($regen_slices, $regen_factions, $regen_order); return_data([ - 'ok' => true + 'ok' => true, ]); } else { $config = new GeneratorConfig(true); @@ -24,6 +26,6 @@ $draft->save(); return_data([ 'id' => $draft->getId(), - 'admin' => $draft->getAdminPass() + 'admin' => $draft->getAdminPass(), ]); } diff --git a/app/api/pick.php b/app/api/pick.php index 97b9e8d..4b1bc9d 100644 --- a/app/api/pick.php +++ b/app/api/pick.php @@ -1,19 +1,21 @@ isAdminPass(get('admin')); if ($draft == null) return_error('draft not found'); -if ($player != $draft->currentPlayer() && !$is_admin) return_error('Not your turn!'); +if ($player != $draft->currentPlayer() && ! $is_admin) return_error('Not your turn!'); // Not enforcing this here yet because it would break for older drafts -if (!$is_admin && !$draft->isPlayerSecret($player, get('secret'))) return_error('You are not allowed to do this!'); +if (! $is_admin && ! $draft->isPlayerSecret($player, get('secret'))) return_error('You are not allowed to do this!'); if ($index != count($draft->log())) { return_error('Draft data out of date, meaning: stuff has been picked or undone while this tab was open.'); @@ -23,5 +25,5 @@ return_data([ 'draft' => $draft, - 'success' => true + 'success' => true, ]); diff --git a/app/api/restore.php b/app/api/restore.php index 0ca54f3..61a0c3d 100644 --- a/app/api/restore.php +++ b/app/api/restore.php @@ -1,21 +1,22 @@ isAdminPass($secret)) { return return_data([ 'admin' => $secret, - 'success' => true + 'success' => true, ]); } $playerId = $draft->getPlayerIdBySecret($secret); -if (!$playerId) return return_error('No session found with that passkey'); - +if (! $playerId) return return_error('No session found with that passkey'); return_data([ 'player' => $playerId, 'secret' => $secret, - 'success' => true + 'success' => true, ]); diff --git a/app/api/undo.php b/app/api/undo.php index 4e6f2f6..b878b25 100644 --- a/app/api/undo.php +++ b/app/api/undo.php @@ -1,15 +1,17 @@ isAdminPass(get('admin')); -if (!$is_admin) return_error("Only the admin can undo"); -if (!count($draft->log())) return_error("Nothing to undo"); +if (! $is_admin) return_error('Only the admin can undo'); +if (! count($draft->log())) return_error('Nothing to undo'); $draft->undoLastAction(); return_data([ 'draft' => $draft, - 'success' => true + 'success' => true, ]); diff --git a/app/helpers.php b/app/helpers.php index b3eb6c5..5cffd03 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1,7 +1,9 @@ '; foreach($variables as $v) { @@ -11,24 +13,22 @@ function d(...$variables) } } - -if (!function_exists('app')) { - function app():\App\Application +if (! function_exists('app')) { + function app():App\Application { - return \App\Application::getInstance(); + return App\Application::getInstance(); } } - -if (!function_exists('dispatch')) { - function dispatch(\App\Shared\Command $command): mixed +if (! function_exists('dispatch')) { + function dispatch(App\Shared\Command $command): mixed { return app()->handle($command); } } -if (!function_exists('dd')) { - function dd(...$variables) +if (! function_exists('dd')) { + function dd(...$variables): void { echo '
';
         foreach ($variables as $var) {
@@ -38,8 +38,7 @@ function dd(...$variables)
     }
 }
 
-
-if (!function_exists('e')) {
+if (! function_exists('e')) {
     function e($condition, $yes, $no = ''): void
     {
         if ($condition) echo $yes;
@@ -47,8 +46,7 @@ function e($condition, $yes, $no = ''): void
     }
 }
 
-
-if (!function_exists('yesno')) {
+if (! function_exists('yesno')) {
     /**
      * return "yes" or "no" based on condition
      *
@@ -57,47 +55,46 @@ function e($condition, $yes, $no = ''): void
      */
     function yesno($condition): string
     {
-        return $condition ? "yes" : "no";
+        return $condition ? 'yes' : 'no';
     }
 }
 
-if (!function_exists('env')) {
+if (! function_exists('env')) {
     function env($key, $defaultValue = null): ?string
     {
         return $_ENV[$key] ?? $defaultValue;
     }
 }
 
-
-if (!function_exists('human_filesize')) {
+if (! function_exists('human_filesize')) {
     function human_filesize($bytes, $dec = 2): string {
 
-        $size   = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+        $size = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
         $factor = floor((strlen($bytes) - 1) / 3);
         if ($factor == 0) $dec = 0;
+
         return sprintf("%.{$dec}f %s", $bytes / (1024 ** $factor), $size[$factor]);
     }
 }
 
-if (!function_exists('get')) {
-    function get($key, $default = null): string
+if (! function_exists('get')) {
+    function get($key, $default = null): mixed
     {
         return $_GET[$key] ?? $default;
     }
 }
 
-if (!function_exists('url')) {
+if (! function_exists('url')) {
     function url($uri): string
     {
         return env('URL', 'https://milty.shenanigans.be/') . $uri;
     }
 }
 
-
-if (!function_exists('ordinal')) {
+if (! function_exists('ordinal')) {
     function ordinal($number): string
     {
-        $ends = array('th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th');
+        $ends = ['th', 'st', 'nd', 'rd', 'th', 'th', 'th', 'th', 'th', 'th'];
         if ((($number % 100) >= 11) && (($number % 100) <= 13))
             return $number . 'th';
         else
@@ -105,7 +102,6 @@ function ordinal($number): string
     }
 }
 
-
 if (! function_exists('class_uses_recursive')) {
     /**
      * Returns all traits used by a class, its parent classes and trait of their traits.
@@ -130,7 +126,6 @@ function class_uses_recursive($class)
     }
 }
 
-
 if (! function_exists('trait_uses_recursive')) {
     /**
      * Returns all traits used by a trait and its traits.
diff --git a/app/routes.php b/app/routes.php
index 3606227..5420392 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -1,13 +1,15 @@
  \App\Http\RequestHandlers\HandleViewFormRequest::class,
-    '/d/{id}' => \App\Http\RequestHandlers\HandleViewDraftRequest::class,
-    '/api/generate' => \App\Http\RequestHandlers\HandleGenerateDraftRequest::class,
-    '/api/regenerate' => \App\Http\RequestHandlers\HandleRegenerateDraftRequest::class,
-    '/api/pick' => \App\Http\RequestHandlers\HandlePickRequest::class,
-    '/api/claim' => \App\Http\RequestHandlers\HandleClaimOrUnclaimPlayerRequest::class,
-    '/api/restore' => \App\Http\RequestHandlers\HandleRestoreClaimRequest::class,
-    '/api/undo' => \App\Http\RequestHandlers\HandleUndoRequest::class,
-    '/api/draft/{id}' => \App\Http\RequestHandlers\HandleGetDraftRequest::class,
+    '/' => App\Http\RequestHandlers\HandleViewFormRequest::class,
+    '/d/{id}' => App\Http\RequestHandlers\HandleViewDraftRequest::class,
+    '/api/generate' => App\Http\RequestHandlers\HandleGenerateDraftRequest::class,
+    '/api/regenerate' => App\Http\RequestHandlers\HandleRegenerateDraftRequest::class,
+    '/api/pick' => App\Http\RequestHandlers\HandlePickRequest::class,
+    '/api/claim' => App\Http\RequestHandlers\HandleClaimOrUnclaimPlayerRequest::class,
+    '/api/restore' => App\Http\RequestHandlers\HandleRestoreClaimRequest::class,
+    '/api/undo' => App\Http\RequestHandlers\HandleUndoRequest::class,
+    '/api/draft/{id}' => App\Http\RequestHandlers\HandleGetDraftRequest::class,
 ];

From 9c6094bf2d72f3d0740470874f9157e692e7ef98 Mon Sep 17 00:00:00 2001
From: Sam Tubbax 
Date: Sat, 27 Dec 2025 15:49:18 +0100
Subject: [PATCH 27/34] It's done. I think. I hope

---
 app/DeprecatedDraft.php                       | 370 ------------------
 app/Draft/Commands/ClaimPlayer.php            |   2 +-
 app/Draft/Commands/ClaimPlayerTest.php        |  10 +
 app/Draft/Commands/GenerateDraft.php          |  16 -
 app/Draft/Commands/GenerateDraftTest.php      |   8 +
 .../Commands/GenerateFactionPoolTest.php      |   8 +
 app/Draft/Commands/GenerateSlicePoolTest.php  |   8 +
 app/Draft/Commands/PlayerPick.php             |  43 ++
 app/Draft/Commands/PlayerPickTest.php         | 130 ++++++
 app/Draft/Commands/RegenerateDraft.php        |  57 +++
 app/Draft/Commands/RegenerateDraftTest.php    |  96 +++++
 app/Draft/Commands/UnclaimPlayer.php          |   2 +-
 app/Draft/Commands/UndoLastPick.php           |  33 ++
 app/Draft/Commands/UndoLastPickTest.php       | 128 ++++++
 app/Draft/Draft.php                           |  31 +-
 app/Draft/DraftTest.php                       |  37 ++
 app/Draft/Exceptions/InvalidPickException.php |  17 +-
 app/Draft/Player.php                          |  38 +-
 app/Draft/PlayerTest.php                      |   4 +-
 app/Draft/Secrets.php                         |  14 +-
 app/Draft/Settings.php                        |  29 ++
 app/Draft/TilePool.php                        |   5 -
 app/Generator.php                             | 313 ---------------
 app/GeneratorConfig.php                       | 174 --------
 .../HandleGenerateDraftRequest.php            |   3 +-
 .../RequestHandlers/HandleGetDraftRequest.php |  13 +-
 .../RequestHandlers/HandlePickRequest.php     |  40 +-
 .../RequestHandlers/HandlePickRequestTest.php | 123 ++++++
 .../HandleRegenerateDraftRequest.php          |  27 +-
 .../HandleRegenerateDraftRequestTest.php      |  86 ++++
 .../RequestHandlers/HandleUndoRequest.php     |  24 +-
 .../RequestHandlers/HandleUndoRequestTest.php |  51 +++
 app/Shared/IdStringBehavior.php               |   5 +
 app/TwilightImperium/Tile.php                 |  27 +-
 app/api/data.php                              |  12 -
 app/api/generate.php                          |  31 --
 app/api/pick.php                              |  29 --
 app/api/restore.php                           |  22 --
 app/api/undo.php                              |  17 -
 app/helpers.php                               |   9 +-
 data/TileDataTest.php                         |  22 +-
 data/tiles.json                               |  30 +-
 js/draft.js                                   |  14 +-
 templates/draft.php                           |  12 +-
 44 files changed, 1100 insertions(+), 1070 deletions(-)
 delete mode 100644 app/DeprecatedDraft.php
 create mode 100644 app/Draft/Commands/PlayerPick.php
 create mode 100644 app/Draft/Commands/PlayerPickTest.php
 create mode 100644 app/Draft/Commands/RegenerateDraft.php
 create mode 100644 app/Draft/Commands/RegenerateDraftTest.php
 create mode 100644 app/Draft/Commands/UndoLastPick.php
 create mode 100644 app/Draft/Commands/UndoLastPickTest.php
 delete mode 100644 app/Generator.php
 delete mode 100644 app/GeneratorConfig.php
 create mode 100644 app/Http/RequestHandlers/HandlePickRequestTest.php
 create mode 100644 app/Http/RequestHandlers/HandleRegenerateDraftRequestTest.php
 create mode 100644 app/Http/RequestHandlers/HandleUndoRequestTest.php
 delete mode 100644 app/api/data.php
 delete mode 100644 app/api/generate.php
 delete mode 100644 app/api/pick.php
 delete mode 100644 app/api/restore.php
 delete mode 100644 app/api/undo.php

diff --git a/app/DeprecatedDraft.php b/app/DeprecatedDraft.php
deleted file mode 100644
index e2f2bde..0000000
--- a/app/DeprecatedDraft.php
+++ /dev/null
@@ -1,370 +0,0 @@
-draft = ($draft === [] ? [
-            'players' => $this->generatePlayerData(),
-            'log' => [],
-        ] : $draft);
-
-        $this->done = $this->isDone();
-        $this->draft['current'] = $this->currentPlayer();
-    }
-
-    public static function createFromConfig(GeneratorConfig $config)
-    {
-        $id = uniqid();
-        $secrets = ['admin_pass' => md5(uniqid('', true))];
-        $slices = Generator::slices($config);
-        $factions = Generator::factions($config);
-
-        $name = $config->name;
-
-        return new self($id, $secrets, [], $slices, $factions, $config, $name);
-    }
-
-    public static function getCurrentInstance(): self
-    {
-        return self::$instance;
-    }
-
-    private static function getS3Client()
-    {
-        $s3 = new \Aws\S3\S3Client([
-            'version' => 'latest',
-            'region' => 'us-east-1',
-            'endpoint' => 'https://' . $_ENV['REGION'] . '.digitaloceanspaces.com',
-            'credentials' => [
-                'key' => $_ENV['ACCESS_KEY'],
-                'secret' => $_ENV['ACCESS_SECRET'],
-            ],
-        ]);
-
-        return $s3;
-    }
-
-    public static function load($id): self
-    {
-        if (! $id) {
-            throw new \Exception('Tried to load draft with no id');
-        }
-
-        try {
-            if ($_ENV['STORAGE'] == 'local') {
-
-                $path = $_ENV['STORAGE_PATH'] . '/' . 'draft_' . $id . '.json';
-
-                if(! file_exists($path)) {
-                  throw new \Exception('Draft not found');
-                }
-
-                $rawDraft = file_get_contents($_ENV['STORAGE_PATH'] . '/' . 'draft_' . $id . '.json');
-            } else {
-                $s3 = self::getS3Client();
-                $file = $s3->getObject([
-                    'Bucket' => $_ENV['BUCKET'],
-                    'Key' => 'draft_' . $id . '.json',
-                ]);
-
-                $rawDraft = (string) $file['Body'];
-            }
-
-            $draft = json_decode($rawDraft, true);
-
-            $secrets = $draft['secrets'] ?: ['admin_pass' => $draft['admin_pass']];
-
-            return new self($id, $secrets, $draft['draft'], $draft['slices'], $draft['factions'], GeneratorConfig::fromArray($draft['config']), $draft['name']);
-        } catch (S3Exception $e) {
-            abort(404, 'Draft not found');
-        }
-
-    }
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    public function getAdminPass(): string
-    {
-        return $this->secrets['admin_pass'];
-    }
-
-    public function isAdminPass(?string $pass): bool
-    {
-        return ($pass ?: '') === $this->getAdminPass();
-    }
-
-    public function getPlayerSecret($playerId = ''): string
-    {
-        return $this->secrets[$playerId] ?: '';
-    }
-
-    public function isPlayerSecret($playerId, $secret): bool
-    {
-        return ($secret ?: '') === $this->getPlayerSecret($playerId);
-    }
-
-    public function getPlayerIdBySecret($secret): string
-    {
-        return array_search($secret ?: '', $this->secrets);
-    }
-
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-    public function slices(): array
-    {
-        return $this->slices;
-    }
-
-    public function factions(): array
-    {
-        return $this->factions;
-    }
-
-    public function config(): GeneratorConfig
-    {
-        return $this->config;
-    }
-
-    public function currentPlayer(): string
-    {
-        $doneSteps = count($this->draft['log']);
-        $snakeDraft = array_merge(array_keys($this->draft['players']), array_keys(array_reverse($this->draft['players'])));
-
-        return $snakeDraft[$doneSteps % count($snakeDraft)];
-    }
-
-    public function log(): array
-    {
-        return $this->draft['log'];
-    }
-
-    public function players(): array
-    {
-        return $this->draft['players'];
-    }
-
-    public function isDone(): bool
-    {
-        return count($this->log()) >= (count($this->players()) * 3);
-    }
-
-    public function undoLastAction(): void
-    {
-        $last_log = array_pop($this->draft['log']);
-
-        $this->draft['players'][$last_log['player']][$last_log['category']] = null;
-        $this->draft['current'] = $last_log['player'];
-
-        $this->save();
-    }
-
-    public function pick($player, $category, $value): void
-    {
-        $this->draft['log'][] = [
-            'player' => $player,
-            'category' => $category,
-            'value' => $value,
-        ];
-
-        $this->draft['players'][$player][$category] = $value;
-
-        $this->draft['current'] = $this->currentPlayer();
-
-        $this->done = $this->isDone();
-
-        $this->save();
-    }
-
-    public function claim($player)
-    {
-        if ($this->draft['players'][$player]['claimed'] == true) {
-            return_error('Already claimed');
-        }
-        $this->draft['players'][$player]['claimed'] = true;
-        $this->secrets[$player] = md5(uniqid('', true));
-
-        return $this->save();
-    }
-
-    public function unclaim($player)
-    {
-        if ($this->draft['players'][$player]['claimed'] == false) {
-            return_error('Already unclaimed');
-        }
-        $this->draft['players'][$player]['claimed'] = false;
-        unset($this->secrets[$player]);
-
-        return $this->save();
-    }
-
-    public function save()
-    {
-        if ($_ENV['STORAGE'] == 'local') {
-            file_put_contents($_ENV['STORAGE_PATH'] . '/' . 'draft_' . $this->getId() . '.json', (string) $this);
-        } else {
-            $s3 = $this->getS3Client();
-
-            $result = $s3->putObject([
-                'Bucket' => $_ENV['BUCKET'],
-                'Key' => 'draft_' . $this->getId() . '.json',
-                'Body' => (string) $this,
-                'ACL' => 'private',
-            ]);
-
-            return $result;
-        }
-    }
-
-    public function regenerate(bool $regen_slices, bool $regen_factions, bool $regen_order): void
-    {
-        if ($this->config->seed !== null) {
-            mt_srand($this->config->seed);
-            $this->config->seed = mt_rand(1, GeneratorConfig::MAX_SEED_VALUE);
-        }
-
-        if ($regen_factions) {
-            $this->factions = Generator::factions($this->config);
-        }
-
-        if ($regen_slices) {
-            $this->slices = Generator::slices($this->config);
-        }
-
-        if ($regen_order) {
-            $this->draft['players'] = $this->generatePlayerData();
-        }
-
-        $this->save();
-    }
-
-    private function generatePlayerData()
-    {
-        $player_data = [];
-
-        $alliance_mode = $this->config->alliance != null;
-
-        if ($this->config->seed !== null) {
-            mt_srand($this->config->seed + self::SEED_OFFSET_PLAYER_ORDER);
-        }
-
-        if ($alliance_mode) {
-            $playerTeams = $this->generateTeams();
-        } else {
-            if(! $this->config->preset_draft_order || ! isset($this->config->preset_draft_order)) {
-                shuffle($this->config->players);
-            }
-        }
-
-        $player_names = $this->config->players;
-
-        foreach ($player_names as $p) {
-            // use admin password and player name to hash an id for the player
-            $id = 'p_' . md5($p . $this->getAdminPass());
-
-            $player_data[$id] = [
-                'id' => $id,
-                'name' => $p,
-                'claimed' => false,
-                'position' => null,
-                'slice' => null,
-                'faction' => null,
-                'team' => $alliance_mode ? $playerTeams[$p] : null,
-            ];
-        }
-
-        return $player_data;
-    }
-
-    private function generateTeams(): array
-    {
-        $teamNames = array_slice(['A', 'B', 'C', 'D'], 0, count($this->config->players) / 2);
-
-        if ($this->config->alliance['alliance_teams'] == 'random') {
-            shuffle($this->config->players);
-        }
-
-        $teams = [];
-        $currentTeam = [];
-        $i = 0;
-        // put players in teams
-        while(count($teamNames) > 0) {
-            $currentTeam[] = $this->config->players[$i];
-            $i++;
-
-            // if we filled up a team add it to the teams array with an unused name
-            if(count($currentTeam) == 2) {
-                $name = array_shift($teamNames);
-                // randomise order of team
-                shuffle($currentTeam);
-                $teams[$name] = $currentTeam;
-                $currentTeam = [];
-            }
-        }
-
-        // determine team order
-        // + put em in dictionary to map player names to team
-        $playerTeams = [];
-        $teamNames = array_keys($teams);
-        shuffle($teamNames);
-        $newPlayerOrder = [];
-
-        foreach($teamNames as $n) {
-            foreach($teams[$n] as $player) {
-                $newPlayerOrder[] = $player;
-                $playerTeams[$player] = $n;
-            }
-        }
-
-        // violates immutability a bit, whoopsie...
-        $this->config->players = $newPlayerOrder;
-
-        return $playerTeams;
-    }
-
-    public function __toString(): string
-    {
-        return json_encode($this->toArray());
-    }
-
-    public function toArray(): array
-    {
-        return get_object_vars($this);
-    }
-
-    public function jsonSerialize(): array
-    {
-        $draft = $this->toArray();
-        unset($draft['secrets']);
-        unset($draft['admin_pass']);
-
-        return $draft;
-    }
-}
diff --git a/app/Draft/Commands/ClaimPlayer.php b/app/Draft/Commands/ClaimPlayer.php
index 55e19b4..4ed7afd 100644
--- a/app/Draft/Commands/ClaimPlayer.php
+++ b/app/Draft/Commands/ClaimPlayer.php
@@ -20,7 +20,7 @@ public function __construct(
     public function handle(): string
     {
         $player = $this->draft->playerById($this->playerId);
-        $this->draft->players[$this->playerId->value] = $player->claim();
+        $this->draft->updatePlayerData($player->claim());
         $secret = $this->draft->secrets->generateSecretForPlayer($this->playerId);
 
         app()->repository->save($this->draft);
diff --git a/app/Draft/Commands/ClaimPlayerTest.php b/app/Draft/Commands/ClaimPlayerTest.php
index c830903..22d963e 100644
--- a/app/Draft/Commands/ClaimPlayerTest.php
+++ b/app/Draft/Commands/ClaimPlayerTest.php
@@ -6,6 +6,7 @@
 
 use App\Draft\Exceptions\InvalidClaimException;
 use App\Draft\PlayerId;
+use App\Shared\Command;
 use App\Testing\TestCase;
 use App\Testing\UsesTestDraft;
 use PHPUnit\Framework\Attributes\Test;
@@ -14,6 +15,15 @@ class ClaimPlayerTest extends TestCase
 {
     use UsesTestDraft;
 
+    #[Test]
+    public function itImplementsCommand(): void
+    {
+        $playerId = PlayerId::fromString(array_key_first($this->testDraft->players));
+        $claimPlayer = new ClaimPlayer($this->testDraft, $playerId);
+
+        $this->assertInstanceOf(Command::class, $claimPlayer);
+    }
+
     #[Test]
     public function itCanClaimAPlayer(): void
     {
diff --git a/app/Draft/Commands/GenerateDraft.php b/app/Draft/Commands/GenerateDraft.php
index 7d28816..ce62b75 100644
--- a/app/Draft/Commands/GenerateDraft.php
+++ b/app/Draft/Commands/GenerateDraft.php
@@ -92,20 +92,4 @@ public function generatePlayerData(): array
 
         return $players;
     }
-
-    /**
-     * @return array
-     */
-    protected function generateTeamPlayerData(): array
-    {
-        $teams = $this->generateTeamNames();
-
-        $players = [];
-        foreach ($this->settings->playerNames as $name) {
-            $p = Player::create($name);
-            $players[$p->id->value] = $p;
-        }
-
-        return $players;
-    }
 }
\ No newline at end of file
diff --git a/app/Draft/Commands/GenerateDraftTest.php b/app/Draft/Commands/GenerateDraftTest.php
index 45306b0..30ca36c 100644
--- a/app/Draft/Commands/GenerateDraftTest.php
+++ b/app/Draft/Commands/GenerateDraftTest.php
@@ -5,6 +5,7 @@
 namespace App\Draft\Commands;
 
 use App\Draft\Player;
+use App\Shared\Command;
 use App\Testing\Factories\DraftSettingsFactory;
 use App\Testing\TestCase;
 use App\TwilightImperium\AllianceTeamMode;
@@ -12,6 +13,13 @@
 
 class GenerateDraftTest extends TestCase
 {
+    #[Test]
+    public function itImplementsCommand(): void
+    {
+        $cmd = new GenerateDraft(DraftSettingsFactory::make());
+        $this->assertInstanceOf(Command::class, $cmd);
+    }
+
     #[Test]
     public function itCanGenerateADraftBasedOnSettings(): void
     {
diff --git a/app/Draft/Commands/GenerateFactionPoolTest.php b/app/Draft/Commands/GenerateFactionPoolTest.php
index e370eb4..a0719b0 100644
--- a/app/Draft/Commands/GenerateFactionPoolTest.php
+++ b/app/Draft/Commands/GenerateFactionPoolTest.php
@@ -4,6 +4,7 @@
 
 namespace App\Draft\Commands;
 
+use App\Shared\Command;
 use App\Testing\Factories\DraftSettingsFactory;
 use App\Testing\TestCase;
 use App\Testing\TestSets;
@@ -14,6 +15,13 @@
 
 class GenerateFactionPoolTest extends TestCase
 {
+    #[Test]
+    public function itImplementsCommand(): void
+    {
+        $cmd = new GenerateFactionPool(DraftSettingsFactory::make());
+        $this->assertInstanceOf(Command::class, $cmd);
+    }
+    
     #[Test]
     #[DataProviderExternal(TestSets::class, 'setCombinations')]
     public function itCanGenerateChoicesFromFactionSets($sets): void
diff --git a/app/Draft/Commands/GenerateSlicePoolTest.php b/app/Draft/Commands/GenerateSlicePoolTest.php
index 60599c9..40eca14 100644
--- a/app/Draft/Commands/GenerateSlicePoolTest.php
+++ b/app/Draft/Commands/GenerateSlicePoolTest.php
@@ -6,6 +6,7 @@
 
 use App\Draft\Exceptions\InvalidDraftSettingsException;
 use App\Draft\Slice;
+use App\Shared\Command;
 use App\Testing\Factories\DraftSettingsFactory;
 use App\Testing\TestCase;
 use App\Testing\TestSets;
@@ -18,6 +19,13 @@
 
 class GenerateSlicePoolTest extends TestCase
 {
+    #[Test]
+    public function itImplementsCommand(): void
+    {
+        $cmd = new GenerateSlicePool(DraftSettingsFactory::make());
+        $this->assertInstanceOf(Command::class, $cmd);
+    }
+
     #[Test]
     #[DataProviderExternal(TestSets::class, 'setCombinations')]
     public function itGathersTheCorrectTiles($sets): void
diff --git a/app/Draft/Commands/PlayerPick.php b/app/Draft/Commands/PlayerPick.php
new file mode 100644
index 0000000..3479c7b
--- /dev/null
+++ b/app/Draft/Commands/PlayerPick.php
@@ -0,0 +1,43 @@
+draft->playerById($this->pick->playerId);
+
+        if ($player->id->value !== $this->draft->currentPlayerId->value) {
+            throw InvalidPickException::notPlayersTurn();
+        }
+
+        foreach($this->draft->players as $p) {
+            if ($p->getPick($this->pick->category) == $this->pick->pickedOption) {
+                throw InvalidPickException::optionAlreadyPicked($this->pick->pickedOption);
+            }
+        }
+
+        $this->draft->updatePlayerData($player->pick($this->pick));
+
+        $this->draft->log[] = $this->pick;
+        $this->draft->updateCurrentPlayer();
+
+        app()->repository->save($this->draft);
+
+        return $this->draft;
+    }
+}
\ No newline at end of file
diff --git a/app/Draft/Commands/PlayerPickTest.php b/app/Draft/Commands/PlayerPickTest.php
new file mode 100644
index 0000000..d217982
--- /dev/null
+++ b/app/Draft/Commands/PlayerPickTest.php
@@ -0,0 +1,130 @@
+testDraft->players));
+        $cmd = new PlayerPick($this->testDraft, new Pick($playerId, PickCategory::SLICE, '1'));
+        $this->assertInstanceOf(Command::class, $cmd);
+    }
+
+    public static function picks()
+    {
+        yield 'Picking position' => [
+            'category' => PickCategory::POSITION,
+            'pick' => '1',
+        ];
+        yield 'Picking faction' => [
+            'category' => PickCategory::FACTION,
+            'pick' => 'Mahact',
+        ];
+        yield 'Picking slice' => [
+            'category' => PickCategory::SLICE,
+            'pick' => '4',
+        ];
+    }
+
+    #[Test]
+    #[DataProvider('picks')]
+    public function itCanPerformPick(PickCategory $category, string $pick): void
+    {
+        $playerId = $this->testDraft->currentPlayerId;
+        $pickCmd = new PlayerPick($this->testDraft, new Pick($playerId, $category, $pick));
+
+        $pickCmd->handle();
+
+        $this->reloadDraft();
+
+        $this->assertSame($pick, $this->testDraft->playerById($playerId)->getPick($category));
+    }
+
+    #[Test]
+    public function itThrowsAnErrorWhenItIsNotPlayersTurn(): void
+    {
+        $playerId = PlayerId::fromString(array_keys($this->testDraft->players)[1]);
+        $pickCmd = new PlayerPick($this->testDraft, new Pick($playerId, PickCategory::POSITION, '2'));
+
+        $this->expectException(InvalidPickException::class);
+
+        $pickCmd->handle();
+    }
+
+    #[Test]
+    #[DataProvider('picks')]
+    public function itSavesPickInLog(PickCategory $category, string $pick): void
+    {
+        $playerId = PlayerId::fromString(array_key_first($this->testDraft->players));
+
+        $pickVo = new Pick($playerId, $category, $pick);
+
+        $pickCmd = new PlayerPick($this->testDraft, $pickVo);
+        $pickCmd->handle();
+
+        $this->reloadDraft();
+
+        $this->assertSame($pickVo->toArray(), $this->testDraft->log[count($this->testDraft->log) - 1]->toArray());
+    }
+
+    #[Test]
+    public function itUpdatesCurrentPlayer(): void
+    {
+        $player1Id = PlayerId::fromString(array_keys($this->testDraft->players)[0]);
+        $player2Id = PlayerId::fromString(array_keys($this->testDraft->players)[1]);
+        $pickCmd = new PlayerPick(
+            $this->testDraft,
+            new Pick($player1Id, PickCategory::SLICE, '7'),
+        );
+        $pickCmd->handle();
+
+        $this->reloadDraft();
+
+        $this->assertSame($this->testDraft->currentPlayerId->value, $player2Id->value);
+    }
+
+    #[Test]
+    #[DataProvider('picks')]
+    public function itThrowsAnErrorWhenPickCategoryIsPicked(PickCategory $category, string $pick): void
+    {
+        $playerId = PlayerId::fromString(array_key_first($this->testDraft->players));
+        $pickCmd = new PlayerPick($this->testDraft, new Pick($playerId, $category, $pick));
+        $pickCmd->handle();
+
+        $this->expectException(InvalidPickException::class);
+
+        $pickCmd->handle();
+    }
+
+    #[Test]
+    #[DataProvider('picks')]
+    public function itThrowsAnErrorWhenPickWasAlreadyPicked(PickCategory $category, string $pick): void
+    {
+        $player1Id = PlayerId::fromString(array_key_first($this->testDraft->players));
+        $player2Id = PlayerId::fromString(array_key_last($this->testDraft->players));
+        $pickCmd = new PlayerPick($this->testDraft, new Pick($player1Id, $category, $pick));
+        $pickCmd->handle();
+
+        $this->expectException(InvalidPickException::class);
+
+        $pick2Cmd = new PlayerPick($this->testDraft, new Pick($player2Id, $category, $pick));
+        $pick2Cmd->handle();
+
+    }
+}
\ No newline at end of file
diff --git a/app/Draft/Commands/RegenerateDraft.php b/app/Draft/Commands/RegenerateDraft.php
new file mode 100644
index 0000000..324dbca
--- /dev/null
+++ b/app/Draft/Commands/RegenerateDraft.php
@@ -0,0 +1,57 @@
+draft->log) > 0) {
+            throw new \Exception('Cannot regenerate ongoing draft');
+        }
+
+        // generate new seed to use for the reshuffle
+        $seed = new Seed();
+
+        if ($this->regenerateOrder) {
+            $seed->setForPlayerOrder();
+            $order = array_keys($this->draft->players);
+            shuffle($order);
+            $newPlayers = [];
+            foreach ($order as $key) {
+                $newPlayers[$key] = $this->draft->players[$key];
+            }
+            $this->draft->players = $newPlayers;
+            $this->draft->updateCurrentPlayer();
+        }
+
+        if ($this->regenerateSlices) {
+            $slices = (new GenerateSlicePool($this->draft->settings->withNewSeed($seed)))->handle();
+            $this->draft->slicePool = $slices;
+        }
+
+        if ($this->regenerateFactions) {
+            $factions = (new GenerateFactionPool($this->draft->settings->withNewSeed($seed)))->handle();
+            $this->draft->factionPool = $factions;
+        }
+
+        app()->repository->save($this->draft);
+
+        return $this->draft;
+    }
+}
\ No newline at end of file
diff --git a/app/Draft/Commands/RegenerateDraftTest.php b/app/Draft/Commands/RegenerateDraftTest.php
new file mode 100644
index 0000000..0bc33c0
--- /dev/null
+++ b/app/Draft/Commands/RegenerateDraftTest.php
@@ -0,0 +1,96 @@
+testDraft, true, true, false);
+        $this->assertInstanceOf(Command::class, $cmd);
+    }
+
+    public static function options() {
+        yield 'When regenerating slices' => [
+            'slices' => true,
+            'factions' => false,
+            'order' => false,
+        ];
+        yield 'When regenerating factions' => [
+            'slices' => false,
+            'factions' => true,
+            'order' => false,
+        ];
+        yield 'When regenerating order' => [
+            'slices' => false,
+            'factions' => false,
+            'order' => true,
+        ];
+        yield 'When regenerating everything' => [
+            'slices' => true,
+            'factions' => true,
+            'order' => true,
+        ];
+    }
+
+    #[Test]
+    #[DataProvider('options')]
+    public function itCanRegenerateDraft(bool $slices, bool $factions, bool $order): void
+    {
+        $oldSlices = array_map(fn (Slice $slice) => $slice->tileIds(), $this->testDraft->slicePool);
+        $oldFactions = array_map(fn (Faction $faction) => $faction->name, $this->testDraft->factionPool);
+        $oldOrder = array_keys($this->testDraft->players);
+
+        $cmd = new RegenerateDraft($this->testDraft, $slices, $factions, $order);
+        $cmd->handle();
+
+        $this->reloadDraft();
+
+        $newSlices = array_map(fn (Slice $slice) => $slice->tileIds(), $this->testDraft->slicePool);
+        $newFactions = array_map(fn (Faction $faction) => $faction->name, $this->testDraft->factionPool);
+        $newOrder = array_keys($this->testDraft->players);
+
+        if ($slices) {
+            $this->assertNotSame($oldSlices, $newSlices);
+        } else {
+            $this->assertSame($oldSlices, $newSlices);
+        }
+
+        if ($factions) {
+            $this->assertNotSame($oldFactions, $newFactions);
+        } else {
+            $this->assertSame($oldFactions, $newFactions);
+        }
+
+        if ($order) {
+            $this->assertEqualsCanonicalizing($oldOrder, $newOrder);
+            $this->assertNotEquals($oldOrder, $newOrder);
+        } else {
+            $this->assertSame($oldOrder, $newOrder);
+        }
+    }
+
+    #[Test]
+    public function itUpdatesCurrentPlayerWhenRegeneratingPlayerOrder(): void
+    {
+        $cmd = new RegenerateDraft($this->testDraft, false, false, true);
+
+        $cmd->handle();
+        $this->reloadDraft();
+
+        $this->assertSame($this->testDraft->currentPlayerId->value, array_key_first($this->testDraft->players));
+    }
+}
\ No newline at end of file
diff --git a/app/Draft/Commands/UnclaimPlayer.php b/app/Draft/Commands/UnclaimPlayer.php
index 1757f25..1ad4854 100644
--- a/app/Draft/Commands/UnclaimPlayer.php
+++ b/app/Draft/Commands/UnclaimPlayer.php
@@ -22,7 +22,7 @@ public function __construct(
 
     public function handle(): void
     {
-        $this->draft->players[$this->playerId->value] = $this->player->unclaim();
+        $this->draft->updatePlayerData($this->player->unclaim());
         $this->draft->secrets->removeSecretForPlayer($this->playerId);
 
         app()->repository->save($this->draft);
diff --git a/app/Draft/Commands/UndoLastPick.php b/app/Draft/Commands/UndoLastPick.php
new file mode 100644
index 0000000..02ec4c6
--- /dev/null
+++ b/app/Draft/Commands/UndoLastPick.php
@@ -0,0 +1,33 @@
+draft->log)) {
+            throw new \Exception('Cannot undo pick, draft has not started');
+        }
+
+        $lastPick = array_pop($this->draft->log);
+        $player = $this->draft->playerById($lastPick->playerId);
+        $this->draft->updatePlayerData($player->unpick($lastPick->category));
+
+        $this->draft->updateCurrentPlayer();
+
+        app()->repository->save($this->draft);
+
+        return $this->draft;
+    }
+}
\ No newline at end of file
diff --git a/app/Draft/Commands/UndoLastPickTest.php b/app/Draft/Commands/UndoLastPickTest.php
new file mode 100644
index 0000000..198d7cc
--- /dev/null
+++ b/app/Draft/Commands/UndoLastPickTest.php
@@ -0,0 +1,128 @@
+testDraft);
+        $this->assertInstanceOf(Command::class, $cmd);
+    }
+
+    protected function makeTwoPicks(): void
+    {
+        $player1Id = PlayerId::fromString(array_keys($this->testDraft->players)[0]);
+        $player2Id = PlayerId::fromString(array_keys($this->testDraft->players)[1]);
+
+        (new PlayerPick(
+            $this->testDraft,
+            new Pick($player1Id, PickCategory::SLICE, '4'),
+        )
+        )->handle();
+        (new PlayerPick(
+            $this->testDraft,
+            new Pick($player2Id, PickCategory::SLICE, '3'),
+        )
+        )->handle();
+    }
+
+    #[Test]
+    public function itCanUndoLastPick(): void
+    {
+        $player2Id = PlayerId::fromString(array_keys($this->testDraft->players)[1]);
+        $this->makeTwoPicks();
+        $cmd = new UndoLastPick($this->testDraft);
+
+        $cmd->handle();
+        $this->reloadDraft();
+
+        $this->assertNull($this->testDraft->playerById($player2Id)->pickedSlice);
+    }
+
+    #[Test]
+    public function itThrowsAnErrorWhenNothingHasBeenPicked(): void
+    {
+        $cmd = new UndoLastPick($this->testDraft);
+
+        $this->expectException(\Exception::class);
+
+        $cmd->handle();
+    }
+
+    #[Test]
+    public function itUpdatesCurrentPlayer(): void
+    {
+        $player2Id = PlayerId::fromString(array_keys($this->testDraft->players)[1]);
+        $this->makeTwoPicks();
+        $cmd = new UndoLastPick($this->testDraft);
+
+        $cmd->handle();
+        $this->reloadDraft();
+
+        $this->assertSame($this->testDraft->currentPlayerId->value, $player2Id->value);
+    }
+
+    #[Test]
+    public function itRemovesPickFromLog(): void
+    {
+        $player1Id = PlayerId::fromString(array_keys($this->testDraft->players)[0]);
+        $this->makeTwoPicks();
+        $cmd = new UndoLastPick($this->testDraft);
+
+        $cmd->handle();
+        $this->reloadDraft();
+
+        $this->assertCount(1, $this->testDraft->log);
+        $this->assertSame($this->testDraft->log[0]->playerId->value, $player1Id->value);
+    }
+
+    #[Test]
+    public function itSetsTheDraftToUndoneIfUndoingLastPick(): void
+    {
+        $order = array_merge(
+            array_keys($this->testDraft->players),
+            array_keys(array_reverse($this->testDraft->players)),
+            array_keys($this->testDraft->players),
+        );
+
+        foreach($order as $currentPlayer) {
+            $pick = new Pick($this->testDraft->currentPlayerId, PickCategory::FACTION, 'foo');
+            $this->testDraft->log[] = $pick;
+            $this->testDraft->updateCurrentPlayer();
+        }
+
+        $this->assertTrue($this->testDraft->isDone);
+        $this->assertNull($this->testDraft->currentPlayerId);
+
+        // update player pick so the undo command doesn't complain
+        $lastPlayer = PlayerId::fromString(array_key_last($this->testDraft->players));
+        $this->testDraft->updatePlayerData($this->testDraft->playerById($lastPlayer)->pick(
+            new Pick(
+                $lastPlayer,
+                PickCategory::FACTION,
+                'foo',
+            ),
+        ));
+
+        $cmd = new UndoLastPick($this->testDraft);
+        $cmd->handle();
+        $this->reloadDraft();
+
+        $this->assertFalse($this->testDraft->isDone);
+        $this->assertNotNull($this->testDraft->currentPlayerId);
+    }
+}
\ No newline at end of file
diff --git a/app/Draft/Draft.php b/app/Draft/Draft.php
index b071df6..57b1cc2 100644
--- a/app/Draft/Draft.php
+++ b/app/Draft/Draft.php
@@ -48,7 +48,7 @@ public static function fromJson($data)
             self::slicesFromJson($data['slices']),
             self::factionsFromJson($data['factions']),
             array_map(fn ($logData) => Pick::fromJson($logData), $data['draft']['log']),
-            PlayerId::fromString($data['draft']['current']),
+            $data['draft']['current'] != null ? PlayerId::fromString($data['draft']['current']) : null,
         );
     }
 
@@ -95,7 +95,7 @@ public function toArray($includeSecrets = false): array
             'draft' => [
                 'players' => array_map(fn (Player $player) => $player->toArray(), $this->players),
                 'log' => array_map(fn (Pick $pick) => $pick->toArray(), $this->log),
-                'current' => $this->currentPlayerId->value,
+                'current' => $this->currentPlayerId?->value,
             ],
             'factions' => array_map(fn (Faction $f) => $f->name, $this->factionPool),
             'slices' => array_map(fn (Slice $s) => ['tiles' => $s->tileIds()], $this->slicePool),
@@ -108,12 +108,18 @@ public function toArray($includeSecrets = false): array
         return $data;
     }
 
-    public function determineCurrentPlayer(): PlayerId
+    public function updateCurrentPlayer(): void
     {
         $doneSteps = count($this->log);
         $snakeDraft = array_merge(array_keys($this->players), array_keys(array_reverse($this->players)));
 
-        return PlayerId::fromString($snakeDraft[$doneSteps % count($snakeDraft)]);
+        if (count($this->log) >= (count($this->players) * 3)) {
+            $this->isDone = true;
+            $this->currentPlayerId = null;
+        } else {
+            $this->isDone = false;
+            $this->currentPlayerId = PlayerId::fromString($snakeDraft[$doneSteps % count($snakeDraft)]);
+        }
     }
 
     public function canRegenerate(): bool
@@ -123,7 +129,22 @@ public function canRegenerate(): bool
 
     public function playerById(PlayerId $id): Player
     {
-        return $this->players[$id->value] ?? throw new \Exception('Player not found in draft');
+        foreach ($this->players as $p) {
+            if ($p->id->equals($id)) {
+                return $p;
+            }
+        }
+
+        throw new \Exception('No player found with id ' . $id->value);
+    }
+
+    public function updatePlayerData(Player $newPlayerData): void
+    {
+        if (! isset($this->players[$newPlayerData->id->value])) {
+            throw new \Exception('No player found with id ' . $newPlayerData->id->value);
+        }
+
+        $this->players[$newPlayerData->id->value] = $newPlayerData;
     }
 
 }
\ No newline at end of file
diff --git a/app/Draft/DraftTest.php b/app/Draft/DraftTest.php
index c9e351e..6550f3a 100644
--- a/app/Draft/DraftTest.php
+++ b/app/Draft/DraftTest.php
@@ -4,6 +4,7 @@
 
 namespace App\Draft;
 
+use App\Draft\Commands\GenerateDraft;
 use App\Testing\Factories\DraftSettingsFactory;
 use App\Testing\TestCase;
 use App\Testing\TestDrafts;
@@ -87,4 +88,40 @@ public function itCanBeConvertedToArray(): void
             $this->assertContains(['tiles' => $slice->tileIds()], $data['slices']);
         }
     }
+
+    #[Test]
+    public function itCanUpdatePlayerData(): void
+    {
+        $draft = (new GenerateDraft(DraftSettingsFactory::make()))->handle();
+
+        $playerId = PlayerId::fromString(array_keys($draft->players)[3]);
+
+        $player = $draft->playerById($playerId);
+
+        $newPlayerData = $player->pick(new Pick($playerId, PickCategory::FACTION, 'Xxcha'));
+
+        $draft->updatePlayerData($newPlayerData);
+
+        $this->assertSame($draft->playerById($playerId)->toArray(), $newPlayerData->toArray());
+        $this->assertSame($draft->playerById($playerId)->getPick(PickCategory::FACTION), 'Xxcha');
+    }
+
+    #[Test]
+    public function itCanUpdateCurrentPlayerInSnakeDraft(): void
+    {
+        $draft = (new GenerateDraft(DraftSettingsFactory::make()))->handle();
+
+        // the order for three rounds: Regular + Reverse + Regular
+        $order = array_merge(array_keys($draft->players), array_keys(array_reverse($draft->players)), array_keys($draft->players));
+
+        foreach($order as $expectedCurrentPlayer) {
+            $this->assertSame($draft->currentPlayerId->value, $expectedCurrentPlayer);
+            $draft->log[] = new Pick($draft->currentPlayerId, PickCategory::FACTION, 'foo');
+            $draft->updateCurrentPlayer();
+        }
+
+        // it sets the draft to done at the end
+        $this->assertNull($draft->currentPlayerId);
+        $this->assertTrue($draft->isDone);
+    }
 }
\ No newline at end of file
diff --git a/app/Draft/Exceptions/InvalidPickException.php b/app/Draft/Exceptions/InvalidPickException.php
index b791593..3daea37 100644
--- a/app/Draft/Exceptions/InvalidPickException.php
+++ b/app/Draft/Exceptions/InvalidPickException.php
@@ -10,6 +10,21 @@ class InvalidPickException extends \Exception
 {
     public static function playerHasAlreadyPicked(PickCategory $category)
     {
-        return new self('Player has already picked ' . $category);
+        return new self('Player has already picked ' . $category->value);
+    }
+
+    public static function optionAlreadyPicked($value)
+    {
+        return new self('Other player has already picked ' . $value);
+    }
+
+    public static function cannotUnpick(PickCategory $category)
+    {
+        return new self('Cannot undo pick: Player has not picked ' . $category->value);
+    }
+
+    public static function notPlayersTurn()
+    {
+        return new self("It's not your turn!");
     }
 }
\ No newline at end of file
diff --git a/app/Draft/Player.php b/app/Draft/Player.php
index 202882c..8437daa 100644
--- a/app/Draft/Player.php
+++ b/app/Draft/Player.php
@@ -121,6 +121,15 @@ public function hasPickedPosition(): bool
         return $this->pickedPosition != null;
     }
 
+    public function getPick(PickCategory $category): ?string
+    {
+        return match($category) {
+            PickCategory::POSITION => $this->pickedPosition,
+            PickCategory::SLICE => $this->pickedSlice,
+            PickCategory::FACTION => $this->pickedFaction,
+        };
+    }
+
     public function hasPicked(PickCategory $category): bool
     {
         return match($category) {
@@ -130,19 +139,36 @@ public function hasPicked(PickCategory $category): bool
         };
     }
 
-    public function pick(PickCategory $category, string $pick): Player
+    public function pick(Pick $pick): Player
+    {
+        if ($this->hasPicked($pick->category)) {
+            throw InvalidPickException::playerHasAlreadyPicked($pick->category);
+        }
+
+        return new self(
+            $this->id,
+            $this->name,
+            $this->claimed,
+            $pick->category == PickCategory::POSITION ? $pick->pickedOption : $this->pickedPosition,
+            $pick->category == PickCategory::FACTION ? $pick->pickedOption : $this->pickedFaction,
+            $pick->category == PickCategory::SLICE ? $pick->pickedOption : $this->pickedSlice,
+            $this->team,
+        );
+    }
+
+    public function unpick(PickCategory $category): Player
     {
-        if ($this->hasPicked($category)) {
-            throw InvalidPickException::playerHasAlreadyPicked($category);
+        if (! $this->hasPicked($category)) {
+            throw InvalidPickException::cannotUnpick($category);
         }
 
         return new self(
             $this->id,
             $this->name,
             $this->claimed,
-            $category == PickCategory::POSITION ? $pick : $this->pickedPosition,
-            $category == PickCategory::FACTION ? $pick : $this->pickedFaction,
-            $category == PickCategory::SLICE ? $pick : $this->pickedSlice,
+            $category == PickCategory::POSITION ? null : $this->pickedPosition,
+            $category == PickCategory::FACTION ? null : $this->pickedFaction,
+            $category == PickCategory::SLICE ? null : $this->pickedSlice,
             $this->team,
         );
     }
diff --git a/app/Draft/PlayerTest.php b/app/Draft/PlayerTest.php
index f873adf..ed21612 100644
--- a/app/Draft/PlayerTest.php
+++ b/app/Draft/PlayerTest.php
@@ -119,9 +119,9 @@ public function itCanPickSomething($category): void
             'A',
         );
 
-        $newPlayerVo = $player->pick($category, 'some-value');
+        $newPlayerVo = $player->pick(new Pick(PlayerId::fromString('1'), $category, 'some-value'));
 
-        $this->assertEquals($player->id, $newPlayerVo->id);
+        $this->assertSame($player->id->value, $newPlayerVo->id->value);
         $this->assertSame($player->name, $newPlayerVo->name);
         $this->assertSame($player->claimed, $newPlayerVo->claimed);
         $this->assertSame($player->team, $newPlayerVo->team);
diff --git a/app/Draft/Secrets.php b/app/Draft/Secrets.php
index 3265f9d..4401d66 100644
--- a/app/Draft/Secrets.php
+++ b/app/Draft/Secrets.php
@@ -30,7 +30,7 @@ public function toArray(): array
 
     public static function generateSecret(): string
     {
-        return base64_encode(random_bytes(16));
+        return bin2hex(random_bytes(16));
     }
 
     public function generateSecretForPlayer(PlayerId $playerId): string
@@ -51,7 +51,11 @@ public function secretById(PlayerId $playerId): ?string
         return $this->playerSecrets[$playerId->value] ?? null;
     }
 
-    public function checkAdminSecret($secret): bool {
+    public function checkAdminSecret(?string $secret): bool {
+        if ($secret == null) {
+            return false;
+        }
+
         return $secret == $this->adminSecret;
     }
 
@@ -65,7 +69,11 @@ public function playerIdBySecret(string $secret): ?PlayerId {
         return null;
     }
 
-    public function checkPlayerSecret(PlayerId $id, string $secret): bool {
+    public function checkPlayerSecret(PlayerId $id, ?string $secret): bool {
+        if ($secret == null) {
+            return false;
+        }
+
         return isset($this->playerSecrets[$id->value]) && $secret == $this->playerSecrets[$id->value];
     }
 
diff --git a/app/Draft/Settings.php b/app/Draft/Settings.php
index 7e874f0..2615220 100644
--- a/app/Draft/Settings.php
+++ b/app/Draft/Settings.php
@@ -286,4 +286,33 @@ public function tileSetNames()
     {
         return array_map(fn (Edition $e) => $e->fullName(), $this->tileSets);
     }
+
+    public function withNewSeed(Seed $seed): Settings
+    {
+        return new self(
+            $this->playerNames,
+            $this->presetDraftOrder,
+            $this->name,
+            $seed,
+            $this->numberOfSlices,
+            $this->numberOfFactions,
+            $this->tileSets,
+            $this->factionSets,
+            $this->includeCouncilKeleresFaction,
+            $this->minimumTwoAlphaAndBetaWormholes,
+            $this->maxOneWormholesPerSlice,
+            $this->minimumLegendaryPlanets,
+            $this->minimumOptimalInfluence,
+            $this->minimumOptimalResources,
+            $this->minimumOptimalTotal,
+            $this->maximumOptimalTotal,
+            $this->customFactions,
+            $this->customSlices,
+            $this->allianceMode,
+            $this->allianceTeamMode,
+            $this->allianceTeamPosition,
+            $this->allianceForceDoublePicks,
+        );
+
+    }
 }
\ No newline at end of file
diff --git a/app/Draft/TilePool.php b/app/Draft/TilePool.php
index e329a1b..451a3b2 100644
--- a/app/Draft/TilePool.php
+++ b/app/Draft/TilePool.php
@@ -43,9 +43,4 @@ public function allIds(): array
     {
         return array_merge($this->highTier, $this->midTier, $this->lowTier, $this->redTier);
     }
-
-    public function slices(): array
-    {
-
-    }
 }
\ No newline at end of file
diff --git a/app/Generator.php b/app/Generator.php
deleted file mode 100644
index 4eef3f5..0000000
--- a/app/Generator.php
+++ /dev/null
@@ -1,313 +0,0 @@
- 100) {
-            return_error('Selection contains no valid slices. This happens occasionally to valid configurations but it probably means that the parameters are impossible.');
-        }
-
-        if ($config->seed !== null) {
-            mt_srand($config->seed + self::SEED_OFFSET_SLICES + $previous_tries);
-        }
-
-        // Gather Tiles
-        $all_tiles = self::gather_tiles($config);
-
-        if ($config->custom_slices != null) {
-            $tile_data = self::import_tile_data();
-
-            $slices = [];
-
-            foreach ($config->custom_slices as $slice_data) {
-                $tiles = [];
-                foreach ($slice_data as $tile_id) {
-                    $tiles[] = $tile_data[$tile_id];
-                }
-                $slices[] = new Slice($tiles);
-            }
-
-            return self::convert_slices_data($slices);
-            //            return $slices;
-
-        } else {
-            $selected_tiles = self::select_tiles($all_tiles, $config);
-            $slices = self::slicesFromTiles($selected_tiles, $config);
-
-            if ($slices == false) {
-                // can't make slices with this selection
-                return self::slices($config, $previous_tries + 1);
-            } else {
-                return self::convert_slices_data($slices);
-            }
-        }
-    }
-
-    /**
-     * @param array $slices
-     * @return array
-     */
-    private static function convert_slices_data($slices)
-    {
-        $data = [];
-
-        foreach ($slices as $slice) {
-            $data[] = $slice->toJson();
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param $tiles
-     * @param GeneratorConfig $config
-     * @param int $previous_tries
-     * @return mixed
-     */
-    private static function slicesFromTiles($tiles, $config, $previous_tries = 0)
-    {
-        $slices = [];
-
-        if ($previous_tries > 1000) {
-            return false;
-        }
-
-        if ($config->seed !== null && $previous_tries > 0) {
-            mt_srand($config->seed + self::SEED_OFFSET_SLICES + $previous_tries);
-        }
-
-        // reshuffle
-        shuffle($tiles['high']);
-        shuffle($tiles['mid']);
-        shuffle($tiles['low']);
-        shuffle($tiles['red']);
-
-        for ($i = 0; $i < $config->num_slices; $i++) {
-            // grab some tiles
-
-            $slice = new Slice([
-                $tiles['high'][$i],
-                $tiles['mid'][$i],
-                $tiles['low'][$i],
-                $tiles['red'][2 * $i],
-                $tiles['red'][(2 * $i) + 1],
-            ]);
-
-            try {
-                $slice->validate(
-                    $config->minimum_optimal_influence,
-                    $config->minimum_optimal_resources,
-                    $config->minimum_optimal_total,
-                    $config->maximum_optimal_total,
-                    $config->max_1_wormhole,
-                );
-                $slice->arrange();
-            } catch (InvalidSliceException $e) {
-                return self::slicesFromTiles($tiles, $config, $previous_tries + 1);
-            }
-
-            // all good!
-            $slices[] = $slice;
-        }
-
-        return $slices;
-    }
-
-    /**
-     * Make a tile selection based on tier-listing
-     *
-     * @param array $tiles
-     * @param GeneratorConfig $config
-     * @param int $previous_tries
-     * @return array
-     */
-    private static function select_tiles($tiles, $config, $previous_tries = 0)
-    {
-        $selection_valid = false;
-
-        if ($previous_tries > 2000) {
-            return_error('Max. number of tries exceeded: no valid tile selection found');
-        }
-
-        if ($config->seed !== null && $previous_tries > 0) {
-            mt_srand($config->seed + self::SEED_OFFSET_SLICES + $previous_tries);
-        }
-
-        shuffle($tiles['high']);
-        shuffle($tiles['mid']);
-        shuffle($tiles['low']);
-        shuffle($tiles['red']);
-
-        $selection = [
-            'high' => array_slice($tiles['high'], 0, $config->num_slices),
-            'mid' => array_slice($tiles['mid'], 0, $config->num_slices),
-            'low' => array_slice($tiles['low'], 0, $config->num_slices),
-            'red' => array_slice($tiles['red'], 0, $config->num_slices * 2),
-        ];
-
-        $all = array_merge($selection['high'], $selection['mid'], $selection['low'], $selection['red']);
-
-        // check if the wormhole/legendary count is high enough
-        $counts = Tile::countSpecials($all);
-
-        // validate against minimums
-        if ($counts['alpha'] < $config->min_wormholes || $counts['beta'] < $config->min_wormholes || $counts['legendary'] < $config->min_legendaries) {
-            // try again
-            return self::select_tiles($tiles, $config, $previous_tries + 1);
-        } else {
-            return $selection;
-        }
-    }
-
-    /**
-     * Import tile tier-listings
-     *
-     * @param GeneratorConfig $config
-     */
-    private static function gather_tiles($config)
-    {
-        $tile_tiers = json_decode(file_get_contents('data/tile-selection.json'), true);
-        $tile_data = self::import_tile_data();
-
-        $all_tiles = [
-            'high' => [],
-            'mid' => [],
-            'low' => [],
-            'red' => [],
-        ];
-
-        foreach ($tile_tiers['tiers'] as $tier => $tiles) {
-            foreach ($tiles as $tile_id) {
-                $all_tiles[$tier][] = $tile_data[$tile_id];
-            }
-        }
-
-        if ($config->include_pok) {
-            foreach ($tile_tiers['pokTiers'] as $tier => $tiles) {
-                foreach ($tiles as $tile_id) {
-                    $all_tiles[$tier][] = $tile_data[$tile_id];
-                }
-            }
-        }
-
-        if ($config->include_ds_tiles) {
-            foreach ($tile_tiers['DSTiers'] as $tier => $tiles) {
-                foreach ($tiles as $tile_id) {
-                    $all_tiles[$tier][] = $tile_data[$tile_id];
-                }
-            }
-        }
-
-        if ($config->include_te_tiles) {
-            foreach ($tile_tiers['TETiers'] as $tier => $tiles) {
-                foreach ($tiles as $tile_id) {
-                    $all_tiles[$tier][] = $tile_data[$tile_id];
-                }
-            }
-        }
-
-        return $all_tiles;
-    }
-
-    private static function import_faction_data()
-    {
-        return json_decode(file_get_contents('data/factions.json'), true);
-    }
-
-    /**
-     * @param GeneratorConfig $config
-     */
-    public static function factions($config)
-    {
-
-        if ($config->seed !== null) {
-            mt_srand($config->seed + self::SEED_OFFSET_FACTIONS);
-        }
-
-        $possible_factions = self::filtered_factions($config);
-
-        if ($config->custom_factions != null) {
-            $factions = [];
-
-            foreach ($config->custom_factions as $f) {
-                $factions[] = $f;
-            }
-
-            // add some more boys and girls untill we reach the magic number
-            $i = 0;
-            while (count($factions) < $config->num_factions) {
-                $f = $possible_factions[$i];
-
-                if (! in_array($f, $factions)) {
-                    $factions[] = $f;
-                }
-
-                $i++;
-            }
-
-            shuffle($factions);
-        } else {
-            $factions = $possible_factions;
-        };
-
-        return array_slice($factions, 0, $config->num_factions);
-    }
-
-    public static function filtered_factions($config)
-    {
-
-        $faction_data = self::import_faction_data();
-        $factions = [];
-        foreach ($faction_data as $faction => $data) {
-            if ($data['set'] == 'base' && $config->include_base_factions) {
-                $factions[] = $faction;
-            }
-            if ($data['set'] == 'pok' && $config->include_pok_factions) {
-                $factions[] = $faction;
-            }
-            if ($data['set'] == 'keleres' && $config->include_keleres) {
-                $factions[] = $faction;
-            }
-            if ($data['set'] == 'discordant' && $config->include_discordant) {
-                $factions[] = $faction;
-            }
-            if ($data['set'] == 'discordantexp' && $config->include_discordantexp) {
-                $factions[] = $faction;
-            }
-            if ($data['set'] == 'te' && $config->include_te_factions) {
-                $factions[] = $faction;
-            }
-        }
-        shuffle($factions);
-
-        return $factions;
-    }
-
-    private static function import_tile_data()
-    {
-        $data = json_decode(file_get_contents('data/tiles.json'), true);
-        $tiles = [];
-
-        foreach ($data as $i => $tile_data) {
-            $tiles[$i] = new Tile($i, $tile_data);
-        }
-
-        return $tiles;
-    }
-
-}
diff --git a/app/GeneratorConfig.php b/app/GeneratorConfig.php
deleted file mode 100644
index a561ce0..0000000
--- a/app/GeneratorConfig.php
+++ /dev/null
@@ -1,174 +0,0 @@
-players = array_filter(array_map('htmlentities', get('player', [])));
-            if ((int) get('num_players') != count($this->players)) {
-                return_error('Number of players does not match number of names');
-            }
-
-            $this->name = new Name(get('game_name', ''));
-            $this->num_slices = (int) get('num_slices');
-            $this->num_factions = (int) get('num_factions');
-            $this->include_pok = get('include_pok') == true;
-            $this->include_ds_tiles = get('include_ds_tiles') == true;
-            $this->include_te_tiles = get('include_te_tiles') == true;
-            $this->include_base_factions = get('include_base_factions') == true;
-            $this->include_pok_factions = get('include_pok_factions') == true;
-            $this->include_keleres = get('include_keleres') == true;
-            $this->include_discordant = get('include_discordant') == true;
-            $this->include_discordantexp = get('include_discordantexp') == true;
-            $this->include_te_factions = get('include_te_factions') == true;
-            $this->preset_draft_order = get('preset_draft_order', false) == true;
-
-            $this->max_1_wormhole = get('max_wormhole') == true;
-            $this->min_wormholes = (get('wormholes') == true) ? 2 : 0;
-            $this->min_legendaries = (int) get('min_legendaries');
-
-            $this->minimum_optimal_influence = (float) get('min_inf');
-            $this->minimum_optimal_resources = (float) get('min_res');
-            $this->minimum_optimal_total = (float) get('min_total');
-            $this->maximum_optimal_total = (float) get('max_total');
-
-            if (! empty(get('custom_factions', []))) {
-                $this->custom_factions = get('custom_factions');
-            }
-
-            if (get('custom_slices') != '') {
-                $slice_data = explode("\n", get('custom_slices'));
-                $this->custom_slices = [];
-                foreach ($slice_data as $s) {
-                    $slice = [];
-                    $t = explode(',', $s);
-                    foreach ($t as $tile) {
-                        $tile = trim($tile);
-                        $slice[] = $tile;
-                    }
-                    $this->custom_slices[] = $slice;
-                }
-            }
-
-            if ((bool) get('alliance_on', false)) {
-                $this->alliance = [];
-                $this->alliance['alliance_teams'] = get('alliance_teams');
-                $this->alliance['alliance_teams_position'] = get('alliance_teams_position');
-                $this->alliance['force_double_picks'] = get('force_double_picks') == 'true';
-            }
-
-            $seed_input = get('seed', '');
-            if ($seed_input !== '' && $seed_input !== null) {
-                $this->seed = (int) $seed_input;
-            } else {
-                $this->seed = mt_rand(1, self::MAX_SEED_VALUE);
-            }
-
-            $this->validate();
-        }
-    }
-
-    public static function fromArray(array $array): GeneratorConfig
-    {
-        $config = new GeneratorConfig(false);
-
-        foreach ($array as $key => $value) {
-            $config->$key = $value;
-        }
-
-        $config->validate();
-
-        return $config;
-    }
-
-    private function validate(): void
-    {
-
-        if (count($this->players) > count(array_filter($this->players))) return_error('Some player names are not filled out');
-        if (count(array_unique($this->players)) != count($this->players)) return_error('Players should all have unique names');
-        $num_tiles = self::NUM_BASE_BLUE + $this->include_pok * self::NUM_POK_BLUE + $this->include_ds_tiles * self::NUM_DS_BLUE + $this->include_te_tiles * self::NUM_TE_BLUE;
-        $num_red = self::NUM_BASE_RED + $this->include_pok * self::NUM_POK_RED + $this->include_ds_tiles * self::NUM_DS_RED + $this->include_te_tiles * self::NUM_TE_RED;
-        // maximum number of possible slices, 3 blue and 2 red tiles per slice
-        $max_slices = min(floor($num_tiles / 3), floor($num_red / 2));
-        if ($max_slices < $this->num_slices) return_error('Can only draft up to ' . $max_slices . ' slices with the selected tiles. (And by extension you can only do drafts up to ' . $max_slices . ' players)');
-        if (count($this->players) < 3) return_error('Please enter at least 3 players');
-        if ($this->num_factions < count($this->players)) return_error("Can't have less factions than players");
-        if ($this->num_slices < count($this->players)) return_error("Can't have less slices than players");
-        if ($this->maximum_optimal_total < $this->minimum_optimal_total) return_error("Maximum optimal can't be less than minimum");
-        $max_legendaries = $this->include_pok * self::NUM_POK_LEGENDARIES + $this->include_ds_tiles * self::NUM_DS_LEGENDARIES + $this->include_te_tiles * self::NUM_TE_LEGENDARIES;
-        if ($max_legendaries < $this->min_legendaries) return_error('Cannot include ' . $this->min_legendaries . ' legendaries, maximum number available is ' . $max_legendaries);
-        if ($this->min_legendaries > $this->num_slices) return_error('Cannot include more legendaries than slices');
-        if ($this->seed !== null && ($this->seed < 1 || $this->seed > self::MAX_SEED_VALUE)) return_error('Seed must be between 1 and ' . self::MAX_SEED_VALUE);
-        // Must include at least 1 of base, pok, discordant, or discordant expansion to have enough factions to use
-        if (! ($this->include_base_factions || $this->include_pok_factions || $this->include_discordant || $this->include_discordantexp || $this->include_te_factions)) return_error('Not enough factions selected.');
-        // if($this->custom_factions != null && count($this->custom_factions) < count($this->players)) return_error("Not enough custom factions for number of players");
-        if ($this->custom_slices != null) {
-            if (count($this->custom_slices) < count($this->players)) return_error('Not enough custom slices for number of players');
-            foreach ($this->custom_slices as $s) {
-                if (count($s) != 5) return_error('Some of the custom slices have the wrong number of tiles. (each should have five)');
-            }
-        }
-    }
-
-    public function toJson(): array
-    {
-        return get_object_vars($this);
-    }
-}
diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php
index 8803610..cf2f23e 100644
--- a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php
+++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php
@@ -9,7 +9,6 @@
 use App\Draft\Name;
 use App\Draft\Seed;
 use App\Draft\Settings;
-use App\Http\ErrorResponse;
 use App\Http\HttpRequest;
 use App\Http\HttpResponse;
 use App\Http\RequestHandler;
@@ -32,7 +31,7 @@ public function handle(): HttpResponse
         try {
             $this->settings->validate();
         } catch (InvalidDraftSettingsException $e) {
-            return new ErrorResponse($e->getMessage(), 400);
+            return $this->error($e->getMessage(), 400);
         }
 
         $draft = dispatch(new GenerateDraft($this->settingsFromRequest()));
diff --git a/app/Http/RequestHandlers/HandleGetDraftRequest.php b/app/Http/RequestHandlers/HandleGetDraftRequest.php
index bf98335..34519b6 100644
--- a/app/Http/RequestHandlers/HandleGetDraftRequest.php
+++ b/app/Http/RequestHandlers/HandleGetDraftRequest.php
@@ -4,20 +4,17 @@
 
 namespace App\Http\RequestHandlers;
 
-use App\Draft\Exceptions\DraftRepositoryException;
-use App\Http\ErrorResponse;
 use App\Http\HttpResponse;
 use App\Http\JsonResponse;
-use App\Http\RequestHandler;
 
-class HandleGetDraftRequest extends RequestHandler
+class HandleGetDraftRequest extends DraftRequestHandler
 {
     public function handle(): HttpResponse
     {
-        try {
-            $draft = app()->repository->load($this->request->get('id'));
-        } catch (DraftRepositoryException $e) {
-            return new ErrorResponse('Draft not found', 404);
+        $draft = $this->loadDraftByUrlId('id');
+
+        if ($draft == null) {
+            return $this->error('Draft not found', 404);
         }
 
         return new JsonResponse(
diff --git a/app/Http/RequestHandlers/HandlePickRequest.php b/app/Http/RequestHandlers/HandlePickRequest.php
index ad2f6e0..e14b624 100644
--- a/app/Http/RequestHandlers/HandlePickRequest.php
+++ b/app/Http/RequestHandlers/HandlePickRequest.php
@@ -4,13 +4,47 @@
 
 namespace App\Http\RequestHandlers;
 
+use App\Draft\Commands\PlayerPick;
+use App\Draft\Pick;
+use App\Draft\PickCategory;
+use App\Draft\PlayerId;
 use App\Http\HttpResponse;
-use App\Http\RequestHandler;
+use App\Http\JsonResponse;
 
-class HandlePickRequest extends RequestHandler
+class HandlePickRequest extends DraftRequestHandler
 {
     public function handle(): HttpResponse
     {
-        // TODO: Implement handle() method.
+        $draft = $this->loadDraftByUrlId('id');
+
+        if ($draft == null) {
+            return $this->error('Draft not found', 404);
+        }
+
+        $playerId = PlayerId::fromString($this->request->get('player'));
+
+        $isAdmin = $draft->secrets->checkAdminSecret($this->request->get('admin'));
+
+        if (! $isAdmin && ! $draft->secrets->checkPlayerSecret($playerId, $this->request->get('secret'))) {
+            return $this->error('You are not allowed to do this.', 403);
+        }
+
+        if ($this->request->get('index', 0) != count($draft->log)) {
+            return $this->error(
+                'Draft data out of date, meaning: stuff has been picked or undone while this tab was open.',
+                400,
+            );
+        }
+
+        dispatch(new PlayerPick($draft, new Pick(
+            $playerId,
+            PickCategory::from($this->request->get('category')),
+            $this->request->get('value'),
+        )));
+
+        return new JsonResponse([
+            'draft' => $draft->toArray(),
+            'success' => true,
+        ]);
     }
 }
\ No newline at end of file
diff --git a/app/Http/RequestHandlers/HandlePickRequestTest.php b/app/Http/RequestHandlers/HandlePickRequestTest.php
new file mode 100644
index 0000000..f5183f2
--- /dev/null
+++ b/app/Http/RequestHandlers/HandlePickRequestTest.php
@@ -0,0 +1,123 @@
+assertIsConfiguredAsHandlerForRoute('/api/pick');
+    }
+
+    #[Test]
+    public function itReturnsErrorIfDraftNotFound(): void
+    {
+        $response = $this->handleRequest(['id' => '12344']);
+
+        $this->assertSame(404, $response->code);
+        $this->assertResponseJson($response);
+        $this->assertJsonResponseSame(['error' => 'Draft not found'], $response);
+    }
+
+    #[Test]
+    public function itReturnsErrorIfPlayerSecretIsIncorrect(): void
+    {
+        $playerId = PlayerId::fromString(array_keys($this->testDraft->players)[0]);
+
+        $response = $this->handleRequest([
+            'id' => $this->testDraft->id,
+            'player' => $playerId->value,
+            'secret' => 'incorrect-value',
+            'category' => PickCategory::SLICE->value,
+            'value' => '3',
+        ]);
+
+        $this->assertForbidden($response);
+    }
+
+    #[Test]
+    public function itAllowsAdminsToMakePicksForOtherPlayers(): void
+    {
+        $playerId = PlayerId::fromString(array_keys($this->testDraft->players)[0]);
+
+        $response = $this->handleRequest([
+            'id' => $this->testDraft->id,
+            'player' => $playerId->value,
+            'admin' => $this->testDraft->secrets->adminSecret,
+            'category' => PickCategory::SLICE->value,
+            'value' => '3',
+        ]);
+
+        $this->assertResponseOk($response);
+    }
+
+    #[Test]
+    public function itReturnsErrorIfIndexIsIncorrect(): void
+    {
+        $playerId = PlayerId::fromString(array_keys($this->testDraft->players)[0]);
+
+        $response = $this->handleRequest([
+            'id' => $this->testDraft->id,
+            'index' => 4,
+            'player' => $playerId->value,
+            'admin' => $this->testDraft->secrets->adminSecret,
+            'category' => PickCategory::FACTION->value,
+            'value' => 'Hacan',
+        ]);
+
+        $this->assertResponseCode(400, $response);
+        $this->assertJsonResponseSame([
+            'error' => 'Draft data out of date, meaning: stuff has been picked or undone while this tab was open.',
+        ], $response);
+    }
+
+    #[Test]
+    public function itDispatchesTheCommand(): void
+    {
+        $playerId = PlayerId::fromString(array_keys($this->testDraft->players)[0]);
+
+        $secret = (new ClaimPlayer($this->testDraft, $playerId))->handle();
+
+        $category = PickCategory::FACTION->value;
+        $value = 'Hacan';
+
+        $response = $this->handleRequest([
+            'id' => $this->testDraft->id,
+            'index' => 0,
+            'player' => $playerId->value,
+            'secret' => $secret,
+            'category' => $category,
+            'value' => $value,
+        ]);
+
+        $this->assertResponseOk($response);
+        $this->assertResponseJson($response);
+
+        $this->assertCommandWasDispatchedWith(
+            PlayerPick::class,
+            function (PlayerPick $cmd) use ($playerId, $category, $value): void {
+                $this->assertSame($cmd->draft->id, $this->testDraft->id);
+                $this->assertSame($cmd->pick->playerId->value, $playerId->value);
+                $this->assertSame($cmd->pick->category->value, $category);
+                $this->assertSame($cmd->pick->pickedOption, $value);
+            },
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Http/RequestHandlers/HandleRegenerateDraftRequest.php b/app/Http/RequestHandlers/HandleRegenerateDraftRequest.php
index 4777b8a..a392994 100644
--- a/app/Http/RequestHandlers/HandleRegenerateDraftRequest.php
+++ b/app/Http/RequestHandlers/HandleRegenerateDraftRequest.php
@@ -4,13 +4,34 @@
 
 namespace App\Http\RequestHandlers;
 
+use App\Draft\Commands\RegenerateDraft;
 use App\Http\HttpResponse;
-use App\Http\RequestHandler;
 
-class HandleRegenerateDraftRequest extends RequestHandler
+class HandleRegenerateDraftRequest extends DraftRequestHandler
 {
     public function handle(): HttpResponse
     {
-        // TODO: Implement handle() method.
+        $draft = $this->loadDraftByUrlId();
+
+        if ($draft == null) {
+            return $this->error('Draft not found', 404);
+        }
+
+        $adminSecret = $this->request->get('admin');
+
+        if (! $draft->secrets->checkAdminSecret($adminSecret)) {
+            return $this->error('Only the admin can regenerate', 403);
+        }
+
+        dispatch(new RegenerateDraft(
+            $draft,
+            $this->request->get('slices', false) === 'true',
+            $this->request->get('factions', false) === 'true',
+            $this->request->get('order', false) === 'true',
+        ));
+
+        return $this->json([
+            'draft' => $draft->toArray(),
+        ]);
     }
 }
\ No newline at end of file
diff --git a/app/Http/RequestHandlers/HandleRegenerateDraftRequestTest.php b/app/Http/RequestHandlers/HandleRegenerateDraftRequestTest.php
new file mode 100644
index 0000000..3f7a638
--- /dev/null
+++ b/app/Http/RequestHandlers/HandleRegenerateDraftRequestTest.php
@@ -0,0 +1,86 @@
+assertIsConfiguredAsHandlerForRoute('/api/regenerate');
+    }
+
+    #[Test]
+    public function itReturnsErrorIfDraftNotFound(): void
+    {
+        $response = $this->handleRequest(['id' => '12344', 'secret' => '']);
+
+        $this->assertResponseNotFound($response);
+        $this->assertResponseJson($response);
+        $this->assertJsonResponseSame(['error' => 'Draft not found'], $response);
+    }
+
+    #[Test]
+    public function itReturnsErrorIfNotAdmin(): void
+    {
+        $response = $this->handleRequest(['id' => $this->testDraft->id, 'secret' => 'Not admin']);
+        $this->assertForbidden($response);
+    }
+
+    public static function parameters()
+    {
+        yield 'When regenerating slices' => [
+            'slices' => 'true',
+            'factions' => 'false',
+            'order' => 'false',
+        ];
+
+        yield 'When regenerating factions' => [
+            'slices' => 'false',
+            'factions' => 'false',
+            'order' => 'true',
+        ];
+
+        yield 'When regenerating player order' => [
+            'slices' => 'false',
+            'factions' => 'false',
+            'order' => 'true',
+        ];
+    }
+
+    #[Test]
+    #[DataProvider('parameters')]
+    public function itDispatchesTheCommand($slices, $factions, $order): void
+    {
+        $response = $this->handleRequest([
+            'id' => $this->testDraft->id,
+            'slices' => $slices,
+            'factions' => $factions,
+            'order' => $order,
+            'admin' => $this->testDraft->secrets->adminSecret,
+        ]);
+
+        $this->assertCommandWasDispatchedWith(
+            RegenerateDraft::class,
+            function (RegenerateDraft $cmd) use ($slices, $factions, $order): void {
+                $this->assertSame($cmd->regenerateSlices, $slices == 'true');
+                $this->assertSame($cmd->regenerateFactions, $factions == 'true');
+                $this->assertSame($cmd->regenerateOrder, $order == 'true');
+            },
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Http/RequestHandlers/HandleUndoRequest.php b/app/Http/RequestHandlers/HandleUndoRequest.php
index bed75f5..3734aa5 100644
--- a/app/Http/RequestHandlers/HandleUndoRequest.php
+++ b/app/Http/RequestHandlers/HandleUndoRequest.php
@@ -4,13 +4,31 @@
 
 namespace App\Http\RequestHandlers;
 
+use App\Draft\Commands\UndoLastPick;
 use App\Http\HttpResponse;
-use App\Http\RequestHandler;
+use App\Http\JsonResponse;
 
-class HandleUndoRequest extends RequestHandler
+class HandleUndoRequest extends DraftRequestHandler
 {
     public function handle(): HttpResponse
     {
-        // @todo
+        $draft = $this->loadDraftByUrlId();
+
+        if ($draft == null) {
+            return $this->error('Draft not found', 404);
+        }
+
+        $adminSecret = $this->request->get('admin');
+
+        if (! $draft->secrets->checkAdminSecret($adminSecret)) {
+            return $this->error('Only the admin can undo picks', 403);
+        }
+
+        dispatch(new UndoLastPick($draft));
+
+        return new JsonResponse([
+            'draft' => $draft->toArray(),
+            'success' => true,
+        ]);
     }
 }
\ No newline at end of file
diff --git a/app/Http/RequestHandlers/HandleUndoRequestTest.php b/app/Http/RequestHandlers/HandleUndoRequestTest.php
new file mode 100644
index 0000000..482a66b
--- /dev/null
+++ b/app/Http/RequestHandlers/HandleUndoRequestTest.php
@@ -0,0 +1,51 @@
+assertIsConfiguredAsHandlerForRoute('/api/undo');
+    }
+
+    #[Test]
+    public function itReturnsErrorIfDraftNotFound(): void
+    {
+        $response = $this->handleRequest(['id' => '12344']);
+
+        $this->assertResponseNotFound($response);
+        $this->assertResponseJson($response);
+        $this->assertJsonResponseSame(['error' => 'Draft not found'], $response);
+    }
+
+    #[Test]
+    public function itReturnsErrorIfNotAdmin(): void
+    {
+        $response = $this->handleRequest(['id' => $this->testDraft->id, 'admin' => 'not-the-correct-secret']);
+        $this->assertForbidden($response);
+    }
+
+    #[Test]
+    public function itDispatchesTheCommand(): void
+    {
+        $response = $this->handleRequest(['id' => $this->testDraft->id, 'admin' => $this->testDraft->secrets->adminSecret]);
+        $this->assertResponseOk($response);
+        $this->assertResponseJson($response);
+        $this->assertCommandWasDispatched(UndoLastPick::class);
+    }
+}
\ No newline at end of file
diff --git a/app/Shared/IdStringBehavior.php b/app/Shared/IdStringBehavior.php
index 86346e9..670fc8b 100644
--- a/app/Shared/IdStringBehavior.php
+++ b/app/Shared/IdStringBehavior.php
@@ -24,4 +24,9 @@ public function __toString(): string
     {
         return $this->value;
     }
+
+    public function equals(\Stringable $other): bool
+    {
+        return $other->__toString() === $this->__toString();
+    }
 }
\ No newline at end of file
diff --git a/app/TwilightImperium/Tile.php b/app/TwilightImperium/Tile.php
index 72f6112..cc12a72 100644
--- a/app/TwilightImperium/Tile.php
+++ b/app/TwilightImperium/Tile.php
@@ -13,7 +13,7 @@ class Tile
     public float $optimalTotal = 0;
 
     /**
-     * @var array
+     * @var array
      */
     private static array $allTileData;
 
@@ -63,7 +63,7 @@ public static function fromJsonData(
             array_map(fn(array $stationData) => SpaceStation::fromJsonData($stationData), $data['stations'] ?? []),
             Wormhole::fromJsonData($data['wormhole']),
             $data['anomaly'] ?? null,
-            isset($data['hyperlanes']) ? $data['hyperlanes'] : [],
+            $data['hyperlanes'] ?? [],
         );
     }
 
@@ -145,18 +145,23 @@ public static function all(): array
             // merge tier and tile data
             // We're keeping it in separate files for maintainability
             foreach ($allTileData as $tileId => $tileData) {
-                $isMecRexOrMallice = count($tileData['planets']) > 0 &&
-                    ($tileData['planets'][0]['name'] == 'Mecatol Rex' || $tileData['planets'][0]['name'] == 'Mallice');
 
-                $tier = match($tileData['type']) {
-                    'red' => TileTier::RED,
-                    'blue' => $isMecRexOrMallice ? TileTier::NONE : $tileTiers[$tileId],
-                    default => TileTier::NONE,
-                };
+                $nonDraftable = isset($tileData['nonDraftable']) && $tileData['nonDraftable'] == true;
 
-                $tiles[$tileId] = Tile::fromJsonData((string) $tileId, $tier, $tileData);
-            }
+                if ($nonDraftable) {
+                    $tier = TileTier::NONE;
+                } else {
+                    $tier = match($tileData['type']) {
+                        'red' => TileTier::RED,
+                        'blue' => $tileTiers[$tileId],
+                        default => TileTier::NONE,
+                    };
+                }
 
+                $tile = Tile::fromJsonData((string) $tileId, $tier, $tileData);
+
+                $tiles[$tileId] = $tile;
+            }
             self::$allTileData = $tiles;
         }
 
diff --git a/app/api/data.php b/app/api/data.php
deleted file mode 100644
index 9c7dc78..0000000
--- a/app/api/data.php
+++ /dev/null
@@ -1,12 +0,0 @@
- $draft,
-    'success' => true,
-]);
diff --git a/app/api/generate.php b/app/api/generate.php
deleted file mode 100644
index eeaad77..0000000
--- a/app/api/generate.php
+++ /dev/null
@@ -1,31 +0,0 @@
-isAdminPass(get('admin'))) return_error('You are not allowed to do this');
-    if (! empty($draft->log())) return_error('Draft already in progress');
-
-    $regen_slices = get('shuffle_slices', 'false') == 'true';
-    $regen_factions = get('shuffle_factions', 'false') == 'true';
-    $regen_order = get('shuffle_order', 'false') == 'true';
-
-    $draft->regenerate($regen_slices, $regen_factions, $regen_order);
-
-    return_data([
-        'ok' => true,
-    ]);
-} else {
-    $config = new GeneratorConfig(true);
-    $draft = DeprecatedDraft::createFromConfig($config);
-    $draft->save();
-    return_data([
-        'id' => $draft->getId(),
-        'admin' => $draft->getAdminPass(),
-    ]);
-}
diff --git a/app/api/pick.php b/app/api/pick.php
deleted file mode 100644
index 4b1bc9d..0000000
--- a/app/api/pick.php
+++ /dev/null
@@ -1,29 +0,0 @@
-isAdminPass(get('admin'));
-if ($draft == null) return_error('draft not found');
-if ($player != $draft->currentPlayer() && ! $is_admin) return_error('Not your turn!');
-
-// Not enforcing this here yet because it would break for older drafts
-if (! $is_admin && ! $draft->isPlayerSecret($player, get('secret'))) return_error('You are not allowed to do this!');
-
-if ($index != count($draft->log())) {
-    return_error('Draft data out of date, meaning: stuff has been picked or undone while this tab was open.');
-}
-
-$draft->pick($player, $category, $value);
-
-return_data([
-    'draft' => $draft,
-    'success' => true,
-]);
diff --git a/app/api/restore.php b/app/api/restore.php
deleted file mode 100644
index 61a0c3d..0000000
--- a/app/api/restore.php
+++ /dev/null
@@ -1,22 +0,0 @@
-isAdminPass($secret)) {
-  return return_data([
-      'admin' => $secret,
-      'success' => true,
-  ]);
-}
-
-$playerId = $draft->getPlayerIdBySecret($secret);
-
-if (! $playerId) return return_error('No session found with that passkey');
-return_data([
-    'player' => $playerId,
-    'secret' => $secret,
-    'success' => true,
-]);
diff --git a/app/api/undo.php b/app/api/undo.php
deleted file mode 100644
index b878b25..0000000
--- a/app/api/undo.php
+++ /dev/null
@@ -1,17 +0,0 @@
-isAdminPass(get('admin'));
-
-if (! $is_admin) return_error('Only the admin can undo');
-if (! count($draft->log())) return_error('Nothing to undo');
-
-$draft->undoLastAction();
-
-return_data([
-    'draft' => $draft,
-    'success' => true,
-]);
diff --git a/app/helpers.php b/app/helpers.php
index 5cffd03..2695baf 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -60,7 +60,7 @@ function yesno($condition): string
 }
 
 if (! function_exists('env')) {
-    function env($key, $defaultValue = null): ?string
+    function env($key, $defaultValue = null)
     {
         return $_ENV[$key] ?? $defaultValue;
     }
@@ -91,6 +91,13 @@ function url($uri): string
     }
 }
 
+if (! function_exists('asset_url')) {
+    function asset_url($uri): string
+    {
+        return url($uri . '?v=' . (env('DEBUG', false) ? (string) time() : env('VERSION')));
+    }
+}
+
 if (! function_exists('ordinal')) {
     function ordinal($number): string
     {
diff --git a/data/TileDataTest.php b/data/TileDataTest.php
index de389a1..19f68f9 100644
--- a/data/TileDataTest.php
+++ b/data/TileDataTest.php
@@ -81,21 +81,33 @@ public function allHistoricTileIdsHaveData()
 
     #[Test]
     #[DataProvider('allJsonTiles')]
-    public function allBlueTilesAreInTiers($id, $data)
+    public function allDraftableBlueTilesAreInTiers($id, $data)
     {
         $tileTiers = Tile::tierData();
 
-        $isMecRexOrMallice = count($data['planets']) > 0 &&
-            ($data['planets'][0]['name'] == "Mecatol Rex" || $data['planets'][0]['name'] == "Mallice");
+        $nonDraftAble = (isset($data['nonDraftable']) && $data['nonDraftable'] == true);
 
-
-        if ($data['type'] == "blue" && !$isMecRexOrMallice) {
+        if ($data['type'] == "blue" && !$nonDraftAble) {
             $this->assertArrayHasKey($id, $tileTiers);
         } else {
             $this->expectNotToPerformAssertions();
         }
     }
 
+
+    #[Test]
+    #[DataProvider('allJsonTiles')]
+    public function allNonDraftableTilesAreMarked($id, $data)
+    {
+        $nonDraftAble = (isset($data['nonDraftable']) && $data['nonDraftable'] == true);
+
+        if (in_array($id, ['18', '81', '112', '82'])) {
+            $this->assertTrue($nonDraftAble);
+        } else {
+            $this->assertFalse($nonDraftAble);
+        }
+    }
+
     #[Test]
     #[DataProvider('allJsonTiles')]
     public function tilesCanBeFetchedFromJson($id, $data)
diff --git a/data/tiles.json b/data/tiles.json
index 6781d98..d4a2511 100644
--- a/data/tiles.json
+++ b/data/tiles.json
@@ -337,6 +337,7 @@
     "18": {
         "type": "blue",
         "wormhole": null,
+        "nonDraftable": true,
         "planets": [
             {
                 "name": "Mecatol Rex",
@@ -1379,27 +1380,29 @@
       "set": "PoK"
     },
     "79": {
-        "type": "red",
-        "wormhole": "alpha",
-        "anomaly": "asteroid-field",
-        "planets": [],
+      "type": "red",
+      "wormhole": "alpha",
+      "anomaly": "asteroid-field",
+      "planets": [],
       "set": "PoK"
     },
     "80": {
-        "type": "red",
-        "wormhole": null,
-        "anomaly": "supernova",
-        "planets": [],
+      "type": "red",
+      "wormhole": null,
+      "anomaly": "supernova",
+      "planets": [],
       "set": "PoK"
     },
     "81": {
-        "type": "red",
-        "wormhole": null,
-        "anomaly": "muaat-supernova",
-        "planets": [],
-      "set": "PoK"
+      "type": "red",
+      "wormhole": null,
+      "anomaly": "muaat-supernova",
+      "planets": [],
+      "set": "PoK",
+      "nonDraftable": true
     },
     "82": {
+        "nonDraftable": true,
         "type": "blue",
         "wormhole": "all",
         "planets": [
@@ -2163,6 +2166,7 @@
         "type": "blue",
         "wormhole": null,
         "anomaly": null,
+        "nonDraftable": true,
         "planets": [
             {
                 "name": "Mecatol Rex",
diff --git a/js/draft.js b/js/draft.js
index 26ca4af..39b71f7 100644
--- a/js/draft.js
+++ b/js/draft.js
@@ -149,11 +149,11 @@ $(document).ready(function () {
                     url: window.routes.regenerate,
                     dataType: 'json',
                     data: {
-                        'regen': draft.id,
+                        'id': draft.id,
                         'admin': localStorage.getItem('admin_' + draft.id),
-                        'shuffle_slices': $('#shuffle_slices').is(':checked'),
-                        'shuffle_factions': $('#shuffle_factions').is(':checked'),
-                        'shuffle_order': $('#shuffle_order').is(':checked'),
+                        'slices': $('#shuffle_slices').is(':checked'),
+                        'factions': $('#shuffle_factions').is(':checked'),
+                        'order': $('#shuffle_order').is(':checked'),
                     },
                     success: function (resp) {
                         if (resp.error) {
@@ -176,7 +176,7 @@ $(document).ready(function () {
                     url: window.routes.undo,
                     dataType: 'json',
                     data: {
-                        'draft': draft.id,
+                        'id': draft.id,
                         'admin': localStorage.getItem('admin_' + draft.id),
                     },
                     success: function (resp) {
@@ -416,15 +416,16 @@ function draft_status() {
     }
 
     $('#log-content').html(log);
+    $('.player').removeClass('active');
 
     if (draft.done) {
         $('#turn').removeClass('show');
         $('#done').addClass('show');
+        return;
     } else {
         $('#turn').addClass('show');
     }
 
-    $('.player').removeClass('active');
     $('#player-' + current_player.id).addClass('active');
 
     if (IS_ADMIN) {
@@ -538,7 +539,6 @@ function session_status() {
 }
 
 function hide_regen() {
-
     $('#tabs nav a[href="#regen"]').hide();
     $('.regen-help').hide();
 }
diff --git a/templates/draft.php b/templates/draft.php
index ea37463..3e1e246 100644
--- a/templates/draft.php
+++ b/templates/draft.php
@@ -9,13 +9,13 @@
     
     
     <?= $draft->settings->name ?> | TI4 - Milty Draft
-    
+    
     
     
     
 
 
-    
+    
 
     
     
@@ -430,16 +430,16 @@
         window.routes = {
             "claim": "",
             "pick": "",
-            "regenerate": "",
+            "regenerate": "",
             "tile_images": "",
             "data": "id) ?>",
             "undo": "",
             "restore": ""
         }
     
-    
-    
-    
+    
+    
+    
 
 
 

From 407777e6ab0d9524a7f1bce3ca3309313df89d45 Mon Sep 17 00:00:00 2001
From: Sam Tubbax 
Date: Sat, 27 Dec 2025 15:52:05 +0100
Subject: [PATCH 28/34] PHPStan fixes

---
 .github/workflows/code-analysis.yml | 24 ++++++++++++++++++++++++
 app/Draft/Slice.php                 |  2 +-
 app/TwilightImperium/Faction.php    |  7 +++++--
 app/helpers.php                     |  4 ++--
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/code-analysis.yml

diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml
new file mode 100644
index 0000000..7f39f26
--- /dev/null
+++ b/.github/workflows/code-analysis.yml
@@ -0,0 +1,24 @@
+name: test
+
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+  workflow_call:
+
+concurrency:
+  group: 'test-${{ github.ref_name }}'
+  cancel-in-progress: true
+
+env:
+  APP_VERSION: ${{ format('0.0.0-build{0}', github.run_number) }}
+
+jobs:
+  app:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - run: composer install --prefer-dist --no-ansi --no-interaction --no-progress
+      - run: composer cs:check
+      - run: composer phpstan
diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php
index 1a4c351..c5dc2b6 100644
--- a/app/Draft/Slice.php
+++ b/app/Draft/Slice.php
@@ -39,7 +39,7 @@ function __construct(
     ) {
         // if the slice doesn't have 5 tiles in it, something went awry
         if (count($this->tiles) != 5) {
-            throw InvalidSliceException::notEnoughTiles();
+            throw new \Exception('Slice does not have enough tiles');
         }
 
         foreach ($tiles as $tile) {
diff --git a/app/TwilightImperium/Faction.php b/app/TwilightImperium/Faction.php
index 673908d..3c4c102 100644
--- a/app/TwilightImperium/Faction.php
+++ b/app/TwilightImperium/Faction.php
@@ -40,9 +40,12 @@ public static function fromJson($data)
      */
     public static function all(): array
     {
-        $rawData = json_decode(file_get_contents('data/factions.json'), true);
+        if (! isset(self::$allFactionData)) {
+            $rawData = json_decode(file_get_contents('data/factions.json'), true);
+            self::$allFactionData = array_map(fn ($factionData) => self::fromJson($factionData), $rawData);
+        }
 
-        return array_map(fn ($factionData) => self::fromJson($factionData), $rawData);
+        return self::$allFactionData;
     }
 
     //
diff --git a/app/helpers.php b/app/helpers.php
index 2695baf..50eb78c 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -51,7 +51,7 @@ function e($condition, $yes, $no = ''): void
      * return "yes" or "no" based on condition
      *
      * @param $condition
-     * @return void
+     * @return string
      */
     function yesno($condition): string
     {
@@ -70,7 +70,7 @@ function env($key, $defaultValue = null)
     function human_filesize($bytes, $dec = 2): string {
 
         $size = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-        $factor = floor((strlen($bytes) - 1) / 3);
+        $factor = (int) floor((strlen($bytes) - 1) / 3);
         if ($factor == 0) $dec = 0;
 
         return sprintf("%.{$dec}f %s", $bytes / (1024 ** $factor), $size[$factor]);

From 00bb0b1c8149bc8b7309379798d199cee2c36e79 Mon Sep 17 00:00:00 2001
From: Sam Tubbax 
Date: Sat, 27 Dec 2025 16:03:18 +0100
Subject: [PATCH 29/34] Disable XDEbug in pipeline

---
 .github/workflows/code-analysis.yml    | 4 +++-
 .github/workflows/test-application.yml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml
index 7f39f26..d4dde89 100644
--- a/.github/workflows/code-analysis.yml
+++ b/.github/workflows/code-analysis.yml
@@ -1,4 +1,4 @@
-name: test
+name: code-analysis
 
 on:
   pull_request:
@@ -19,6 +19,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - name: Disable Xdebug
+        run: sudo phpdismod xdebug
       - run: composer install --prefer-dist --no-ansi --no-interaction --no-progress
       - run: composer cs:check
       - run: composer phpstan
diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml
index c3f7b61..20b37eb 100644
--- a/.github/workflows/test-application.yml
+++ b/.github/workflows/test-application.yml
@@ -24,5 +24,7 @@ jobs:
           - data
     steps:
       - uses: actions/checkout@v5
+      - name: Disable Xdebug
+        run: sudo phpdismod xdebug
       - run: composer install --prefer-dist --no-ansi --no-interaction --no-progress
       - run: composer paratest -- --processes=4 --testsuite ${{ matrix.testsuite }}

From f423aa5f889f72b44ecc6e88690498701c5a45e7 Mon Sep 17 00:00:00 2001
From: Sam Tubbax 
Date: Sat, 27 Dec 2025 16:05:12 +0100
Subject: [PATCH 30/34] Make test drafts folder

---
 .github/workflows/test-application.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml
index 20b37eb..c79721c 100644
--- a/.github/workflows/test-application.yml
+++ b/.github/workflows/test-application.yml
@@ -26,5 +26,7 @@ jobs:
       - uses: actions/checkout@v5
       - name: Disable Xdebug
         run: sudo phpdismod xdebug
+      - name: Create test folder
+        run: mkdir tmp/test-drafts
       - run: composer install --prefer-dist --no-ansi --no-interaction --no-progress
       - run: composer paratest -- --processes=4 --testsuite ${{ matrix.testsuite }}

From de1cfe2018a3ee05bb5cee48703b36ba91dcc4f5 Mon Sep 17 00:00:00 2001
From: Sam Tubbax 
Date: Sat, 27 Dec 2025 16:05:46 +0100
Subject: [PATCH 31/34] Fix cs

---
 app/Draft/Slice.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php
index c5dc2b6..5287f4a 100644
--- a/app/Draft/Slice.php
+++ b/app/Draft/Slice.php
@@ -4,7 +4,6 @@
 
 namespace App\Draft;
 
-use App\Draft\Exceptions\InvalidSliceException;
 use App\TwilightImperium\TechSpecialties;
 use App\TwilightImperium\Tile;
 use App\TwilightImperium\Wormhole;

From c7c5671635665c173f3ff24594cfcfca9a6d8cf1 Mon Sep 17 00:00:00 2001
From: Sam Tubbax 
Date: Sat, 27 Dec 2025 16:07:08 +0100
Subject: [PATCH 32/34] Make test drafts folder

---
 .github/workflows/test-application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml
index c79721c..8540f49 100644
--- a/.github/workflows/test-application.yml
+++ b/.github/workflows/test-application.yml
@@ -27,6 +27,6 @@ jobs:
       - name: Disable Xdebug
         run: sudo phpdismod xdebug
       - name: Create test folder
-        run: mkdir tmp/test-drafts
+        run: mkdir tmp && mkdir tmp/test-drafts
       - run: composer install --prefer-dist --no-ansi --no-interaction --no-progress
       - run: composer paratest -- --processes=4 --testsuite ${{ matrix.testsuite }}

From b76319518b90d8e4a4312e603b5de902e029eb5d Mon Sep 17 00:00:00 2001
From: Sam Tubbax 
Date: Sun, 28 Dec 2025 14:28:12 +0100
Subject: [PATCH 33/34] Refactor frontend to use tilesets and factionsets

---
 README.md                                     |   5 +-
 .../InvalidDraftSettingsException.php         |   2 +-
 app/Draft/Slice.php                           |   6 +-
 .../HandleGenerateDraftRequest.php            |  39 +++--
 .../HandleGenerateDraftRequestTest.php        |  57 ++-----
 app/TwilightImperium/Edition.php              |   1 -
 data/factions.json                            |  71 ++++----
 js/main.js                                    | 154 +++++++++++-------
 templates/factions.php                        |  14 +-
 templates/generate.php                        | 124 +++++++-------
 10 files changed, 260 insertions(+), 213 deletions(-)

diff --git a/README.md b/README.md
index c433bab..a0f2fdc 100644
--- a/README.md
+++ b/README.md
@@ -30,12 +30,11 @@ If you want to, you can add the certificate to your device's truster certificate
 Frontend runs on vanilla JS/jQuery (I'm aware jQuery is a bit of a blast from the past at this point; sue me and/or change it and PR me if you want) and the Back-end is vanilla PHP.
 As such there's no build-system, or compiling required except for the steps described above.
 
-To make this app as lean and mean (and easy to understand for anyone) as possible, external dependencies, both in the front- and backend should be kept to an absolute minimum. 
+To make this app as lean and mean (and easy to understand for anyone) as possible, external dependencies, both in the front- and backend should be kept to an absolute minimum.
 
 ### Understanding the App flow
 
 1. Players come in on index.php and choose their options. 
 2. A JSON config file is created (either locally or remotely, depending on .env settings) with a unique ID
-3. That Draft ID is also the Draft URL: APP_URL/d/{draft-id} (URL rewriting is done via Caddy)
+3. That Draft ID is also the Draft URL: APP_URL/d/{draft-id} (URL rewriting is done via Caddy locally)
 4. Players (or the Admin) make draft choices, which updates the draft json file (with very loose security, since we're assuming a very low amount of bad actors)
-
diff --git a/app/Draft/Exceptions/InvalidDraftSettingsException.php b/app/Draft/Exceptions/InvalidDraftSettingsException.php
index b73943e..6b26754 100644
--- a/app/Draft/Exceptions/InvalidDraftSettingsException.php
+++ b/app/Draft/Exceptions/InvalidDraftSettingsException.php
@@ -41,7 +41,7 @@ public static function notEnoughTilesForSlices(float $maxSlices): self
 
     public static function notEnoughSlicesForLegendaryPlanets(): self
     {
-        return new self('Cannot have more slices than legendary planets');
+        return new self('Cannot have more legendary planets than slices');
     }
 
     public static function notEnoughLegendaryPlanets(int $max): self
diff --git a/app/Draft/Slice.php b/app/Draft/Slice.php
index 5287f4a..c80c95c 100644
--- a/app/Draft/Slice.php
+++ b/app/Draft/Slice.php
@@ -122,10 +122,14 @@ public function validate(
 
     public function arrange(Seed $seed): bool {
         $tries = 0;
+        // always shuffle at least once
+        $seed->setForSlices($tries);
+        shuffle($this->tiles);
+
         while (! $this->tileArrangementIsValid()) {
+            $tries++;
             $seed->setForSlices($tries);
             shuffle($this->tiles);
-            $tries++;
 
             if ($tries > self::MAX_ARRANGEMENT_TRIES) {
                 return false;
diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php
index cf2f23e..5689005 100644
--- a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php
+++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php
@@ -14,6 +14,7 @@
 use App\Http\RequestHandler;
 use App\TwilightImperium\AllianceTeamMode;
 use App\TwilightImperium\AllianceTeamPosition;
+use App\TwilightImperium\Edition;
 
 class HandleGenerateDraftRequest extends RequestHandler
 {
@@ -74,18 +75,8 @@ private function settingsFromRequest(): Settings
             new Seed($this->request->get('seed') != null ? (int) $this->request->get('seed') : null),
             (int) $this->request->get('num_slices'),
             (int) $this->request->get('num_factions'),
-            Settings::tileSetsFromPayload([
-                'include_pok' => $this->request->get('include_pok') == 'on',
-                'include_ds_tiles' => $this->request->get('include_ds_tiles') == 'on',
-                'include_te_tiles' => $this->request->get('include_te_tiles') == 'on',
-            ]),
-            Settings::factionSetsFromPayload([
-                'include_base_factions' => $this->request->get('include_base_factions') == 'on',
-                'include_pok_factions' => $this->request->get('include_pok_factions') == 'on',
-                'include_te_factions' => $this->request->get('include_te_factions') == 'on',
-                'include_discordant' => $this->request->get('include_discordant') == 'on',
-                'include_discordantexp' => $this->request->get('include_discordantexp') == 'on',
-            ]),
+            $this->tileSetsFromRequest(),
+            $this->factionSetsFromRequest(),
             $this->request->get('include_keleres') == 'on',
             $this->request->get('wormholes', 0) == 1,
             $this->request->get('max_wormhole') == 'on',
@@ -103,6 +94,30 @@ private function settingsFromRequest(): Settings
         );
     }
 
+    protected function tileSetsFromRequest()
+    {
+        $sets = [Edition::BASE_GAME];
+        foreach($this->request->get('tileSets', []) as $key => $value) {
+            $edition = Edition::from($key);
+            if ($value == 'on' && !in_array($edition, $sets)) {
+                $sets[] = $edition;
+            }
+        }
+
+        return $sets;
+    }
+
+    protected function factionSetsFromRequest()
+    {
+        $sets = [];
+        foreach($this->request->get('factionSets', []) as $key => $value) {
+            if ($value == 'on') {
+                $sets[] = Edition::from($key);
+            }
+        }
+        return $sets;
+    }
+
     /** used for tests */
     public function settingValue($field) {
         return $this->settings->$field;
diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php
index 487800f..b872d96 100644
--- a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php
+++ b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php
@@ -110,68 +110,44 @@ public static function settingsPayload()
             'expected' => 7,
             'expectedWhenNotSet' => 0,
         ];
-        yield 'Tile set POK' => [
+        yield 'Tile sets (official)' => [
             'postData' => [
-                'include_pok' => 'on',
+                'tileSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on'],
             ],
             'field' => 'tileSets',
-            'expected' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS],
+            'expected' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE],
             'expectedWhenNotSet' => [Edition::BASE_GAME],
         ];
-        yield 'Tile set DS' => [
+        yield 'Tile sets (everything)' => [
             'postData' => [
-                'include_ds_tiles' => 'on',
+                'tileSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on', 'DSPlus' => 'on'],
             ],
             'field' => 'tileSets',
-            'expected' => [Edition::BASE_GAME, Edition::DISCORDANT_STARS_PLUS],
+            'expected' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE, Edition::DISCORDANT_STARS_PLUS],
             'expectedWhenNotSet' => [Edition::BASE_GAME],
         ];
-        yield 'Tile set TE' => [
+        yield 'Faction sets (base only)' => [
             'postData' => [
-                'include_te_tiles' => 'on',
-            ],
-            'field' => 'tileSets',
-            'expected' => [Edition::BASE_GAME, Edition::THUNDERS_EDGE],
-            'expectedWhenNotSet' => [Edition::BASE_GAME],
-        ];
-        yield 'Faction set basegame' => [
-            'postData' => [
-                'include_base_factions' => 'on',
+                'factionSets' => ['BaseGame' => 'on'],
             ],
             'field' => 'factionSets',
             'expected' => [Edition::BASE_GAME],
             'expectedWhenNotSet' => [],
         ];
-        yield 'Faction set pok' => [
-            'postData' => [
-                'include_pok_factions' => 'on',
-            ],
-            'field' => 'factionSets',
-            'expected' => [Edition::PROPHECY_OF_KINGS],
-            'expectedWhenNotSet' => [],
-        ];
-        yield 'Faction set te' => [
-            'postData' => [
-                'include_te_factions' => 'on',
-            ],
-            'field' => 'factionSets',
-            'expected' => [Edition::THUNDERS_EDGE],
-            'expectedWhenNotSet' => [],
-        ];
-        yield 'Faction set ds' => [
+        yield 'Faction sets (official)' => [
             'postData' => [
-                'include_discordant' => 'on',
+                'factionSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on'],
             ],
             'field' => 'factionSets',
-            'expected' => [Edition::DISCORDANT_STARS],
+            'expected' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE],
             'expectedWhenNotSet' => [],
         ];
-        yield 'Faction set ds+' => [
+        yield 'Faction sets (all)' => [
             'postData' => [
-                'include_discordantexp' => 'on',
+                'factionSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on', 'DS' => 'on', 'DSPlus' => 'on'],
             ],
             'field' => 'factionSets',
-            'expected' => [Edition::DISCORDANT_STARS_PLUS],
+            'expected' => [Edition::BASE_GAME, Edition::PROPHECY_OF_KINGS, Edition::THUNDERS_EDGE, Edition::DISCORDANT_STARS, Edition::DISCORDANT_STARS_PLUS],
             'expectedWhenNotSet' => [],
         ];
         yield 'Council Keleres' => [
@@ -288,11 +264,10 @@ public function itGeneratesADraft(): void
         $response = $this->handleRequest([
             'num_players' => 4,
             'player' => ['John', 'Paul', 'George', 'Ringo'],
-            'include_pok' => true,
+            'tileSets' => ['BaseGame'  => 'on', 'PoK' => 'on', 'TE' => 'on'],
+            'factionSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on'],
             'num_slices' => 4,
             'num_factions' => 4,
-            'include_pok_factions' => true,
-            'include_base_factions' => true,
         ]);;
 
         $this->assertCommandWasDispatched(GenerateDraft::class);
diff --git a/app/TwilightImperium/Edition.php b/app/TwilightImperium/Edition.php
index 8e80e0b..5906555 100644
--- a/app/TwilightImperium/Edition.php
+++ b/app/TwilightImperium/Edition.php
@@ -6,7 +6,6 @@
 
 enum Edition: string
 {
-
     case BASE_GAME = 'BaseGame';
     case PROPHECY_OF_KINGS = 'PoK';
     case THUNDERS_EDGE = 'TE';
diff --git a/data/factions.json b/data/factions.json
index cb4fa36..c24923c 100644
--- a/data/factions.json
+++ b/data/factions.json
@@ -175,6 +175,41 @@
         "homesystem": "0",
         "set": "keleres"
     },
+    "Last Bastion": {
+      "id": "last_bastion",
+      "name": "Last Bastion",
+      "homesystem": "92",
+      "wiki": "https://twilight-imperium.fandom.com/wiki/Last_Bastion",
+      "set": "te"
+    },
+    "The Ral Nel Consortium": {
+      "id": "ral_nel",
+      "name": "The Ral Nel Consortium",
+      "homesystem": "93",
+      "wiki": "https://twilight-imperium.fandom.com/wiki/The_Ral_Nel_Consortium",
+      "set": "te"
+    },
+    "The Deepwrought Scholarate": {
+      "id": "deepwrought_scholarate",
+      "name": "The Deepwrought Scholarate",
+      "homesystem": "95",
+      "wiki": "https://twilight-imperium.fandom.com/wiki/The_Deepwrought_Scholarate",
+      "set": "te"
+    },
+    "The Crimson Rebellion": {
+      "id": "crimson_rebellion",
+      "name": "The Crimson Rebellion",
+      "homesystem": "94",
+      "wiki": "https://twilight-imperium.fandom.com/wiki/The_Crimson_Rebellion",
+      "set": "te"
+    },
+    "The Firmament / The Obsidian": {
+      "id": "firmament_obsidian",
+      "name": "The Firmament / The Obsidian",
+      "homesystem": "96a",
+      "wiki": "https://twilight-imperium.fandom.com/wiki/The_Firmament_/_The_Obsidian",
+      "set": "te"
+    },
     "Augurs of Ilyxum": {
         "id": "ilyxum",
         "name": "Augurs of Ilyxum",
@@ -412,41 +447,5 @@
         "homesystem": "4231",
         "wiki": "https://twilight-imperium.fandom.com/wiki/Nokar_Sellships_(UNOFFICIAL)",
         "set": "discordantexp"
-    },
-    "Last Bastion": {
-        "id": "last_bastion",
-        "name": "Last Bastion",
-        "homesystem": "92",
-        "wiki": "https://twilight-imperium.fandom.com/wiki/Last_Bastion",
-        "set": "te"
-    },
-    "The Ral Nel Consortium": {
-        "id": "ral_nel",
-        "name": "The Ral Nel Consortium",
-        "homesystem": "93",
-        "wiki": "https://twilight-imperium.fandom.com/wiki/The_Ral_Nel_Consortium",
-        "set": "te"
-    },
-    "The Deepwrought Scholarate": {
-        "id": "deepwrought_scholarate",
-        "name": "The Deepwrought Scholarate",
-        "homesystem": "95",
-        "wiki": "https://twilight-imperium.fandom.com/wiki/The_Deepwrought_Scholarate",
-        "set": "te"
-    },
-    "The Crimson Rebellion": {
-        "id": "crimson_rebellion",
-        "name": "The Crimson Rebellion",
-        "homesystem": "94",
-        "wiki": "https://twilight-imperium.fandom.com/wiki/The_Crimson_Rebellion",
-        "set": "te"
-    },
-    "The Firmament / The Obsidian": {
-        "id": "firmament_obsidian",
-        "name": "The Firmament / The Obsidian",
-        "homesystem": "96a",
-        "wiki": "https://twilight-imperium.fandom.com/wiki/The_Firmament_/_The_Obsidian",
-        "set": "te"
     }
-
 }
diff --git a/js/main.js b/js/main.js
index 0cf69b5..f2330ab 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,10 +1,49 @@
 let advanced_open = false;
 let alliance_mode = false;
 
+const EDITIONS = {
+    BASEGAME: {
+        id: 'BaseGame',
+        maxFactions: 17,
+        maxSlices: 5,
+        maxLegendaries: 0,
+    },
+    POK: {
+        id: 'PoK',
+        maxFactions: 7,
+        maxSlices: 4,
+        maxLegendaries: 2,
+    },
+    TE: {
+        id: 'TE',
+        maxFactions: 7,
+        maxSlices: 3,
+        maxLegendaries: 5
+    },
+    DS: {
+        id: 'DS',
+        maxFactions: 24,
+        maxSlices: 0,
+        maxLegendaries: 0
+    },
+    DSPLUS: {
+        id: 'DSPlus',
+        maxFactions: 10,
+        maxSlices: 1,
+        maxLegendaries: 5
+    },
+};
+
 $(document).ready(function () {
+    $('input[data-toggle-expansion]').each((_, el) => {
+        toggleExpansion($(el));
+    }).on('change', (e) => {
+        toggleExpansion($(e.currentTarget))
+    });
+
+    // @todo initial check
+    // @todo disable DS/DSPlus when Pok is disabled
 
-    pok_check();
-    $('#pok').on('change', pok_check);
     $('.draft-faction').on('change', faction_check);
 
     $('#tabs nav a').on('click', function (e) {
@@ -62,16 +101,17 @@ $(document).ready(function () {
         const request = new XMLHttpRequest();
         request.open("POST", routes.generate);
         request.onreadystatechange = function () {
-            if (request.readyState != 4 || request.status != 200) return;
+            if (request.readyState != 4) return;
+
+
 
             let data = JSON.parse(request.responseText);
 
             if (data.error) {
                 $('#error').show().html(data.error);
                 loading(false);
-            } else {
+            } else if (request.status == 200) {
                 localStorage.setItem('admin_' + data.id, data.admin);
-
                 window.location.href = "d/" + data.id + '?fresh=1';
             }
             // alert("Success: " + r.responseText);
@@ -97,6 +137,54 @@ $(document).ready(function () {
     init_player_count();
 });
 
+function toggleExpansion($checkbox) {
+    const expansion = $checkbox.data('toggle-expansion');
+    $checkbox.is(':checked') ? enableExpansion(expansion) : disableExpansion(expansion);
+}
+
+function enableExpansion(expansion) {
+    $('[data-expansion="' + expansion + '"]')
+        .prop('disabled', false)
+        .removeClass('disabled');
+    $('.check[data-expansion="' + expansion + '"] input').each((_, el) => {
+        $checkbox = $(el);
+        $checkbox.prop('disabled', false)
+        $checkbox.prop('checked', $checkbox.hasClass('auto-enable'))
+    });
+
+    if (expansion == 'PoK') {
+        toggleDiscordantAvailability(true);
+    }
+}
+
+function toggleDiscordantAvailability(pokIsEnabled) {
+
+    if (pokIsEnabled) {
+        $('[data-toggle-expansion="DS"]').prop('disabled', false).parent().removeClass('disabled');
+        $('[data-toggle-expansion="DSPlus"]').prop('disabled', false).parent().removeClass('disabled');
+    } else {
+        $('[data-toggle-expansion="DS"]').prop('disabled', true).parent().addClass('disabled');
+        $('[data-toggle-expansion="DSPlus"]').prop('disabled', true).parent().addClass('disabled');
+        disableExpansion('DS');
+        disableExpansion('DSPlus');
+    }
+}
+
+function disableExpansion(expansion) {
+    $('[data-expansion="' + expansion + '"]')
+        .prop('disabled', true)
+        .addClass('disabled');
+    $('.check[data-expansion="' + expansion + '"] input').each((_, el) => {
+        $checkbox = $(el);
+        $checkbox.prop('disabled', true)
+        $checkbox.prop('checked', false)
+    });
+
+    if (expansion == 'PoK') {
+        toggleDiscordantAvailability(false);
+    }
+}
+
 function update_alliance_mode() {
     alliance_mode = $('#alliance_toggle').is(':checked');
 
@@ -136,62 +224,6 @@ function loading(loading = true) {
     }
 }
 
-function pok_check() {
-    let $pokf = $('#pokf');
-    let $keleres = $('#keleres');
-    let $legendaries = $('#min_legendaries');
-    let $DSTiles = $('#DSTiles');
-    let $discordant = $('#discordant');
-    let $discordantexp = $('#discordantexp');
-
-    if ($('#pok').is(':checked')) {
-
-        // When POK is checked, allow POK dependant items to be selectable
-        $pokf.prop('disabled', false);
-        $pokf.parent().removeClass('disabled'); // I think these all share the same parent now, so additional lines might be moot.
-
-        $keleres.prop('disabled', false);
-        $keleres.parent().removeClass('disabled');
-
-
-        $legendaries.prop('disabled', false);
-        $legendaries.parent().removeClass('disabled');
-
-        $DSTiles.prop('disabled', false);
-        $DSTiles.parent().removeClass('disabled');
-
-        $discordant.prop('disabled', false);
-        $discordant.parent().removeClass('disabled');
-
-        $discordantexp.prop('disabled', false);
-        $discordantexp.parent().removeClass('disabled');
-    } else {
-
-        // When POK is not checked, disable options that depend on POK
-        $pokf.prop('checked', false)
-            .prop('disabled', true);
-        $pokf.parent().addClass('disabled');
-
-        $keleres.prop('checked', false)
-            .prop('disabled', true);
-        $keleres.parent().addClass('disabled');
-
-        $legendaries.val(0)
-            .prop('disabled', true);
-        $legendaries.parent().addClass('disabled');
-
-        $discordant.prop('checked', false)
-            .prop('disabled', true);
-        $discordant.parent().addClass('disabled');
-
-        $discordantexp.prop('checked', false)
-            .prop('disabled', true);
-        $discordantexp.parent().addClass('disabled');
-    }
-
-    faction_check();
-}
-
 
 function faction_check() {
     let sets = [];
diff --git a/templates/factions.php b/templates/factions.php
index edb5d83..32eed2c 100644
--- a/templates/factions.php
+++ b/templates/factions.php
@@ -2,8 +2,20 @@
 
 $factions = json_decode(file_get_contents('data/factions.json'), true);
 
+function translateSet($set): string
+{
+    return match($set) {
+        'base' => \App\TwilightImperium\Edition::BASE_GAME->value,
+        'pok' => \App\TwilightImperium\Edition::PROPHECY_OF_KINGS->value,
+        'te' => \App\TwilightImperium\Edition::THUNDERS_EDGE->value,
+        'discordant' => \App\TwilightImperium\Edition::DISCORDANT_STARS->value,
+        'discordantexp' => \App\TwilightImperium\Edition::DISCORDANT_STARS_PLUS->value,
+        'keleres' => \App\TwilightImperium\Edition::THUNDERS_EDGE->value,
+    };
+}
+
 foreach ($factions as $f) {
-    $fact = '
@@ -456,8 +468,8 @@ } - - + + From 86ea5456356e4bf18df08df0e19ec457b5ea23e7 Mon Sep 17 00:00:00 2001 From: Sam Tubbax Date: Sun, 28 Dec 2025 15:47:04 +0100 Subject: [PATCH 34/34] cs fixes --- app/Draft/Secrets.php | 2 +- app/Http/RequestHandlers/HandleGenerateDraftRequest.php | 3 ++- app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Draft/Secrets.php b/app/Draft/Secrets.php index 4401d66..c75df41 100644 --- a/app/Draft/Secrets.php +++ b/app/Draft/Secrets.php @@ -30,7 +30,7 @@ public function toArray(): array public static function generateSecret(): string { - return bin2hex(random_bytes(16)); + return bin2hex(random_bytes(8)); } public function generateSecretForPlayer(PlayerId $playerId): string diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php index 5689005..e6c1c3c 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequest.php @@ -99,7 +99,7 @@ protected function tileSetsFromRequest() $sets = [Edition::BASE_GAME]; foreach($this->request->get('tileSets', []) as $key => $value) { $edition = Edition::from($key); - if ($value == 'on' && !in_array($edition, $sets)) { + if ($value == 'on' && ! in_array($edition, $sets)) { $sets[] = $edition; } } @@ -115,6 +115,7 @@ protected function factionSetsFromRequest() $sets[] = Edition::from($key); } } + return $sets; } diff --git a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php index b872d96..e234439 100644 --- a/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php +++ b/app/Http/RequestHandlers/HandleGenerateDraftRequestTest.php @@ -264,7 +264,7 @@ public function itGeneratesADraft(): void $response = $this->handleRequest([ 'num_players' => 4, 'player' => ['John', 'Paul', 'George', 'Ringo'], - 'tileSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on'], + 'tileSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on'], 'factionSets' => ['BaseGame' => 'on', 'PoK' => 'on', 'TE' => 'on'], 'num_slices' => 4, 'num_factions' => 4,