From a9654f00c8fbc9934289d761843ddd071025013f Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 28 Aug 2026 17:20:28 +0000
Subject: [PATCH] =PHPStorm Code Inspection: fixed class reference errors (from getting rid of JVB() and replacing with direct class::getInstance; as well as general code sniffing, etc
---
inc/rest/routes/ShopRoutes.php | 191 ++++++++++++++++++++++++-----------------------
1 files changed, 97 insertions(+), 94 deletions(-)
diff --git a/inc/rest/routes/ShopRoutes.php b/inc/rest/routes/ShopRoutes.php
index 5c9b3ac..658828a 100644
--- a/inc/rest/routes/ShopRoutes.php
+++ b/inc/rest/routes/ShopRoutes.php
@@ -1,10 +1,11 @@
<?php
namespace JVBase\rest\routes;
-use JVBase\JVB;
use JVBase\managers\Emails;
use JVBase\managers\Errors;
use JVBase\managers\ImageGenerator;
+use JVBase\managers\NotificationManager;
+use JVBase\managers\queue\Queue;
use JVBase\managers\UploadManager;
use JVBase\registrar\Registrar;
use JVBase\rest\RestRouteManager;
@@ -111,7 +112,6 @@
$operationID = $data['id'];
unset($data['id']);
- $data = json_encode($data);
$queue->queueOperation(
'shop_update',
@@ -545,19 +545,20 @@
$shop_name = get_term($shopID, BASE . 'shop')->name;
// Notify each manager
- foreach ($owners as $owner) {
- NotificationManager::getInstance()->addNotification(
- $owner,
- 'artist_request',
- [
- 'artist_id' => $artistID,
- 'artist_name' => $artist_name,
- 'user_id' => $userID,
- 'shop_id' => $shopID,
- 'shop_name' => $shop_name
- ]
- );
- }
+ //TODO
+// foreach ($owners as $owner) {
+// NotificationManager::getInstance()->addNotification(
+// $owner,
+// 'artist_request',
+// [
+// 'artist_id' => $artistID,
+// 'artist_name' => $artist_name,
+// 'user_id' => $userID,
+// 'shop_id' => $shopID,
+// 'shop_name' => $shop_name
+// ]
+// );
+// }
}
/**
@@ -681,16 +682,17 @@
$invitation_id = $wpdb->insert_id;
// If user exists, send notification through the system
- if ($existing_user_id) {
- NotificationManager::getInstance()->addNotification(
- $existing_user_id,
- 'artist_invitation',
- $manager_id,
- sprintf('You have been invited to join %s', get_term($shop_id, BASE . 'shop')->name),
- $invitation_id,
- 'invitation'
- );
- }
+ //TODO
+// if ($existing_user_id) {
+// NotificationManager::getInstance()->addNotification(
+// $existing_user_id,
+// 'artist_invitation',
+// $manager_id,
+// sprintf('You have been invited to join %s', get_term($shop_id, BASE . 'shop')->name),
+// $invitation_id,
+// 'invitation'
+// );
+// }
// Send email invitation
$this->sendInvitationEmail($artist_email, $artist_name, $manager_id, $shop_id, $token);
@@ -802,16 +804,17 @@
// If invitation was for an existing user, notify them
$user_id = email_exists($invitation->email);
- if ($user_id) {
- NotificationManager::getInstance()->addNotification(
- $user_id,
- 'invitation_revoked',
- $manager_id,
- sprintf('Your invitation to %s has been revoked', get_term($shop_id, BASE . 'shop')->name),
- $shop_id,
- BASE . 'shop'
- );
- }
+ //TODO
+// if ($user_id) {
+// NotificationManager::getInstance()->addNotification(
+// $user_id,
+// 'invitation_revoked',
+// $manager_id,
+// sprintf('Your invitation to %s has been revoked', get_term($shop_id, BASE . 'shop')->name),
+// $shop_id,
+// BASE . 'shop'
+// );
+// }
return new WP_REST_Response([
'success' => true,
@@ -871,15 +874,16 @@
// Notify the artist
$notification_type = $status === 'accepted' ? 'shop_accepted' : 'shop_rejected';
- NotificationManager::getInstance()->addNotification(
- $request->user_id,
- $notification_type,
- [
- 'shop_id' => $request->shop_id,
- 'shop_name' => get_term($request->shop_id, BASE . 'shop')->name,
- 'notes' => $notes
- ]
- );
+ //TODO
+// NotificationManager::getInstance()->addNotification(
+// $request->user_id,
+// $notification_type,
+// [
+// 'shop_id' => $request->shop_id,
+// 'shop_name' => get_term($request->shop_id, BASE . 'shop')->name,
+// 'notes' => $notes
+// ]
+// );
return new WP_REST_Response([
'success' => true,
@@ -989,20 +993,21 @@
}
// Notify inviters
- $inviters = json_decode($invitation['inviters'], true);
- if (!empty($inviters)) {
- foreach ($inviters as $inviter_id) {
- NotificationManager::getInstance()->addNotification(
- $inviter_id,
- 'invitation_accepted',
- [
- 'artist_id' => $user_id,
- 'artist_name' => jvbGetUsername($user_id),
- 'shop_id' => $invitation['to_shop']
- ]
- );
- }
- }
+ //TODO
+// $inviters = json_decode($invitation['inviters'], true);
+// if (!empty($inviters)) {
+// foreach ($inviters as $inviter_id) {
+// NotificationManager::getInstance()->addNotification(
+// $inviter_id,
+// 'invitation_accepted',
+// [
+// 'artist_id' => $user_id,
+// 'artist_name' => jvbGetUsername($user_id),
+// 'shop_id' => $invitation['to_shop']
+// ]
+// );
+// }
+// }
$wpdb->query('COMMIT');
return true;
@@ -1014,9 +1019,8 @@
[
'user_id' => $user_id,
'invitation' => $invitation
- ],
- 'error'
- );
+ ]
+ );
return false;
}
@@ -1059,20 +1063,21 @@
);
// Notify inviters
- $inviters = json_decode($invitation['inviters'], true);
- if (!empty($inviters)) {
- foreach ($inviters as $inviter_id) {
- NotificationManager::getInstance()->addNotification(
- $inviter_id,
- 'invitation_declined',
- [
- 'artist_id' => $user_id,
- 'artist_name' => jvbGetUsername($user_id),
- 'shop_id' => $invitation['to_shop']
- ]
- );
- }
- }
+ //TODO
+// $inviters = json_decode($invitation['inviters'], true);
+// if (!empty($inviters)) {
+// foreach ($inviters as $inviter_id) {
+// NotificationManager::getInstance()->addNotification(
+// $inviter_id,
+// 'invitation_declined',
+// [
+// 'artist_id' => $user_id,
+// 'artist_name' => jvbGetUsername($user_id),
+// 'shop_id' => $invitation['to_shop']
+// ]
+// );
+// }
+// }
return true;
} catch (Exception $e) {
@@ -1082,9 +1087,8 @@
[
'user_id' => $user_id,
'invitation' => $invitation
- ],
- 'error'
- );
+ ]
+ );
return false;
}
@@ -1225,19 +1229,19 @@
$shop_meta = Meta::forTerm($shop_id);
$owners = $shop_meta->getAll(['owner', 'managers']);
$owners = array_unique(array_merge(explode(',', $owners['owner']),explode(',', $owners['managers'])));
-
- foreach ($owners as $owner_id) {
- if (!empty($owner_id)) {
- NotificationManager::getInstance()->addNotification(
- $owner_id,
- 'artist_left',
- $user_id,
- sprintf('%s has left %s', jvbGetUsername($user_id), $shop_name),
- $shop_id,
- BASE . 'shop'
- );
- }
- }
+// TODO
+// foreach ($owners as $owner_id) {
+// if (!empty($owner_id)) {
+// NotificationManager::getInstance()->addNotification(
+// $owner_id,
+// 'artist_left',
+// $user_id,
+// sprintf('%s has left %s', jvbGetUsername($user_id), $shop_name),
+// $shop_id,
+// BASE . 'shop'
+// );
+// }
+// }
return true;
} catch (Exception $e) {
@@ -1248,9 +1252,8 @@
[
'user_id' => $user_id,
'shop_id' => $shop_id
- ],
- 'error'
- );
+ ]
+ );
return false;
}
--
Gitblit v1.10.0