Merge branch 'main' into 'release3.x'

Release 3.2.2

See merge request really-simple-plugins/simplybook-me/simplybook!152

Author: wimbraam

app/App.php

@@ -2,7 +2,7 @@
 namespace SimplyBook\Controllers;
 
 use Carbon\Carbon;
-use SimplyBook\App;
+use SimplyBook\Bootstrap\App;
 use SimplyBook\Traits\HasViews;
 use SimplyBook\Traits\HasAllowlistControl;
 use SimplyBook\Interfaces\ControllerInterface;
@@ -12,18 +12,24 @@ class AdminController implements ControllerInterface
     use HasViews;
     use HasAllowlistControl;
 
+    private App $app;
     private string $restApiAction = 'resp_rest_api_notice_form_submit';
     private string $restApiNonceName = 'resp_rest_api_notice_nonce';
     private string $restApiAccessibleOptionName = 'simplybook_rest_api_accessible';
     private string $restApiValidationTimeOptionName = 'simplybook_rest_api_validation_time';
 
+    public function __construct(App $app)
+    {
+        $this->app = $app;
+    }
+
     public function register(): void
     {
         if ($this->adminAccessAllowed() === false) {
             return;
         }
 
-        add_filter('plugin_action_links_' . App::env('plugin.base_file'), [$this, 'addPluginSettingsAction']);
+        add_filter('plugin_action_links_' . $this->app->env->getString('plugin.base_file'), [$this, 'addPluginSettingsAction']);
         add_action('admin_notices', [$this, 'showRestApiNotice']);
         add_action('admin_init', [$this, 'processRestApiNoticeFormSubmit']);
     }
@@ -37,11 +43,11 @@ public function addPluginSettingsAction(array $links): array
             return $links;
         }
 
-        $settings_link = '<a href="' . App::env('plugin.dashboard_url') . '">' . esc_html__('Settings', 'simplybook') . '</a>';
+        $settings_link = '<a href="' . $this->app->env->getUrl('plugin.dashboard_url') . '">' . esc_html__('Settings', 'simplybook') . '</a>';
         array_unshift($links, $settings_link);
 
         //support
-        $support = '<a rel="noopener noreferrer" target="_blank" href="' . esc_attr(App::env('simplybook.support_url')) . '">' . esc_html__('Support', 'simplybook') . '</a>';
+        $support = '<a rel="noopener noreferrer" target="_blank" href="' . esc_attr($this->app->env->getUrl('simplybook.support_url')) . '">' . esc_html__('Support', 'simplybook') . '</a>';
         array_unshift($links, $support);
 
         return $links;
@@ -75,12 +81,11 @@ public function showRestApiNotice(): void
      */
     public function processRestApiNoticeFormSubmit(): void
     {
-        $request = App::provide('request')->fromGlobal();
-        if ($request->isEmpty('simplybook_rest_api_notice_form')) {
+        if ($this->app->request->isEmpty('simplybook_rest_api_notice_form')) {
             return;
         }
 
-        $nonce = $request->get($this->restApiNonceName);
+        $nonce = $this->app->request->get($this->restApiNonceName);
         if (wp_verify_nonce($nonce, $this->restApiAction) === false) {
             return; // Invalid nonce
         }

app/controllers/AdminController.php app/Controllers/AdminController.phpapp/controllers/AdminController.php renamed to app/Controllers/AdminController.php

@@ -1,12 +1,18 @@
 <?php namespace SimplyBook\Controllers;
 
+use SimplyBook\Bootstrap\App;
 use Elementor\Widgets_Manager;
-use SimplyBook\App;
 use SimplyBook\Interfaces\ControllerInterface;
-use SimplyBook\Widgets\ElementorWidget;
+use SimplyBook\Support\Widgets\ElementorWidget;
 
 class BlockController implements ControllerInterface
 {
+    private App $app;
+
+    public function __construct(App $app) {
+        $this->app = $app;
+    }
+
     public function register()
     {
         if (!function_exists('register_block_type')) {
@@ -33,7 +39,7 @@ public function registerGutenbergBlockType(): void
 			return;
         }
 
-	    $blockMetaData = App::env('plugin.assets_path') . '/block/build/block.json';
+	    $blockMetaData = $this->app->env->getString('plugin.assets_path') . '/block/build/block.json';
 	    if ( file_exists( $blockMetaData ) === false ) {
 		    $this->registerGutenbergBlockTypeManually();
 		    return;
@@ -92,10 +98,10 @@ class_exists('\WP_Block_Type_Registry')
             $this->registerGutenbergBlockType();
         }
 
-        $assetsData = include(App::env('plugin.assets_path') . '/block/build/index.asset.php');
-        $indexJs = App::env('plugin.assets_url') . 'block/build/index.js';
-        $indexCss = App::env('plugin.assets_url') . 'block/build/index.css';
-        $preview = App::env('plugin.assets_url') . '/img/preview.png';
+        $assetsData = include($this->app->env->getString('plugin.assets_path') . '/block/build/index.asset.php');
+        $indexJs = $this->app->env->getUrl('plugin.assets_url') . 'block/build/index.js';
+        $indexCss = $this->app->env->getUrl('plugin.assets_url') . 'block/build/index.css';
+        $preview = $this->app->env->getUrl('plugin.assets_url') . '/img/preview.png';
 
         wp_enqueue_script(
             'simplybook-block',
@@ -114,20 +120,20 @@ class_exists('\WP_Block_Type_Registry')
                 'preview' => $preview,
                 'nonce' => wp_create_nonce('simplybook_nonce'),
                 'x_wp_nonce' => wp_create_nonce('wp_rest'),
-                'rest_namespace' => App::env('http.namespace'),
-                'rest_version' => App::env('http.version'),
+                'rest_namespace' => $this->app->env->getString('http.namespace'),
+                'rest_version' => $this->app->env->getString('http.version'),
                 'site_url' => site_url(),
-                'dashboard_url' => App::env('plugin.dashboard_url'),
-                'assets_url' => App::env('plugin.assets_url'),
+                'dashboard_url' => $this->app->env->getUrl('plugin.dashboard_url'),
+                'assets_url' => $this->app->env->getUrl('plugin.assets_url'),
                 'debug' => defined( 'SIMPLYBOOK_DEBUG' ) && SIMPLYBOOK_DEBUG,
             ]
         );
 
         // Add widget.js script in the header of the page. We need it to be
         // Loaded as soon as possible, as our widgets are dependent on it.
-        wp_enqueue_script('simplybookMePl_widget_scripts', App::env('simplybook.widget_script_url'), [], App::env('simplybook.widget_script_version'), false);
+        wp_enqueue_script('simplybookMePl_widget_scripts', $this->app->env->getUrl('simplybook.widget_script_url'), [], $this->app->env->getString('simplybook.widget_script_version'), false);
 
-        wp_register_style('simplybookMePl_widget_styles', $indexCss, [], App::env('plugin.version'));
+        wp_register_style('simplybookMePl_widget_styles', $indexCss, [], $this->app->env->getString('plugin.version'));
         wp_enqueue_style('simplybookMePl_widget_styles');
 
         wp_set_script_translations('simplybook-block', 'simplybook');