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/managers/ImageGenerator.php | 63 ++++++++++---------------------
1 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/inc/managers/ImageGenerator.php b/inc/managers/ImageGenerator.php
index dc6479c..2636de7 100644
--- a/inc/managers/ImageGenerator.php
+++ b/inc/managers/ImageGenerator.php
@@ -1,7 +1,6 @@
<?php
namespace JVBase\managers;
-use JVBase\managers\UploadManager;
use WP_Error;
use Imagick;
use ImagickPixel;
@@ -184,13 +183,10 @@
$artist_name = $this->data['display_name'];
$city = $this->data['city'];
- switch ($this->type) {
- case 'shop':
- $title = 'Featured Shop Image';
- break;
- default:
- $title = 'Featured Artist Image';
- }
+ $title = match ($this->type) {
+ 'shop' => 'Featured Shop Image',
+ default => 'Featured Artist Image',
+ };
$attachment = [
'post_mime_type' => 'image/webp',
@@ -213,14 +209,10 @@
require_once(ABSPATH . 'wp-admin/includes/media.php');
- switch ($this->type) {
- case 'shop':
- $type = 'Tattoo Studio';
- break;
- default:
- $type = $this->data['type'];
- break;
- }
+ $type = match ($this->type) {
+ 'shop' => 'Tattoo Studio',
+ default => $this->data['type'],
+ };
// Set alt text
$alt_text = sprintf(
'Featured image for %s - %sin %s',
@@ -240,14 +232,10 @@
protected function generateFilename():void
{
if ($this->fileManager) {
- switch ($this->type) {
- case 'shop':
- $title = 'tattoo-shop';
- break;
- default:
- $title = 'artist';
- break;
- }
+ $title = match ($this->type) {
+ 'shop' => 'tattoo-shop',
+ default => 'artist',
+ };
// Use FileUploadManager to generate a filename
$user_data = get_userdata($this->data['user_id']);
@@ -578,7 +566,7 @@
* @param string $color Center color
* @return void
*/
- protected function createGradientBackgroundImagick(Imagick &$canvas, string $color): void
+ protected function createGradientBackgroundImagick(Imagick $canvas, string $color): void
{
$width = $canvas->getImageWidth();
$height = $canvas->getImageHeight();
@@ -959,7 +947,7 @@
* @param string $color Center color
* @return void
*/
- protected function createGradientBackgroundGD(GdImage &$canvas, string $color):void
+ protected function createGradientBackgroundGD(GdImage $canvas, string $color):void
{
$width = imagesx($canvas);
$height = imagesy($canvas);
@@ -1017,22 +1005,13 @@
$imageInfo = getimagesize($imagePath);
// Create image from source based on file type
- switch ($imageInfo[2]) {
- case IMAGETYPE_JPEG:
- $sourceImage = imagecreatefromjpeg($imagePath);
- break;
- case IMAGETYPE_PNG:
- $sourceImage = imagecreatefrompng($imagePath);
- break;
- case IMAGETYPE_GIF:
- $sourceImage = imagecreatefromgif($imagePath);
- break;
- case IMAGETYPE_WEBP:
- $sourceImage = imagecreatefromwebp($imagePath);
- break;
- default:
- throw new Exception("Unsupported image type");
- }
+ $sourceImage = match ($imageInfo[2]) {
+ IMAGETYPE_JPEG => imagecreatefromjpeg($imagePath),
+ IMAGETYPE_PNG => imagecreatefrompng($imagePath),
+ IMAGETYPE_GIF => imagecreatefromgif($imagePath),
+ IMAGETYPE_WEBP => imagecreatefromwebp($imagePath),
+ default => throw new Exception("Unsupported image type"),
+ };
// Calculate dimensions while maintaining aspect ratio
$sourceWidth = imagesx($sourceImage);
--
Gitblit v1.10.0