Projects/nettsiden
Projects/nettsiden
8
2
Fork 0
Code Issues15 Pull Requests Activity

treewide: strict comparisons

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit 2025-03-12 01:09:08 +01:00
parent 84de16fc25
commit c1802e7cf2
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
8 changed files with 30 additions and 31 deletions

1
.php-cs-fixer.php

@ -51,7 +51,6 @@ return (new PhpCsFixer\Config())
// TODO: fix these // TODO: fix these
'psr_autoloading' => false, 'psr_autoloading' => false,
'strict_comparison' => false,
]) ])
->setFinder($finder) ->setFinder($finder)
->setIndent(" ") ->setIndent(" ")

2
inc/navbar.php

@ -18,7 +18,7 @@ function navbar($depth, $active = null) {
]; ];
foreach ($menuItems as $caption => $link) { foreach ($menuItems as $caption => $link) {
$isActive = $active === $link; $isActive = $active === $link;
if (substr($link, 0, 4) != 'http') { if (substr($link, 0, 4) !== 'http') {
$link = rtrim(str_repeat('../', $depth) . $link, '/') . '/'; $link = rtrim(str_repeat('../', $depth) . $link, '/') . '/';
} }

2
src/pvv/admin/usermanager.php

@ -98,7 +98,7 @@ class UserManager {
$statement->execute(); $statement->execute();
$row = $statement->fetch(); $row = $statement->fetch();
if ($row == false) { if ($row === false) {
return 0; return 0;
} }

8
src/pvv/side/social/animekveldactivity.php

@ -8,11 +8,11 @@ use pvv\side\Activity;
class AnimekveldActivity implements Activity { class AnimekveldActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) { public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 20 || $date->format('H') == 19 && $date->format('i') > 30) { if (intval($date->format('H')) > 20 || intval($date->format('H')) === 19 && intval($date->format('i')) > 30) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(19, 30, 0)); return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(19, 30, 0));
} }
$date = $date->setTime(19, 30, 0); $date = $date->setTime(19, 30, 0);
if ($date->format('N') != 5) { if (intval($date->format('N')) !== 5) {
return $this->nextDate($date->add(new \DateInterval('P1D'))); return $this->nextDate($date->add(new \DateInterval('P1D')));
} }
@ -20,11 +20,11 @@ class AnimekveldActivity implements Activity {
} }
public function prevDate(\DateTimeImmutable $date) { public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 19 || $date->format('H') == 20 && $date->format('i') < 30) { if (intval($date->format('H')) < 19 || intval($date->format('H')) === 20 && intval($date->format('i')) < 30) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(19, 30, 0)); return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(19, 30, 0));
} }
$date = $date->setTime(19, 30, 0); $date = $date->setTime(19, 30, 0);
if ($date->format('N') != 5) { if (intval($date->format('N')) !== 5) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))); return $this->prevDate($date->sub(new \DateInterval('P1D')));
} }

12
src/pvv/side/social/brettspillactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class BrettspillActivity implements Activity { class BrettspillActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) { public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 17 || $date->format('H') == 16 && $date->format('i') > 15) { if (intval($date->format('H')) > 17 || intval($date->format('H')) === 16 && intval($date->format('i')) > 15) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(16, 15, 0)); return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(16, 15, 0));
} }
$date = $date->setTime(16, 15, 0); $date = $date->setTime(16, 15, 0);
if ($date->format('N') != 7) { if (intval($date->format('N')) !== 7) {
return $this->nextDate($date->add(new \DateInterval('P1D'))); return $this->nextDate($date->add(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2 - 1) { if (intval($date->format('W')) % 2 - 1) {
return $this->nextDate($date->add(new \DateInterval('P7D'))); return $this->nextDate($date->add(new \DateInterval('P7D')));
} }
@ -23,14 +23,14 @@ class BrettspillActivity implements Activity {
} }
public function prevDate(\DateTimeImmutable $date) { public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 16 || $date->format('H') == 17 && $date->format('i') < 15) { if (intval($date->format('H')) < 16 || intval($date->format('H')) === 17 && intval($date->format('i')) < 15) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(16, 15, 0)); return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(16, 15, 0));
} }
$date = $date->setTime(16, 15, 0); $date = $date->setTime(16, 15, 0);
if ($date->format('N') != 7) { if (intval($date->format('N')) !== 7) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))); return $this->prevDate($date->sub(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2 - 1) { if (intval($date->format('W')) % 2 - 1) {
return $this->prevDate($date->sub(new \DateInterval('P7D'))); return $this->prevDate($date->sub(new \DateInterval('P7D')));
} }

12
src/pvv/side/social/driftkveldactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class DriftkveldActivity implements Activity { class DriftkveldActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) { public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 18 || $date->format('H') == 17 && $date->format('i') > 30) { if (intval($date->format('H')) > 18 || intval($date->format('H')) === 17 && intval($date->format('i')) > 30) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(18, 15, 0)); return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(18, 15, 0));
} }
$date = $date->setTime(18, 15, 0); $date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) { if (intval($date->format('N')) !== 6) {
return $this->nextDate($date->add(new \DateInterval('P1D'))); return $this->nextDate($date->add(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2 - 1) { if (intval($date->format('W')) % 2 - 1) {
return $this->nextDate($date->add(new \DateInterval('P7D'))); return $this->nextDate($date->add(new \DateInterval('P7D')));
} }
@ -23,14 +23,14 @@ class DriftkveldActivity implements Activity {
} }
public function prevDate(\DateTimeImmutable $date) { public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 17 || $date->format('H') == 18 && $date->format('i') < 30) { if (intval($date->format('H')) < 17 || intval($date->format('H')) === 18 && intval($date->format('i')) < 30) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(18, 15, 0)); return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(18, 15, 0));
} }
$date = $date->setTime(18, 15, 0); $date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) { if (intval($date->format('N')) !== 6) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))); return $this->prevDate($date->sub(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2 - 1) { if (intval($date->format('W')) % 2 - 1) {
return $this->prevDate($date->sub(new \DateInterval('P7D'))); return $this->prevDate($date->sub(new \DateInterval('P7D')));
} }

12
src/pvv/side/social/hackekveldactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class HackekveldActivity implements Activity { class HackekveldActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) { public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 18 || $date->format('H') == 17 && $date->format('i') > 30) { if (intval($date->format('H')) > 18 || intval($date->format('H')) === 17 && intval($date->format('i')) > 30) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(18, 15, 0)); return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(18, 15, 0));
} }
$date = $date->setTime(16, 15, 0); $date = $date->setTime(16, 15, 0);
if ($date->format('N') != 6) { if (intval($date->format('N')) !== 6) {
return $this->nextDate($date->add(new \DateInterval('P1D'))); return $this->nextDate($date->add(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2) { if (intval($date->format('W')) % 2) {
return $this->nextDate($date->add(new \DateInterval('P7D'))); return $this->nextDate($date->add(new \DateInterval('P7D')));
} }
@ -23,14 +23,14 @@ class HackekveldActivity implements Activity {
} }
public function prevDate(\DateTimeImmutable $date) { public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 17 || $date->format('H') == 18 && $date->format('i') < 30) { if (intval($date->format('H')) < 17 || intval($date->format('H')) === 18 && intval($date->format('i')) < 30) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(18, 15, 0)); return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(18, 15, 0));
} }
$date = $date->setTime(18, 15, 0); $date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) { if (intval($date->format('N')) !== 6) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))); return $this->prevDate($date->sub(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2) { if (intval($date->format('W')) % 2) {
return $this->prevDate($date->sub(new \DateInterval('P7D'))); return $this->prevDate($date->sub(new \DateInterval('P7D')));
} }

12
src/pvv/side/social/nerdepitsaactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class NerdepitsaActivity implements Activity { class NerdepitsaActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) { public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 19) { if (intval($date->format('H')) > 19) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(19, 0, 0)); return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(19, 0, 0));
} }
$date = $date->setTime(19, 0, 0); $date = $date->setTime(19, 0, 0);
if ($date->format('N') != 5) { if (intval($date->format('N')) !== 5) {
return $this->nextDate($date->add(new \DateInterval('P1D'))); return $this->nextDate($date->add(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2) { if (intval($date->format('W')) % 2) {
return $this->nextDate($date->add(new \DateInterval('P7D'))); return $this->nextDate($date->add(new \DateInterval('P7D')));
} }
@ -23,14 +23,14 @@ class NerdepitsaActivity implements Activity {
} }
public function prevDate(\DateTimeImmutable $date) { public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 19) { if (intval($date->format('H')) < 19) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(19, 0, 0)); return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(19, 0, 0));
} }
$date = $date->setTime(19, 0, 0); $date = $date->setTime(19, 0, 0);
if ($date->format('N') != 5) { if (intval($date->format('N')) !== 5) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))); return $this->prevDate($date->sub(new \DateInterval('P1D')));
} }
if ($date->format('W') % 2) { if (intval($date->format('W')) % 2) {
return $this->prevDate($date->sub(new \DateInterval('P7D'))); return $this->prevDate($date->sub(new \DateInterval('P7D')));
} }