Type hinting fixes

heyainsleymae · Jan 9, 2024 · f9c8730 · f9c8730
1 parent 716fc8b
commit f9c8730
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/config/phpstan/phpstan.neon b/config/phpstan/phpstan.neon
@@ -11,8 +11,8 @@ parameters:
 		# Ignore errors caused by no type hints on class properties, as that's not available till PHP 7.4
 		- '#Property .+? has no type specified.#'
 
-		# Ignore errors caused by type hints that should be union types. Union types are not yet supported in PHP.
-		- '#Function vd(s|d)?\(\) has parameter \$var with no type specified.#'
+		# Ignore setters for properties that accept several types
+		- '#Property Artwork::\$Tags \(array<ArtworkTag>\) does not accept.+#'
 	level:
 		8
 	paths:

diff --git a/lib/Artwork.php b/lib/Artwork.php
@@ -21,7 +21,7 @@
  * @property User $Submitter
  * @property User $Reviewer
  * @property ?ImageMimeType $MimeType
- * @property array<ArtworkTag> $_Tags
+ * @property ?array<ArtworkTag> $_Tags
  */
 class Artwork extends PropertiesBase{
 	public ?string $Name = null;
@@ -60,6 +60,9 @@ class Artwork extends PropertiesBase{
 	// SETTERS
 	// *******
 
+	/**
+	 * @param string|null|array<ArtworkTag> $tags
+	 */
 	protected function SetTags(string|array|null $tags): void{
 		if($tags === null || is_array($tags)){
 			$this->_Tags = $tags;
@@ -289,14 +292,14 @@ protected function Validate(array &$uploadedFile = []): void{
 			$error->Add(new Exceptions\MissingEbookException());
 		}
 
-		if($this->Tags === null || count($this->_Tags) == 0){
+		if(count($this->Tags) == 0){
 			// In-use artwork doesn't have user-provided tags.
 			if($this->Status !== COVER_ARTWORK_STATUS_IN_USE){
 				$error->Add(new Exceptions\TagsRequiredException());
 			}
 		}
 
-		if($this->Tags !== null && count($this->_Tags) > COVER_ARTWORK_MAX_TAGS){
+		if(count($this->Tags) > COVER_ARTWORK_MAX_TAGS){
 			$error->Add(new Exceptions\TooManyTagsException());
 		}
 

diff --git a/lib/CoreFunctions.php b/lib/CoreFunctions.php
@@ -6,18 +6,18 @@
 use function Safe\ob_start;
 
 // Convenience alias of var_dump.
-function vd($var): void{
+function vd(mixed $var): void{
 	var_dump($var);
 }
 
 // var_dump($var) then die().
-function vdd($var): void{
+function vdd(mixed $var): void{
 	var_dump($var);
 	die();
 }
 
 // var_dump into a string.
-function vds($var): string{
+function vds(mixed $var): string{
 	ob_start();
 	var_dump($var);
 	$str = ob_get_contents();

diff --git a/www/artworks/post.php b/www/artworks/post.php
@@ -30,7 +30,7 @@
 		$artwork->Name = HttpInput::Str(POST, 'artwork-name', false);
 		$artwork->CompletedYear = HttpInput::Int(POST, 'artwork-year');
 		$artwork->CompletedYearIsCirca = HttpInput::Bool(POST, 'artwork-year-is-circa', false);
-		$artwork->Tags = HttpInput::Str(POST, 'artwork-tags', false);
+		$artwork->Tags = HttpInput::Str(POST, 'artwork-tags', false) ?? [];
 		$artwork->Status = HttpInput::Str(POST, 'artwork-status', false, COVER_ARTWORK_STATUS_UNVERIFIED);
 		$artwork->EbookWwwFilesystemPath = HttpInput::Str(POST, 'artwork-ebook-www-filesystem-path', false);
 		$artwork->SubmitterUserId = $GLOBALS['User']->UserId ?? null;