Skip to content

Commit 509c7e1

Browse files
committed
fixed nullable values in the helper methods
1 parent 1164caf commit 509c7e1

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/Canvas.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,21 @@ public static function gravatar(string $email, int $size = 200, string $default
151151
/**
152152
* Return true if dark mode is enabled.
153153
*
154-
* @param int $enabled
154+
* @param int|null $enabled
155155
* @return bool
156156
*/
157-
public static function enabledDarkMode(int $enabled): bool
157+
public static function enabledDarkMode(?int $enabled): bool
158158
{
159159
return (bool) $enabled ?: false;
160160
}
161161

162162
/**
163163
* Return true if the app is configured to use Arabic or Farsi.
164164
*
165-
* @param string $locale
165+
* @param string|null $locale
166166
* @return bool
167167
*/
168-
public static function usingRightToLeftLanguage(string $locale): bool
168+
public static function usingRightToLeftLanguage(?string $locale): bool
169169
{
170170
return in_array($locale, ['ar', 'fa']);
171171
}

tests/CanvasTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public function testURLIsValid(): void
6767

6868
public function testTrimURL(): void
6969
{
70-
$url = Canvas::trimUrl('https://www.example.com?string-to-trim');
70+
$this->assertSame(Canvas::trimUrl('https://www.example.com?string-to-trim'), 'www.example.com');
7171

72-
$this->assertSame($url, 'www.example.com');
72+
$this->assertNull(Canvas::trimUrl(null));
7373
}
7474

7575
public function testGravatar(): void
@@ -90,12 +90,14 @@ public function testEnabledDarkMode(): void
9090
{
9191
$this->assertTrue(Canvas::enabledDarkMode(1));
9292
$this->assertFalse(Canvas::enabledDarkMode(0));
93+
$this->assertFalse(Canvas::enabledDarkMode(null));
9394
}
9495

9596
public function testUsingRightToLeftLanguage(): void
9697
{
9798
$this->assertTrue(Canvas::usingRightToLeftLanguage('ar'));
9899
$this->assertTrue(Canvas::usingRightToLeftLanguage('fa'));
99100
$this->assertFalse(Canvas::usingRightToLeftLanguage('en'));
101+
$this->assertFalse(Canvas::usingRightToLeftLanguage(null));
100102
}
101103
}

0 commit comments

Comments
 (0)