Merge branch 'main' into release3.x

# Conflicts:
#	assets/languages/simplybook.pot
#	composer.json
#	config/env.php
#	readme.txt
#	simplybook.php

Author: wimbraam

app/Controllers/AdminController.php

@@ -3,25 +3,29 @@
 namespace SimplyBook\Controllers;
 
 use Carbon\Carbon;
-use SimplyBook\Bootstrap\App;
 use SimplyBook\Traits\HasViews;
 use SimplyBook\Traits\HasAllowlistControl;
 use SimplyBook\Interfaces\ControllerInterface;
+use SimplyBook\Support\Helpers\Storages\RequestStorage;
+use SimplyBook\Support\Helpers\Storages\EnvironmentConfig;
 
 class AdminController implements ControllerInterface
 {
     use HasViews;
     use HasAllowlistControl;
 
-    private App $app;
+    private EnvironmentConfig $env;
+    private RequestStorage $request;
+
     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)
+    public function __construct(EnvironmentConfig $env, RequestStorage $request)
     {
-        $this->app = $app;
+        $this->env = $env;
+        $this->request = $request;
     }
 
     public function register(): void
@@ -30,7 +34,7 @@ public function register(): void
             return;
         }
 
-        add_filter('plugin_action_links_' . $this->app->env->getString('plugin.base_file'), [$this, 'addPluginSettingsAction']);
+        add_filter('plugin_action_links_' . $this->env->getString('plugin.base_file'), [$this, 'addPluginSettingsAction']);
         add_action('admin_notices', [$this, 'showRestApiNotice']);
         add_action('admin_init', [$this, 'processRestApiNoticeFormSubmit']);
     }
@@ -44,11 +48,11 @@ public function addPluginSettingsAction(array $links): array
             return $links;
         }
 
-        $settings_link = '<a href="' . $this->app->env->getUrl('plugin.dashboard_url') . '">' . esc_html__('Settings', 'simplybook') . '</a>';
+        $settings_link = '<a href="' . $this->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($this->app->env->getUrl('simplybook.support_url')) . '">' . esc_html__('Support', 'simplybook') . '</a>';
+        $support = '<a rel="noopener noreferrer" target="_blank" href="' . esc_attr($this->env->getUrl('simplybook.support_url')) . '">' . esc_html__('Support', 'simplybook') . '</a>';
         array_unshift($links, $support);
 
         return $links;
@@ -82,11 +86,11 @@ public function showRestApiNotice(): void
      */
     public function processRestApiNoticeFormSubmit(): void
     {
-        if ($this->app->request->isEmpty('simplybook_rest_api_notice_form')) {
+        if ($this->request->isEmpty('global.simplybook_rest_api_notice_form')) {
             return;
         }
 
-        $nonce = $this->app->request->get($this->restApiNonceName);
+        $nonce = $this->request->get('global.' . $this->restApiNonceName);
         if (wp_verify_nonce($nonce, $this->restApiAction) === false) {
             return; // Invalid nonce
         }
@@ -109,8 +113,10 @@ public function processRestApiNoticeFormSubmit(): void
     private function shouldRenderRestApiNotice(): bool
     {
         $cacheName = 'rsp_simplybook_rest_api_inaccessible';
-        if ($cache = wp_cache_get($cacheName, 'simplybook')) {
-            return (bool) $cache;
+        $cacheValue = wp_cache_get($cacheName, 'simplybook', false, $found);
+
+        if ($found) {
+            return (bool) $cacheValue;
         }
 
         // Dismissed notice or completed onboarding? No notice.

app/Controllers/BlockController.php

@@ -2,18 +2,18 @@
 
 namespace SimplyBook\Controllers;
 
-use SimplyBook\Bootstrap\App;
 use Elementor\Widgets_Manager;
 use SimplyBook\Interfaces\ControllerInterface;
 use SimplyBook\Support\Widgets\ElementorWidget;
+use SimplyBook\Support\Helpers\Storages\EnvironmentConfig;
 
 class BlockController implements ControllerInterface
 {
-    private App $app;
+    private EnvironmentConfig $env;
 
-    public function __construct(App $app)
+    public function __construct(EnvironmentConfig $env)
     {
-        $this->app = $app;
+        $this->env = $env;
     }
 
     public function register(): void
@@ -42,7 +42,7 @@ public function registerGutenbergBlockType(): void
             return;
         }
 
-        $blockMetaData = $this->app->env->getString('plugin.assets_path') . '/block/build/block.json';
+        $blockMetaData = $this->env->getString('plugin.assets_path') . '/block/build/block.json';
         if (file_exists($blockMetaData) === false) {
             $this->registerGutenbergBlockTypeManually();
             return;
@@ -101,10 +101,10 @@ class_exists('\WP_Block_Type_Registry')
             $this->registerGutenbergBlockType();
         }
 
-        $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';
+        $assetsData = include($this->env->getString('plugin.assets_path') . '/block/build/index.asset.php');
+        $indexJs = $this->env->getUrl('plugin.assets_url') . 'block/build/index.js';
+        $indexCss = $this->env->getUrl('plugin.assets_url') . 'block/build/index.css';
+        $preview = $this->env->getUrl('plugin.assets_url') . '/img/preview.png';
 
         wp_enqueue_script(
             'simplybook-block',
@@ -123,20 +123,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' => $this->app->env->getString('http.namespace'),
-                'rest_version' => $this->app->env->getString('http.version'),
+                'rest_namespace' => $this->env->getString('http.namespace'),
+                'rest_version' => $this->env->getString('http.version'),
                 'site_url' => site_url(),
-                'dashboard_url' => $this->app->env->getUrl('plugin.dashboard_url'),
-                'assets_url' => $this->app->env->getUrl('plugin.assets_url'),
+                'dashboard_url' => $this->env->getUrl('plugin.dashboard_url'),
+                'assets_url' => $this->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', $this->app->env->getUrl('simplybook.widget_script_url'), [], $this->app->env->getString('simplybook.widget_script_version'), false);
+        wp_enqueue_script('simplybookMePl_widget_scripts', $this->env->getUrl('simplybook.widget_script_url'), [], $this->env->getString('simplybook.widget_script_version'), false);
 
-        wp_register_style('simplybookMePl_widget_styles', $indexCss, [], $this->app->env->getString('plugin.version'));
+        wp_register_style('simplybookMePl_widget_styles', $indexCss, [], $this->env->getString('plugin.version'));
         wp_enqueue_style('simplybookMePl_widget_styles');
 
         wp_set_script_translations('simplybook-block', 'simplybook');

app/Controllers/DashboardController.php

@@ -2,13 +2,16 @@
 
 namespace SimplyBook\Controllers;
 
-use SimplyBook\Bootstrap\App;
+use SimplyBook\Http\ApiClient;
 use SimplyBook\Traits\HasViews;
 use SimplyBook\Traits\LegacyLoad;
 use SimplyBook\Traits\HasUserAccess;
 use SimplyBook\Traits\HasAllowlistControl;
 use SimplyBook\Services\ThemeColorService;
 use SimplyBook\Interfaces\ControllerInterface;
+use SimplyBook\Support\Helpers\Storages\GeneralConfig;
+use SimplyBook\Support\Helpers\Storages\RequestStorage;
+use SimplyBook\Support\Helpers\Storages\EnvironmentConfig;
 
 class DashboardController implements ControllerInterface
 {
@@ -17,12 +20,18 @@ class DashboardController implements ControllerInterface
     use HasUserAccess;
     use HasAllowlistControl;
 
-    private App $app;
+    private ApiClient $client;
+    private EnvironmentConfig $env;
+    private RequestStorage $request;
+    private GeneralConfig $config;
     private ThemeColorService $themeColorService;
 
-    public function __construct(App $app, ThemeColorService $themeColorService)
+    public function __construct(ApiClient $client, EnvironmentConfig $env, GeneralConfig $config, RequestStorage $request, ThemeColorService $themeColorService)
     {
-        $this->app = $app;
+        $this->client = $client;
+        $this->env = $env;
+        $this->request = $request;
+        $this->config = $config;
         $this->themeColorService = $themeColorService;
     }
 
@@ -46,8 +55,8 @@ public function register(): void
      */
     public function enqueueSimplyBookDashiconStyle(): void
     {
-        $iconCss = $this->app->env->getUrl('plugin.assets_url') . 'css/simplybook-icon.css';
-        wp_enqueue_style('simplybook-font', $iconCss, [], $this->app->env->getString('plugin.version'));
+        $iconCss = $this->env->getUrl('plugin.assets_url') . 'css/simplybook-icon.css';
+        wp_enqueue_style('simplybook-font', $iconCss, [], $this->env->getString('plugin.version'));
     }
 
     /**
@@ -64,7 +73,7 @@ public function maybeRedirectToDashboard(string $pageSource = ''): void
             return;
         }
 
-        wp_safe_redirect($this->app->env->getUrl('plugin.dashboard_url'));
+        wp_safe_redirect($this->env->getUrl('plugin.dashboard_url'));
         exit;
     }
 
@@ -109,22 +118,22 @@ public function addDashboardPage(): void
      */
     public function renderReactApp(): void
     {
-        $this->render('admin/dashboard', [], 'html');
+        $this->render('admin/dashboard');
     }
 
     /**
      * Enqueue the Tailwind CSS for the dashboard in the header
      */
     public function enqueueDashboardStyles(): void
     {
-        $chunkTranslation = $this->getReactChunkTranslations();
+        $chunkTranslation = $this->getReactChunksAndTranslations();
         if (empty($chunkTranslation)) {
             return;
         }
 
         wp_enqueue_style(
             'simplybook-tailwind',
-            $this->app->env->getUrl('plugin.assets_url') . '/css/tailwind.generated.css',
+            $this->env->getUrl('plugin.assets_url') . '/css/tailwind.generated.css',
             [],
             ($chunkTranslation['version'] ?? '')
         );
@@ -139,23 +148,23 @@ public function enqueueDashboardStyles(): void
      */
     public function enqueueReactScripts(): void
     {
-        $chunkTranslation = $this->getReactChunkTranslations();
+        $chunkTranslation = $this->getReactChunksAndTranslations();
         if (empty($chunkTranslation)) {
             return;
         }
 
         // Enqueue SimplyBook Widget script for preview functionality
         wp_enqueue_script(
             'simplybookMePl_widget_scripts',
-            $this->app->env->getUrl('simplybook.widget_script_url'),
+            $this->env->getUrl('simplybook.widget_script_url'),
             [],
-            $this->app->env->getString('simplybook.widget_script_version'),
+            $this->env->getString('simplybook.widget_script_version'),
             true
         );
 
         wp_enqueue_script(
             'simplybook-main-script',
-            $this->app->env->getUrl('plugin.react_url') . '/build/' . ($chunkTranslation['js_file_name'] ?? ''),
+            $this->env->getUrl('plugin.react_url') . '/build/' . ($chunkTranslation['js_file_name'] ?? ''),
             ($chunkTranslation['dependencies'] ?? ''),
             ($chunkTranslation['version'] ?? ''),
             true
@@ -177,15 +186,17 @@ public function enqueueReactScripts(): void
      * simplest approach. Simplicity is king here.
      * @see https://wordpress.com/blog/2022/01/06/wordpress-plugin-i18n-webpack-and-composer/
      */
-    private function getReactChunkTranslations(): array
+    private function getReactChunksAndTranslations(): array
     {
-        $cacheName = 'simplybook-react-chunk-translations';
-        if ($cache = wp_cache_get($cacheName, 'simplybook')) {
-            return $cache;
+        $cacheName = 'simplybook-react-chunk-and-translations';
+        $cacheValue = wp_cache_get($cacheName, 'simplybook', false, $found);
+
+        if ($found && is_array($cacheValue)) {
+            return $cacheValue;
         }
 
         // get all files from the settings/build folder
-        $buildDirPath = $this->app->env->getString('plugin.react_path') . '/build';
+        $buildDirPath = $this->env->getString('plugin.react_path') . '/build';
         $filenames = scandir($buildDirPath);
 
         $jsFileName = '';
@@ -209,8 +220,8 @@ private function getReactChunkTranslations(): array
             // remove extension from $filename
             $chunkHandle = str_replace('.js', '', $filename);
             // temporarily register the script, so we can get a translations object.
-            $chunkSource = $this->app->env->getUrl('plugin.react_url') . '/build/' . $filename;
-            wp_register_script($chunkHandle, $chunkSource, [], $this->app->env->getString('plugin.version'), true);
+            $chunkSource = $this->env->getUrl('plugin.react_url') . '/build/' . $filename;
+            wp_register_script($chunkHandle, $chunkSource, [], $this->env->getString('plugin.version'), true);
 
             //as there is no pro version of this plugin, no need to declare a path
             $localeData = load_script_textdomain($chunkHandle, 'simplybook');
@@ -233,7 +244,7 @@ private function getReactChunkTranslations(): array
             'version' => $assetFileData['version'] ?? '',
         ];
 
-        wp_cache_set($cacheName, $chunkTranslations, 'simplybook');
+        wp_cache_set($cacheName, $chunkTranslations, 'simplybook', (5 * MINUTE_IN_SECONDS));
         return $chunkTranslations;
     }
 
@@ -250,21 +261,21 @@ private function localizedReactSettings(array $chunkTranslation): array
                 'x_wp_nonce' => wp_create_nonce('wp_rest'),
                 'ajax_url' => admin_url('admin-ajax.php'),
                 'rest_url' => get_rest_url(),
-                'rest_namespace' => $this->app->env->getString('http.namespace'),
-                'rest_version' => $this->app->env->getString('http.version'),
+                'rest_namespace' => $this->env->getString('http.namespace'),
+                'rest_version' => $this->env->getString('http.version'),
                 'site_url' => site_url(),
-                'dashboard_url' => $this->app->env->getUrl('plugin.dashboard_url'),
-                'assets_url' => $this->app->env->getUrl('plugin.assets_url'),
+                'dashboard_url' => $this->env->getUrl('plugin.dashboard_url'),
+                'assets_url' => $this->env->getUrl('plugin.assets_url'),
                 'debug' => defined('SIMPLYBOOK_DEBUG') && SIMPLYBOOK_DEBUG,
                 'json_translations' => ($chunkTranslation['json_translations'] ?? []),
                 'settings_menu' => $this->menu(),
                 'settings_fields' => $this->fields(true),
                 'is_onboarding_completed' => $this->isOnboardingCompleted(),
                 'first_name' => $this->getCurrentUserFirstName(),
                 'completed_step' => get_option('simplybook_completed_step', 0),
-                'simplybook_domains' => $this->app->env->get('simplybook.domains'),
-                'simplybook_countries' => $this->app->config->get('countries'),
-                'support' => $this->app->env->get('simplybook.support'),
+                'simplybook_domains' => $this->env->get('simplybook.domains'),
+                'simplybook_countries' => $this->config->get('countries'),
+                'support' => $this->env->get('simplybook.support'),
                 'fallback_colors' => $this->themeColorService->getFallbackColors(),
             ]
         );
@@ -281,11 +292,11 @@ private function isOnboardingCompleted(): bool
      */
     public function maybeResetRegistration(): void
     {
-        if ($this->app->request->getString('reset_registration', 'false') !== 'true') {
+        if ($this->request->getString('global.reset_registration', 'false') !== 'true') {
             return;
         }
 
-        $this->app->client->reset_registration();
+        $this->client->reset_registration();
     }
 
     /**