Merge pull request #466 from BracketSpace/feature/Notifications-table…

…/CU-3mp4ad

Notification table

src/Abstracts/Adapter.php → compat/src-deprecated/Abstracts/Adapter.php

@@ -14,12 +14,12 @@
 use BracketSpace\Notification\Dependencies\Micropackage\Casegnostic\Helpers\CaseHelper;
 use BracketSpace\Notification\Interfaces;
 use BracketSpace\Notification\Core\Notification;
-use function BracketSpace\Notification\addNotification;
 
 /**
  * Adapter class
  *
  * @mixin \BracketSpace\Notification\Core\Notification
+ * @deprecated [Next]
  */
 abstract class Adapter implements Interfaces\Adaptable
 {
@@ -39,6 +39,8 @@ abstract class Adapter implements Interfaces\Adaptable
 	 */
 	public function __construct(Notification $notification)
 	{
+		notification_deprecated_class( __CLASS__, '[Next]' );
+
 		$this->notification = $notification;
 	}
 
@@ -81,6 +83,7 @@ public function getNotification()
 	/**
 	 * Sets up Notification object with data.
 	 *
+	 * phpcs:ignore SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation.NonFullyQualifiedClassName
 	 * @param array<mixed> $data Data array.
 	 * @return \BracketSpace\Notification\Core\Notification
 	 * @since  6.0.0
@@ -109,6 +112,6 @@ public function isEnabled()
 	 */
 	public function registerNotification()
 	{
-		addNotification($this->getNotification());
+		notification_add($this->getNotification());
 	}
 }

src/Defaults/Adapter/JSON.php → compat/src-deprecated/Adapter/JSON.php

@@ -11,10 +11,11 @@
 namespace BracketSpace\Notification\Defaults\Adapter;
 
 use BracketSpace\Notification\Abstracts;
-use function BracketSpace\Notification\convertNotificationData;
 
 /**
  * JSON Adapter class
+ *
+ * @deprecated [Next]
  */
 class JSON extends Abstracts\Adapter
 {
@@ -33,7 +34,7 @@ public function read($input = null)
 			throw new \Exception('Read method of JSON adapter expects valid JSON string');
 		}
 
-		$this->setupNotification(convertNotificationData((array)$data));
+		$this->setupNotification(notification_convert_data((array)$data));
 		$this->setSource('JSON');
 
 		return $this;

src/Defaults/Adapter/WordPress.php → compat/src-deprecated/Adapter/WordPress.php

@@ -12,14 +12,12 @@
 
 use BracketSpace\Notification\Abstracts;
 use BracketSpace\Notification\Core\Notification;
-use function BracketSpace\Notification\adaptNotificationFrom;
-use function BracketSpace\Notification\convertNotificationData;
-use function BracketSpace\Notification\swapNotificationAdapter;
 
 /**
  * WordPress Adapter class
  *
  * @mixin \BracketSpace\Notification\Core\Notification
+ * @deprecated [Next]
  */
 class WordPress extends Abstracts\Adapter
 {
@@ -61,15 +59,15 @@ public function read($input = null)
 		}
 
 		try {
-			$jsonAdapter = adaptNotificationFrom(
+			$jsonAdapter = notification_adapt_from(
 				'JSON',
 				wp_specialchars_decode(
 					$this->post->post_content,
 					ENT_COMPAT
 				)
 			);
 			$this->setupNotification(
-				convertNotificationData(
+				notification_convert_data(
 					$jsonAdapter->getNotification()->toArray()
 				)
 			);
@@ -101,7 +99,7 @@ public function save()
 		$data = $this->getNotification()->toArray();
 
 		/** @var \BracketSpace\Notification\Defaults\Adapter\JSON */
-		$jsonAdapter = swapNotificationAdapter('JSON', $this);
+		$jsonAdapter = notification_swap_adapter('JSON', $this);
 		$json = $jsonAdapter->save(JSON_UNESCAPED_UNICODE);
 
 		// Update the hash.

src/Queries/NotificationQueries.php → compat/src-deprecated/Database/Queries/NotificationQueries.php

@@ -8,20 +8,31 @@
 
 declare(strict_types=1);
 
-namespace BracketSpace\Notification\Queries;
+namespace BracketSpace\Notification\Database\Queries;
 
-use function BracketSpace\Notification\adaptNotificationFrom;
+use BracketSpace\Notification\Core\Notification;
+use BracketSpace\Notification\Database\NotificationDatabaseService as Db;
 
 /**
  * Notification Queries class
+ *
+ * @deprecated [Next]
  */
 class NotificationQueries
 {
+	/**
+	 * Class constructor
+	 */
+	public function __construct()
+	{
+		notification_deprecated_class( __CLASS__, '[Next]' );
+	}
+
 	/**
 	 * Gets Notification posts.
 	 *
 	 * @param bool $includingDisabled If should include disabled notifications as well.
-	 * @return array<int, \BracketSpace\Notification\Defaults\Adapter\WordPress>
+	 * @return array<Notification>
 	 * @since  8.0.0
 	 */
 	public static function all(bool $includingDisabled = false): array
@@ -48,7 +59,13 @@ public static function all(bool $includingDisabled = false): array
 		}
 
 		foreach ($wpposts as $wppost) {
-			$posts[] = adaptNotificationFrom('WordPress', $wppost);
+			$notification = Db::postToNotification($wppost);
+
+			if (!($notification instanceof Notification)) {
+				continue;
+			}
+
+			$posts[] = $notification;
 		}
 
 		return $posts;
@@ -58,15 +75,13 @@ public static function all(bool $includingDisabled = false): array
 	 * Gets Notification post by hash.
 	 *
 	 * @param string $hash Notification hash.
-	 * @return \BracketSpace\Notification\Interfaces\Adaptable|null
+	 * @return ?Notification
 	 * @since  8.0.0
 	 */
 	public static function withHash(string $hash)
 	{
 		$post = get_page_by_path($hash, OBJECT, 'notification');
 
-		return empty($post)
-			? null
-			: adaptNotificationFrom('WordPress', $post);
+		return empty($post) ? null : Db::postToNotification($post);
 	}
 }