Changeset 3241875

Timestamp:

02/17/2025 11:59:27 AM (12 months ago)

Author:

vocalreferences

Message:

fixed initialisations of plugin

Location:

a-testimonial-builder

Files:

• tags/1.0.0/a-testimonial-builder.php (modified) (1 diff)
• tags/1.0.0/includes/ATBS_Main.php (modified) (2 diffs)
• trunk/a-testimonial-builder.php (modified) (1 diff)
• trunk/includes/ATBS_Main.php (modified) (2 diffs)

a-testimonial-builder/tags/1.0.0/a-testimonial-builder.php

@@ -16 +16 @@
     exit; // Exit if accessed directly
 
+    
 // Define constants
 define('ATBS_DIR', plugin_dir_path(__FILE__));
 define('ATBS_URL', plugin_dir_url(__FILE__));
 
+// Check if Composer autoloader exists.
+if (!file_exists(ATBS_DIR . 'vendor/autoload.php')) {
+
+    function atbs_plugin_autoload_notice()
+    {
+        echo '<div class="notice notice-error"><p><strong>A+ Testimonial Builder:</strong> The Composer autoloader is missing. Please run <code>composer install</code> inside the plugin folder.</p></div>';
+    }
+
+    add_action('admin_notices', 'atbs_plugin_autoload_notice');
+    return;
+}
+
+// Load Composer autoloader.
+require_once ATBS_DIR . 'vendor/autoload.php';
+
+// Use the correct namespace
+use DavidWenner\ATestimonialBuilder\ATBS_Hooks;
 use DavidWenner\ATestimonialBuilder\ATBS_Main;
 
-/**
- * Checks basic requirements and loads the plugin.
- *
- * @since 1.0.0
- */
-function atbs_plugin_load()
-{
-    // Check Composer autoloader exists.
-    if (!file_exists(ATBS_DIR . 'vendor/autoload.php')) {
-        add_action('admin_notices', 'wp_plugin_check_display_composer_autoload_notice');
-        return;
-    }
+// Register activation and deactivation hooks
+register_activation_hook(__FILE__, [ATBS_Hooks::class, 'atbs_activation_hook']);
+register_deactivation_hook(__FILE__, [ATBS_Hooks::class, 'atbs_deactivation_hook']);
+register_uninstall_hook(__FILE__, [ATBS_Hooks::class, 'atbs_deactivation_hook']);
 
-    // Load the Composer autoloader.
-    require_once ATBS_DIR . 'vendor/autoload.php';
-
-    $instance = new ATBS_Main();
-}
-
-atbs_plugin_load();
-
+// Initialize the plugin
+new ATBS_Main();

a-testimonial-builder/tags/1.0.0/includes/ATBS_Main.php

@@ -9 +9 @@
 use DavidWenner\ATestimonialBuilder\ATBS_FlashMessages;
 use DavidWenner\ATestimonialBuilder\ATBS_Shortcodes;
-use DavidWenner\ATestimonialBuilder\ATBS_Hooks;
 
 /**
@@ -26 +25 @@
         new ATBS_FlashMessages();
         new ATBS_Shortcodes();
-
-        $hooks = new ATBS_Hooks();
-
-        // Register activation and deactivation hooks
-        register_activation_hook(__FILE__, [$hooks, 'atbs_activation_hook']);
-        register_deactivation_hook(__FILE__, [$hooks, 'atbs_deactivation_hook']);
-        register_uninstall_hook(__FILE__, [$hooks, 'atbs_deactivation_hook']);
     }
 }

a-testimonial-builder/trunk/a-testimonial-builder.php

@@ -16 +16 @@
     exit; // Exit if accessed directly
 
+    
 // Define constants
 define('ATBS_DIR', plugin_dir_path(__FILE__));
 define('ATBS_URL', plugin_dir_url(__FILE__));
 
+// Check if Composer autoloader exists.
+if (!file_exists(ATBS_DIR . 'vendor/autoload.php')) {
+
+    function atbs_plugin_autoload_notice()
+    {
+        echo '<div class="notice notice-error"><p><strong>A+ Testimonial Builder:</strong> The Composer autoloader is missing. Please run <code>composer install</code> inside the plugin folder.</p></div>';
+    }
+
+    add_action('admin_notices', 'atbs_plugin_autoload_notice');
+    return;
+}
+
+// Load Composer autoloader.
+require_once ATBS_DIR . 'vendor/autoload.php';
+
+// Use the correct namespace
+use DavidWenner\ATestimonialBuilder\ATBS_Hooks;
 use DavidWenner\ATestimonialBuilder\ATBS_Main;
 
-/**
- * Checks basic requirements and loads the plugin.
- *
- * @since 1.0.0
- */
-function atbs_plugin_load()
-{
-    // Check Composer autoloader exists.
-    if (!file_exists(ATBS_DIR . 'vendor/autoload.php')) {
-        add_action('admin_notices', 'wp_plugin_check_display_composer_autoload_notice');
-        return;
-    }
+// Register activation and deactivation hooks
+register_activation_hook(__FILE__, [ATBS_Hooks::class, 'atbs_activation_hook']);
+register_deactivation_hook(__FILE__, [ATBS_Hooks::class, 'atbs_deactivation_hook']);
+register_uninstall_hook(__FILE__, [ATBS_Hooks::class, 'atbs_deactivation_hook']);
 
-    // Load the Composer autoloader.
-    require_once ATBS_DIR . 'vendor/autoload.php';
-
-    $instance = new ATBS_Main();
-}
-
-atbs_plugin_load();
-
+// Initialize the plugin
+new ATBS_Main();

a-testimonial-builder/trunk/includes/ATBS_Main.php

@@ -9 +9 @@
 use DavidWenner\ATestimonialBuilder\ATBS_FlashMessages;
 use DavidWenner\ATestimonialBuilder\ATBS_Shortcodes;
-use DavidWenner\ATestimonialBuilder\ATBS_Hooks;
 
 /**
@@ -26 +25 @@
         new ATBS_FlashMessages();
         new ATBS_Shortcodes();
-
-        $hooks = new ATBS_Hooks();
-
-        // Register activation and deactivation hooks
-        register_activation_hook(__FILE__, [$hooks, 'atbs_activation_hook']);
-        register_deactivation_hook(__FILE__, [$hooks, 'atbs_deactivation_hook']);
-        register_uninstall_hook(__FILE__, [$hooks, 'atbs_deactivation_hook']);
     }
 }