From 004a4a27c31fe3a59901005bcfc72013d45020e9 Mon Sep 17 00:00:00 2001
From: Mike Colagrosso <colagrosso@users.noreply.github.com>
Date: Mon, 29 Jan 2024 23:20:29 -0700
Subject: [PATCH] Convert SORT_COVER_ constants to an enum

---
 lib/ArtworkSort.php    | 6 ++++++
 lib/Constants.php      | 3 ---
 lib/Library.php        | 4 ++--
 www/artworks/index.php | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 lib/ArtworkSort.php

diff --git a/lib/ArtworkSort.php b/lib/ArtworkSort.php
new file mode 100644
index 00000000..57374b8b
--- /dev/null
+++ b/lib/ArtworkSort.php
@@ -0,0 +1,6 @@
+<?
+enum ArtworkSort: string{
+	case CreatedNewest = 'created-newest';
+	case ArtistAlpha = 'artist-alpha';
+	case CompletedNewest = 'completed-newest';
+}
diff --git a/lib/Constants.php b/lib/Constants.php
index a3c2104e..9cec01e0 100644
--- a/lib/Constants.php
+++ b/lib/Constants.php
@@ -44,9 +44,6 @@ const ARTWORK_MAX_STRING_LENGTH = 250;
 const ARTWORK_MAX_TAGS = 15;
 const ARTWORK_IMAGE_MINIMUM_WIDTH = 300;
 const ARTWORK_IMAGE_MINIMUM_HEIGHT = 300;
-const SORT_COVER_ARTWORK_CREATED_NEWEST = 'created-newest';
-const SORT_COVER_ARTIST_ALPHA = 'artist-alpha';
-const SORT_COVER_ARTWORK_COMPLETED_NEWEST = 'completed-newest';
 
 const CAPTCHA_IMAGE_HEIGHT = 72;
 const CAPTCHA_IMAGE_WIDTH = 230;
diff --git a/lib/Library.php b/lib/Library.php
index 99c099f3..6b0f464c 100644
--- a/lib/Library.php
+++ b/lib/Library.php
@@ -210,10 +210,10 @@ class Library{
 		}
 
 		$orderBy = 'art.Created desc';
-		if($sort == SORT_COVER_ARTIST_ALPHA){
+		if($sort == ArtworkSort::ArtistAlpha->value){
 			$orderBy = 'a.Name';
 		}
-		elseif($sort == SORT_COVER_ARTWORK_COMPLETED_NEWEST){
+		elseif($sort == ArtworkSort::CompletedNewest->value){
 			$orderBy = 'art.CompletedYear desc';
 		}
 
diff --git a/www/artworks/index.php b/www/artworks/index.php
index 465a54c1..ac99256c 100644
--- a/www/artworks/index.php
+++ b/www/artworks/index.php
@@ -142,9 +142,9 @@ catch(Exceptions\PageOutOfBoundsException){
 				<span>Sort</span>
 				<span>
 					<select name="sort">
-						<option value="<?= SORT_COVER_ARTWORK_CREATED_NEWEST ?>"<? if($sort == SORT_COVER_ARTWORK_CREATED_NEWEST){ ?> selected="selected"<? } ?>>Date added (new &#x2192; old)</option>
-						<option value="<?= SORT_COVER_ARTIST_ALPHA ?>"<? if($sort == SORT_COVER_ARTIST_ALPHA){ ?> selected="selected"<? } ?>>Artist name (a &#x2192; z)</option>
-						<option value="<?= SORT_COVER_ARTWORK_COMPLETED_NEWEST ?>"<? if($sort == SORT_COVER_ARTWORK_COMPLETED_NEWEST){ ?> selected="selected"<? } ?>>Date of artwork completion (new &#x2192; old)</option>
+						<option value="<?= ArtworkSort::CreatedNewest->value ?>"<? if($sort == ArtworkSort::CreatedNewest->value){ ?> selected="selected"<? } ?>>Date added (new &#x2192; old)</option>
+						<option value="<?= ArtworkSort::ArtistAlpha->value ?>"<? if($sort == ArtworkSort::ArtistAlpha->value){ ?> selected="selected"<? } ?>>Artist name (a &#x2192; z)</option>
+						<option value="<?= ArtworkSort::CompletedNewest->value ?>"<? if($sort == ArtworkSort::CompletedNewest->value){ ?> selected="selected"<? } ?>>Date of artwork completion (new &#x2192; old)</option>
 					</select>
 				</span>
 			</label>