@@ -883,27 +897,27 @@ public function after_setup_theme() {
// BackUp
\CSF::createSection($prefix, [
- 'title' => __('Backup Settings', 'wp-addon'),
- 'icon' => 'fa fa-server',
+ 'title' => __('Backup Settings', 'wp-addon'),
+ 'icon' => 'fa fa-server',
'fields' => [
[
'title' => __('Download settings now', 'wp-addon'),
- 'desc' => __('You can get or set settings from backup'),
- 'type' => 'backup',
+ 'desc' => __('You can get or set settings from backup'),
+ 'type' => 'backup',
],
],
]);
- // My Plugins
- \CSF::createSection($prefix, [
- 'title' => __('Мои плагины', 'wp-addon'),
- 'icon' => 'fa fa-plug',
- 'fields' => [
- [
- 'type' => 'content',
- 'content' => $this->get_plugins_html(),
- ],
- ],
- ]);
- }
+ // My Plugins
+ \CSF::createSection($prefix, [
+ 'title' => __('Мои плагины', 'wp-addon'),
+ 'icon' => 'fa fa-plug',
+ 'fields' => [
+ [
+ 'type' => 'content',
+ 'content' => $this->get_plugins_html(),
+ ],
+ ],
+ ]);
+ }
}
diff --git a/src/Config/wp-widgets.php b/src/Config/wp-widgets.php
index 2925e8f..cf68c3a 100644
--- a/src/Config/wp-widgets.php
+++ b/src/Config/wp-widgets.php
@@ -1,69 +1,68 @@
'content',
+ 'type' => 'content',
'content' => '',
],
[
- 'id' => 'disable_guttenberg_widget',
- 'type' => 'switcher',
- 'title' => __( 'Disable guttenberg for widgets', 'wp-addon' ),
+ 'id' => 'disable_guttenberg_widget',
+ 'type' => 'switcher',
+ 'title' => __('Disable guttenberg for widgets', 'wp-addon'),
'default' => true,
],
[
- 'id' => 'add_clone_widget',
- 'type' => 'switcher',
- 'title' => __( 'Enable Duplicate widgets', 'wp-addon' ),
+ 'id' => 'add_clone_widget',
+ 'type' => 'switcher',
+ 'title' => __('Enable Duplicate widgets', 'wp-addon'),
'default' => true,
],
- /*[
- 'id' => 'custom_sidebars',
- 'type' => 'switcher',
- 'title' => __( 'Enable custom Dynamic sidebars', 'wp-addon' ),
- 'default' => true,
- ],*/
+ /*[
+ 'id' => 'custom_sidebars',
+ 'type' => 'switcher',
+ 'title' => __( 'Enable custom Dynamic sidebars', 'wp-addon' ),
+ 'default' => true,
+ ],*/
[ // Shortcodes
- 'id' => 'components',
- 'type' => 'tabbed',
- 'title' => __('Components', 'wp-addon'),
+ 'id' => 'components',
+ 'type' => 'tabbed',
+ 'title' => __('Components', 'wp-addon'),
'subtitle' => '',
- 'tabs' => [
+ 'tabs' => [
+ [
+ 'title' => __('Shortcodes', 'rw-addon'),
+ 'icon' => '',
+ 'fields' => [
+ [
+ 'id' => 'faq_shortcode',
+ 'type' => 'switcher',
+ 'title' => __('Enable FAQ shortcode', 'wp-addon'),
+ 'desc' => __('WPBakery Page Builder support ', 'wp-addon'),
+ 'default' => true,
+ ],
+ [
+ 'id' => 'table_of_contents',
+ 'type' => 'switcher',
+ 'title' => __('Enable Table of Content shortcode', 'wp-addon'),
+ 'desc' => __('WPBakery Page Builder support ', 'wp-addon'),
+ 'default' => true,
+ ],
+ ],
+ ],
[
- 'title' => __('Shortcodes', 'rw-addon'),
- 'icon' => '',
+ 'title' => __('Widgets', 'rw-addon'),
+ 'icon' => 'fa fa-connectdevelop',
'fields' => [
- [
- 'id' => 'faq_shortcode',
- 'type' => 'switcher',
- 'title' => __('Enable FAQ shortcode', 'wp-addon'),
- 'desc' => __('WPBakery Page Builder support ', 'wp-addon'),
- 'default' => true,
- ],
- [
- 'id' => 'table_of_contents',
- 'type' => 'switcher',
- 'title' => __('Enable Table of Content shortcode', 'wp-addon'),
- 'desc' => __('WPBakery Page Builder support ', 'wp-addon'),
- 'default' => true,
- ],
+ [
+ 'id' => 'archive_widget',
+ 'type' => 'switcher',
+ 'title' => __('Yearly archive widget', 'wp-addon'),
+ 'default' => true,
+ ],
],
],
- [
- 'title' => __('Widgets', 'rw-addon'),
- 'icon' => 'fa fa-connectdevelop',
- 'fields' => [
- [
- 'id' => 'archive_widget',
- 'type' => 'switcher',
- 'title' => __('Yearly archive widget', 'wp-addon'),
- 'default' => true,
- ],
- ],
- ],
],
],
-];
\ No newline at end of file
+];
diff --git a/src/ControllerWP.php b/src/ControllerWP.php
index 83901ba..efe7dad 100644
--- a/src/ControllerWP.php
+++ b/src/ControllerWP.php
@@ -7,12 +7,11 @@
final class ControllerWP
{
private OptionService $optionService;
+
private array $options;
/**
* Constructor
- *
- * @param OptionService $optionService
*/
public function __construct(OptionService $optionService)
{
@@ -25,15 +24,15 @@ public function __construct(OptionService $optionService)
*/
public function options_loader()
{
- if (!is_array($this->options)) {
+ if (! is_array($this->options)) {
return;
}
- /**
- * @var string $key Option name
- * @var int|array|false $value Option value
- */
- foreach ($this->options as $key => $value) {
+ /**
+ * @var string $key Option name
+ * @var int|array|false $value Option value
+ */
+ foreach ($this->options as $key => $value) {
if ($value == 1) {
$this->run($key); // 'plugins_loaded'
} elseif (is_array($value)) { // block options
@@ -49,8 +48,7 @@ public function options_loader()
/**
* Запускаем если есть такая функция
*
- * @param $function
- * @param $settings
+ * @param $settings
*/
protected function run($function)
{
@@ -59,6 +57,4 @@ protected function run($function)
add_action('init', $function, 1);
}
}
-
-
-}
\ No newline at end of file
+}
diff --git a/src/Core/Plugin.php b/src/Core/Plugin.php
index ed1267d..3a2d9d2 100644
--- a/src/Core/Plugin.php
+++ b/src/Core/Plugin.php
@@ -2,11 +2,21 @@
namespace WpAddon\Core;
+use WpAddon\ControllerWP;
+use WpAddon\FrontWP;
+use WpAddon\Services\AssetService;
+use WpAddon\Services\ImageOptimizationService;
+use WpAddon\Services\MediaCleanupService;
+use WpAddon\Services\OptionService;
+use WpAddon\WP_Addon_Settings;
+
/**
* Main Plugin class for initialization and constants
*/
class Plugin
{
+ private bool $initialized = false;
+
/**
* Plugin file path
*/
@@ -25,7 +35,7 @@ class Plugin
/**
* Plugin version
*/
- private string $version = '1.3.6';
+ private string $version = '1.4.0';
/**
* Text domain
@@ -35,27 +45,27 @@ class Plugin
/**
* Option service
*/
- private \WpAddon\Services\OptionService $optionService;
+ private OptionService $optionService;
/**
* Asset service
*/
- private \WpAddon\Services\AssetService $assetService;
+ private AssetService $assetService;
/**
* Media cleanup service
*/
- private \WpAddon\Services\MediaCleanupService $mediaCleanupService;
+ private MediaCleanupService $mediaCleanupService;
/**
* Image optimization service
*/
- private \WpAddon\Services\ImageOptimizationService $imageOptimizationService;
+ private ImageOptimizationService $imageOptimizationService;
/**
* Constructor
*
- * @param string $file Plugin file path
+ * @param string $file Plugin file path
*/
public function __construct(string $file)
{
@@ -69,10 +79,15 @@ public function __construct(string $file)
*/
public function init(): void
{
+ if ($this->initialized) {
+ return;
+ }
+
+ $this->initialized = true;
register_activation_hook($this->file, [$this, 'activate']);
$this->defineConstants();
- $this->loadLocales();
+ $this->loadLocales();
$this->loadDependencies();
$this->addHooks();
}
@@ -82,91 +97,53 @@ public function init(): void
*/
public function activate(): void
{
- // Check if CodeStar Framework is installed
- if (!class_exists('CSF')) {
- $this->installCodestarFramework();
+ if (! class_exists('CSF')) {
+ add_action('admin_notices', [$this, 'renderMissingCodeStarNotice']);
}
}
- /**
- * Install CodeStar Framework
- */
- private function installCodestarFramework(): void
+ public function renderMissingCodeStarNotice(): void
{
- $csf_dir = $this->dir . 'lib/codestar-framework/';
-
- // Check if already downloaded
- if (file_exists($csf_dir . 'codestar-framework.php')) {
- require_once $csf_dir . 'codestar-framework.php';
+ if (! current_user_can('activate_plugins')) {
return;
}
- // Download CodeStar Framework
- $zip_url = 'https://github.com/Codestar/codestar-framework/archive/refs/heads/master.zip';
- $temp_zip = download_url($zip_url);
-
- if (is_wp_error($temp_zip)) {
- wp_die(__('Error downloading CodeStar Framework. Please install it manually from https://github.com/Codestar/codestar-framework', 'wp-addon'));
- }
-
- // Unzip
- WP_Filesystem();
- global $wp_filesystem;
-
- $unzip_result = unzip_file($temp_zip, $this->dir . 'lib/');
-
- // Clean up temp file
- @unlink($temp_zip);
-
- if (is_wp_error($unzip_result)) {
- wp_die(__('Error unpacking CodeStar Framework. Please install it manually.', 'wp-addon'));
- }
-
- // Rename directory
- $extracted_dir = $this->dir . 'lib/codestar-framework-master/';
- if (file_exists($extracted_dir)) {
- $wp_filesystem->move($extracted_dir, $csf_dir);
- }
-
- // Include CSF
- if (file_exists($csf_dir . 'codestar-framework.php')) {
- require_once $csf_dir . 'codestar-framework.php';
- } else {
- wp_die(__('CodeStar Framework not found after installation. Please install it manually.', 'wp-addon'));
- }
+ echo '
'
+ .esc_html__('WP Addon requires the bundled CodeStar Framework. Reinstall the plugin from a complete release package.', 'wp-addon')
+ .'
';
}
-
- private function loadLocales(): void {
- add_action( 'plugins_loaded', function () {
- $domain = 'wp-addon';
- $path = dirname( plugin_basename( RW_FILE ) ) . '/languages';
- load_plugin_textdomain( $domain, false, $path );
- }, 9 );
- }
+ private function loadLocales(): void
+ {
+ add_action('plugins_loaded', function () {
+ $domain = 'wp-addon';
+ $path = dirname(plugin_basename(RW_FILE)).'/languages';
+ load_plugin_textdomain($domain, false, $path);
+ }, 9);
+ }
/**
* Define plugin constants
*/
private function defineConstants(): void
{
- if (!defined('RW_LANG')) {
+ if (! defined('RW_LANG')) {
define('RW_LANG', $this->textDomain);
}
- if (!defined('RW_PLUGIN_DIR')) {
+ if (! defined('RW_PLUGIN_DIR')) {
define('RW_PLUGIN_DIR', $this->dir);
}
- if (!defined('RW_PLUGIN_URL')) {
+ if (! defined('RW_PLUGIN_URL')) {
define('RW_PLUGIN_URL', $this->url);
}
- if (!defined('RW_FILE')) {
+ if (! defined('RW_FILE')) {
define('RW_FILE', $this->file);
}
- if (!defined('WP_ADDON_VERSION')) {
+ if (! defined('WP_ADDON_VERSION')) {
define('WP_ADDON_VERSION', $this->version);
}
}
@@ -177,19 +154,19 @@ private function defineConstants(): void
private function loadDependencies(): void
{
// Load CodeStar Framework if available
- $csf_file = $this->dir . 'lib/codestar-framework/codestar-framework.php';
+ $csf_file = $this->dir.'lib/codestar-framework/codestar-framework.php';
if (file_exists($csf_file)) {
require_once $csf_file;
}
// Load settings
- require_once $this->dir . 'src/Config/wp-addon-settings.php';
+ require_once $this->dir.'src/Config/wp-addon-settings.php';
// Initialize services
- $this->optionService = new \WpAddon\Services\OptionService(RW_LANG);
- $this->assetService = new \WpAddon\Services\AssetService(RW_FILE, RW_PLUGIN_URL, RW_LANG, $this->version);
- $this->mediaCleanupService = new \WpAddon\Services\MediaCleanupService();
- $this->imageOptimizationService = new \WpAddon\Services\ImageOptimizationService();
+ $this->optionService = new OptionService(RW_LANG);
+ $this->assetService = new AssetService(RW_FILE, RW_PLUGIN_URL, RW_LANG, $this->version);
+ $this->mediaCleanupService = new MediaCleanupService;
+ $this->imageOptimizationService = new ImageOptimizationService;
// Load functions and modules
$this->loadModules();
@@ -198,31 +175,37 @@ private function loadDependencies(): void
/**
* Load and initialize modules from functions directory
*/
- private function loadModules(): void {
- foreach (glob($this->dir . 'functions/*.php') as $file) {
+ private function loadModules(): void
+ {
+ $initializedModules = [];
+ $moduleDependencies = [
+ 'MediaCleanup' => [$this->mediaCleanupService],
+ 'PageCache' => [$this->optionService],
+ 'AssetMinification' => [$this->optionService],
+ 'LazyLoading' => [$this->optionService, $this->imageOptimizationService],
+ ];
+
+ $files = glob($this->dir.'functions/*.php') ?: [];
+ sort($files, SORT_STRING);
+ foreach ($files as $file) {
require_once $file;
$className = basename($file, '.php');
- if (class_exists($className) && is_subclass_of($className, 'WpAddon\Interfaces\ModuleInterface')) {
- // For complex modules inject dependencies
- if ($className === 'MediaCleanup') {
- $module = new $className($this->mediaCleanupService);
- } elseif ($className === 'PageCache' || $className === 'AssetMinification') {
- $module = new $className($this->optionService);
- } elseif ($className === 'LazyLoading') {
- $module = new $className($this->optionService, $this->imageOptimizationService);
- } else {
- $module = new $className();
- }
+ if (class_exists($className) && is_subclass_of($className, 'WpAddon\Interfaces\ModuleInterface') && ! isset($initializedModules[$className])) {
+ $module = new $className(...($moduleDependencies[$className] ?? []));
$module->init();
+ $initializedModules[$className] = true;
}
}
- foreach (glob($this->dir . 'functions/*/*.php') as $file) {
+ $files = glob($this->dir.'functions/*/*.php') ?: [];
+ sort($files, SORT_STRING);
+ foreach ($files as $file) {
require_once $file;
$className = basename($file, '.php');
- if (class_exists($className) && is_subclass_of($className, 'WpAddon\Interfaces\ModuleInterface')) {
- $module = new $className();
+ if (class_exists($className) && is_subclass_of($className, 'WpAddon\Interfaces\ModuleInterface') && ! isset($initializedModules[$className])) {
+ $module = new $className(...($moduleDependencies[$className] ?? []));
$module->init();
+ $initializedModules[$className] = true;
}
}
}
@@ -241,19 +224,19 @@ private function addHooks(): void
*/
public function loadSeoFunctions(): void
{
- $seo_dir = $this->dir . 'functions/seo/';
+ $seo_dir = $this->dir.'functions/seo/';
if (is_dir($seo_dir)) {
- foreach (glob($seo_dir . '*.php') as $file) {
+ foreach (glob($seo_dir.'*.php') as $file) {
require_once $file;
}
}
-
+
// Also load from functions/posts, functions/terms, etc
$function_subdirs = ['posts', 'terms', 'comments', 'users', 'shortcodes', 'widgets', 'dashboard-widget', 'cf7', 'vc', 'TinyMCE'];
foreach ($function_subdirs as $subdir) {
- $dir = $this->dir . 'functions/' . $subdir . '/';
+ $dir = $this->dir.'functions/'.$subdir.'/';
if (is_dir($dir)) {
- foreach (glob($dir . '*.php') as $file) {
+ foreach (glob($dir.'*.php') as $file) {
require_once $file;
}
}
@@ -267,15 +250,15 @@ public function onPluginsLoaded(): void
{
// Initialize settings
if (class_exists('\WpAddon\WP_Addon_Settings')) {
- \WpAddon\WP_Addon_Settings::getInstance()->add_actions();
+ WP_Addon_Settings::getInstance()->add_actions();
}
// Initialize front-end logic
- $frontWP = new \WpAddon\FrontWP($this->optionService, $this->assetService);
+ $frontWP = new FrontWP($this->optionService, $this->assetService);
$frontWP->add_actions();
// Initialize controller
- $controllerWP = new \WpAddon\ControllerWP($this->optionService);
+ $controllerWP = new ControllerWP($this->optionService);
$controllerWP->options_loader();
}
}
diff --git a/src/FrontWP.php b/src/FrontWP.php
index 2a3cc85..ec1248f 100644
--- a/src/FrontWP.php
+++ b/src/FrontWP.php
@@ -2,25 +2,29 @@
namespace WpAddon;
-use WpAddon\Services\OptionService;
use WpAddon\Services\AssetService;
+use WpAddon\Services\OptionService;
final class FrontWP
{
private OptionService $optionService;
+
private AssetService $assetService;
+
private array $options;
+
private string $file;
+
private string $path;
+
private string $url;
+
private string $name;
+
private string $ver;
/**
* Constructor
- *
- * @param OptionService $optionService
- * @param AssetService $assetService
*/
public function __construct(OptionService $optionService, AssetService $assetService)
{
@@ -47,7 +51,6 @@ public function add_actions()
add_action('wp_footer', [__CLASS__, 'add_wp_footer'], 10, 0);
}
-
public function action_add_meta()
{
if (empty($this->options)) {
@@ -55,15 +58,15 @@ public function action_add_meta()
}
foreach ($this->options as $option => $value) {
if (is_string($option) && $option === 'meta_tags') {
- if (!is_array($value)) {
+ if (! is_array($value)) {
continue;
}
foreach ($value as $val) {
- if (!is_array($val)) {
+ if (! is_array($val)) {
continue;
}
foreach ($val as $item) {
- if (!is_array($item)) {
+ if (! is_array($item)) {
continue;
}
echo $item;
@@ -75,31 +78,30 @@ public function action_add_meta()
public function add_header_js()
{
- if (!empty($this->options['rw_header_js'])) {
+ if (! empty($this->options['rw_header_js'])) {
echo '';
}
}
public function add_header_css()
{
- if (!empty($this->options['rw_header_css'])) {
+ if (! empty($this->options['rw_header_css'])) {
echo '';
}
}
-
public function rw_header_html()
{
- if (!empty($this->options['rw_header_html'])) {
+ if (! empty($this->options['rw_header_html'])) {
echo $this->options['rw_header_html'];
}
}
public function rw_footer_html()
{
- if (!empty($this->options['rw_footer_html'])) {
+ if (! empty($this->options['rw_footer_html'])) {
echo $this->options['rw_footer_html'];
}
}
@@ -109,10 +111,8 @@ public function rw_enqueue_scripts()
$this->assetService->enqueueScripts();
}
-
public static function add_wp_footer()
{
do_action('add_front');
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Interfaces/CacheInterface.php b/src/Interfaces/CacheInterface.php
index 8e20969..c3bb63b 100644
--- a/src/Interfaces/CacheInterface.php
+++ b/src/Interfaces/CacheInterface.php
@@ -5,7 +5,10 @@
interface CacheInterface
{
public function generateCacheKey(string $url): string;
+
public function getCachedContent(string $key): ?string;
+
public function saveCachedContent(string $key, string $content): void;
+
public function clearCache(): void;
}
diff --git a/src/Interfaces/ModuleInterface.php b/src/Interfaces/ModuleInterface.php
index 1974598..d774435 100644
--- a/src/Interfaces/ModuleInterface.php
+++ b/src/Interfaces/ModuleInterface.php
@@ -1,6 +1,8 @@
config = $config;
- $this->cacheDir = rtrim($config['cache_dir'], '/') . '/';
+ $this->cacheDir = rtrim($config['cache_dir'], '/').'/';
$this->ensureCacheDir();
}
private function ensureCacheDir(): void
{
- if (!is_dir($this->cacheDir)) {
+ if (! is_dir($this->cacheDir)) {
mkdir($this->cacheDir, 0755, true);
}
}
@@ -29,7 +30,7 @@ private function ensureCacheDir(): void
*/
public function minifyCss(string $css): string
{
- if (!$this->config['minify_css']) {
+ if (! $this->config['minify_css']) {
return $css;
}
@@ -49,7 +50,7 @@ public function minifyCss(string $css): string
*/
public function minifyJs(string $js): string
{
- if (!$this->config['minify_js']) {
+ if (! $this->config['minify_js']) {
return $js;
}
@@ -67,14 +68,14 @@ public function minifyJs(string $js): string
*/
public function combineCss(array $files): string
{
- if (!$this->config['combine_css']) {
+ if (! $this->config['combine_css']) {
return '';
}
$combined = '';
foreach ($files as $file) {
if (file_exists($file)) {
- $combined .= file_get_contents($file) . "\n";
+ $combined .= file_get_contents($file)."\n";
}
}
@@ -86,14 +87,14 @@ public function combineCss(array $files): string
*/
public function combineJs(array $files): string
{
- if (!$this->config['combine_js']) {
+ if (! $this->config['combine_js']) {
return '';
}
$combined = '';
foreach ($files as $file) {
if (file_exists($file)) {
- $combined .= file_get_contents($file) . ";\n";
+ $combined .= file_get_contents($file).";\n";
}
}
@@ -105,7 +106,7 @@ public function combineJs(array $files): string
*/
public function generateVersion(string $content): string
{
- return substr(md5($content . $this->config['version_salt']), 0, 8);
+ return substr(md5($content.$this->config['version_salt']), 0, 8);
}
/**
@@ -113,8 +114,9 @@ public function generateVersion(string $content): string
*/
public function saveToCache(string $key, string $content): string
{
- $file = $this->cacheDir . $key . '.gz';
+ $file = $this->cacheDir.$key.'.gz';
file_put_contents($file, gzcompress($content, 6));
+
return $key;
}
@@ -123,8 +125,8 @@ public function saveToCache(string $key, string $content): string
*/
public function getFromCache(string $key): ?string
{
- $file = $this->cacheDir . $key . '.gz';
- if (!is_file($file)) {
+ $file = $this->cacheDir.$key.'.gz';
+ if (! is_file($file)) {
return null;
}
@@ -141,7 +143,7 @@ public function getFromCache(string $key): ?string
public function cleanupCache(int $maxAge = 604800, int $maxFiles = 500): void
{
- $files = glob($this->cacheDir . '*.gz') ?: [];
+ $files = glob($this->cacheDir.'*.gz') ?: [];
$now = time();
foreach ($files as $file) {
@@ -151,12 +153,12 @@ public function cleanupCache(int $maxAge = 604800, int $maxFiles = 500): void
}
}
- $files = glob($this->cacheDir . '*.gz') ?: [];
+ $files = glob($this->cacheDir.'*.gz') ?: [];
if (count($files) <= $maxFiles) {
return;
}
- usort($files, static fn(string $left, string $right): int => (filemtime($left) ?: 0) <=> (filemtime($right) ?: 0));
+ usort($files, static fn (string $left, string $right): int => (filemtime($left) ?: 0) <=> (filemtime($right) ?: 0));
foreach (array_slice($files, 0, count($files) - $maxFiles) as $file) {
unlink($file);
}
@@ -167,7 +169,7 @@ public function cleanupCache(int $maxAge = 604800, int $maxFiles = 500): void
*/
public function extractCriticalCss(string $css, array $selectors = []): string
{
- if (!$this->config['critical_css_enabled']) {
+ if (! $this->config['critical_css_enabled']) {
return '';
}
@@ -177,7 +179,7 @@ public function extractCriticalCss(string $css, array $selectors = []): string
foreach ($lines as $line) {
// Simple check for common critical selectors
if (preg_match('/^(body|html|\.site|\.header|\.nav|\.main|\.footer)/i', trim($line))) {
- $critical .= $line . "\n";
+ $critical .= $line."\n";
}
}
diff --git a/src/Services/AssetService.php b/src/Services/AssetService.php
index 6b30e82..3fdb707 100644
--- a/src/Services/AssetService.php
+++ b/src/Services/AssetService.php
@@ -34,11 +34,6 @@ class AssetService
/**
* Constructor
- *
- * @param string $file
- * @param string $url
- * @param string $name
- * @param string $version
*/
public function __construct(string $file, string $url, string $name, string $version)
{
@@ -60,7 +55,7 @@ public function enqueueScripts(): void
wp_enqueue_style(
$this->name,
- $this->url . 'assets/css/min/wp-addon.min.css',
+ $this->url.'assets/css/min/wp-addon.min.css',
[],
$this->version
);
diff --git a/src/Services/CacheService.php b/src/Services/CacheService.php
index 632d7dc..0439ea9 100644
--- a/src/Services/CacheService.php
+++ b/src/Services/CacheService.php
@@ -7,14 +7,15 @@
class CacheService implements CacheInterface
{
private string $cacheDir;
+
private int $ttl;
public function __construct(string $cacheDir = '', int $ttl = 3600)
{
- $this->cacheDir = $cacheDir ?: WP_CONTENT_DIR . '/cache/pages/';
+ $this->cacheDir = $cacheDir ?: WP_CONTENT_DIR.'/cache/pages/';
$this->ttl = $ttl;
- if (!is_dir($this->cacheDir)) {
- mkdir($this->cacheDir, 0755, true);
+ if (! is_dir($this->cacheDir) && ! mkdir($this->cacheDir, 0755, true) && ! is_dir($this->cacheDir)) {
+ throw new \RuntimeException(sprintf('Unable to create cache directory: %s', $this->cacheDir));
}
}
@@ -25,8 +26,8 @@ public function generateCacheKey(string $url): string
public function getCachedContent(string $key): ?string
{
- $file = $this->cacheDir . $key . '.gz';
- if (!is_file($file)) {
+ $file = $this->cacheDir.$key.'.gz';
+ if (! is_file($file)) {
return null;
}
@@ -50,7 +51,7 @@ public function getCachedContent(string $key): ?string
public function cleanup(int $maxEntries, int $maxAge, int $batchSize): void
{
- $files = glob($this->cacheDir . '*.gz') ?: [];
+ $files = glob($this->cacheDir.'*.gz') ?: [];
$now = time();
$removed = 0;
@@ -66,12 +67,12 @@ public function cleanup(int $maxEntries, int $maxAge, int $batchSize): void
}
}
- $files = glob($this->cacheDir . '*.gz') ?: [];
+ $files = glob($this->cacheDir.'*.gz') ?: [];
if (count($files) <= $maxEntries) {
return;
}
- usort($files, static fn(string $left, string $right): int => (filemtime($left) ?: 0) <=> (filemtime($right) ?: 0));
+ usort($files, static fn (string $left, string $right): int => (filemtime($left) ?: 0) <=> (filemtime($right) ?: 0));
$entriesToRemove = min(count($files) - $maxEntries, max(0, $batchSize - $removed));
foreach (array_slice($files, 0, $entriesToRemove) as $file) {
$this->deleteFile($file);
@@ -81,21 +82,33 @@ public function cleanup(int $maxEntries, int $maxAge, int $batchSize): void
private function deleteFile(string $file): void
{
if (is_file($file)) {
- unlink($file);
+ @unlink($file);
}
}
public function saveCachedContent(string $key, string $content): void
{
- $file = $this->cacheDir . $key . '.gz';
- file_put_contents($file, gzcompress($content, 6));
+ $file = $this->cacheDir.$key.'.gz';
+ $compressed = gzcompress($content, 6);
+ if ($compressed === false) {
+ return;
+ }
+
+ $temporaryFile = tempnam($this->cacheDir, $key.'.');
+ if ($temporaryFile === false) {
+ return;
+ }
+
+ if (file_put_contents($temporaryFile, $compressed, LOCK_EX) === false || ! rename($temporaryFile, $file)) {
+ @unlink($temporaryFile);
+ }
}
public function clearCache(): void
{
- $files = glob($this->cacheDir . '*.gz');
+ $files = glob($this->cacheDir.'*.gz') ?: [];
foreach ($files as $file) {
- unlink($file);
+ $this->deleteFile($file);
}
}
}
diff --git a/src/Services/ImageOptimizationService.php b/src/Services/ImageOptimizationService.php
index 5e63b36..254802d 100644
--- a/src/Services/ImageOptimizationService.php
+++ b/src/Services/ImageOptimizationService.php
@@ -10,10 +10,10 @@ class ImageOptimizationService
/**
* Generate blur placeholder for image
*
- * @param string $imagePath Path to the image file
- * @param int $blurIntensity Blur intensity (1-20, default 5)
- * @param int $thumbnailSize Maximum thumbnail size in pixels (default 50)
- * @param int $quality JPEG quality (1-100, default 70)
+ * @param string $imagePath Path to the image file
+ * @param int $blurIntensity Blur intensity (1-20, default 5)
+ * @param int $thumbnailSize Maximum thumbnail size in pixels (default 50)
+ * @param int $quality JPEG quality (1-100, default 70)
* @return string Base64 encoded blur placeholder or empty string on error
*/
public function generateBlurPlaceholder(
@@ -23,8 +23,12 @@ public function generateBlurPlaceholder(
int $quality = 70
): string {
try {
+ if (! $this->isGdAvailable()) {
+ return '';
+ }
+
// Validate input parameters
- if (!file_exists($imagePath) || !is_readable($imagePath)) {
+ if (! file_exists($imagePath) || ! is_readable($imagePath)) {
return '';
}
@@ -34,17 +38,20 @@ public function generateBlurPlaceholder(
// Get image info
$imageInfo = @getimagesize($imagePath);
- if (!$imageInfo) {
+ if (! $imageInfo) {
return '';
}
$originalWidth = $imageInfo[0];
$originalHeight = $imageInfo[1];
+ if ($originalWidth < 1 || $originalHeight < 1) {
+ return '';
+ }
$mimeType = $imageInfo['mime'] ?? '';
// Load image based on type
$sourceImage = $this->loadImage($imagePath, $mimeType);
- if (!$sourceImage) {
+ if (! $sourceImage) {
return '';
}
@@ -53,17 +60,18 @@ public function generateBlurPlaceholder(
if ($aspectRatio > 1) {
// Landscape
$thumbWidth = $thumbnailSize;
- $thumbHeight = (int)($thumbnailSize / $aspectRatio);
+ $thumbHeight = (int) ($thumbnailSize / $aspectRatio);
} else {
// Portrait or square
- $thumbWidth = (int)($thumbnailSize * $aspectRatio);
+ $thumbWidth = (int) ($thumbnailSize * $aspectRatio);
$thumbHeight = $thumbnailSize;
}
// Create thumbnail
$thumbnail = imagecreatetruecolor($thumbWidth, $thumbHeight);
- if (!$thumbnail) {
+ if (! $thumbnail) {
imagedestroy($sourceImage);
+
return '';
}
@@ -76,9 +84,10 @@ public function generateBlurPlaceholder(
}
// Resize image
- if (!imagecopyresampled($thumbnail, $sourceImage, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $originalWidth, $originalHeight)) {
+ if (! imagecopyresampled($thumbnail, $sourceImage, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $originalWidth, $originalHeight)) {
imagedestroy($sourceImage);
imagedestroy($thumbnail);
+
return '';
}
@@ -87,19 +96,20 @@ public function generateBlurPlaceholder(
// Apply blur effect
if ($blurIntensity > 1) {
$thumbnail = $this->applyBlur($thumbnail, $blurIntensity);
- if (!$thumbnail) {
+ if (! $thumbnail) {
return '';
}
}
// Convert to base64
- $base64Data = $this->imageToBase64($thumbnail, $quality);
+ $base64Data = $this->imageToBase64($thumbnail, $quality, $mimeType);
imagedestroy($thumbnail);
return $base64Data;
- } catch (\Exception $e) {
- error_log('ImageOptimizationService error: ' . $e->getMessage());
+ } catch (\Throwable $e) {
+ error_log('ImageOptimizationService error: '.$e->getMessage());
+
return '';
}
}
@@ -107,8 +117,6 @@ public function generateBlurPlaceholder(
/**
* Load image from file based on MIME type
*
- * @param string $imagePath
- * @param string $mimeType
* @return resource|\GdImage|null
*/
private function loadImage(string $imagePath, string $mimeType)
@@ -131,18 +139,27 @@ private function loadImage(string $imagePath, string $mimeType)
return null;
}
+ private function isGdAvailable(): bool
+ {
+ return function_exists('imagecreatetruecolor')
+ && function_exists('imagecopyresampled')
+ && function_exists('imagefilter')
+ && function_exists('imagejpeg')
+ && function_exists('imagepng')
+ && function_exists('imagedestroy');
+ }
+
/**
* Apply blur effect to image
*
- * @param resource|\GdImage $image
- * @param int $intensity
+ * @param resource|\GdImage $image
* @return resource|\GdImage|null
*/
private function applyBlur($image, int $intensity)
{
// Simple blur implementation using imagefilter
for ($i = 0; $i < $intensity; $i++) {
- if (!imagefilter($image, IMG_FILTER_GAUSSIAN_BLUR)) {
+ if (! imagefilter($image, IMG_FILTER_GAUSSIAN_BLUR)) {
return null;
}
}
@@ -153,55 +170,61 @@ private function applyBlur($image, int $intensity)
/**
* Convert image to base64 string
*
- * @param resource|\GdImage $image
- * @param int $quality
- * @return string
+ * @param resource|\GdImage $image
*/
- private function imageToBase64($image, int $quality): string
+ private function imageToBase64($image, int $quality, string $mimeType = 'image/jpeg'): string
{
ob_start();
- imagejpeg($image, null, $quality);
+ if ($mimeType === 'image/png') {
+ imagepng($image, null, 8);
+ } else {
+ imagejpeg($image, null, $quality);
+ }
$imageData = ob_get_clean();
- if (!$imageData) {
+ if (! $imageData) {
return '';
}
- return 'data:image/jpeg;base64,' . base64_encode($imageData);
+ return 'data:'.($mimeType === 'image/png' ? 'image/png' : 'image/jpeg').';base64,'.base64_encode($imageData);
}
/**
* Optimize image file (reduce size without quality loss)
*
- * @param string $imagePath
- * @param int $quality JPEG quality (1-100, default 85)
+ * @param int $quality JPEG quality (1-100, default 85)
* @return bool Success
*/
public function optimizeImage(string $imagePath, int $quality = 85): bool
{
try {
- if (!file_exists($imagePath) || !is_writable($imagePath)) {
+ if (! $this->isGdAvailable()) {
+ return false;
+ }
+
+ if (! file_exists($imagePath) || ! is_writable($imagePath)) {
return false;
}
$imageInfo = @getimagesize($imagePath);
- if (!$imageInfo) {
+ if (! $imageInfo) {
return false;
}
$mimeType = $imageInfo['mime'] ?? '';
$sourceImage = $this->loadImage($imagePath, $mimeType);
- if (!$sourceImage) {
+ if (! $sourceImage) {
return false;
}
$quality = max(1, min(100, $quality));
// Create temporary file
- $tempFile = tempnam(sys_get_temp_dir(), 'wp_addon_opt_');
- if (!$tempFile) {
+ $tempFile = tempnam(dirname($imagePath), '.wp_addon_opt_');
+ if (! $tempFile) {
imagedestroy($sourceImage);
+
return false;
}
@@ -227,17 +250,18 @@ public function optimizeImage(string $imagePath, int $quality = 85): bool
if ($success && filesize($tempFile) < filesize($imagePath)) {
// Replace original file if optimized version is smaller
- if (copy($tempFile, $imagePath)) {
- unlink($tempFile);
+ if (rename($tempFile, $imagePath)) {
return true;
}
}
unlink($tempFile);
- return $success;
- } catch (\Exception $e) {
- error_log('ImageOptimizationService optimizeImage error: ' . $e->getMessage());
+ return false;
+
+ } catch (\Throwable $e) {
+ error_log('ImageOptimizationService optimizeImage error: '.$e->getMessage());
+
return false;
}
}
@@ -245,8 +269,7 @@ public function optimizeImage(string $imagePath, int $quality = 85): bool
/**
* Generate responsive image thumbnails
*
- * @param string $imagePath
- * @param array $sizes Array of sizes ['width' => height] or ['width']
+ * @param array $sizes Array of sizes ['width' => height] or ['width']
* @return array Array of generated thumbnail paths
*/
public function generateThumbnails(string $imagePath, array $sizes): array
@@ -254,12 +277,12 @@ public function generateThumbnails(string $imagePath, array $sizes): array
$thumbnails = [];
try {
- if (!file_exists($imagePath)) {
+ if (! file_exists($imagePath)) {
return $thumbnails;
}
$imageInfo = @getimagesize($imagePath);
- if (!$imageInfo) {
+ if (! $imageInfo) {
return $thumbnails;
}
@@ -268,7 +291,7 @@ public function generateThumbnails(string $imagePath, array $sizes): array
$mimeType = $imageInfo['mime'] ?? '';
$sourceImage = $this->loadImage($imagePath, $mimeType);
- if (!$sourceImage) {
+ if (! $sourceImage) {
return $thumbnails;
}
@@ -281,18 +304,18 @@ public function generateThumbnails(string $imagePath, array $sizes): array
$thumbHeight = null;
}
- if (!$thumbWidth) {
+ if (! $thumbWidth) {
continue;
}
// Calculate height maintaining aspect ratio if not specified
- if (!$thumbHeight) {
+ if (! $thumbHeight) {
$aspectRatio = $originalWidth / $originalHeight;
- $thumbHeight = (int)($thumbWidth / $aspectRatio);
+ $thumbHeight = (int) ($thumbWidth / $aspectRatio);
}
$thumbnail = imagecreatetruecolor($thumbWidth, $thumbHeight);
- if (!$thumbnail) {
+ if (! $thumbnail) {
continue;
}
@@ -308,7 +331,7 @@ public function generateThumbnails(string $imagePath, array $sizes): array
if (imagecopyresampled($thumbnail, $sourceImage, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $originalWidth, $originalHeight)) {
// Generate filename
$pathInfo = pathinfo($imagePath);
- $thumbnailPath = $pathInfo['dirname'] . '/' . $pathInfo['filename'] . '-' . $thumbWidth . 'x' . $thumbHeight . '.' . $pathInfo['extension'];
+ $thumbnailPath = $pathInfo['dirname'].'/'.$pathInfo['filename'].'-'.$thumbWidth.'x'.$thumbHeight.'.'.$pathInfo['extension'];
// Save thumbnail
$saved = false;
@@ -338,7 +361,7 @@ public function generateThumbnails(string $imagePath, array $sizes): array
imagedestroy($sourceImage);
} catch (\Exception $e) {
- error_log('ImageOptimizationService generateThumbnails error: ' . $e->getMessage());
+ error_log('ImageOptimizationService generateThumbnails error: '.$e->getMessage());
}
return $thumbnails;
diff --git a/src/Services/MediaCleanupService.php b/src/Services/MediaCleanupService.php
index 3b4515c..e53609e 100644
--- a/src/Services/MediaCleanupService.php
+++ b/src/Services/MediaCleanupService.php
@@ -2,8 +2,8 @@
namespace WpAddon\Services;
-use RecursiveIteratorIterator;
use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
use RegexIterator;
/**
@@ -13,8 +13,6 @@ class MediaCleanupService
{
/**
* Get registered image sizes (static)
- *
- * @return array
*/
public static function getRegisteredSizesStatic(): array
{
@@ -45,7 +43,7 @@ public static function getRegisteredSizesStatic(): array
}
break;
}
- $registeredSizes[] = $width . 'x' . $height;
+ $registeredSizes[] = $width.'x'.$height;
}
return $registeredSizes;
@@ -53,14 +51,11 @@ public static function getRegisteredSizesStatic(): array
/**
* Check if file should be deleted
- *
- * @param string $basename
- * @return bool
*/
public function isFileToDelete(string $basename): bool
{
if (preg_match('/-(\d+)x(\d+)\.(jpg|jpeg|png|gif)$/i', $basename, $matches)) {
- $sizeKey = $matches[1] . 'x' . $matches[2];
+ $sizeKey = $matches[1].'x'.$matches[2];
// Exclude scaled and other special files
if (strpos($basename, '-scaled') !== false) {
@@ -68,7 +63,8 @@ public function isFileToDelete(string $basename): bool
}
$activeSizes = self::getRegisteredSizesStatic();
- return !in_array($sizeKey, $activeSizes);
+
+ return ! in_array($sizeKey, $activeSizes);
}
return false;
@@ -76,9 +72,6 @@ public function isFileToDelete(string $basename): bool
/**
* Get all image files in directory
- *
- * @param string $directory
- * @return array
*/
public function getAllImageFiles(string $directory): array
{
@@ -98,7 +91,6 @@ public function getAllImageFiles(string $directory): array
/**
* Get files to delete with total size
*
- * @param string $uploadPath
* @return array ['files' => array, 'totalSize' => int]
*/
public function getFilesToDelete(string $uploadPath): array
@@ -118,15 +110,13 @@ public function getFilesToDelete(string $uploadPath): array
return [
'files' => $toDelete,
- 'totalSize' => $totalSize
+ 'totalSize' => $totalSize,
];
}
/**
* Delete files
*
- * @param array $files
- * @param string $uploadPath
* @return array ['deleted' => int, 'errors' => int]
*/
public function deleteFiles(array $files, string $uploadPath = ''): array
@@ -144,7 +134,7 @@ public function deleteFiles(array $files, string $uploadPath = ''): array
return [
'deleted' => $deleted,
- 'errors' => $errors
+ 'errors' => $errors,
];
}
}
diff --git a/src/Services/OptionService.php b/src/Services/OptionService.php
index 94996f8..0ef73ac 100644
--- a/src/Services/OptionService.php
+++ b/src/Services/OptionService.php
@@ -14,8 +14,6 @@ class OptionService
/**
* Constructor
- *
- * @param string $optionKey
*/
public function __construct(string $optionKey = 'wp-addon')
{
@@ -24,8 +22,6 @@ public function __construct(string $optionKey = 'wp-addon')
/**
* Get plugin settings from DB
- *
- * @return array
*/
public function getSettings(): array
{
@@ -34,9 +30,6 @@ public function getSettings(): array
/**
* Update plugin settings
- *
- * @param array $settings
- * @return bool
*/
public function updateSettings(array $settings): bool
{
@@ -46,13 +39,13 @@ public function updateSettings(array $settings): bool
/**
* Get specific setting value
*
- * @param string $key
- * @param mixed $default
+ * @param mixed $default
* @return mixed
*/
public function getSetting(string $key, $default = null)
{
$settings = $this->getSettings();
+
return $settings[$key] ?? $default;
}
}
diff --git a/src/Traits/AjaxTrait.php b/src/Traits/AjaxTrait.php
index c68c5e8..2b84956 100644
--- a/src/Traits/AjaxTrait.php
+++ b/src/Traits/AjaxTrait.php
@@ -1,10 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/DatabaseMigrations.php b/tests/DatabaseMigrations.php
index 694a889..4736aac 100644
--- a/tests/DatabaseMigrations.php
+++ b/tests/DatabaseMigrations.php
@@ -14,19 +14,19 @@ protected function runDatabaseMigrations(): void
{
global $db;
- if (!$db) {
+ if (! $db) {
return; // Skip if database not initialized
}
// Clear all tables
- $db->exec("DELETE FROM wp_options");
- $db->exec("DELETE FROM wp_posts");
- $db->exec("DELETE FROM wp_postmeta");
- $db->exec("DELETE FROM wp_users");
- $db->exec("DELETE FROM wp_usermeta");
+ $db->exec('DELETE FROM wp_options');
+ $db->exec('DELETE FROM wp_posts');
+ $db->exec('DELETE FROM wp_postmeta');
+ $db->exec('DELETE FROM wp_users');
+ $db->exec('DELETE FROM wp_usermeta');
// Reset auto-increment counters
- $db->exec("DELETE FROM sqlite_sequence");
+ $db->exec('DELETE FROM sqlite_sequence');
// Insert default WordPress options
$this->seedDefaultOptions();
@@ -48,7 +48,7 @@ private function seedDefaultOptions(): void
{
global $db;
- if (!$db) {
+ if (! $db) {
return; // Skip if database not initialized
}
@@ -62,7 +62,7 @@ private function seedDefaultOptions(): void
['option_name' => 'stylesheet', 'option_value' => 'twentytwentyone'],
];
- $stmt = $db->prepare("INSERT INTO wp_options (option_name, option_value) VALUES (?, ?)");
+ $stmt = $db->prepare('INSERT INTO wp_options (option_name, option_value) VALUES (?, ?)');
foreach ($defaultOptions as $option) {
$stmt->execute([$option['option_name'], $option['option_value']]);
}
@@ -72,7 +72,7 @@ protected function createPost(array $attributes = []): int
{
global $db;
- if (!$db) {
+ if (! $db) {
throw new \Exception('Database not initialized');
}
@@ -103,7 +103,7 @@ protected function createPost(array $attributes = []): int
$data = array_merge($defaults, $attributes);
- $stmt = $db->prepare("
+ $stmt = $db->prepare('
INSERT INTO wp_posts (
post_author, post_date, post_date_gmt, post_content, post_title,
post_excerpt, post_status, comment_status, ping_status, post_password,
@@ -111,9 +111,10 @@ protected function createPost(array $attributes = []): int
post_content_filtered, post_parent, guid, menu_order, post_type,
post_mime_type, comment_count
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
- ");
+ ');
$stmt->execute(array_values($data));
+
return $db->lastInsertId();
}
@@ -124,7 +125,7 @@ protected function createUser(array $attributes = []): int
{
global $db;
- if (!$db) {
+ if (! $db) {
throw new \Exception('Database not initialized');
}
@@ -142,14 +143,15 @@ protected function createUser(array $attributes = []): int
$data = array_merge($defaults, $attributes);
- $stmt = $db->prepare("
+ $stmt = $db->prepare('
INSERT INTO wp_users (
user_login, user_pass, user_nicename, user_email, user_url,
user_registered, user_activation_key, user_status, display_name
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
- ");
+ ');
$stmt->execute(array_values($data));
+
return $db->lastInsertId();
}
}
diff --git a/tests/Factories/AssetFactory.php b/tests/Factories/AssetFactory.php
index 4ef992a..7725e7f 100644
--- a/tests/Factories/AssetFactory.php
+++ b/tests/Factories/AssetFactory.php
@@ -10,8 +10,8 @@ class AssetFactory extends Factory
protected function definition(): array
{
return [
- 'handle' => $this->faker->word() . '-asset',
- 'src' => $this->faker->url() . '/assets/' . $this->faker->word() . '.' . $this->faker->randomElement(['css', 'js']),
+ 'handle' => $this->faker->word().'-asset',
+ 'src' => $this->faker->url().'/assets/'.$this->faker->word().'.'.$this->faker->randomElement(['css', 'js']),
'deps' => [],
'ver' => $this->faker->randomFloat(1, 1, 9),
'media' => 'all',
@@ -82,7 +82,7 @@ public function asCss(): self
{
return $this->state([
'type' => 'style',
- 'src' => $this->faker->url() . '/assets/' . $this->faker->word() . '.css',
+ 'src' => $this->faker->url().'/assets/'.$this->faker->word().'.css',
'content' => $this->generateCssContent(),
]);
}
@@ -94,7 +94,7 @@ public function asJs(): self
{
return $this->state([
'type' => 'script',
- 'src' => $this->faker->url() . '/assets/' . $this->faker->word() . '.js',
+ 'src' => $this->faker->url().'/assets/'.$this->faker->word().'.js',
'content' => $this->generateJsContent(),
'media' => null,
]);
@@ -106,11 +106,11 @@ public function asJs(): self
public function minified(): self
{
$content = $this->attributes['content'] ?? $this->generateAssetContent();
- $minifiedContent = str_replace(["\n", "\t", " "], '', $content);
+ $minifiedContent = str_replace(["\n", "\t", ' '], '', $content);
return $this->state([
'content' => $minifiedContent,
- 'src' => str_replace('.css', '.min.css', $this->attributes['src'] ?? $this->faker->url() . '/assets/' . $this->faker->word() . '.css'),
+ 'src' => str_replace('.css', '.min.css', $this->attributes['src'] ?? $this->faker->url().'/assets/'.$this->faker->word().'.css'),
]);
}
@@ -132,7 +132,7 @@ public function small(): self
{
return $this->state([
'size' => $this->faker->numberBetween(100, 999),
- 'content' => $this->faker->word() . '{}',
+ 'content' => $this->faker->word().'{}',
]);
}
@@ -142,6 +142,7 @@ public function small(): self
protected function state(array $state): self
{
$this->attributes = array_merge($this->attributes, $state);
+
return $this;
}
}
diff --git a/tests/Factories/Factory.php b/tests/Factories/Factory.php
index bfca3dc..abfdd43 100644
--- a/tests/Factories/Factory.php
+++ b/tests/Factories/Factory.php
@@ -11,6 +11,7 @@
abstract class Factory
{
protected Generator $faker;
+
protected array $attributes = [];
public function __construct()
@@ -24,6 +25,7 @@ public function __construct()
public function create(array $attributes = []): mixed
{
$data = array_merge($this->definition(), $attributes);
+
return $this->createInstance($data);
}
@@ -36,6 +38,7 @@ public function createMany(int $count, array $attributes = []): array
for ($i = 0; $i < $count; $i++) {
$instances[] = $this->create($attributes);
}
+
return $instances;
}
diff --git a/tests/Factories/PostFactory.php b/tests/Factories/PostFactory.php
index db7ecca..043b011 100644
--- a/tests/Factories/PostFactory.php
+++ b/tests/Factories/PostFactory.php
@@ -39,7 +39,7 @@ protected function createInstance(array $data): int
{
global $db;
- $stmt = $db->prepare("
+ $stmt = $db->prepare('
INSERT INTO wp_posts (
post_author, post_date, post_date_gmt, post_content, post_title,
post_excerpt, post_status, comment_status, ping_status, post_password,
@@ -47,9 +47,10 @@ protected function createInstance(array $data): int
post_content_filtered, post_parent, guid, menu_order, post_type,
post_mime_type, comment_count
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
- ");
+ ');
$stmt->execute(array_values($data));
+
return $db->lastInsertId();
}
@@ -83,6 +84,7 @@ public function withAuthor(int $authorId): self
protected function state(array $state): self
{
$this->attributes = array_merge($this->attributes, $state);
+
return $this;
}
}
diff --git a/tests/Feature/AssetMinificationIntegrationTest.php b/tests/Feature/AssetMinificationIntegrationTest.php
index ead932f..2fb0bb7 100644
--- a/tests/Feature/AssetMinificationIntegrationTest.php
+++ b/tests/Feature/AssetMinificationIntegrationTest.php
@@ -2,27 +2,30 @@
use Brain\Monkey;
use Brain\Monkey\Functions;
+use WpAddon\Services\AssetOptimizationService;
+use WpAddon\Services\OptionService;
/**
* Integration test for AssetMinification module
*/
describe('AssetMinification Integration', function () {
// Пропустить тесты, если WordPress не загружен (integration среда)
- if (!function_exists('wp_die')) {
+ if (! function_exists('wp_die')) {
test('skipped - requires WordPress environment', function () {})->skip('WordPress environment not available');
+
return;
}
beforeEach(function () {
Monkey\setUp();
- $this->cacheDir = sys_get_temp_dir() . '/wp_addon_integration_cache_' . uniqid();
+ $this->cacheDir = sys_get_temp_dir().'/wp_addon_integration_cache_'.uniqid();
mkdir($this->cacheDir, 0755, true);
- $this->mockOptionService = \Mockery::mock('\WpAddon\Services\OptionService');
+ $this->mockOptionService = Mockery::mock('\WpAddon\Services\OptionService');
// Mock option service to return enabled config
$this->mockOptionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key, $default = null) {
+ ->andReturnUsing(function ($key, $default = null) {
$config = [
'enabled' => true,
'minify_css' => true,
@@ -36,6 +39,7 @@
'cache_dir' => $this->cacheDir,
'version_salt' => 'wp-addon-v1',
];
+
return $config[$key] ?? $default;
});
@@ -46,7 +50,7 @@
afterEach(function () {
// Clean up cache directory
if (is_dir($this->cacheDir)) {
- $files = glob($this->cacheDir . '/*');
+ $files = glob($this->cacheDir.'/*');
foreach ($files as $file) {
unlink($file);
}
@@ -54,7 +58,7 @@
}
Monkey\tearDown();
- \Mockery::close();
+ Mockery::close();
});
it('processes CSS assets', function () {
@@ -69,11 +73,11 @@
'src' => 'http://localhost/wp-content/plugins/plugin/style.css',
'deps' => [],
'ver' => '1.0.0',
- ]
+ ],
];
global $wp_styles;
- $wp_styles = new \stdClass();
+ $wp_styles = new stdClass;
$wp_styles->queue = array_keys($cssFiles);
$wp_styles->registered = [];
@@ -88,19 +92,20 @@
}
// Create temporary CSS files
- $tempCss1 = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.css';
+ $tempCss1 = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.css';
file_put_contents($tempCss1, 'body { color: red; }');
- $tempCss2 = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.css';
+ $tempCss2 = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.css';
file_put_contents($tempCss2, '.small { margin: 0; }');
// Mock file paths
Functions\when('file_exists')->justReturn(true);
Functions\when('filesize')->justReturn(2048);
Functions\when('file_get_contents')
- ->alias(function($path) use ($tempCss1, $tempCss2) {
+ ->alias(function ($path) use ($tempCss1, $tempCss2) {
if (str_contains($path, 'theme-style') || str_contains($path, 'style.css')) {
return file_get_contents($tempCss1);
}
+
return file_get_contents($tempCss2);
});
@@ -137,7 +142,7 @@
'src' => 'http://example.com/wp-content/plugins/plugin/script.js',
'deps' => [],
'ver' => '1.0.0',
- ]
+ ],
];
$this->mockWpScripts($jsFiles);
@@ -150,10 +155,11 @@
\Brain\Monkey\Functions\when('file_exists')->return(true);
\Brain\Monkey\Functions\when('filesize')->justReturn(2048);
\Brain\Monkey\Functions\when('file_get_contents')
- ->alias(function($path) use ($tempJs1, $tempJs2) {
+ ->alias(function ($path) use ($tempJs1, $tempJs2) {
if (str_contains($path, 'theme-script') || str_contains($path, 'script.js')) {
return file_get_contents($tempJs1);
}
+
return file_get_contents($tempJs2);
});
@@ -191,7 +197,7 @@
'src' => 'http://example.com/wp-includes/css/admin-bar.css',
'deps' => [],
'ver' => '1.0.0',
- ]
+ ],
];
$this->mockWpStyles($systemAssets);
@@ -227,7 +233,7 @@
'src' => 'http://example.com/wp-content/themes/theme/minified.css',
'deps' => [],
'ver' => '1.0.0',
- ]
+ ],
];
$this->mockWpStyles($cssFiles);
@@ -254,7 +260,7 @@
'src' => 'http://example.com/wp-content/themes/theme/small.css',
'deps' => [],
'ver' => '1.0.0',
- ]
+ ],
];
$this->mockWpStyles($cssFiles);
@@ -313,7 +319,7 @@
// Mock wp_add_inline_script to capture the added script
$addedScripts = [];
\Brain\Monkey\Functions\when('wp_add_inline_script')
- ->alias(function($handle, $data) use (&$addedScripts) {
+ ->alias(function ($handle, $data) use (&$addedScripts) {
$addedScripts[$handle] = $data;
});
@@ -328,8 +334,8 @@
it('clears cache files', function () {
// Create test cache files
- $testFile1 = $this->cacheDir . '/test1.gz';
- $testFile2 = $this->cacheDir . '/test2.gz';
+ $testFile1 = $this->cacheDir.'/test1.gz';
+ $testFile2 = $this->cacheDir.'/test2.gz';
file_put_contents($testFile1, 'test content 1');
file_put_contents($testFile2, 'test content 2');
@@ -348,14 +354,15 @@
it('does not register hooks when disabled', function () {
// Mock disabled config
- $this->mockOptionService = $this->createMock(\WpAddon\Services\OptionService::class);
+ $this->mockOptionService = $this->createMock(OptionService::class);
$this->mockOptionService->method('getSetting')
- ->willReturnCallback(function($key, $default = null) {
+ ->willReturnCallback(function ($key, $default = null) {
$config = [
'enabled' => false, // Disabled
'minify_css' => true,
'minify_js' => true,
];
+
return $config[$key] ?? $default;
});
@@ -364,7 +371,7 @@
// Mock add_action to capture registered actions
$registeredActions = [];
\Brain\Monkey\Functions\when('add_action')
- ->alias(function($hook, $callback) use (&$registeredActions) {
+ ->alias(function ($hook, $callback) use (&$registeredActions) {
$registeredActions[] = $hook;
});
@@ -379,7 +386,7 @@
// Mock add_action to capture registered actions
$registeredActions = [];
\Brain\Monkey\Functions\when('add_action')
- ->alias(function($hook, $callback) use (&$registeredActions) {
+ ->alias(function ($hook, $callback) use (&$registeredActions) {
$registeredActions[] = $hook;
});
@@ -423,7 +430,7 @@
it('checks real cache directory', function () {
// Проверяем директорию кэша в реальной среде
if (defined('WP_CONTENT_DIR')) {
- $cacheDir = WP_CONTENT_DIR . '/cache/assets/';
+ $cacheDir = WP_CONTENT_DIR.'/cache/assets/';
expect(is_dir($cacheDir))->toBeTrue();
expect(is_writable($cacheDir))->toBeTrue();
} else {
@@ -441,7 +448,7 @@
$criticalKeys = [
'asset_minification_enabled',
'asset_minify_css',
- 'asset_minify_js'
+ 'asset_minify_js',
];
foreach ($criticalKeys as $key) {
@@ -493,7 +500,7 @@
$this->assetMinification->processAssets();
// Проверяем что очередь изменилась или остались оригинальные стили
- expect(!empty($wp_styles->queue) || $wp_styles->queue === $originalQueue)->toBeTrue();
+ expect(! empty($wp_styles->queue) || $wp_styles->queue === $originalQueue)->toBeTrue();
} else {
skip('WordPress styles not available');
}
@@ -502,7 +509,7 @@
it('checks real critical CSS injection', function () {
// Проверяем инъекцию критического CSS
if (function_exists('get_template_directory')) {
- $themeCss = get_template_directory() . '/style.css';
+ $themeCss = get_template_directory().'/style.css';
if (file_exists($themeCss)) {
ob_start();
@@ -527,7 +534,7 @@
// Пробуем получить главную страницу
$response = wp_remote_get($homeUrl, ['timeout' => 5]);
- if (!is_wp_error($response)) {
+ if (! is_wp_error($response)) {
$html = wp_remote_retrieve_body($response);
// Проверяем наличие признаков оптимизации
@@ -554,8 +561,8 @@
it('checks real file system operations', function () {
// Проверяем файловые операции в реальной среде
- $service = new \WpAddon\Services\AssetOptimizationService([
- 'cache_dir' => sys_get_temp_dir() . '/test_real_cache/',
+ $service = new AssetOptimizationService([
+ 'cache_dir' => sys_get_temp_dir().'/test_real_cache/',
'version_salt' => 'real_test',
'minify_css' => true,
'minify_js' => true,
@@ -563,11 +570,11 @@
'combine_js' => true,
'critical_css_enabled' => true,
'exclude_css' => [],
- 'exclude_js' => []
+ 'exclude_js' => [],
]);
$testContent = 'body { color: red; }';
- $cacheKey = 'real_test_' . time();
+ $cacheKey = 'real_test_'.time();
// Тест сохранения
$service->saveToCache($cacheKey, $testContent);
@@ -577,7 +584,7 @@
expect($cached)->toBe($testContent);
// Очистка
- $cacheFile = sys_get_temp_dir() . '/test_real_cache/' . $cacheKey . '.gz';
+ $cacheFile = sys_get_temp_dir().'/test_real_cache/'.$cacheKey.'.gz';
if (file_exists($cacheFile)) {
unlink($cacheFile);
}
diff --git a/tests/Feature/AssetMinificationRealWorldTest.php b/tests/Feature/AssetMinificationRealWorldTest.php
index 1253a9d..d551603 100644
--- a/tests/Feature/AssetMinificationRealWorldTest.php
+++ b/tests/Feature/AssetMinificationRealWorldTest.php
@@ -2,11 +2,14 @@
use Brain\Monkey;
use Brain\Monkey\Functions;
+use WpAddon\Services\AssetOptimizationService;
+use WpAddon\Services\OptionService;
describe('AssetMinification Real World Integration', function () {
// Пропустить тесты, если WordPress не загружен (integration среда)
- if (!function_exists('wp_die')) {
+ if (! function_exists('wp_die')) {
test('skipped - requires WordPress environment', function () {})->skip('WordPress environment not available');
+
return;
}
beforeEach(function () {
@@ -22,10 +25,18 @@
'wp_dequeue_script' => null,
'wp_add_inline_script' => null,
'add_action' => null,
- 'site_url' => function() { return 'http://localhost'; },
- 'content_url' => function() { return 'http://localhost/wp-content'; },
- 'plugin_dir_path' => function() { return '/var/www/no-borders.ru/wp-content/plugins/wp-addon-plugin/'; },
- 'get_template_directory' => function() { return '/var/www/no-borders.ru/wp-content/themes/yootheme_child'; },
+ 'site_url' => function () {
+ return 'http://localhost';
+ },
+ 'content_url' => function () {
+ return 'http://localhost/wp-content';
+ },
+ 'plugin_dir_path' => function () {
+ return '/var/www/no-borders.ru/wp-content/plugins/wp-addon-plugin/';
+ },
+ 'get_template_directory' => function () {
+ return '/var/www/no-borders.ru/wp-content/themes/yootheme_child';
+ },
]);
});
@@ -53,11 +64,11 @@
it('loads asset minification config', function () {
// Чекпоинт 4: Конфиг загружается
- $optionService = new \WpAddon\Services\OptionService();
+ $optionService = new OptionService;
$assetMinification = new AssetMinification($optionService);
Functions\stubs([
- 'get_option' => function($key) {
+ 'get_option' => function ($key) {
return ['wp-addon' => [
'asset_minification_enabled' => true,
'asset_minify_css' => true,
@@ -67,14 +78,14 @@
'asset_critical_css_enabled' => true,
'asset_defer_non_critical_css' => true,
'asset_exclude_css' => 'admin-bar,dashicons',
- 'asset_exclude_js' => 'jquery,jquery-core'
+ 'asset_exclude_js' => 'jquery,jquery-core',
]];
- }
+ },
]);
$assetMinification->init();
- $reflection = new \ReflectionClass($assetMinification);
+ $reflection = new ReflectionClass($assetMinification);
$configProperty = $reflection->getProperty('config');
$configProperty->setAccessible(true);
$config = $configProperty->getValue($assetMinification);
@@ -86,7 +97,7 @@
it('creates cache directory', function () {
// Чекпоинт 5: Директория кэша существует
- $cacheDir = WP_CONTENT_DIR . '/cache/assets/';
+ $cacheDir = WP_CONTENT_DIR.'/cache/assets/';
expect(is_dir($cacheDir))->toBeTrue();
expect(is_writable($cacheDir))->toBeTrue();
});
@@ -94,7 +105,7 @@
it('works with asset optimization service', function () {
// Чекпоинт 6: Сервис оптимизации работает
$config = [
- 'cache_dir' => WP_CONTENT_DIR . '/cache/assets/',
+ 'cache_dir' => WP_CONTENT_DIR.'/cache/assets/',
'version_salt' => 'test',
'minify_css' => true,
'minify_js' => true,
@@ -102,10 +113,10 @@
'combine_js' => true,
'critical_css_enabled' => true,
'exclude_css' => [],
- 'exclude_js' => []
+ 'exclude_js' => [],
];
- $service = new \WpAddon\Services\AssetOptimizationService($config);
+ $service = new AssetOptimizationService($config);
expect($service)->toBeInstanceOf('WpAddon\\Services\\AssetOptimizationService');
// Тест минификации CSS
@@ -129,7 +140,7 @@
it('creates cache file for CSS minification', function () {
// Чекпоинт 7: Минификация CSS создает файл кэша
$config = [
- 'cache_dir' => WP_CONTENT_DIR . '/cache/assets/',
+ 'cache_dir' => WP_CONTENT_DIR.'/cache/assets/',
'version_salt' => 'test',
'minify_css' => true,
'minify_js' => true,
@@ -137,16 +148,16 @@
'combine_js' => true,
'critical_css_enabled' => true,
'exclude_css' => [],
- 'exclude_js' => []
+ 'exclude_js' => [],
];
- $service = new \WpAddon\Services\AssetOptimizationService($config);
+ $service = new AssetOptimizationService($config);
$css = '.test { color: red; font-size: 14px; }';
$version = $service->generateVersion($css);
- $cacheKey = 'test-css-' . $version;
+ $cacheKey = 'test-css-'.$version;
$service->saveToCache($cacheKey, $css);
- $cacheFile = $config['cache_dir'] . $cacheKey . '.gz';
+ $cacheFile = $config['cache_dir'].$cacheKey.'.gz';
expect(file_exists($cacheFile))->toBeTrue();
// Проверить содержимое
@@ -160,7 +171,7 @@
it('creates cache file for JS minification', function () {
// Чекпоинт 8: Минификация JS создает файл кэша
$config = [
- 'cache_dir' => WP_CONTENT_DIR . '/cache/assets/',
+ 'cache_dir' => WP_CONTENT_DIR.'/cache/assets/',
'version_salt' => 'test',
'minify_css' => true,
'minify_js' => true,
@@ -168,16 +179,16 @@
'combine_js' => true,
'critical_css_enabled' => true,
'exclude_css' => [],
- 'exclude_js' => []
+ 'exclude_js' => [],
];
- $service = new \WpAddon\Services\AssetOptimizationService($config);
+ $service = new AssetOptimizationService($config);
$js = 'function test() { return true; }';
$version = $service->generateVersion($js);
- $cacheKey = 'test-js-' . $version;
+ $cacheKey = 'test-js-'.$version;
$service->saveToCache($cacheKey, $js);
- $cacheFile = $config['cache_dir'] . $cacheKey . '.gz';
+ $cacheFile = $config['cache_dir'].$cacheKey.'.gz';
expect(file_exists($cacheFile))->toBeTrue();
$cachedContent = $service->getFromCache($cacheKey);
expect($cachedContent)->toBe($js);
@@ -186,13 +197,13 @@
it('extracts critical CSS', function () {
// Чекпоинт 9: Извлечение critical CSS работает
- $optionService = new \WpAddon\Services\OptionService();
+ $optionService = new OptionService;
$assetMinification = new AssetMinification($optionService);
Functions\stubs([
- 'get_option' => function($key) {
+ 'get_option' => function ($key) {
return ['wp-addon' => ['asset_critical_css_enabled' => true]];
- }
+ },
]);
$assetMinification->init();
@@ -207,7 +218,7 @@
it('registers asset processing hooks', function () {
// Чекпоинт 10: Хуки зарегистрированы
- $optionService = new \WpAddon\Services\OptionService();
+ $optionService = new OptionService;
$assetMinification = new AssetMinification($optionService);
$assetMinification->init();
@@ -222,7 +233,7 @@
if (function_exists('wp_remote_get')) {
$response = wp_remote_get($url);
- if (!is_wp_error($response) && $response['response']['code'] === 200) {
+ if (! is_wp_error($response) && $response['response']['code'] === 200) {
$html = wp_remote_retrieve_body($response);
$hasCriticalCss = strpos($html, 'wp-addon-critical-css') !== false;
diff --git a/tests/Feature/LazyLoadingIntegrationTest.php b/tests/Feature/LazyLoadingIntegrationTest.php
index 5849838..ea54cf5 100644
--- a/tests/Feature/LazyLoadingIntegrationTest.php
+++ b/tests/Feature/LazyLoadingIntegrationTest.php
@@ -5,8 +5,9 @@
*/
describe('LazyLoading Integration', function () {
// Пропустить тесты, если WordPress не загружен
- if (!function_exists('wp_die')) {
+ if (! function_exists('wp_die')) {
test('skipped - requires WordPress environment', function () {})->skip('WordPress environment not available');
+
return;
}
@@ -14,11 +15,11 @@
// Убираем Brain Monkey, чтобы избежать конфликтов с Patchwork
// Monkey\setUp();
- $this->mockOptionService = \Mockery::mock('\WpAddon\Services\OptionService');
+ $this->mockOptionService = Mockery::mock('\WpAddon\Services\OptionService');
// Mock option service для настроек
$this->mockOptionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key, $default = null) {
+ ->andReturnUsing(function ($key, $default = null) {
$config = [
'enable_lazy_loading' => true,
'lazy_types' => ['img'],
@@ -27,13 +28,14 @@
'threshold' => 0.1,
'enable_fallback' => true,
];
+
return $config[$key] ?? $default;
});
});
afterEach(function () {
// Monkey\tearDown();
- \Mockery::close();
+ Mockery::close();
});
it('activates module without errors', function () {
@@ -44,7 +46,7 @@
expect($lazyLoading)->toBeInstanceOf('\WpAddon\Interfaces\ModuleInterface');
// Инициализация не должна вызывать ошибки
- expect(function() use ($lazyLoading) {
+ expect(function () use ($lazyLoading) {
$lazyLoading->init();
})->not->toThrow(Exception::class);
});
@@ -104,7 +106,7 @@
// Измеряем время выполнения
$startTime = microtime(true);
- $content = str_repeat('
 . '.jpg)
', 5);
+ $content = str_repeat('
.'.jpg)
', 5);
$lazyLoading = new LazyLoading($this->mockOptionService);
$lazyLoading->init();
@@ -125,7 +127,7 @@
$lazyLoading->init();
// Обработка не должна вызывать исключения
- expect(function() use ($lazyLoading, $contentWithErrors) {
+ expect(function () use ($lazyLoading, $contentWithErrors) {
$lazyLoading->processContent($contentWithErrors);
})->not->toThrow(Exception::class);
});
diff --git a/tests/Feature/SmokeTest.php b/tests/Feature/SmokeTest.php
index 3bedc65..db23ac2 100644
--- a/tests/Feature/SmokeTest.php
+++ b/tests/Feature/SmokeTest.php
@@ -1,5 +1,8 @@
toBeInstanceOf(\WpAddon\Services\OptionService::class);
+ $optionService = new OptionService;
+ expect($optionService)->toBeInstanceOf(OptionService::class);
- $mediaCleanupService = new \WpAddon\Services\MediaCleanupService();
- expect($mediaCleanupService)->toBeInstanceOf(\WpAddon\Services\MediaCleanupService::class);
+ $mediaCleanupService = new MediaCleanupService;
+ expect($mediaCleanupService)->toBeInstanceOf(MediaCleanupService::class);
});
});
diff --git a/tests/Pest.php b/tests/Pest.php
index 8396017..f1fab3e 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -1,5 +1,7 @@
in('Unit', 'Feature');
+uses(TestCase::class)->in('Unit', 'Feature');
/*
|--------------------------------------------------------------------------
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 8f4d521..d2746c5 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -3,6 +3,7 @@
namespace WpAddon\Tests;
use PHPUnit\Framework\TestCase as BaseTestCase;
+use WpAddon\Services\AssetOptimizationService;
/**
* Base test case for WP Addon Plugin tests with database support
@@ -44,8 +45,9 @@ protected function tearDown(): void
*/
protected function getTestDataPath(string $filename = ''): string
{
- $path = __DIR__ . '/data';
- return $filename ? $path . '/' . $filename : $path;
+ $path = __DIR__.'/data';
+
+ return $filename ? $path.'/'.$filename : $path;
}
/**
@@ -53,8 +55,9 @@ protected function getTestDataPath(string $filename = ''): string
*/
protected function createTempFile(string $content, string $extension = 'css'): string
{
- $filename = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.' . $extension;
+ $filename = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.'.$extension;
file_put_contents($filename, $content);
+
return $filename;
}
@@ -74,7 +77,7 @@ protected function removeTempFile(string $filename): void
protected function mockWpStyles(array $styles): void
{
global $wp_styles;
- $wp_styles = new \stdClass();
+ $wp_styles = new \stdClass;
$wp_styles->queue = array_keys($styles);
$wp_styles->registered = [];
@@ -95,7 +98,7 @@ protected function mockWpStyles(array $styles): void
protected function mockWpScripts(array $scripts): void
{
global $wp_scripts;
- $wp_scripts = new \stdClass();
+ $wp_scripts = new \stdClass;
$wp_scripts->queue = array_keys($scripts);
$wp_scripts->registered = [];
@@ -113,30 +116,30 @@ protected function mockWpScripts(array $scripts): void
/**
* Get mock asset optimization service
*/
- protected function getMockAssetOptimizationService(): \WpAddon\Services\AssetOptimizationService
+ protected function getMockAssetOptimizationService(): AssetOptimizationService
{
- $mock = $this->getMockBuilder(\WpAddon\Services\AssetOptimizationService::class)
+ $mock = $this->getMockBuilder(AssetOptimizationService::class)
->disableOriginalConstructor()
->getMock();
// Default behaviors
- $mock->method('minifyCss')->willReturnCallback(function($css) {
+ $mock->method('minifyCss')->willReturnCallback(function ($css) {
return str_replace([' ', "\n", "\t"], '', $css);
});
- $mock->method('minifyJs')->willReturnCallback(function($js) {
+ $mock->method('minifyJs')->willReturnCallback(function ($js) {
return str_replace([' ', "\n", "\t"], '', $js);
});
- $mock->method('combineCss')->willReturnCallback(function($files) {
+ $mock->method('combineCss')->willReturnCallback(function ($files) {
return implode("\n", array_map('file_get_contents', $files));
});
- $mock->method('combineJs')->willReturnCallback(function($files) {
+ $mock->method('combineJs')->willReturnCallback(function ($files) {
return implode(";\n", array_map('file_get_contents', $files));
});
- $mock->method('generateVersion')->willReturnCallback(function($content) {
+ $mock->method('generateVersion')->willReturnCallback(function ($content) {
return md5($content);
});
@@ -160,6 +163,7 @@ protected function callPrivateMethod($object, string $methodName, array $args =
$reflection = new \ReflectionClass($object);
$method = $reflection->getMethod($methodName);
$method->setAccessible(true);
+
return $method->invokeArgs($object, $args);
}
}
diff --git a/tests/Unit/AssetMinificationEdgeCasesTest.php b/tests/Unit/AssetMinificationEdgeCasesTest.php
index 6effcd9..4cb74a6 100644
--- a/tests/Unit/AssetMinificationEdgeCasesTest.php
+++ b/tests/Unit/AssetMinificationEdgeCasesTest.php
@@ -2,23 +2,25 @@
/**
* Test AssetMinification edge cases and error handling
+ *
* @group problematic
*/
describe('AssetMinification Edge Cases', function () {
// Пропускаем эти тесты в CI из-за Patchwork конфликтов
if (getenv('CI') === 'true' || getenv('GITHUB_ACTIONS') === 'true') {
test('skipped in CI', function () {})->skip('Patchwork conflicts in CI');
+
return;
}
beforeEach(function () {
global $mock_functions;
$mock_functions = [];
- $this->mockOptionService = \Mockery::mock('\WpAddon\Services\OptionService');
+ $this->mockOptionService = Mockery::mock('\WpAddon\Services\OptionService');
// Mock option service with default config
$this->mockOptionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key, $default = null) {
+ ->andReturnUsing(function ($key, $default = null) {
$config = [
'enabled' => true,
'minify_css' => true,
@@ -29,9 +31,10 @@
'defer_non_critical_css' => true,
'exclude_css' => [],
'exclude_js' => [],
- 'cache_dir' => sys_get_temp_dir() . '/wp_addon_cache',
+ 'cache_dir' => sys_get_temp_dir().'/wp_addon_cache',
'version_salt' => 'wp-addon-v1',
];
+
return $config[$key] ?? $default;
});
@@ -40,15 +43,15 @@
});
afterEach(function () {
- \Mockery::close();
+ Mockery::close();
});
it('processes assets with empty queue', function () {
// Setup: Empty queues
global $wp_styles, $wp_scripts;
- $wp_styles = new \stdClass();
+ $wp_styles = new stdClass;
$wp_styles->queue = [];
- $wp_scripts = new \stdClass();
+ $wp_scripts = new stdClass;
$wp_scripts->queue = [];
// Execute - should not throw any errors
@@ -86,7 +89,7 @@
});
it('does not process assets with empty src', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, ['test-handle', '', []]);
@@ -94,7 +97,7 @@
});
it('does not process assets with null src', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, ['test-handle', '', []]);
@@ -105,20 +108,20 @@
global $mock_functions;
$mock_functions['file_exists'] = false;
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, [
'test-handle',
'http://example.com/wp-content/themes/theme/invalid.css',
- []
+ [],
]);
expect($result)->toBeFalse();
});
it('handles malformed CSS gracefully', function () {
$malformedCss = '.class { color: #fff; font-size: 14px; /* unclosed comment ';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isAlreadyMinified');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, [$malformedCss, 'css']);
@@ -129,7 +132,7 @@
it('handles malformed JS gracefully', function () {
$malformedJs = 'function test() { console.log("test"); /* unclosed comment ';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isAlreadyMinified');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, [$malformedJs, 'js']);
@@ -139,7 +142,7 @@
});
it('returns empty string for empty URL', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('urlToPath');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, ['']);
@@ -148,7 +151,7 @@
it('handles non-matching URL', function () {
$url = 'https://cdn.example.com/style.css';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('urlToPath');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, [$url]);
@@ -159,7 +162,7 @@
});
it('generates cache URL with empty key', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('getCacheUrl');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, ['']);
@@ -169,7 +172,7 @@
it('handles special characters in cache key', function () {
$key = 'test@key#with$special%chars';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('getCacheUrl');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, [$key]);
@@ -193,7 +196,7 @@
it('handles empty theme CSS file', function () {
// Create empty theme CSS file
- $emptyCssFile = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.css';
+ $emptyCssFile = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.css';
file_put_contents($emptyCssFile, '');
$themeDir = dirname($emptyCssFile);
@@ -215,7 +218,7 @@
it('handles corrupt theme CSS file', function () {
// Create corrupt CSS file
$corruptCss = 'this is not css {{{ }}} }}}';
- $corruptCssFile = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.css';
+ $corruptCssFile = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.css';
file_put_contents($corruptCssFile, $corruptCss);
$themeDir = dirname($corruptCssFile);
@@ -249,11 +252,11 @@
it('handles clearing cache with non-existent directory', function () {
// Mock cache directory that doesn't exist
- $nonExistentDir = '/tmp/non_existent_wp_addon_cache_' . uniqid();
+ $nonExistentDir = '/tmp/non_existent_wp_addon_cache_'.uniqid();
- $mockOptionService = \Mockery::mock('\WpAddon\Services\OptionService');
+ $mockOptionService = Mockery::mock('\WpAddon\Services\OptionService');
$mockOptionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key) use ($nonExistentDir) {
+ ->andReturnUsing(function ($key) use ($nonExistentDir) {
return $key === 'cache_dir' ? $nonExistentDir : true;
});
@@ -269,12 +272,12 @@
it('handles clearing cache with permission denied', function () {
// Create cache directory and make it read-only
- $cacheDir = sys_get_temp_dir() . '/wp_addon_readonly_cache_' . uniqid();
+ $cacheDir = sys_get_temp_dir().'/wp_addon_readonly_cache_'.uniqid();
mkdir($cacheDir, 0444, true); // Read-only
- $mockOptionService = \Mockery::mock('\WpAddon\Services\OptionService');
+ $mockOptionService = Mockery::mock('\WpAddon\Services\OptionService');
$mockOptionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key) use ($cacheDir) {
+ ->andReturnUsing(function ($key) use ($cacheDir) {
return $key === 'cache_dir' ? $cacheDir : true;
});
@@ -298,7 +301,7 @@
// Setup some assets
global $wp_styles, $wp_scripts;
- $wp_styles = new \stdClass();
+ $wp_styles = new stdClass;
$wp_styles->queue = ['test-style'];
$wp_styles->registered = [
'test-style' => (object) [
@@ -306,10 +309,10 @@
'src' => 'http://example.com/style.css',
'deps' => [],
'ver' => false,
- 'args' => 'all'
- ]
+ 'args' => 'all',
+ ],
];
- $wp_scripts = new \stdClass();
+ $wp_scripts = new stdClass;
$wp_scripts->queue = ['test-script'];
$wp_scripts->registered = [
'test-script' => (object) [
@@ -317,8 +320,8 @@
'src' => 'http://example.com/script.js',
'deps' => [],
'ver' => false,
- 'args' => false
- ]
+ 'args' => false,
+ ],
];
// Execute
@@ -335,7 +338,7 @@
// Setup some assets
global $wp_styles, $wp_scripts;
- $wp_styles = new \stdClass();
+ $wp_styles = new stdClass;
$wp_styles->queue = ['test-style'];
$wp_styles->registered = [
'test-style' => (object) [
@@ -343,10 +346,10 @@
'src' => 'http://example.com/style.css',
'deps' => [],
'ver' => false,
- 'args' => 'all'
- ]
+ 'args' => 'all',
+ ],
];
- $wp_scripts = new \stdClass();
+ $wp_scripts = new stdClass;
$wp_scripts->queue = ['test-script'];
$wp_scripts->registered = [
'test-script' => (object) [
@@ -354,8 +357,8 @@
'src' => 'http://example.com/script.js',
'deps' => [],
'ver' => false,
- 'args' => false
- ]
+ 'args' => false,
+ ],
];
// Execute
@@ -367,7 +370,7 @@
});
it('returns normal priority for unknown asset', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('getAssetPriority');
$method->setAccessible(true);
$priority = $method->invokeArgs($this->assetMinification, ['unknown-asset-handle']);
@@ -375,7 +378,7 @@
});
it('returns normal priority for empty handle', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('getAssetPriority');
$method->setAccessible(true);
$priority = $method->invokeArgs($this->assetMinification, ['']);
@@ -383,7 +386,7 @@
});
it('does not consider empty handle as system asset', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isSystemAsset');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, ['']);
@@ -391,7 +394,7 @@
});
it('does not consider null handle as system asset', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isSystemAsset');
$method->setAccessible(true);
$result = $method->invokeArgs($this->assetMinification, ['']);
diff --git a/tests/Unit/AssetMinificationSmartLogicTest.php b/tests/Unit/AssetMinificationSmartLogicTest.php
index f23a1c0..cbd57f9 100644
--- a/tests/Unit/AssetMinificationSmartLogicTest.php
+++ b/tests/Unit/AssetMinificationSmartLogicTest.php
@@ -2,23 +2,25 @@
/**
* Test AssetMinification smart logic
+ *
* @group problematic
*/
describe('AssetMinification Smart Logic', function () {
// Пропускаем эти тесты в CI из-за Patchwork конфликтов
if (getenv('CI') === 'true' || getenv('GITHUB_ACTIONS') === 'true') {
test('skipped in CI', function () {})->skip('Patchwork conflicts in CI');
+
return;
}
beforeEach(function () {
global $mock_functions;
$mock_functions = [];
- $this->mockOptionService = \Mockery::mock('\WpAddon\Services\OptionService');
+ $this->mockOptionService = Mockery::mock('\WpAddon\Services\OptionService');
// Mock option service to return default config
$this->mockOptionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key, $default = null) {
+ ->andReturnUsing(function ($key, $default = null) {
$config = [
'enabled' => true,
'minify_css' => true,
@@ -29,9 +31,10 @@
'defer_non_critical_css' => true,
'exclude_css' => ['admin-bar', 'dashicons'],
'exclude_js' => ['jquery', 'jquery-core'],
- 'cache_dir' => sys_get_temp_dir() . '/wp_addon_cache',
+ 'cache_dir' => sys_get_temp_dir().'/wp_addon_cache',
'version_salt' => 'wp-addon-v1',
];
+
return $config[$key] ?? $default;
});
@@ -40,7 +43,7 @@
});
afterEach(function () {
- \Mockery::close();
+ Mockery::close();
});
it('excludes system assets', function () {
@@ -57,7 +60,7 @@
'wp-emoji',
];
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -70,7 +73,7 @@
it('excludes explicitly excluded assets', function () {
$excludes = ['custom-plugin-css', 'theme-style'];
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -89,7 +92,7 @@
'https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js',
];
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -111,7 +114,7 @@
$mock_functions['file_exists'] = true;
$mock_functions['filesize'] = 2048;
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -126,7 +129,7 @@
global $mock_functions;
$mock_functions['filesize'] = 500; // 500 bytes
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -140,7 +143,7 @@
$mock_functions['file_exists'] = true;
$mock_functions['filesize'] = 2048; // 2KB
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -153,7 +156,7 @@
global $mock_functions;
$mock_functions['file_exists'] = false;
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -167,7 +170,7 @@
$mock_functions['file_exists'] = true;
$mock_functions['filesize'] = 2048;
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('shouldProcessAsset');
$method->setAccessible(true);
@@ -179,7 +182,7 @@
// Test minified CSS
$minifiedCss = '.class{color:#fff;font-size:14px}.another{margin:0}';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isAlreadyMinified');
$method->setAccessible(true);
@@ -196,7 +199,7 @@
// Test minified JS
$minifiedJs = 'function test(){var a=1;return a*2}document.addEventListener("load",test)';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isAlreadyMinified');
$method->setAccessible(true);
@@ -210,7 +213,7 @@
});
it('handles minification edge cases', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isAlreadyMinified');
$method->setAccessible(true);
@@ -230,10 +233,10 @@
// Test known system assets
$systemAssets = [
'jquery', 'jquery-core', 'jquery-migrate', 'jquery-ui',
- 'admin-bar', 'dashicons', 'heartbeat', 'wp-embed'
+ 'admin-bar', 'dashicons', 'heartbeat', 'wp-embed',
];
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('isSystemAsset');
$method->setAccessible(true);
@@ -244,7 +247,7 @@
// Test non-system assets
$nonSystemAssets = [
- 'custom-script', 'theme-style', 'plugin-css', 'bootstrap'
+ 'custom-script', 'theme-style', 'plugin-css', 'bootstrap',
];
foreach ($nonSystemAssets as $asset) {
@@ -254,7 +257,7 @@
});
it('returns correct asset priorities', function () {
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('getAssetPriority');
$method->setAccessible(true);
@@ -289,9 +292,9 @@
it('converts URL to path', function () {
$url = 'http://localhost/wp-content/themes/theme/style.css';
- $expectedPath = ABSPATH . 'wp-content/themes/theme/style.css';
+ $expectedPath = ABSPATH.'wp-content/themes/theme/style.css';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('urlToPath');
$method->setAccessible(true);
@@ -303,7 +306,7 @@
$key = 'test-cache-key';
$expectedUrl = 'http://localhost/wp-content/cache/assets/test-cache-key.gz';
- $reflection = new \ReflectionClass($this->assetMinification);
+ $reflection = new ReflectionClass($this->assetMinification);
$method = $reflection->getMethod('getCacheUrl');
$method->setAccessible(true);
diff --git a/tests/Unit/AssetMinificationTest.php b/tests/Unit/AssetMinificationTest.php
index 8ec98f1..3f3c348 100644
--- a/tests/Unit/AssetMinificationTest.php
+++ b/tests/Unit/AssetMinificationTest.php
@@ -1,8 +1,9 @@
skip('Complex dependencies in CI');
+
return;
}
it('creates cache files for CSS assets', function () {
- $cacheDir = sys_get_temp_dir() . '/wp_addon_cache/';
- $optionService = \Mockery::mock('\\WpAddon\\Services\\OptionService');
- $assetMinification = new \AssetMinification($optionService);
+ $cacheDir = sys_get_temp_dir().'/wp_addon_cache/';
+ $optionService = Mockery::mock('\\WpAddon\\Services\\OptionService');
+ $assetMinification = new AssetMinification($optionService);
// Mock config
$optionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key, $default) {
+ ->andReturnUsing(function ($key, $default) {
$config = [
'asset_minification_enabled' => true,
'asset_minify_css' => true,
@@ -37,20 +40,21 @@ function site_url() {
'asset_defer_non_critical_css' => false,
'asset_exclude_css' => '',
'asset_exclude_js' => '',
- 'cache_dir' => sys_get_temp_dir() . '/wp_addon_cache',
+ 'cache_dir' => sys_get_temp_dir().'/wp_addon_cache',
'version_salt' => 'wp-addon-v1',
];
+
return $config[$key] ?? $default;
});
// Mock WordPress globals
global $wp_styles;
- $wp_styles = new \stdClass();
+ $wp_styles = new stdClass;
$wp_styles->queue = ['test-style'];
// Create test CSS file
$cssContent = str_repeat(".test {\n color: red;\n font-size: 14px;\n margin: 10px;\n padding: 5px;\n}\n", 20); // CSS with newlines, > 1KB
- $testCssPath = sys_get_temp_dir() . '/test.css';
+ $testCssPath = sys_get_temp_dir().'/test.css';
file_put_contents($testCssPath, $cssContent);
$wp_styles->registered = [
@@ -59,15 +63,15 @@ function site_url() {
'src' => 'http://localhost/test.css',
'deps' => [],
'ver' => '1.0.0',
- 'args' => 'all'
- ]
+ 'args' => 'all',
+ ],
];
// Mock ABSPATH for urlToPath
- define('ABSPATH', sys_get_temp_dir() . '/');
+ define('ABSPATH', sys_get_temp_dir().'/');
// Ensure cache dir exists
- if (!is_dir($cacheDir)) {
+ if (! is_dir($cacheDir)) {
mkdir($cacheDir, 0755, true);
}
@@ -78,7 +82,7 @@ function site_url() {
$assetMinification->processAssets();
// Check if cache file was created
- $files = glob($cacheDir . '*.gz');
+ $files = glob($cacheDir.'*.gz');
expect(count($files))->toBeGreaterThan(0, 'Cache file should be created');
@@ -90,13 +94,13 @@ function site_url() {
});
it('creates cache files for JS assets', function () {
- $cacheDir = sys_get_temp_dir() . '/wp_addon_cache/';
- $optionService = \Mockery::mock('\\WpAddon\\Services\\OptionService');
- $assetMinification = new \AssetMinification($optionService);
+ $cacheDir = sys_get_temp_dir().'/wp_addon_cache/';
+ $optionService = Mockery::mock('\\WpAddon\\Services\\OptionService');
+ $assetMinification = new AssetMinification($optionService);
// Mock config for JS
$optionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key, $default) {
+ ->andReturnUsing(function ($key, $default) {
$config = [
'asset_minification_enabled' => true,
'asset_minify_css' => false,
@@ -107,20 +111,21 @@ function site_url() {
'asset_defer_non_critical_css' => false,
'asset_exclude_css' => '',
'asset_exclude_js' => '',
- 'cache_dir' => sys_get_temp_dir() . '/wp_addon_cache',
+ 'cache_dir' => sys_get_temp_dir().'/wp_addon_cache',
'version_salt' => 'wp-addon-v1',
];
+
return $config[$key] ?? $default;
});
// Mock WordPress globals
global $wp_scripts;
- $wp_scripts = new \stdClass();
+ $wp_scripts = new stdClass;
$wp_scripts->queue = ['test-script'];
// Create test JS file
$jsContent = str_repeat("function test() {\n console.log('test');\n return true;\n}\n", 20); // JS with newlines
- $testJsPath = sys_get_temp_dir() . '/test.js';
+ $testJsPath = sys_get_temp_dir().'/test.js';
file_put_contents($testJsPath, $jsContent);
$wp_scripts->registered = [
@@ -129,15 +134,15 @@ function site_url() {
'src' => 'http://localhost/test.js',
'deps' => [],
'ver' => '1.0.0',
- 'args' => false
- ]
+ 'args' => false,
+ ],
];
// Mock ABSPATH for urlToPath
- define('ABSPATH', sys_get_temp_dir() . '/');
+ define('ABSPATH', sys_get_temp_dir().'/');
// Ensure cache dir exists
- if (!is_dir($cacheDir)) {
+ if (! is_dir($cacheDir)) {
mkdir($cacheDir, 0755, true);
}
@@ -148,7 +153,7 @@ function site_url() {
$assetMinification->processAssets();
// Check if cache file was created
- $files = glob($cacheDir . '*.gz');
+ $files = glob($cacheDir.'*.gz');
expect(count($files))->toBeGreaterThan(0, 'Cache file should be created');
diff --git a/tests/Unit/FactoriesTest.php b/tests/Unit/FactoriesTest.php
index 3c0bdaa..b89c5b4 100644
--- a/tests/Unit/FactoriesTest.php
+++ b/tests/Unit/FactoriesTest.php
@@ -1,18 +1,18 @@
setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
});
it('creates posts with PostFactory', function () {
- $factory = new PostFactory();
+ $factory = new PostFactory;
$post = $factory->create(['post_title' => 'Test Post']);
expect($post)->toBeInt();
@@ -20,7 +20,7 @@
});
it('creates multiple posts', function () {
- $factory = new PostFactory();
+ $factory = new PostFactory;
$posts = $factory->createMany(3);
expect($posts)->toBeArray();
@@ -33,7 +33,7 @@
});
it('creates assets with AssetFactory', function () {
- $factory = new AssetFactory();
+ $factory = new AssetFactory;
$asset = $factory->create(['handle' => 'test-asset']);
expect($asset)->toBeArray();
@@ -42,7 +42,7 @@
});
it('creates CSS assets', function () {
- $factory = new AssetFactory();
+ $factory = new AssetFactory;
$factory->asCss();
$asset = $factory->create();
@@ -52,7 +52,7 @@
});
it('creates JS assets', function () {
- $factory = new AssetFactory();
+ $factory = new AssetFactory;
$factory->asJs();
$asset = $factory->create();
diff --git a/tests/Unit/ImageOptimizationServiceTest.php b/tests/Unit/ImageOptimizationServiceTest.php
index 5461788..c60b62b 100644
--- a/tests/Unit/ImageOptimizationServiceTest.php
+++ b/tests/Unit/ImageOptimizationServiceTest.php
@@ -1,19 +1,21 @@
skip('Patchwork conflicts in CI');
+
return;
}
beforeEach(function () {
- $this->imageOptimizationService = new ImageOptimizationService();
+ $this->imageOptimizationService = new ImageOptimizationService;
});
afterEach(function () {
@@ -22,13 +24,14 @@
it('generates blur placeholder for valid image', function () {
// Skip test if GD is not available or in CI environment
- if (!function_exists('imagecreatetruecolor') || getenv('CI') === 'true' || getenv('GITHUB_ACTIONS') === 'true') {
+ if (! function_exists('imagecreatetruecolor') || getenv('CI') === 'true' || getenv('GITHUB_ACTIONS') === 'true') {
expect(true)->toBeTrue(); // Skip test
+
return;
}
// Создаем тестовое изображение
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.jpg';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.jpg';
$image = imagecreatetruecolor(200, 200);
$blue = imagecolorallocate($image, 0, 0, 255);
imagefill($image, 0, 0, $blue);
@@ -51,7 +54,7 @@
});
it('handles invalid image files', function () {
- $tempFile = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.jpg';
+ $tempFile = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.jpg';
file_put_contents($tempFile, 'not an image content');
$result = $this->imageOptimizationService->generateBlurPlaceholder($tempFile);
@@ -62,7 +65,7 @@
});
it('respects blur intensity parameter', function () {
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.png';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.png';
$image = imagecreatetruecolor(100, 100);
$red = imagecolorallocate($image, 255, 0, 0);
imagefill($image, 0, 0, $red);
@@ -73,15 +76,15 @@
$resultLow = $this->imageOptimizationService->generateBlurPlaceholder($tempImage, 2);
$resultHigh = $this->imageOptimizationService->generateBlurPlaceholder($tempImage, 8);
- expect($resultLow)->toStartWith('data:image/jpeg;base64,');
- expect($resultHigh)->toStartWith('data:image/jpeg;base64,');
+ expect($resultLow)->toStartWith('data:image/png;base64,');
+ expect($resultHigh)->toStartWith('data:image/png;base64,');
expect($resultLow)->not->toBe($resultHigh); // Разные уровни размытия дают разные результаты
unlink($tempImage);
});
it('generates correct thumbnail size', function () {
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.jpg';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.jpg';
$image = imagecreatetruecolor(800, 600); // Большое изображение
$green = imagecolorallocate($image, 0, 255, 0);
imagefill($image, 0, 0, $green);
@@ -94,7 +97,7 @@
// Декодируем и проверяем размер
$imageData = base64_decode(str_replace('data:image/jpeg;base64,', '', $result));
- $tempDecoded = tempnam(sys_get_temp_dir(), 'wp_addon_decoded_') . '.jpg';
+ $tempDecoded = tempnam(sys_get_temp_dir(), 'wp_addon_decoded_').'.jpg';
file_put_contents($tempDecoded, $imageData);
if (function_exists('getimagesize')) {
@@ -108,7 +111,7 @@
});
it('optimizes image quality', function () {
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.jpg';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.jpg';
$image = imagecreatetruecolor(100, 100);
$yellow = imagecolorallocate($image, 255, 255, 0);
imagefill($image, 0, 0, $yellow);
@@ -130,7 +133,7 @@
$formats = ['jpg', 'jpeg', 'png'];
foreach ($formats as $format) {
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.' . $format;
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.'.$format;
$image = imagecreatetruecolor(50, 50);
$color = imagecolorallocate($image, rand(0, 255), rand(0, 255), rand(0, 255));
imagefill($image, 0, 0, $color);
@@ -144,18 +147,19 @@
$result = $this->imageOptimizationService->generateBlurPlaceholder($tempImage);
- expect($result)->toStartWith('data:image/jpeg;base64,'); // Всегда возвращает JPEG
+ $expectedMime = $format === 'png' ? 'image/png' : 'image/jpeg';
+ expect($result)->toStartWith('data:'.$expectedMime.';base64,');
unlink($tempImage);
}
});
it('handles images with alpha channel', function () {
- if (!function_exists('imagecreatetruecolor')) {
+ if (! function_exists('imagecreatetruecolor')) {
skip('GD library not available');
}
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.png';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.png';
$image = imagecreatetruecolor(50, 50);
imagealphablending($image, false);
$transparent = imagecolorallocatealpha($image, 0, 0, 0, 127);
@@ -166,14 +170,14 @@
$result = $this->imageOptimizationService->generateBlurPlaceholder($tempImage);
- expect($result)->toStartWith('data:image/jpeg;base64,');
+ expect($result)->toStartWith('data:image/png;base64,');
expect(strlen($result))->toBeGreaterThan(100);
unlink($tempImage);
});
it('validates input parameters', function () {
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.jpg';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.jpg';
$image = imagecreatetruecolor(10, 10);
imagejpeg($image, $tempImage);
imagedestroy($image);
@@ -191,7 +195,7 @@
});
it('handles file permission errors', function () {
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.jpg';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.jpg';
$image = imagecreatetruecolor(10, 10);
imagejpeg($image, $tempImage);
imagedestroy($image);
@@ -209,7 +213,7 @@
});
it('optimizes image dimensions proportionally', function () {
- $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_') . '.jpg';
+ $tempImage = tempnam(sys_get_temp_dir(), 'wp_addon_test_').'.jpg';
$image = imagecreatetruecolor(400, 200); // Прямоугольное изображение
$color = imagecolorallocate($image, 100, 100, 100);
imagefill($image, 0, 0, $color);
@@ -220,7 +224,7 @@
// Декодируем и проверяем пропорции
$imageData = base64_decode(str_replace('data:image/jpeg;base64,', '', $result));
- $tempDecoded = tempnam(sys_get_temp_dir(), 'wp_addon_decoded_') . '.jpg';
+ $tempDecoded = tempnam(sys_get_temp_dir(), 'wp_addon_decoded_').'.jpg';
file_put_contents($tempDecoded, $imageData);
if (function_exists('getimagesize')) {
diff --git a/tests/Unit/LazyLoadingTest.php b/tests/Unit/LazyLoadingTest.php
index 6bba027..eb7de43 100644
--- a/tests/Unit/LazyLoadingTest.php
+++ b/tests/Unit/LazyLoadingTest.php
@@ -9,8 +9,9 @@
beforeEach(function () {
$this->mockOptionService = Mockery::mock('WpAddon\Services\OptionService');
$this->mockOptionService->shouldReceive('getSetting')
- ->andReturnUsing(function($key, $default = null) {
+ ->andReturnUsing(function ($key, $default = null) {
$config = ['enable_lazy_loading' => true];
+
return $config[$key] ?? $default;
});
});
@@ -110,4 +111,32 @@
expect($result)->toContain('class="existing-class lazy-img"');
expect($result)->toContain('id="test-img"');
});
+
+ it('defers responsive images without losing sizes', function () {
+ $lazyLoading = new LazyLoading($this->mockOptionService);
+
+ $result = $lazyLoading->processContent('
');
+
+ expect($result)->toContain('data-src="/image.jpg"');
+ expect($result)->toContain('data-srcset="/image-400.jpg 400w, /image-800.jpg 800w"');
+ expect($result)->toContain('sizes="(max-width: 600px) 100vw, 600px"');
+ expect($result)->not()->toMatch('/\ssrcset=/');
+ });
+
+ it('supports single quoted attributes and remains idempotent', function () {
+ $lazyLoading = new LazyLoading($this->mockOptionService);
+
+ $result = $lazyLoading->processContent("
");
+
+ expect($result)->toContain('data-src="/image.jpg"');
+ expect($lazyLoading->processContent($result))->toBe($result);
+ });
+
+ it('matches no-lazy as a complete CSS class', function () {
+ $lazyLoading = new LazyLoading($this->mockOptionService);
+
+ $result = $lazyLoading->processContent('
');
+
+ expect($result)->toContain('data-src="/image.jpg"');
+ });
});
diff --git a/tests/Unit/MediaCleanupServiceTest.php b/tests/Unit/MediaCleanupServiceTest.php
index 11dae64..6a8903c 100644
--- a/tests/Unit/MediaCleanupServiceTest.php
+++ b/tests/Unit/MediaCleanupServiceTest.php
@@ -9,6 +9,7 @@
// Пропускаем эти тесты в CI из-за проблем с mock'ами
if (getenv('CI') === 'true' || getenv('GITHUB_ACTIONS') === 'true') {
test('skipped in CI', function () {})->skip('Mock issues in CI');
+
return;
}
beforeEach(function () {
@@ -16,7 +17,7 @@
$mock_functions = [];
// Mock get_option
- $mock_functions['get_option'] = function($key, $default = '') {
+ $mock_functions['get_option'] = function ($key, $default = '') {
$options = [
'thumbnail_size_w' => 150,
'thumbnail_size_h' => 150,
@@ -25,10 +26,11 @@
'large_size_w' => 1024,
'large_size_h' => 1024,
];
+
return $options[$key] ?? $default;
};
- $this->service = new MediaCleanupService();
+ $this->service = new MediaCleanupService;
});
it('returns registered sizes', function () {
diff --git a/tests/Unit/ModuleSystemTest.php b/tests/Unit/ModuleSystemTest.php
index 36825ec..43b8e34 100644
--- a/tests/Unit/ModuleSystemTest.php
+++ b/tests/Unit/ModuleSystemTest.php
@@ -3,7 +3,6 @@
use WpAddon\Interfaces\ModuleInterface;
use WpAddon\Traits\AjaxTrait;
use WpAddon\Traits\WidgetTrait;
-use WpAddon\Traits\HookTrait;
describe('Module System', function () {
it('has ModuleInterface', function () {
@@ -17,9 +16,12 @@
});
it('AjaxTrait has methods', function () {
- $mock = new class implements ModuleInterface {
+ $mock = new class implements ModuleInterface
+ {
use AjaxTrait;
+
public function init(): void {}
+
public function handleAjax(): void {}
};
@@ -27,9 +29,12 @@ public function handleAjax(): void {}
});
it('WidgetTrait has methods', function () {
- $mock = new class implements ModuleInterface {
+ $mock = new class implements ModuleInterface
+ {
use WidgetTrait;
+
public function init(): void {}
+
public function widget($args, $instance): void {}
};
@@ -37,17 +42,13 @@ public function widget($args, $instance): void {}
});
it('Redirects module works', function () {
- // Assume class is autoloaded
- if (class_exists('Redirects')) {
- expect(class_exists('Redirects'))->toBeTrue();
- expect(is_subclass_of('Redirects', 'WpAddon\Interfaces\ModuleInterface'))->toBeTrue();
-
- $redirects = new Redirects();
- expect($redirects)->toBeInstanceOf(ModuleInterface::class);
- expect(method_exists($redirects, 'init'))->toBeTrue();
- } else {
- // Skip if not available
- expect(true)->toBeTrue();
- }
+ require_once dirname(__DIR__, 2).'/functions/Redirects.php';
+
+ expect(class_exists('Redirects'))->toBeTrue();
+ expect(is_subclass_of('Redirects', 'WpAddon\Interfaces\ModuleInterface'))->toBeTrue();
+
+ $redirects = new Redirects;
+ expect($redirects)->toBeInstanceOf(ModuleInterface::class);
+ expect(method_exists($redirects, 'init'))->toBeTrue();
});
});
diff --git a/tests/Unit/Services/AssetOptimizationServiceTest.php b/tests/Unit/Services/AssetOptimizationServiceTest.php
index 2d73674..b1e926b 100644
--- a/tests/Unit/Services/AssetOptimizationServiceTest.php
+++ b/tests/Unit/Services/AssetOptimizationServiceTest.php
@@ -1,11 +1,11 @@
cacheDir = sys_get_temp_dir() . '/wp_addon_test_cache_' . uniqid();
+ $this->cacheDir = sys_get_temp_dir().'/wp_addon_test_cache_'.uniqid();
mkdir($this->cacheDir, 0755, true);
$config = [
@@ -17,16 +17,16 @@
'combine_js' => true,
'critical_css_enabled' => true,
'exclude_css' => [],
- 'exclude_js' => []
+ 'exclude_js' => [],
];
- $this->service = new \WpAddon\Services\AssetOptimizationService($config);
+ $this->service = new AssetOptimizationService($config);
});
afterEach(function () {
// Clean up cache directory
if (is_dir($this->cacheDir)) {
- $files = glob($this->cacheDir . '/*');
+ $files = glob($this->cacheDir.'/*');
foreach ($files as $file) {
unlink($file);
}
@@ -83,7 +83,7 @@
it('combines CSS files', function () {
$files = [
$this->getTestDataPath('test.css'),
- $this->getTestDataPath('small.css')
+ $this->getTestDataPath('small.css'),
];
$combined = $this->service->combineCss($files);
@@ -96,7 +96,7 @@
it('combines JS files', function () {
$files = [
$this->createTempFile('function a(){return 1;}'),
- $this->createTempFile('function b(){return 2;}')
+ $this->createTempFile('function b(){return 2;}'),
];
$combined = $this->service->combineJs($files);
@@ -138,7 +138,7 @@
$this->service->saveToCache($key, $content);
- $cacheFile = $this->cacheDir . '/' . $key . '.gz';
+ $cacheFile = $this->cacheDir.'/'.$key.'.gz';
// Mock file_exists to return true for this test
$this->setMockFunction('file_exists', true);
expect(file_exists($cacheFile))->toBeTrue();
diff --git a/tests/Unit/Services/SimpleAssetOptimizationServiceTest.php b/tests/Unit/Services/SimpleAssetOptimizationServiceTest.php
index 0f2acf3..d57e674 100644
--- a/tests/Unit/Services/SimpleAssetOptimizationServiceTest.php
+++ b/tests/Unit/Services/SimpleAssetOptimizationServiceTest.php
@@ -1,11 +1,11 @@
cacheDir = sys_get_temp_dir() . '/wp_addon_simple_test_cache_' . uniqid();
+ $this->cacheDir = sys_get_temp_dir().'/wp_addon_simple_test_cache_'.uniqid();
mkdir($this->cacheDir, 0755, true);
$config = [
@@ -17,16 +17,16 @@
'combine_js' => true,
'critical_css_enabled' => true,
'exclude_css' => [],
- 'exclude_js' => []
+ 'exclude_js' => [],
];
- $this->service = new \WpAddon\Services\AssetOptimizationService($config);
+ $this->service = new AssetOptimizationService($config);
});
afterEach(function () {
// Clean up cache directory
if (is_dir($this->cacheDir)) {
- $files = glob($this->cacheDir . '/*');
+ $files = glob($this->cacheDir.'/*');
foreach ($files as $file) {
unlink($file);
}
@@ -35,24 +35,24 @@
});
it('minifies basic CSS', function () {
- $css = "
+ $css = '
.test-class {
color: #ff0000;
font-size: 14px;
}
.another { margin: 0; }
- ";
+ ';
$minified = $this->service->minifyCss($css);
// Check that CSS is minified
expect(strpos($minified, "\n"))->toBeFalse();
- expect(strpos($minified, " "))->toBeFalse();
+ expect(strpos($minified, ' '))->toBeFalse();
expect(strpos($minified, '.test-class{color:#ff0000;font-size:14px}.another{margin:0}'))->not->toBeFalse();
});
it('removes comments from CSS', function () {
- $css = "/* This is a comment */ .test { color: red; } /* Another comment */";
+ $css = '/* This is a comment */ .test { color: red; } /* Another comment */';
$minified = $this->service->minifyCss($css);
expect(strpos($minified, '/*'))->toBeFalse();
@@ -61,23 +61,23 @@
});
it('minifies basic JS', function () {
- $js = "
+ $js = '
function test() {
var a = 1;
return a + 2;
}
- ";
+ ';
$minified = $this->service->minifyJs($js);
// Check that JS is minified
expect(strpos($minified, "\n"))->toBeFalse();
- expect(strpos($minified, " "))->toBeFalse();
+ expect(strpos($minified, ' '))->toBeFalse();
expect(strpos($minified, 'function test(){var a=1;return a+2;}'))->not->toBeFalse();
});
it('removes comments from JS', function () {
- $js = "/* Block comment */ function test() { return 1; } // Line comment";
+ $js = '/* Block comment */ function test() { return 1; } // Line comment';
$minified = $this->service->minifyJs($js);
expect(strpos($minified, '/*'))->toBeFalse();
@@ -126,12 +126,12 @@ function test() {
});
it('extracts critical CSS', function () {
- $css = "
+ $css = '
.header { position: fixed; background: white; }
.content { margin-top: 100px; }
.footer { position: absolute; bottom: 0; }
.nav { display: block; }
- ";
+ ';
$criticalCss = $this->service->extractCriticalCss($css);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b7f6340..bc7d459 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,45 +4,49 @@
// Complete prevention of Patchwork loading and conflicts
// Mock Patchwork namespace and classes BEFORE autoloader
-if (!class_exists('Patchwork')) {
- class Patchwork {
- public static function redefine() { }
- public static function restoreAll() { }
- public static function disable() { }
- public static function enable() { }
+if (! class_exists('Patchwork')) {
+ class Patchwork
+ {
+ public static function redefine() {}
+
+ public static function restoreAll() {}
+
+ public static function disable() {}
+
+ public static function enable() {}
}
}
// Mock Patchwork\redefine function
-if (!function_exists('redefine')) {
- function redefine() { }
+if (! function_exists('redefine')) {
+ function redefine() {}
}
// Mock Patchwork\restoreAll function
-if (!function_exists('restoreAll')) {
- function restoreAll() { }
+if (! function_exists('restoreAll')) {
+ function restoreAll() {}
}
// Mock Patchwork\replace function
-if (!function_exists('replace')) {
- function replace() { }
+if (! function_exists('replace')) {
+ function replace() {}
}
// Mock Patchwork\relay function
-if (!function_exists('relay')) {
- function relay() { }
+if (! function_exists('relay')) {
+ function relay() {}
}
// Mock Patchwork\redefineMethod function
-if (!function_exists('redefineMethod')) {
- function redefineMethod() { }
+if (! function_exists('redefineMethod')) {
+ function redefineMethod() {}
}
// Mock Brain Monkey functions
-if (!function_exists('Brain\Monkey\setUp')) {
+if (! function_exists('Brain\Monkey\setUp')) {
eval('namespace Brain\Monkey; function setUp() {} function tearDown() {}');
}
-if (!function_exists('Brain\Monkey\tearDown')) {
+if (! function_exists('Brain\Monkey\tearDown')) {
eval('namespace Brain\Monkey; function tearDown() {}');
}
@@ -51,8 +55,10 @@ function redefineMethod() { }
if (strpos($class, 'Patchwork') === 0 || strpos($class, 'Brain\\Monkey') === 0) {
// Return a mock class for any Patchwork or Brain Monkey class
eval("class {$class} { public static function __callStatic(\$method, \$args) { return \$args ? \$args[0] : null; } public function __call(\$method, \$args) { return \$args ? \$args[0] : null; } }");
+
return true;
}
+
return false;
}, true, true);
@@ -62,11 +68,11 @@ function redefineMethod() { }
'call_user_func_array', 'spl_autoload_register', 'array_map',
'array_intersect_uassoc', 'array_udiff', 'array_uintersect_uassoc',
'libxml_set_external_entity_loader', 'array_diff_uassoc', 'call_user_func',
- 'array_udiff_assoc', 'iterator_apply', 'array_udiff_uassoc'
+ 'array_udiff_assoc', 'iterator_apply', 'array_udiff_uassoc',
];
foreach ($patchworkFunctions as $func) {
- if (!function_exists("Patchwork\\Redefinitions\\{$func}")) {
+ if (! function_exists("Patchwork\\Redefinitions\\{$func}")) {
eval("namespace Patchwork\\Redefinitions; function {$func}(...\$args) { return \$args ? \$args[0] : null; }");
}
}
@@ -74,7 +80,7 @@ function redefineMethod() { }
// === END PATCHWORK PREVENTION ===
// Load composer autoloader
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
// Disable any remaining Patchwork functionality
if (class_exists('Patchwork')) {
@@ -95,59 +101,61 @@ function redefineMethod() { }
}
// Mock basic WordPress functions early
-if (!function_exists('plugin_dir_path')) {
- function plugin_dir_path($file) {
- return dirname($file) . '/';
+if (! function_exists('plugin_dir_path')) {
+ function plugin_dir_path($file)
+ {
+ return dirname($file).'/';
}
}
-if (!function_exists('wp_die')) {
- function wp_die($message = '', $title = '', $args = []) {
+if (! function_exists('wp_die')) {
+ function wp_die($message = '', $title = '', $args = [])
+ {
throw new Exception($message ?: 'WordPress died');
}
}
// === WORDPRESS TEST ENVIRONMENT SETUP ===
$wp_tests_dir = getenv('WP_TESTS_DIR');
-if ($wp_tests_dir && file_exists($wp_tests_dir . '/includes/bootstrap.php')) {
+if ($wp_tests_dir && file_exists($wp_tests_dir.'/includes/bootstrap.php')) {
// Load WordPress test bootstrap for proper environment
- require_once $wp_tests_dir . '/includes/bootstrap.php';
+ require_once $wp_tests_dir.'/includes/bootstrap.php';
} else {
// Fallback for local development without WordPress test suite
// Define WordPress constants
- if (!defined('ABSPATH')) {
- define('ABSPATH', dirname(dirname(__DIR__)) . '/');
+ if (! defined('ABSPATH')) {
+ define('ABSPATH', dirname(dirname(__DIR__)).'/');
}
- if (!defined('WPINC')) {
+ if (! defined('WPINC')) {
define('WPINC', 'wp-includes');
}
- if (!defined('WP_CONTENT_DIR')) {
- define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
+ if (! defined('WP_CONTENT_DIR')) {
+ define('WP_CONTENT_DIR', ABSPATH.'wp-content');
}
- if (!defined('WP_PLUGIN_DIR')) {
- define('WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins');
+ if (! defined('WP_PLUGIN_DIR')) {
+ define('WP_PLUGIN_DIR', WP_CONTENT_DIR.'/plugins');
}
- if (!defined('WP_CONTENT_URL')) {
+ if (! defined('WP_CONTENT_URL')) {
define('WP_CONTENT_URL', 'http://localhost/wp-content');
}
- if (!defined('WP_PLUGIN_URL')) {
- define('WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins');
+ if (! defined('WP_PLUGIN_URL')) {
+ define('WP_PLUGIN_URL', WP_CONTENT_URL.'/plugins');
}
- if (!defined('WP_DEBUG')) {
+ if (! defined('WP_DEBUG')) {
define('WP_DEBUG', true);
}
- if (!defined('WP_DEBUG_LOG')) {
+ if (! defined('WP_DEBUG_LOG')) {
define('WP_DEBUG_LOG', false);
}
- if (!defined('WP_DEBUG_DISPLAY')) {
+ if (! defined('WP_DEBUG_DISPLAY')) {
define('WP_DEBUG_DISPLAY', true);
}
// Set up in-memory database for tests
global $wpdb, $db;
- if (!isset($wpdb)) {
- $wpdb = new stdClass();
+ if (! isset($wpdb)) {
+ $wpdb = new stdClass;
$wpdb->prefix = 'wp_';
}
@@ -230,56 +238,66 @@ function wp_die($message = '', $title = '', $args = []) {
");
// Mock WordPress functions for local testing
- if (!function_exists('get_option')) {
- function get_option($key, $default = '') {
+ if (! function_exists('get_option')) {
+ function get_option($key, $default = '')
+ {
global $db;
- $stmt = $db->prepare("SELECT option_value FROM wp_options WHERE option_name = ?");
+ $stmt = $db->prepare('SELECT option_value FROM wp_options WHERE option_name = ?');
$stmt->execute([$key]);
$result = $stmt->fetch(PDO::FETCH_ASSOC);
+
return $result ? $result['option_value'] : $default;
}
}
- if (!function_exists('update_option')) {
- function update_option($key, $value) {
+ if (! function_exists('update_option')) {
+ function update_option($key, $value)
+ {
global $db;
- $stmt = $db->prepare("INSERT OR REPLACE INTO wp_options (option_name, option_value) VALUES (?, ?)");
+ $stmt = $db->prepare('INSERT OR REPLACE INTO wp_options (option_name, option_value) VALUES (?, ?)');
+
return $stmt->execute([$key, $value]);
}
}
- if (!function_exists('wp_die')) {
- function wp_die($message = '', $title = '', $args = []) {
+ if (! function_exists('wp_die')) {
+ function wp_die($message = '', $title = '', $args = [])
+ {
throw new Exception($message ?: 'WordPress died');
}
}
- if (!function_exists('apply_filters')) {
- function apply_filters($tag, $value) {
+ if (! function_exists('apply_filters')) {
+ function apply_filters($tag, $value)
+ {
return $value;
}
}
- if (!function_exists('add_action')) {
- function add_action($tag, $callback, $priority = 10, $accepted_args = 1) {
+ if (! function_exists('add_action')) {
+ function add_action($tag, $callback, $priority = 10, $accepted_args = 1)
+ {
// Mock add_action - do nothing
}
}
- if (!function_exists('is_admin')) {
- function is_admin() {
+ if (! function_exists('is_admin')) {
+ function is_admin()
+ {
return false;
}
}
- if (!function_exists('home_url')) {
- function home_url($path = '') {
- return 'http://localhost' . $path;
+ if (! function_exists('home_url')) {
+ function home_url($path = '')
+ {
+ return 'http://localhost'.$path;
}
}
- if (!function_exists('wp_upload_dir')) {
- function wp_upload_dir() {
+ if (! function_exists('wp_upload_dir')) {
+ function wp_upload_dir()
+ {
return [
'path' => '/tmp/uploads',
'url' => 'http://localhost/wp-content/uploads',
@@ -291,56 +309,65 @@ function wp_upload_dir() {
}
}
- if (!function_exists('get_file_data')) {
- function get_file_data($file, $headers) {
- return ['Version' => '1.3.6'];
+ if (! function_exists('get_file_data')) {
+ function get_file_data($file, $headers)
+ {
+ return ['Version' => '1.4.0'];
}
}
- if (!function_exists('plugin_dir_path')) {
- function plugin_dir_path($file) {
- return dirname($file) . '/';
+ if (! function_exists('plugin_dir_path')) {
+ function plugin_dir_path($file)
+ {
+ return dirname($file).'/';
}
}
- if (!function_exists('wp_json_encode')) {
- function wp_json_encode($data, $options = 0, $depth = 512) {
+ if (! function_exists('wp_json_encode')) {
+ function wp_json_encode($data, $options = 0, $depth = 512)
+ {
return \json_encode($data, $options, $depth);
}
}
- if (!function_exists('__')) {
- function __($text, $domain = 'default') {
+ if (! function_exists('__')) {
+ function __($text, $domain = 'default')
+ {
return $text;
}
}
- if (!function_exists('_e')) {
- function _e($text, $domain = 'default') {
+ if (! function_exists('_e')) {
+ function _e($text, $domain = 'default')
+ {
echo $text;
}
}
- if (!function_exists('site_url')) {
- function site_url($path = '') {
- return 'http://localhost' . $path;
+ if (! function_exists('site_url')) {
+ function site_url($path = '')
+ {
+ return 'http://localhost'.$path;
}
}
- if (!function_exists('admin_url')) {
- function admin_url($path = '') {
- return 'http://localhost/wp-admin' . $path;
+ if (! function_exists('admin_url')) {
+ function admin_url($path = '')
+ {
+ return 'http://localhost/wp-admin'.$path;
}
}
- if (!function_exists('get_site_url')) {
- function get_site_url($blog_id = null, $path = '', $scheme = null) {
- return 'http://localhost' . $path;
+ if (! function_exists('get_site_url')) {
+ function get_site_url($blog_id = null, $path = '', $scheme = null)
+ {
+ return 'http://localhost'.$path;
}
}
- if (!function_exists('wp_get_upload_dir')) {
- function wp_get_upload_dir() {
+ if (! function_exists('wp_get_upload_dir')) {
+ function wp_get_upload_dir()
+ {
return [
'path' => '/tmp/uploads',
'url' => 'http://localhost/wp-content/uploads',
@@ -352,140 +379,163 @@ function wp_get_upload_dir() {
}
}
- if (!function_exists('wp_normalize_path')) {
- function wp_normalize_path($path) {
+ if (! function_exists('wp_normalize_path')) {
+ function wp_normalize_path($path)
+ {
return str_replace('\\', '/', $path);
}
}
- if (!function_exists('wp_doing_ajax')) {
- function wp_doing_ajax() {
+ if (! function_exists('wp_doing_ajax')) {
+ function wp_doing_ajax()
+ {
return defined('DOING_AJAX') && DOING_AJAX;
}
}
- if (!function_exists('wp_doing_cron')) {
- function wp_doing_cron() {
+ if (! function_exists('wp_doing_cron')) {
+ function wp_doing_cron()
+ {
return defined('DOING_CRON') && DOING_CRON;
}
}
- if (!function_exists('wp_is_xml_request')) {
- function wp_is_xml_request() {
+ if (! function_exists('wp_is_xml_request')) {
+ function wp_is_xml_request()
+ {
return false;
}
}
- if (!function_exists('wp_is_json_request')) {
- function wp_is_json_request() {
+ if (! function_exists('wp_is_json_request')) {
+ function wp_is_json_request()
+ {
return false;
}
}
- if (!function_exists('wp_is_jsonp_request')) {
- function wp_is_jsonp_request() {
+ if (! function_exists('wp_is_jsonp_request')) {
+ function wp_is_jsonp_request()
+ {
return false;
}
}
- if (!function_exists('wp_kses_post')) {
- function wp_kses_post($data) {
+ if (! function_exists('wp_kses_post')) {
+ function wp_kses_post($data)
+ {
return $data;
}
}
- if (!function_exists('sanitize_text_field')) {
- function sanitize_text_field($str) {
+ if (! function_exists('sanitize_text_field')) {
+ function sanitize_text_field($str)
+ {
return trim($str);
}
}
- if (!function_exists('esc_attr')) {
- function esc_attr($text) {
+ if (! function_exists('esc_attr')) {
+ function esc_attr($text)
+ {
return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
}
}
- if (!function_exists('esc_html')) {
- function esc_html($text) {
+ if (! function_exists('esc_html')) {
+ function esc_html($text)
+ {
return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
}
}
- if (!function_exists('esc_url')) {
- function esc_url($url) {
+ if (! function_exists('esc_url')) {
+ function esc_url($url)
+ {
return filter_var($url, FILTER_SANITIZE_URL);
}
}
- if (!function_exists('wp_enqueue_script')) {
- function wp_enqueue_script($handle, $src = '', $deps = [], $ver = false, $in_footer = false) {
+ if (! function_exists('wp_enqueue_script')) {
+ function wp_enqueue_script($handle, $src = '', $deps = [], $ver = false, $in_footer = false)
+ {
// Mock - do nothing
}
}
- if (!function_exists('wp_enqueue_style')) {
- function wp_enqueue_style($handle, $src = '', $deps = [], $ver = false, $media = 'all') {
+ if (! function_exists('wp_enqueue_style')) {
+ function wp_enqueue_style($handle, $src = '', $deps = [], $ver = false, $media = 'all')
+ {
// Mock - do nothing
}
}
- if (!function_exists('wp_register_script')) {
- function wp_register_script($handle, $src = '', $deps = [], $ver = false, $in_footer = false) {
+ if (! function_exists('wp_register_script')) {
+ function wp_register_script($handle, $src = '', $deps = [], $ver = false, $in_footer = false)
+ {
// Mock - do nothing
}
}
- if (!function_exists('wp_register_style')) {
- function wp_register_style($handle, $src = '', $deps = [], $ver = false, $media = 'all') {
+ if (! function_exists('wp_register_style')) {
+ function wp_register_style($handle, $src = '', $deps = [], $ver = false, $media = 'all')
+ {
// Mock - do nothing
}
}
- if (!function_exists('wp_deregister_script')) {
- function wp_deregister_script($handle) {
+ if (! function_exists('wp_deregister_script')) {
+ function wp_deregister_script($handle)
+ {
// Mock - do nothing
}
}
- if (!function_exists('wp_deregister_style')) {
- function wp_deregister_style($handle) {
+ if (! function_exists('wp_deregister_style')) {
+ function wp_deregister_style($handle)
+ {
// Mock - do nothing
}
}
- if (!function_exists('wp_localize_script')) {
- function wp_localize_script($handle, $object_name, $l10n) {
+ if (! function_exists('wp_localize_script')) {
+ function wp_localize_script($handle, $object_name, $l10n)
+ {
// Mock - do nothing
}
}
- if (!function_exists('wp_create_nonce')) {
- function wp_create_nonce($action = -1) {
- return 'test_nonce_' . $action;
+ if (! function_exists('wp_create_nonce')) {
+ function wp_create_nonce($action = -1)
+ {
+ return 'test_nonce_'.$action;
}
}
- if (!function_exists('wp_verify_nonce')) {
- function wp_verify_nonce($nonce, $action = -1) {
+ if (! function_exists('wp_verify_nonce')) {
+ function wp_verify_nonce($nonce, $action = -1)
+ {
return strpos($nonce, 'test_nonce_') === 0;
}
}
- if (!function_exists('current_user_can')) {
- function current_user_can($capability) {
+ if (! function_exists('current_user_can')) {
+ function current_user_can($capability)
+ {
return true; // Assume admin for tests
}
}
- if (!function_exists('get_current_user_id')) {
- function get_current_user_id() {
+ if (! function_exists('get_current_user_id')) {
+ function get_current_user_id()
+ {
return 1;
}
}
- if (!function_exists('get_userdata')) {
- function get_userdata($user_id) {
+ if (! function_exists('get_userdata')) {
+ function get_userdata($user_id)
+ {
return (object) [
'ID' => $user_id,
'user_login' => 'testuser',
@@ -495,14 +545,16 @@ function get_userdata($user_id) {
}
}
- if (!function_exists('is_user_logged_in')) {
- function is_user_logged_in() {
+ if (! function_exists('is_user_logged_in')) {
+ function is_user_logged_in()
+ {
return true;
}
}
- if (!function_exists('wp_get_current_user')) {
- function wp_get_current_user() {
+ if (! function_exists('wp_get_current_user')) {
+ function wp_get_current_user()
+ {
return (object) [
'ID' => 1,
'user_login' => 'testuser',
@@ -513,8 +565,9 @@ function wp_get_current_user() {
}
}
- if (!function_exists('get_bloginfo')) {
- function get_bloginfo($show = '') {
+ if (! function_exists('get_bloginfo')) {
+ function get_bloginfo($show = '')
+ {
$info = [
'name' => 'Test Site',
'description' => 'Test Description',
@@ -522,60 +575,71 @@ function get_bloginfo($show = '') {
'version' => '6.0',
'charset' => 'UTF-8',
];
+
return $info[$show] ?? '';
}
}
- if (!function_exists('get_option')) {
- function get_option($key, $default = '') {
+ if (! function_exists('get_option')) {
+ function get_option($key, $default = '')
+ {
global $db;
- $stmt = $db->prepare("SELECT option_value FROM wp_options WHERE option_name = ?");
+ $stmt = $db->prepare('SELECT option_value FROM wp_options WHERE option_name = ?');
$stmt->execute([$key]);
$result = $stmt->fetch(PDO::FETCH_ASSOC);
+
return $result ? $result['option_value'] : $default;
}
}
- if (!function_exists('update_option')) {
- function update_option($key, $value) {
+ if (! function_exists('update_option')) {
+ function update_option($key, $value)
+ {
global $db;
- $stmt = $db->prepare("INSERT OR REPLACE INTO wp_options (option_name, option_value) VALUES (?, ?)");
+ $stmt = $db->prepare('INSERT OR REPLACE INTO wp_options (option_name, option_value) VALUES (?, ?)');
+
return $stmt->execute([$key, $value]);
}
}
- if (!function_exists('wp_die')) {
- function wp_die($message = '', $title = '', $args = []) {
+ if (! function_exists('wp_die')) {
+ function wp_die($message = '', $title = '', $args = [])
+ {
throw new Exception($message ?: 'WordPress died');
}
}
- if (!function_exists('apply_filters')) {
- function apply_filters($tag, $value) {
+ if (! function_exists('apply_filters')) {
+ function apply_filters($tag, $value)
+ {
return $value;
}
}
- if (!function_exists('add_action')) {
- function add_action($tag, $callback, $priority = 10, $accepted_args = 1) {
+ if (! function_exists('add_action')) {
+ function add_action($tag, $callback, $priority = 10, $accepted_args = 1)
+ {
// Mock add_action - do nothing
}
}
- if (!function_exists('is_admin')) {
- function is_admin() {
+ if (! function_exists('is_admin')) {
+ function is_admin()
+ {
return false;
}
}
- if (!function_exists('home_url')) {
- function home_url($path = '') {
- return 'http://localhost' . $path;
+ if (! function_exists('home_url')) {
+ function home_url($path = '')
+ {
+ return 'http://localhost'.$path;
}
}
- if (!function_exists('wp_upload_dir')) {
- function wp_upload_dir() {
+ if (! function_exists('wp_upload_dir')) {
+ function wp_upload_dir()
+ {
return [
'path' => '/tmp/uploads',
'url' => 'http://localhost/wp-content/uploads',
@@ -587,26 +651,30 @@ function wp_upload_dir() {
}
}
- if (!function_exists('get_file_data')) {
- function get_file_data($file, $headers) {
- return ['Version' => '1.3.6'];
+ if (! function_exists('get_file_data')) {
+ function get_file_data($file, $headers)
+ {
+ return ['Version' => '1.4.0'];
}
}
- if (!function_exists('plugin_dir_path')) {
- function plugin_dir_path($file) {
- return dirname($file) . '/';
+ if (! function_exists('plugin_dir_path')) {
+ function plugin_dir_path($file)
+ {
+ return dirname($file).'/';
}
}
- if (!function_exists('wp_json_encode')) {
- function wp_json_encode($data, $options = 0, $depth = 512) {
+ if (! function_exists('wp_json_encode')) {
+ function wp_json_encode($data, $options = 0, $depth = 512)
+ {
return \json_encode($data, $options, $depth);
}
}
- if (!function_exists('__')) {
- function __($text, $domain = 'default') {
+ if (! function_exists('__')) {
+ function __($text, $domain = 'default')
+ {
return $text;
}
}
diff --git a/wp-addon-plugin.php b/wp-addon-plugin.php
index 75245b4..3bbd65d 100644
--- a/wp-addon-plugin.php
+++ b/wp-addon-plugin.php
@@ -1,9 +1,13 @@
init();
\ No newline at end of file
+$plugin = new Plugin(__FILE__);
+$plugin->init();