chg: dev: change the code style to fit the current standard #4
This commit is contained in:
@@ -175,7 +175,7 @@ class MineSeeker extends React.Component {
|
||||
// ------------------------------------------------------------------ //
|
||||
|
||||
handleMercureMessage(payload) {
|
||||
let isTopicEvent = 'undefined' !== typeof payload.data;
|
||||
let isTopicEvent = 'undefined' !== typeof payload.data;
|
||||
let isNotUnsubscribe = 'undefined' === typeof payload.msg;
|
||||
|
||||
if (isTopicEvent) {
|
||||
@@ -197,9 +197,9 @@ class MineSeeker extends React.Component {
|
||||
}
|
||||
|
||||
openEventSource() {
|
||||
const wrapper = document.getElementById('mine-wrapper');
|
||||
const hubUrl = wrapper.dataset.mercureHubUrl;
|
||||
const subscriberJwt = wrapper.dataset.mercureSubscriberJwt;
|
||||
const wrapper = document.getElementById('mine-wrapper');
|
||||
const hubUrl = wrapper.dataset.mercureHubUrl;
|
||||
const subscriberJwt = wrapper.dataset.mercureSubscriberJwt;
|
||||
|
||||
const url = new URL(hubUrl, window.location.origin);
|
||||
url.searchParams.append('topic', this.state.channel);
|
||||
@@ -324,8 +324,8 @@ class MineSeeker extends React.Component {
|
||||
try {
|
||||
if (this.state.gameInherited) {
|
||||
/** Fetch existing player info and previously revealed cells */
|
||||
const resp = await fetch('/api/game/connect/' + this.state.gameAssoc);
|
||||
const b64 = await resp.text();
|
||||
const resp = await fetch('/api/game/connect/' + this.state.gameAssoc);
|
||||
const b64 = await resp.text();
|
||||
const serverData = JSON.parse(window.atob(b64));
|
||||
|
||||
if ('undefined' === typeof serverData.users || null === serverData.users) {
|
||||
@@ -393,7 +393,7 @@ class MineSeeker extends React.Component {
|
||||
let dataPack = {
|
||||
coords: coords,
|
||||
player: activePlayer,
|
||||
bomb: this.refs.gridControl.refs.userControl.state.bombSelected,
|
||||
bomb: this.refs.gridControl.refs.userControl.state.bombSelected,
|
||||
resign: null,
|
||||
};
|
||||
|
||||
@@ -403,7 +403,7 @@ class MineSeeker extends React.Component {
|
||||
}
|
||||
|
||||
try {
|
||||
const resp = await this.publishStep(dataPack);
|
||||
const resp = await this.publishStep(dataPack);
|
||||
const result = await resp.json();
|
||||
|
||||
this.refs.gridControl.applyStep(result);
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
framework:
|
||||
assets:
|
||||
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
|
||||
assets:
|
||||
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
monolog:
|
||||
handlers:
|
||||
main:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: error
|
||||
channels: ["!event"]
|
||||
# uncomment to get logging in your browser
|
||||
# you may have to allow bigger header sizes in your Web server configuration
|
||||
#firephp:
|
||||
# type: firephp
|
||||
# level: info
|
||||
#chromephp:
|
||||
# type: chromephp
|
||||
# level: info
|
||||
console:
|
||||
type: console
|
||||
process_psr_3_messages: false
|
||||
channels: ["!event", "!doctrine", "!console"]
|
||||
handlers:
|
||||
main:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: error
|
||||
channels: [ "!event" ]
|
||||
# uncomment to get logging in your browser
|
||||
# you may have to allow bigger header sizes in your Web server configuration
|
||||
#firephp:
|
||||
# type: firephp
|
||||
# level: info
|
||||
#chromephp:
|
||||
# type: chromephp
|
||||
# level: info
|
||||
console:
|
||||
type: console
|
||||
process_psr_3_messages: false
|
||||
channels: [ "!event", "!doctrine", "!console" ]
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
framework:
|
||||
router:
|
||||
strict_requirements: true
|
||||
router:
|
||||
strict_requirements: true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
web_profiler:
|
||||
toolbar: true
|
||||
intercept_redirects: false
|
||||
toolbar: true
|
||||
intercept_redirects: false
|
||||
|
||||
framework:
|
||||
profiler: { only_exceptions: false }
|
||||
profiler: { only_exceptions: false }
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
parameters:
|
||||
# Adds a fallback DATABASE_URL if the env var is not set.
|
||||
# This allows you to run cache:warmup even if your
|
||||
# environment variables are not available yet.
|
||||
# You should not need to change this value.
|
||||
env(DATABASE_URL): ''
|
||||
# Adds a fallback DATABASE_URL if the env var is not set.
|
||||
# This allows you to run cache:warmup even if your
|
||||
# environment variables are not available yet.
|
||||
# You should not need to change this value.
|
||||
env(DATABASE_URL): ''
|
||||
|
||||
doctrine:
|
||||
dbal:
|
||||
# configure these for your database server
|
||||
driver: 'pdo_mysql'
|
||||
server_version: '5.7'
|
||||
charset: utf8mb4
|
||||
default_table_options:
|
||||
charset: utf8mb4
|
||||
collate: utf8mb4_unicode_ci
|
||||
dbal:
|
||||
# configure these for your database server
|
||||
driver: 'pdo_mysql'
|
||||
server_version: '5.7'
|
||||
charset: utf8mb4
|
||||
default_table_options:
|
||||
charset: utf8mb4
|
||||
collate: utf8mb4_unicode_ci
|
||||
|
||||
url: '%env(resolve:DATABASE_URL)%'
|
||||
url: '%env(resolve:DATABASE_URL)%'
|
||||
|
||||
orm:
|
||||
auto_generate_proxy_classes: '%kernel.debug%'
|
||||
naming_strategy: doctrine.orm.naming_strategy.underscore
|
||||
auto_mapping: true
|
||||
mappings:
|
||||
App:
|
||||
is_bundle: false
|
||||
type: attribute
|
||||
dir: '%kernel.project_dir%/src/Entity'
|
||||
prefix: 'App\Entity'
|
||||
alias: App
|
||||
orm:
|
||||
auto_generate_proxy_classes: '%kernel.debug%'
|
||||
naming_strategy: doctrine.orm.naming_strategy.underscore
|
||||
auto_mapping: true
|
||||
mappings:
|
||||
App:
|
||||
is_bundle: false
|
||||
type: attribute
|
||||
dir: '%kernel.project_dir%/src/Entity'
|
||||
prefix: 'App\Entity'
|
||||
alias: App
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
doctrine_migrations:
|
||||
migrations_paths:
|
||||
'App\Migrations': '%kernel.project_dir%/src/Migrations'
|
||||
organize_migrations: BY_YEAR_AND_MONTH
|
||||
migrations_paths:
|
||||
'App\Migrations': '%kernel.project_dir%/src/Migrations'
|
||||
organize_migrations: BY_YEAR_AND_MONTH
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
framework:
|
||||
secret: '%env(APP_SECRET)%'
|
||||
#default_locale: en
|
||||
#csrf_protection: true
|
||||
#http_method_override: true
|
||||
# Enables session support. Note that the session will ONLY be started if you read or write from it.
|
||||
# Remove or comment this section to explicitly disable session support.
|
||||
session:
|
||||
handler_id: ~
|
||||
secret: '%env(APP_SECRET)%'
|
||||
#default_locale: en
|
||||
#csrf_protection: true
|
||||
#http_method_override: true
|
||||
# Enables session support. Note that the session will ONLY be started if you read or write from it.
|
||||
# Remove or comment this section to explicitly disable session support.
|
||||
session:
|
||||
handler_id: ~
|
||||
|
||||
#esi: true
|
||||
#fragments: true
|
||||
php_errors:
|
||||
log: true
|
||||
#esi: true
|
||||
#fragments: true
|
||||
php_errors:
|
||||
log: true
|
||||
|
||||
cache:
|
||||
# Put the unique name of your app here: the prefix seed
|
||||
# is used to compute stable namespaces for cache keys.
|
||||
#prefix_seed: your_vendor_name/app_name
|
||||
cache:
|
||||
# Put the unique name of your app here: the prefix seed
|
||||
# is used to compute stable namespaces for cache keys.
|
||||
#prefix_seed: your_vendor_name/app_name
|
||||
|
||||
# The app cache caches to the filesystem by default.
|
||||
# Other options include:
|
||||
# The app cache caches to the filesystem by default.
|
||||
# Other options include:
|
||||
|
||||
# Redis
|
||||
#app: cache.adapter.redis
|
||||
#default_redis_provider: redis://localhost
|
||||
# Redis
|
||||
#app: cache.adapter.redis
|
||||
#default_redis_provider: redis://localhost
|
||||
|
||||
# APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
|
||||
#app: cache.adapter.apcu
|
||||
# APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
|
||||
#app: cache.adapter.apcu
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
framework:
|
||||
mailer:
|
||||
dsn: '%env(MAILER_DSN)%'
|
||||
mailer:
|
||||
dsn: '%env(MAILER_DSN)%'
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
doctrine:
|
||||
orm:
|
||||
metadata_cache_driver:
|
||||
type: pool
|
||||
pool: doctrine.system_cache_pool
|
||||
query_cache_driver:
|
||||
type: pool
|
||||
pool: doctrine.system_cache_pool
|
||||
result_cache_driver:
|
||||
type: pool
|
||||
pool: doctrine.result_cache_pool
|
||||
orm:
|
||||
metadata_cache_driver:
|
||||
type: pool
|
||||
pool: doctrine.system_cache_pool
|
||||
query_cache_driver:
|
||||
type: pool
|
||||
pool: doctrine.system_cache_pool
|
||||
result_cache_driver:
|
||||
type: pool
|
||||
pool: doctrine.result_cache_pool
|
||||
|
||||
framework:
|
||||
cache:
|
||||
pools:
|
||||
doctrine.result_cache_pool:
|
||||
adapter: cache.app
|
||||
doctrine.system_cache_pool:
|
||||
adapter: cache.system
|
||||
cache:
|
||||
pools:
|
||||
doctrine.result_cache_pool:
|
||||
adapter: cache.app
|
||||
doctrine.system_cache_pool:
|
||||
adapter: cache.system
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
monolog:
|
||||
handlers:
|
||||
main:
|
||||
type: fingers_crossed
|
||||
action_level: error
|
||||
handler: nested
|
||||
excluded_http_codes: [404, 405]
|
||||
nested:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: debug
|
||||
console:
|
||||
type: console
|
||||
process_psr_3_messages: false
|
||||
channels: ["!event", "!doctrine"]
|
||||
deprecation:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"
|
||||
deprecation_filter:
|
||||
type: filter
|
||||
handler: deprecation
|
||||
max_level: info
|
||||
channels: ["php"]
|
||||
handlers:
|
||||
main:
|
||||
type: fingers_crossed
|
||||
action_level: error
|
||||
handler: nested
|
||||
excluded_http_codes: [ 404, 405 ]
|
||||
nested:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: debug
|
||||
console:
|
||||
type: console
|
||||
process_psr_3_messages: false
|
||||
channels: [ "!event", "!doctrine" ]
|
||||
deprecation:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"
|
||||
deprecation_filter:
|
||||
type: filter
|
||||
handler: deprecation
|
||||
max_level: info
|
||||
channels: [ "php" ]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#webpack_encore:
|
||||
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
|
||||
# Available in version 1.2
|
||||
#cache: true
|
||||
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
|
||||
# Available in version 1.2
|
||||
#cache: true
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
framework:
|
||||
router:
|
||||
strict_requirements: ~
|
||||
router:
|
||||
strict_requirements: ~
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
security:
|
||||
# https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
|
||||
providers:
|
||||
app_user_provider:
|
||||
entity:
|
||||
class: App\Entity\User
|
||||
property: username
|
||||
firewalls:
|
||||
dev:
|
||||
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
||||
security: false
|
||||
main:
|
||||
lazy: true
|
||||
# https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
|
||||
providers:
|
||||
app_user_provider:
|
||||
entity:
|
||||
class: App\Entity\User
|
||||
property: username
|
||||
firewalls:
|
||||
dev:
|
||||
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
||||
security: false
|
||||
main:
|
||||
lazy: true
|
||||
|
||||
# activate different ways to authenticate
|
||||
# activate different ways to authenticate
|
||||
|
||||
# http_basic: true
|
||||
# https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
|
||||
# http_basic: true
|
||||
# https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
|
||||
|
||||
# form_login: true
|
||||
# https://symfony.com/doc/current/security/form_login_setup.html
|
||||
# form_login: true
|
||||
# https://symfony.com/doc/current/security/form_login_setup.html
|
||||
|
||||
# Easy way to control access for large sections of your site
|
||||
# Note: Only the *first* access control that matches will be used
|
||||
access_control:
|
||||
# - { path: ^/admin, roles: ROLE_ADMIN }
|
||||
# - { path: ^/profile, roles: ROLE_USER }
|
||||
# Easy way to control access for large sections of your site
|
||||
# Note: Only the *first* access control that matches will be used
|
||||
access_control:
|
||||
# - { path: ^/admin, roles: ROLE_ADMIN }
|
||||
# - { path: ^/profile, roles: ROLE_USER }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
framework:
|
||||
test: true
|
||||
session:
|
||||
storage_id: session.storage.mock_file
|
||||
test: true
|
||||
session:
|
||||
storage_id: session.storage.mock_file
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
monolog:
|
||||
handlers:
|
||||
main:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: debug
|
||||
channels: ["!event"]
|
||||
handlers:
|
||||
main:
|
||||
type: stream
|
||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||
level: debug
|
||||
channels: [ "!event" ]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
web_profiler:
|
||||
toolbar: false
|
||||
intercept_redirects: false
|
||||
toolbar: false
|
||||
intercept_redirects: false
|
||||
|
||||
framework:
|
||||
profiler: { collect: false }
|
||||
profiler: { collect: false }
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
framework:
|
||||
default_locale: '%locale%'
|
||||
translator:
|
||||
paths:
|
||||
- '%kernel.project_dir%/translations'
|
||||
fallbacks:
|
||||
- '%locale%'
|
||||
default_locale: '%locale%'
|
||||
translator:
|
||||
paths:
|
||||
- '%kernel.project_dir%/translations'
|
||||
fallbacks:
|
||||
- '%locale%'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
twig:
|
||||
paths: ['%kernel.project_dir%/templates']
|
||||
debug: '%kernel.debug%'
|
||||
strict_variables: '%kernel.debug%'
|
||||
globals:
|
||||
version: "%jotunheimr.version%"
|
||||
paths: [ '%kernel.project_dir%/templates' ]
|
||||
debug: '%kernel.debug%'
|
||||
strict_variables: '%kernel.debug%'
|
||||
globals:
|
||||
version: "%jotunheimr.version%"
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
services:
|
||||
_defaults:
|
||||
public: false
|
||||
autowire: true
|
||||
autoconfigure: true
|
||||
_defaults:
|
||||
public: false
|
||||
autowire: true
|
||||
autoconfigure: true
|
||||
|
||||
#Twig\Extensions\ArrayExtension: ~
|
||||
#Twig\Extensions\DateExtension: ~
|
||||
#Twig\Extensions\IntlExtension: ~
|
||||
#Twig\Extensions\TextExtension: ~
|
||||
#Twig\Extensions\ArrayExtension: ~
|
||||
#Twig\Extensions\DateExtension: ~
|
||||
#Twig\Extensions\IntlExtension: ~
|
||||
#Twig\Extensions\TextExtension: ~
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
webpack_encore:
|
||||
# The path where Encore is building the assets.
|
||||
# This should match Encore.setOutputPath() in webpack.config.js.
|
||||
output_path: '%kernel.project_dir%/public/build'
|
||||
# If multiple builds are defined (as shown below), you can disable the default build:
|
||||
# output_path: false
|
||||
# The path where Encore is building the assets.
|
||||
# This should match Encore.setOutputPath() in webpack.config.js.
|
||||
output_path: '%kernel.project_dir%/public/build'
|
||||
# If multiple builds are defined (as shown below), you can disable the default build:
|
||||
# output_path: false
|
||||
|
||||
# if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: false, or use 'anonymous' or 'use-credentials')
|
||||
# crossorigin: 'anonymous'
|
||||
# if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: false, or use 'anonymous' or 'use-credentials')
|
||||
# crossorigin: 'anonymous'
|
||||
|
||||
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes).
|
||||
# To enable caching for the production environment, creating a webpack_encore.yaml in the config/packages/prod directory with this value set to true
|
||||
# Available in version 1.2
|
||||
#cache: false
|
||||
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes).
|
||||
# To enable caching for the production environment, creating a webpack_encore.yaml in the config/packages/prod directory with this value set to true
|
||||
# Available in version 1.2
|
||||
#cache: false
|
||||
|
||||
@@ -43,7 +43,7 @@ class MercureController extends AbstractController
|
||||
#[Route('/api/game/start', name: 'MineSeekerBundle_api_game_start', methods: ['POST'])]
|
||||
public function start(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->toArray();
|
||||
$data = $request->toArray();
|
||||
$result = $this->rpcManager->saveGrid($data['gameAssoc']);
|
||||
|
||||
return $this->json(['success' => $result]);
|
||||
|
||||
@@ -62,7 +62,7 @@ class RpcManager implements RpcManagerInterface
|
||||
}
|
||||
}
|
||||
|
||||
$users = $this->getUserCollection($playedGame);
|
||||
$users = $this->getUserCollection($playedGame);
|
||||
$revealedCells = $this->aggregateRevealedCells($playedGame);
|
||||
|
||||
try {
|
||||
@@ -85,9 +85,9 @@ class RpcManager implements RpcManagerInterface
|
||||
return true;
|
||||
}
|
||||
|
||||
$grid2d = $this->generateGrid();
|
||||
$grid2d = $this->generateGrid();
|
||||
$playedGame = new PlayedGame();
|
||||
$grid = new Grid();
|
||||
$grid = new Grid();
|
||||
|
||||
try {
|
||||
foreach ($grid2d as $row) {
|
||||
@@ -127,7 +127,7 @@ class RpcManager implements RpcManagerInterface
|
||||
|
||||
// Fisher-Yates shuffle
|
||||
for ($i = count($set) - 1; $i > 0; $i--) {
|
||||
$j = random_int(0, $i);
|
||||
$j = random_int(0, $i);
|
||||
[$set[$i], $set[$j]] = [$set[$j], $set[$i]];
|
||||
}
|
||||
|
||||
@@ -180,10 +180,10 @@ class RpcManager implements RpcManagerInterface
|
||||
private function getUserCollection(PlayedGame $playedGame): array
|
||||
{
|
||||
return [
|
||||
'red' => null !== $playedGame->getRed() ? $playedGame->getRed()->getUsername() : '',
|
||||
'blue' => null !== $playedGame->getBlue() ? $playedGame->getBlue()->getUsername() : '',
|
||||
'red' => null !== $playedGame->getRed() ? $playedGame->getRed()->getUsername() : '',
|
||||
'blue' => null !== $playedGame->getBlue() ? $playedGame->getBlue()->getUsername() : '',
|
||||
'redAnon' => null !== $playedGame->getRedAnon() ? $playedGame->getRedAnon()->getUserName() : '',
|
||||
'blueAnon' => null !== $playedGame->getBlueAnon()? $playedGame->getBlueAnon()->getUserName(): '',
|
||||
'blueAnon' => null !== $playedGame->getBlueAnon() ? $playedGame->getBlueAnon()->getUserName() : '',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -19,9 +19,9 @@ use App\Interfaces\TopicManagerInterface;
|
||||
use DateTime;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Exception;
|
||||
use RuntimeException;
|
||||
use JsonException;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use RuntimeException;
|
||||
use Symfony\Component\Mercure\HubInterface;
|
||||
use Symfony\Component\Mercure\Update;
|
||||
use Symfony\Component\Security\Core\User\UserInterface;
|
||||
@@ -52,8 +52,8 @@ class TopicManager implements TopicManagerInterface
|
||||
return;
|
||||
}
|
||||
|
||||
$users = $this->getUserCollection($playedGame);
|
||||
$count = $this->getPlayerCount($users);
|
||||
$users = $this->getUserCollection($playedGame);
|
||||
$count = $this->getPlayerCount($users);
|
||||
$isKnown = in_array($userName, array_filter(array_values($users)), true);
|
||||
|
||||
/** Reject a third player who is not a reconnecting player */
|
||||
@@ -105,9 +105,9 @@ class TopicManager implements TopicManagerInterface
|
||||
$this->saveResignToDb($gameAssoc, $event['resign']);
|
||||
|
||||
$playedGame = $this->getPlayedGame($gameAssoc);
|
||||
$users = $this->getUserCollection($playedGame);
|
||||
$count = $this->getPlayerCount($users);
|
||||
$topic = 'mineseeker/channel/' . $gameAssoc;
|
||||
$users = $this->getUserCollection($playedGame);
|
||||
$count = $this->getPlayerCount($users);
|
||||
$topic = 'mineseeker/channel/' . $gameAssoc;
|
||||
|
||||
$data = ['resign' => $event['resign'], 'coords' => null];
|
||||
|
||||
@@ -134,10 +134,10 @@ class TopicManager implements TopicManagerInterface
|
||||
// ------------------------------------------------------------------ //
|
||||
$coords = $event['coords'];
|
||||
$player = $event['player']; // 'red' | 'blue'
|
||||
$isBomb = (bool) $event['bomb'];
|
||||
$isBomb = (bool)$event['bomb'];
|
||||
|
||||
$playedGame = $this->getPlayedGame($gameAssoc);
|
||||
$grid = $this->loadGrid($gameAssoc);
|
||||
$grid = $this->loadGrid($gameAssoc);
|
||||
|
||||
// Cells already revealed by previous steps (as "row,col" => true map)
|
||||
$alreadyRevealed = $this->buildRevealedMap($playedGame);
|
||||
@@ -152,10 +152,10 @@ class TopicManager implements TopicManagerInterface
|
||||
$revealedCells = $this->floodFill($grid, $coords[0], $coords[1], $alreadyRevealed);
|
||||
}
|
||||
|
||||
$minesFound = count(array_filter($revealedCells, static fn($c) => 'm' === $c['value']));
|
||||
$redPoints = ($playedGame->getRedPoints() ?? 0) + ('red' === $player ? $minesFound : 0);
|
||||
$bluePoints = ($playedGame->getBluePoints() ?? 0) + ('blue' === $player ? $minesFound : 0);
|
||||
$gameOver = $redPoints > 25 || $bluePoints > 25;
|
||||
$minesFound = count(array_filter($revealedCells, static fn($c) => 'm' === $c['value']));
|
||||
$redPoints = ($playedGame->getRedPoints() ?? 0) + ('red' === $player ? $minesFound : 0);
|
||||
$bluePoints = ($playedGame->getBluePoints() ?? 0) + ('blue' === $player ? $minesFound : 0);
|
||||
$gameOver = $redPoints > 25 || $bluePoints > 25;
|
||||
|
||||
// Reveal remaining mines when the game ends
|
||||
$leftMines = [];
|
||||
@@ -232,13 +232,13 @@ class TopicManager implements TopicManagerInterface
|
||||
* Reveals the clicked cell plus all connected zero-value cells and their non-mine borders.
|
||||
* Mines are never added to the result.
|
||||
*
|
||||
* @param array<string, true> $visited Map of "row,col" already revealed; updated in-place.
|
||||
* @param array<string, true> $visited Map of "row,col" already revealed; updated in-place.
|
||||
*/
|
||||
private function floodFill(array $grid, int $row, int $col, array &$visited): array
|
||||
{
|
||||
$cells = [];
|
||||
$queue = [[$row, $col]];
|
||||
$dirs = [[-1, -1], [-1, 0], [-1, 1], [0, -1], [0, 1], [1, -1], [1, 0], [1, 1]];
|
||||
$dirs = [[-1, -1], [-1, 0], [-1, 1], [0, -1], [0, 1], [1, -1], [1, 0], [1, 1]];
|
||||
|
||||
while (!empty($queue)) {
|
||||
[$r, $c] = array_shift($queue);
|
||||
@@ -265,8 +265,8 @@ class TopicManager implements TopicManagerInterface
|
||||
// Only expand neighbours for zero-cells
|
||||
if (0 === $value) {
|
||||
foreach ($dirs as [$dr, $dc]) {
|
||||
$nr = $r + $dr;
|
||||
$nc = $c + $dc;
|
||||
$nr = $r + $dr;
|
||||
$nc = $c + $dc;
|
||||
$nKey = $nr . ',' . $nc;
|
||||
if (!isset($visited[$nKey]) && isset($grid[$nr][$nc])) {
|
||||
$queue[] = [$nr, $nc];
|
||||
@@ -290,12 +290,12 @@ class TopicManager implements TopicManagerInterface
|
||||
}
|
||||
|
||||
return [
|
||||
[$row, $col ], [$row - 2, $col - 2], [$row - 2, $col ], [$row - 2, $col + 2],
|
||||
[$row, $col - 2], [$row, $col + 2], [$row + 2, $col - 2], [$row + 2, $col ],
|
||||
[$row, $col], [$row - 2, $col - 2], [$row - 2, $col], [$row - 2, $col + 2],
|
||||
[$row, $col - 2], [$row, $col + 2], [$row + 2, $col - 2], [$row + 2, $col],
|
||||
[$row + 2, $col + 2], [$row - 2, $col + 1], [$row - 2, $col - 1],
|
||||
[$row - 1, $col - 2], [$row - 1, $col - 1], [$row - 1, $col ], [$row - 1, $col + 1], [$row - 1, $col + 2],
|
||||
[$row, $col - 1], [$row, $col + 1],
|
||||
[$row + 1, $col - 2], [$row + 1, $col - 1], [$row + 1, $col ], [$row + 1, $col + 1], [$row + 1, $col + 2],
|
||||
[$row - 1, $col - 2], [$row - 1, $col - 1], [$row - 1, $col], [$row - 1, $col + 1], [$row - 1, $col + 2],
|
||||
[$row, $col - 1], [$row, $col + 1],
|
||||
[$row + 1, $col - 2], [$row + 1, $col - 1], [$row + 1, $col], [$row + 1, $col + 1], [$row + 1, $col + 2],
|
||||
[$row + 2, $col - 1], [$row + 2, $col + 1],
|
||||
];
|
||||
}
|
||||
@@ -307,8 +307,8 @@ class TopicManager implements TopicManagerInterface
|
||||
private function getBombRevealedCells(array $grid, int $row, int $col, array $alreadyRevealed): array
|
||||
{
|
||||
$bombCells = $this->getBombRadius($row, $col);
|
||||
$visited = $alreadyRevealed;
|
||||
$cells = [];
|
||||
$visited = $alreadyRevealed;
|
||||
$cells = [];
|
||||
|
||||
foreach ($bombCells as [$r, $c]) {
|
||||
$key = $r . ',' . $c;
|
||||
@@ -318,11 +318,11 @@ class TopicManager implements TopicManagerInterface
|
||||
|
||||
if ('m' === $grid[$r][$c]) {
|
||||
$visited[$key] = true;
|
||||
$cells[] = ['row' => $r, 'col' => $c, 'value' => 'm'];
|
||||
$cells[] = ['row' => $r, 'col' => $c, 'value' => 'm'];
|
||||
} else {
|
||||
// flood-fill handles the zero-cascade and deduplication via $visited
|
||||
$newCells = $this->floodFill($grid, $r, $c, $visited);
|
||||
$cells = array_merge($cells, $newCells);
|
||||
$cells = array_merge($cells, $newCells);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -376,7 +376,7 @@ class TopicManager implements TopicManagerInterface
|
||||
|
||||
private function getPlayerCount(array $users): int
|
||||
{
|
||||
$red = '' !== $users['red'] || '' !== $users['redAnon'] ? 1 : 0;
|
||||
$red = '' !== $users['red'] || '' !== $users['redAnon'] ? 1 : 0;
|
||||
$blue = '' !== $users['blue'] || '' !== $users['blueAnon'] ? 1 : 0;
|
||||
|
||||
return $red + $blue;
|
||||
@@ -404,7 +404,7 @@ class TopicManager implements TopicManagerInterface
|
||||
$step = new Step();
|
||||
$step->setRow($event['coords'][0]);
|
||||
$step->setCol($event['coords'][1]);
|
||||
$step->setWBomb((bool) $event['bomb']);
|
||||
$step->setWBomb((bool)$event['bomb']);
|
||||
$step->setPlayer($player);
|
||||
$step->setRevealedCells($revealedCells);
|
||||
$step->setPlayedGame($playedGame);
|
||||
@@ -413,8 +413,8 @@ class TopicManager implements TopicManagerInterface
|
||||
|
||||
$playedGame->setRedPoints($redPoints);
|
||||
$playedGame->setBluePoints($bluePoints);
|
||||
$playedGame->setRedExplodedBomb((bool) $event['bomb'] && 'red' === $player ? true : null);
|
||||
$playedGame->setBlueExplodedBomb((bool) $event['bomb'] && 'blue' === $player ? true : null);
|
||||
$playedGame->setRedExplodedBomb((bool)$event['bomb'] && 'red' === $player ? true : null);
|
||||
$playedGame->setBlueExplodedBomb((bool)$event['bomb'] && 'blue' === $player ? true : null);
|
||||
$playedGame->setUpdated(new DateTime());
|
||||
$this->entityManager->persist($playedGame);
|
||||
|
||||
@@ -483,9 +483,9 @@ class TopicManager implements TopicManagerInterface
|
||||
private function getUserCollection(PlayedGame $playedGame): array
|
||||
{
|
||||
return [
|
||||
'red' => null !== $playedGame->getRed() ? $playedGame->getRed()->getUsername() : '',
|
||||
'blue' => null !== $playedGame->getBlue() ? $playedGame->getBlue()->getUsername() : '',
|
||||
'redAnon' => null !== $playedGame->getRedAnon() ? $playedGame->getRedAnon()->getUserName() : '',
|
||||
'red' => null !== $playedGame->getRed() ? $playedGame->getRed()->getUsername() : '',
|
||||
'blue' => null !== $playedGame->getBlue() ? $playedGame->getBlue()->getUsername() : '',
|
||||
'redAnon' => null !== $playedGame->getRedAnon() ? $playedGame->getRedAnon()->getUserName() : '',
|
||||
'blueAnon' => null !== $playedGame->getBlueAnon() ? $playedGame->getBlueAnon()->getUserName() : '',
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user