From 18a2d0d7795f3aca3c832aa86fac19ee9981aa1f Mon Sep 17 00:00:00 2001
From: "Florine W. Dekker" <florine@fwdekker.com>
Date: Thu, 1 Dec 2022 20:52:16 +0100
Subject: [PATCH] Restructure some packages

---
 composer.json                                 |   2 +-
 composer.lock                                 | Bin 77196 -> 77196 bytes
 package-lock.json                             | Bin 226174 -> 226174 bytes
 package.json                                  |   2 +-
 src/main/api.php                              |  12 ++---
 .../com/fwdekker/deathnotifier/Database.php   |   2 +-
 .../fwdekker/deathnotifier/mailer/Email.php   |   6 +--
 .../deathnotifier/mediawiki/ArticleType.php   |  23 ++++++++
 .../{ => mediawiki}/Mediawiki.php             |  51 +-----------------
 .../deathnotifier/mediawiki/QueryOutput.php   |  40 ++++++++++++++
 .../AddTrackingAction.php                     |   2 +-
 .../ListTrackingsAction.php                   |   2 +-
 .../NotifyArticleDeletedEmail.php             |   2 +-
 .../NotifyArticleUndeletedEmail.php           |   2 +-
 .../NotifyStatusChangedEmail.php              |   2 +-
 .../{trackings => tracking}/PersonStatus.php  |   2 +-
 .../RemoveTrackingAction.php                  |   2 +-
 .../TrackingManager.php                       |   6 +--
 .../UpdateTrackingsCliAction.php              |   2 +-
 .../deathnotifier/DatabaseTestCase.php        |   2 +-
 20 files changed, 89 insertions(+), 73 deletions(-)
 create mode 100644 src/main/php/com/fwdekker/deathnotifier/mediawiki/ArticleType.php
 rename src/main/php/com/fwdekker/deathnotifier/{ => mediawiki}/Mediawiki.php (88%)
 create mode 100644 src/main/php/com/fwdekker/deathnotifier/mediawiki/QueryOutput.php
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/AddTrackingAction.php (96%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/ListTrackingsAction.php (94%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/NotifyArticleDeletedEmail.php (97%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/NotifyArticleUndeletedEmail.php (97%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/NotifyStatusChangedEmail.php (97%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/PersonStatus.php (81%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/RemoveTrackingAction.php (95%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/TrackingManager.php (99%)
 rename src/main/php/com/fwdekker/deathnotifier/{trackings => tracking}/UpdateTrackingsCliAction.php (95%)

diff --git a/composer.json b/composer.json
index 1f6811d..a9d9e87 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "fwdekker/death-notifier",
     "description": "Get notified when a famous person dies.",
-    "version": "0.15.2", "_comment_version": "Also update version in `package.json`!",
+    "version": "0.15.3", "_comment_version": "Also update version in `package.json`!",
     "type": "project",
     "license": "MIT",
     "homepage": "https://git.fwdekker.com/tools/death-notifier",
diff --git a/composer.lock b/composer.lock
index 1a78606dbed3b934b0bcbb47556a16297ab8234a..d66640ae31ec86b6582f9a29f77abba50748c1f1 100644
GIT binary patch
delta 51
zcmeCV&C+w5WrHxIf=RMjl8I%qabjAkftiJ+xuKb<fvIt_K}xD=TAGD<O0zNJc4J1y
GNF4y3zz(wj

delta 51
zcmeCV&C+w5WrHxIf?-;+MY5?$l5vW8qG^(exq+F9g^96oqGh6~MUsW7X|ploc4J1y
GNF4y0=nhN(

diff --git a/package-lock.json b/package-lock.json
index 77f94a0766b1eafe2db50bbb1b62a70d08169062..1d3ce1f6ac9c44bb1640c9ab5788de36aced863c 100644
GIT binary patch
delta 32
qcmV+*0N?-q<_-Sl4UjbfGm$oy0W*`K4HJRjh2Q~&-~zSa1D<mAjSiOp

delta 32
qcmV+*0N?-q<_-Sl4UjbfGLbfx0Wy=J4HJRjh2Q~&-~zSa1D<mAWDb=8

diff --git a/package.json b/package.json
index 6737cad..436fb7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "death-notifier",
-    "version": "0.15.2", "_comment_version": "Also update version in `composer.json`!",
+    "version": "0.15.3", "_comment_version": "Also update version in `composer.json`!",
     "description": "Get notified when a famous person dies.",
     "author": "Florine W. Dekker",
     "browser": "dist/bundle.js",
diff --git a/src/main/api.php b/src/main/api.php
index d15ce3c..b334f76 100644
--- a/src/main/api.php
+++ b/src/main/api.php
@@ -6,14 +6,14 @@ use com\fwdekker\deathnotifier\Database;
 use com\fwdekker\deathnotifier\EmulateCronCliAction;
 use com\fwdekker\deathnotifier\mailer\Mailer;
 use com\fwdekker\deathnotifier\mailer\ProcessEmailQueueCliAction;
-use com\fwdekker\deathnotifier\Mediawiki;
+use com\fwdekker\deathnotifier\mediawiki\Mediawiki;
 use com\fwdekker\deathnotifier\Response;
 use com\fwdekker\deathnotifier\StartSessionAction;
-use com\fwdekker\deathnotifier\trackings\AddTrackingAction;
-use com\fwdekker\deathnotifier\trackings\ListTrackingsAction;
-use com\fwdekker\deathnotifier\trackings\RemoveTrackingAction;
-use com\fwdekker\deathnotifier\trackings\TrackingManager;
-use com\fwdekker\deathnotifier\trackings\UpdateTrackingsCliAction;
+use com\fwdekker\deathnotifier\tracking\AddTrackingAction;
+use com\fwdekker\deathnotifier\tracking\ListTrackingsAction;
+use com\fwdekker\deathnotifier\tracking\RemoveTrackingAction;
+use com\fwdekker\deathnotifier\tracking\TrackingManager;
+use com\fwdekker\deathnotifier\tracking\UpdateTrackingsCliAction;
 use com\fwdekker\deathnotifier\user\GetUserDataAction;
 use com\fwdekker\deathnotifier\user\LoginAction;
 use com\fwdekker\deathnotifier\user\LogoutAction;
diff --git a/src/main/php/com/fwdekker/deathnotifier/Database.php b/src/main/php/com/fwdekker/deathnotifier/Database.php
index dca0289..711ca4d 100644
--- a/src/main/php/com/fwdekker/deathnotifier/Database.php
+++ b/src/main/php/com/fwdekker/deathnotifier/Database.php
@@ -3,7 +3,7 @@
 namespace com\fwdekker\deathnotifier;
 
 use com\fwdekker\deathnotifier\mailer\Mailer;
-use com\fwdekker\deathnotifier\trackings\TrackingManager;
+use com\fwdekker\deathnotifier\tracking\TrackingManager;
 use com\fwdekker\deathnotifier\user\UserManager;
 use Composer\Semver\Comparator;
 use Monolog\Logger;
diff --git a/src/main/php/com/fwdekker/deathnotifier/mailer/Email.php b/src/main/php/com/fwdekker/deathnotifier/mailer/Email.php
index 0cce100..0e7f1ba 100644
--- a/src/main/php/com/fwdekker/deathnotifier/mailer/Email.php
+++ b/src/main/php/com/fwdekker/deathnotifier/mailer/Email.php
@@ -2,9 +2,9 @@
 
 namespace com\fwdekker\deathnotifier\mailer;
 
-use com\fwdekker\deathnotifier\trackings\NotifyArticleDeletedEmail;
-use com\fwdekker\deathnotifier\trackings\NotifyArticleUndeletedEmail;
-use com\fwdekker\deathnotifier\trackings\NotifyStatusChangedEmail;
+use com\fwdekker\deathnotifier\tracking\NotifyArticleDeletedEmail;
+use com\fwdekker\deathnotifier\tracking\NotifyArticleUndeletedEmail;
+use com\fwdekker\deathnotifier\tracking\NotifyStatusChangedEmail;
 use com\fwdekker\deathnotifier\user\ChangedEmailEmail;
 use com\fwdekker\deathnotifier\user\ChangedPasswordEmail;
 use com\fwdekker\deathnotifier\user\RegisterEmail;
diff --git a/src/main/php/com/fwdekker/deathnotifier/mediawiki/ArticleType.php b/src/main/php/com/fwdekker/deathnotifier/mediawiki/ArticleType.php
new file mode 100644
index 0000000..183d3e4
--- /dev/null
+++ b/src/main/php/com/fwdekker/deathnotifier/mediawiki/ArticleType.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace com\fwdekker\deathnotifier\mediawiki;
+
+
+/**
+ * The type of Wikipedia article.
+ */
+enum ArticleType
+{
+    /**
+     * A page about a real-life person.
+     */
+    case Person;
+    /**
+     * A disambiguation page.
+     */
+    case Disambiguation;
+    /**
+     * A page that is not one of the other types.
+     */
+    case Other;
+}
diff --git a/src/main/php/com/fwdekker/deathnotifier/Mediawiki.php b/src/main/php/com/fwdekker/deathnotifier/mediawiki/Mediawiki.php
similarity index 88%
rename from src/main/php/com/fwdekker/deathnotifier/Mediawiki.php
rename to src/main/php/com/fwdekker/deathnotifier/mediawiki/Mediawiki.php
index e556963..0cf76f1 100644
--- a/src/main/php/com/fwdekker/deathnotifier/Mediawiki.php
+++ b/src/main/php/com/fwdekker/deathnotifier/mediawiki/Mediawiki.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace com\fwdekker\deathnotifier;
+namespace com\fwdekker\deathnotifier\mediawiki;
 
-use com\fwdekker\deathnotifier\trackings\PersonStatus;
+use com\fwdekker\deathnotifier\tracking\PersonStatus;
 use Exception;
 use Monolog\Logger;
 
@@ -232,53 +232,6 @@ class Mediawiki
 }
 
 
-/**
- * Output of a query request sent to Wikipedia's API.
- *
- * @template T the result type that is returned
- */
-class QueryOutput
-{
-    /**
-     * @var array<string, T> the results of the query, either raw from the API or processed in some way
-     */
-    public readonly array $results;
-    /**
-     * @var array<string, string> mapping of queried names to normalized/redirected names
-     */
-    public readonly array $redirects;
-    /**
-     * @var string[] list of missing articles
-     */
-    public readonly array $missing;
-
-
-    /**
-     * Constructs a new query output.
-     *
-     * @param array<string, T> $results the results of the query, either raw from the API or processed in some way
-     * @param array<string, string> $redirects mapping of queried names to normalized/redirected names
-     * @param string[] $missing list of missing articles
-     */
-    public function __construct(array $results, array $redirects, array $missing)
-    {
-        $this->results = $results;
-        $this->redirects = $redirects;
-        $this->missing = $missing;
-    }
-}
-
-/**
- * The type of Wikipedia article.
- */
-enum ArticleType
-{
-    case Person;
-    case Disambiguation;
-    case Other;
-}
-
-
 /**
  * Recursively merges arrays, while overwriting other types.
  *
diff --git a/src/main/php/com/fwdekker/deathnotifier/mediawiki/QueryOutput.php b/src/main/php/com/fwdekker/deathnotifier/mediawiki/QueryOutput.php
new file mode 100644
index 0000000..409b1e7
--- /dev/null
+++ b/src/main/php/com/fwdekker/deathnotifier/mediawiki/QueryOutput.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace com\fwdekker\deathnotifier\mediawiki;
+
+
+/**
+ * Output of a query request sent to Wikipedia's API.
+ *
+ * @template T the result type that is returned
+ */
+class QueryOutput
+{
+    /**
+     * @var array<string, T> the results of the query, either raw from the API or processed in some way
+     */
+    public readonly array $results;
+    /**
+     * @var array<string, string> mapping of queried names to normalized/redirected names
+     */
+    public readonly array $redirects;
+    /**
+     * @var string[] list of missing articles
+     */
+    public readonly array $missing;
+
+
+    /**
+     * Constructs a new query output.
+     *
+     * @param array<string, T> $results the results of the query, either raw from the API or processed in some way
+     * @param array<string, string> $redirects mapping of queried names to normalized/redirected names
+     * @param string[] $missing list of missing articles
+     */
+    public function __construct(array $results, array $redirects, array $missing)
+    {
+        $this->results = $results;
+        $this->redirects = $redirects;
+        $this->missing = $missing;
+    }
+}
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/AddTrackingAction.php b/src/main/php/com/fwdekker/deathnotifier/tracking/AddTrackingAction.php
similarity index 96%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/AddTrackingAction.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/AddTrackingAction.php
index 6dcd50c..8615eb8 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/AddTrackingAction.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/AddTrackingAction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 use com\fwdekker\deathnotifier\Action;
 use com\fwdekker\deathnotifier\ActionException;
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/ListTrackingsAction.php b/src/main/php/com/fwdekker/deathnotifier/tracking/ListTrackingsAction.php
similarity index 94%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/ListTrackingsAction.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/ListTrackingsAction.php
index 2b95017..c7bf96b 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/ListTrackingsAction.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/ListTrackingsAction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 use com\fwdekker\deathnotifier\Action;
 use com\fwdekker\deathnotifier\ActionException;
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/NotifyArticleDeletedEmail.php b/src/main/php/com/fwdekker/deathnotifier/tracking/NotifyArticleDeletedEmail.php
similarity index 97%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/NotifyArticleDeletedEmail.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/NotifyArticleDeletedEmail.php
index 5feb139..d1234eb 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/NotifyArticleDeletedEmail.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/NotifyArticleDeletedEmail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 use com\fwdekker\deathnotifier\mailer\Email;
 
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/NotifyArticleUndeletedEmail.php b/src/main/php/com/fwdekker/deathnotifier/tracking/NotifyArticleUndeletedEmail.php
similarity index 97%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/NotifyArticleUndeletedEmail.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/NotifyArticleUndeletedEmail.php
index e103130..b304168 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/NotifyArticleUndeletedEmail.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/NotifyArticleUndeletedEmail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 use com\fwdekker\deathnotifier\mailer\Email;
 
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/NotifyStatusChangedEmail.php b/src/main/php/com/fwdekker/deathnotifier/tracking/NotifyStatusChangedEmail.php
similarity index 97%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/NotifyStatusChangedEmail.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/NotifyStatusChangedEmail.php
index 17c0710..7323fdb 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/NotifyStatusChangedEmail.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/NotifyStatusChangedEmail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 use com\fwdekker\deathnotifier\mailer\Email;
 
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/PersonStatus.php b/src/main/php/com/fwdekker/deathnotifier/tracking/PersonStatus.php
similarity index 81%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/PersonStatus.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/PersonStatus.php
index 3bf6f85..52aa4c2 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/PersonStatus.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/PersonStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 
 /**
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/RemoveTrackingAction.php b/src/main/php/com/fwdekker/deathnotifier/tracking/RemoveTrackingAction.php
similarity index 95%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/RemoveTrackingAction.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/RemoveTrackingAction.php
index e8cfdef..6d3ad5f 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/RemoveTrackingAction.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/RemoveTrackingAction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 use com\fwdekker\deathnotifier\Action;
 use com\fwdekker\deathnotifier\ActionException;
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/TrackingManager.php b/src/main/php/com/fwdekker/deathnotifier/tracking/TrackingManager.php
similarity index 99%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/TrackingManager.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/TrackingManager.php
index 5b74f00..32cc2ce 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/TrackingManager.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/TrackingManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
-use com\fwdekker\deathnotifier\ArticleType;
 use com\fwdekker\deathnotifier\Database;
 use com\fwdekker\deathnotifier\mailer\Mailer;
-use com\fwdekker\deathnotifier\Mediawiki;
+use com\fwdekker\deathnotifier\mediawiki\ArticleType;
+use com\fwdekker\deathnotifier\mediawiki\Mediawiki;
 use com\fwdekker\deathnotifier\Response;
 use Exception;
 use Monolog\Logger;
diff --git a/src/main/php/com/fwdekker/deathnotifier/trackings/UpdateTrackingsCliAction.php b/src/main/php/com/fwdekker/deathnotifier/tracking/UpdateTrackingsCliAction.php
similarity index 95%
rename from src/main/php/com/fwdekker/deathnotifier/trackings/UpdateTrackingsCliAction.php
rename to src/main/php/com/fwdekker/deathnotifier/tracking/UpdateTrackingsCliAction.php
index d37b88b..c702cc7 100644
--- a/src/main/php/com/fwdekker/deathnotifier/trackings/UpdateTrackingsCliAction.php
+++ b/src/main/php/com/fwdekker/deathnotifier/tracking/UpdateTrackingsCliAction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace com\fwdekker\deathnotifier\trackings;
+namespace com\fwdekker\deathnotifier\tracking;
 
 use com\fwdekker\deathnotifier\CliAction;
 
diff --git a/src/test/php/com/fwdekker/deathnotifier/DatabaseTestCase.php b/src/test/php/com/fwdekker/deathnotifier/DatabaseTestCase.php
index 4464f86..8c7e5e0 100644
--- a/src/test/php/com/fwdekker/deathnotifier/DatabaseTestCase.php
+++ b/src/test/php/com/fwdekker/deathnotifier/DatabaseTestCase.php
@@ -3,7 +3,7 @@
 namespace com\fwdekker\deathnotifier;
 
 use com\fwdekker\deathnotifier\mailer\Mailer;
-use com\fwdekker\deathnotifier\trackings\TrackingManager;
+use com\fwdekker\deathnotifier\tracking\TrackingManager;
 use com\fwdekker\deathnotifier\user\UserManager;
 use Exception;
 use Monolog\Logger;