Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checkpoint release of "juggernaut" branch matching release Oct 31st 3.30pm #811

Merged
merged 114 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
53080eb
Give a more sensible message when someone tries to register with no p…
bakert Oct 30, 2024
67a1f2f
Represent a maybe-not-present season as a nullable int, not as a string
bakert Oct 30, 2024
bb3b838
Log slow queries
bakert Oct 30, 2024
e3d8111
Don't call a link to eventreport.php "eventLink" because that's event…
bakert Oct 30, 2024
9125b87
Remove unused import
bakert Oct 30, 2024
7b6f56b
Remove redundant func and simplify calling code in TrophyCell
bakert Oct 30, 2024
7b7bdef
Remove some unused funcs
bakert Oct 30, 2024
8d3e249
Don't show a big "registered players" heading if we're not going to s…
bakert Oct 30, 2024
cbd989a
Force consistent use of title by making it a required constructor arg
bakert Oct 30, 2024
42e5071
Don't "self close" img tags, that hasn't been the recommended style s…
bakert Oct 30, 2024
4fcadb2
Don't self close br tags, use html5 preferred style
bakert Oct 30, 2024
7f8b043
Don't self close input tags, in preferred html5 style
bakert Oct 31, 2024
fd480df
Clean up the last of the self closing html elements, we now use html5…
bakert Oct 31, 2024
a256d0f
Fix bug in decksearch error display
bakert Oct 31, 2024
a27a1ab
Remove HTML from DeckSearch and put it in the template where it belongs
bakert Oct 31, 2024
012ab1c
Remove some <center> tags that don't contribute a lot
bakert Oct 31, 2024
51e726c
Shush phpstan with an explicit cast in case json_encode returns false
bakert Oct 31, 2024
cff402f
Clean up masterplayerfile at least enough to satisfy phpstan level 7
bakert Oct 31, 2024
50e577e
Some phpstan level 7 fixes
bakert Oct 31, 2024
bba0e9b
Use json_encode's throw on error to get typesafe result
bakert Oct 31, 2024
4d0099a
Type fixes working towards phpstan level 7
bakert Oct 31, 2024
1075bd9
Move test to ComponentTest where it more correctly belongs
bakert Oct 31, 2024
4a148e0
Undo recent change to getObjectVarsCamelCase
bakert Oct 31, 2024
ab2aa55
Remove a hardcoded file_put_contents that hasn't working in 100 milli…
bakert Oct 31, 2024
2de75f5
Remove unused funcs
bakert Oct 31, 2024
ae5568a
Always call a link to eventreport.php eventReportLink not reportLink
bakert Oct 31, 2024
63c3399
Log interpolated queries, they are just much easier to debug
bakert Oct 31, 2024
6fa8489
Don't allow event name to be null, we don't allow events without names
bakert Oct 31, 2024
fc53070
Update psalm baseline now that we use interpolateQuery for debugging …
bakert Oct 31, 2024
51cbb1f
Event->name is no longer nullable which clears up a lot of type errors
bakert Oct 31, 2024
8303bad
Set Event->current_round to not be nullable, like the database
bakert Oct 31, 2024
3c8079b
Mark a lot more properties of Event that are not-nullable in the db a…
bakert Oct 31, 2024
a1165b3
Bring model into line with database and make Player->name not nullable
bakert Oct 31, 2024
850d155
Declare in line with db that some properties of Player are not nullable
bakert Oct 31, 2024
2e59420
Move Entry's constructor to top of file
bakert Oct 31, 2024
6ef5de1
Bit overzealous marking things as not nullable
bakert Oct 31, 2024
640a2ec
Remove "ignore" functionality
bakert Oct 31, 2024
c6f1b9e
River-style SQL over more spaced out version
bakert Oct 31, 2024
fdfefba
Bring Entry and EntryDto in line with nullability of props in database
bakert Oct 31, 2024
6ae30c0
Remove PHPDoc tags we aren't supporting
bakert Oct 31, 2024
3611273
Bring models and database yet further in sync, removing lots of nulla…
bakert Oct 31, 2024
a61e918
Bring some properties of Matchup in line with database
bakert Oct 31, 2024
5157f08
Update copy to more correctly describe what's going to happen
bakert Oct 31, 2024
fafbcfe
Use our superglobal helper to get typesafe values and fix static chec…
bakert Oct 31, 2024
89c6b73
Declare war on pointless use of strcmp
bakert Oct 31, 2024
d170d72
Eradicate strcmp from the codebase
bakert Oct 31, 2024
a66c7f0
Get timezone in the approved way
bakert Oct 31, 2024
5c600ee
Swtich to river-style SQL to save space/for clarity
bakert Oct 31, 2024
176016f
Give main the more correct return type of never - we output and then …
bakert Oct 31, 2024
fb193cb
Redirect to player.php rather than show a blank screen on report.php
bakert Oct 31, 2024
51db47f
Copy update for error messages about sideboard
bakert Oct 31, 2024
1417994
River-style SQL formatting
bakert Oct 31, 2024
0cace20
Don't use strings-as-funcs anywhere, prefer fn and real lambdas
bakert Oct 31, 2024
709a3b7
Get rid of unused column on players
bakert Oct 31, 2024
de44338
Site name is no longer configurable
bakert Oct 31, 2024
8cd38f3
Don't error if there are two or more events with the most recent date
bakert Oct 31, 2024
0ea5b5f
Don't center player name on ratings table, it looks wonky
bakert Oct 31, 2024
88bd30b
Don't need to check for null event name now that it's not nullable
bakert Oct 31, 2024
385c7fb
Don't show 'Round 0' for unstarted events, show 'Not Yet Started'
bakert Oct 31, 2024
4dfae20
Always show headings in silver not link color in Current Events section
bakert Oct 31, 2024
055518c
Buttons are now larger, this looks silly for the not allowed icon
bakert Oct 31, 2024
c4e1668
Whoops we clobbered the player search form on profile.php at some point
bakert Oct 31, 2024
f326786
Don't squish text on buttons of formatcp
bakert Oct 31, 2024
ae70ba5
Bump semver to celebrate our first real visual changes
bakert Oct 31, 2024
d6632f6
Update psalm baseline now we are using the unused PlayerSearchForm
bakert Oct 31, 2024
f1be06f
Remove unused import
bakert Oct 31, 2024
a632f28
Suppress unused method warning from psalm
bakert Oct 31, 2024
aa06afd
Move test to the correct namespace
bakert Oct 31, 2024
97fc55b
Start to move the last of the "global" funcs out of lib.php
bakert Oct 31, 2024
1f12161
Upgrade to PHP 8.2, switch to using "Safe" versions of built in funcs
bakert Oct 31, 2024
bcbce1e
Convince psalm that interpolateQuery will return a string not an array
bakert Oct 31, 2024
2826587
Remove FileNotFoundException
bakert Oct 31, 2024
cd31f53
Simplify setting of prereg default
bakert Oct 31, 2024
073f968
Move yet more stuff out of lib.php
bakert Oct 31, 2024
3dbcf47
Detect restricted sideboard cards (a little) more sanely
bakert Oct 31, 2024
8ea59e1
Find decks that match all criteria more simply
bakert Oct 31, 2024
534897e
Remove unused func
bakert Oct 31, 2024
4702021
Remove unused func
bakert Oct 31, 2024
88d81a8
Remove unused func
bakert Oct 31, 2024
169ff89
Remove two initializations that are always overwritten
bakert Oct 31, 2024
cb0e986
Remove all concept of "Round Robin" structure, there's none in the db
bakert Oct 31, 2024
16f8e70
Remove unused vars
bakert Oct 31, 2024
eccaedb
Don't call set_time_limit until after we've autoloaded in lib
bakert Oct 31, 2024
e47f82d
Bring phpstan baseline up to date with latest fixes
bakert Oct 31, 2024
f61ce1f
Fix an ancient snafu found by psalm
bakert Oct 31, 2024
0c6c43b
Move git_hash to inline and version_tagline to Page (only user)
bakert Oct 31, 2024
8ca7751
Remove dead code
bakert Oct 31, 2024
e4bd533
Remove pointless variable assignment
bakert Oct 31, 2024
078de1b
Remove dead code, fix return types
bakert Oct 31, 2024
1970d7a
Kill some unused vars
bakert Oct 31, 2024
64f2b76
Kill a bunch of unused code
bakert Oct 31, 2024
8247c55
Remove unused func
bakert Oct 31, 2024
fd6dcb3
Convert to void funcs where we don't use the return value
bakert Oct 31, 2024
521f980
Remove unused vars
bakert Oct 31, 2024
e96f218
Don't use string names of funcs as lambdas now that fn exists
bakert Oct 31, 2024
4a3fa5c
Reorganize code to be nearer to usage and less global
bakert Oct 31, 2024
af21c95
Get more specific about types in pairing weights
bakert Oct 31, 2024
7dc126b
Don't check for null if it can't be null, live up to type promises
bakert Oct 31, 2024
254bb4c
Migrate game/platform constants to where they are used
bakert Oct 31, 2024
6e4a7ed
Type fixes
bakert Oct 31, 2024
beb20e7
Type fixes
bakert Oct 31, 2024
ec94d29
Don't pass unused var
bakert Oct 31, 2024
b605c4f
Update psalm baseline after fixing a bunch of stuff
bakert Oct 31, 2024
25398be
Fix visibility
bakert Oct 31, 2024
93bf5fe
Lint
bakert Oct 31, 2024
3a6e6a0
Update all libraries trying to fix a psalm issue (didn't help)
bakert Oct 31, 2024
8f4d0bc
Set threads=1 for psalm because of https://github.com/vimeo/psalm/iss…
bakert Oct 31, 2024
509924d
Don't counterfeit property with private fun name - confuses mustache
bakert Oct 31, 2024
c293a60
Clearer display when an event is upcoming versus in progress, better …
bakert Oct 31, 2024
447eff6
Complete the update to PHP 8.2 in composer, docker, github
bakert Oct 31, 2024
7e844ac
Github CI/CD doesn't allow set_time_limit so cope with that
bakert Oct 31, 2024
0656764
Don't try and use Safe\ini_set before it is available
bakert Oct 31, 2024
9838979
Somewhat hacky fix to prod issue, for now
bakert Oct 31, 2024
dcffbce
Don't add a match every time Update Match Listing is clicked
bakert Nov 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup PHP with PECL extension
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
extensions: curl, mysqli

- name: Setup problem matchers for PHP
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-apache as compose
FROM php:8.2-apache as compose
WORKDIR /restore
COPY composer.* ./
RUN apt-get update && apt-get install -y git zip unzip
Expand All @@ -8,7 +8,7 @@ RUN docker-php-ext-install mysqli pdo pdo_mysql && docker-php-ext-enable mysqli
RUN curl --silent --show-error https://getcomposer.org/installer | php
RUN php composer.phar --version && php composer.phar install

FROM php:8.1-apache
FROM php:8.2-apache
LABEL maintainer="Katelyn Gigante"
RUN apt-get update && apt-get install -y git zip unzip

Expand Down
18 changes: 11 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"scripts": {
"qa": ["@tests", "@analyze", "@lint", "@jstests"],
"tests": "vendor/bin/phpunit --stop-on-defect tests",
"lint": "vendor/bin/phpcs -d memory_limit=2G --runtime-set testVersion 8.1 .",
"autofix": "vendor/bin/phpcbf -d memory_limit=2G --runtime-set testVersion 8.1 .",
"analyze": "vendor/bin/phpstan --memory-limit=2G && vendor/bin/psalm --no-cache",
"lint": "vendor/bin/phpcs -d memory_limit=2G --runtime-set testVersion 8.2 .",
"autofix": "vendor/bin/phpcbf -d memory_limit=2G --runtime-set testVersion 8.2 .",
"analyze": "vendor/bin/phpstan --memory-limit=2G && vendor/bin/psalm --no-cache --threads=1",
"jstests": "bun test"
},
"require": {
"php": "8.1.*",
"php": "^8.2",
"ext-curl": "*",
"ext-mysqli": "*",
"ext-pdo": "*",
Expand All @@ -27,15 +27,17 @@
"symfony/css-selector": "^6.4",
"bakert/blossom-php": "^1.0",
"stefangabos/zebra_pagination": "^2.4",
"yassinedoghri/php-icons": "^1.1"
"yassinedoghri/php-icons": "^1.1",
"shish/safe": "^2.6"
},
"require-dev": {
"squizlabs/php_codesniffer": "3.*",
"phpunit/phpunit": ">=10.0",
"phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.12",
"vimeo/psalm": "^5.26",
"psalm/plugin-phpunit": "^0.19.0"
"psalm/plugin-phpunit": "^0.19.0",
"shish/phpstan-safe-rule": "^1.3"
},
"autoload": {
"psr-4": {
Expand All @@ -44,8 +46,10 @@
"Gatherling\\Tests\\": "tests/"
},
"files": [
"gatherling/Helpers/cards.php",
"gatherling/Helpers/database.php",
"gatherling/Helpers/helpers.php",
"gatherling/Helpers/database.php"
"gatherling/Helpers/templates.php"
]
}
}
Loading