Merge pull request #6 from Zuluru/master

Improve Cake 4.3 compatibility
anuj9196 · Jun 1, 2024 · 523e49f · 523e49f
2 parents 33ccc5b + c121ca4
commit 523e49f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -3,7 +3,9 @@
 /**
  * Path constants
  */
-    define('PLUGIN_CONFIG', dirname(__DIR__) . DS . 'config' .DS);
+    if (!defined('PLUGIN_CONFIG')) {
+        define('PLUGIN_CONFIG', dirname(__DIR__) . DS . 'config' .DS);
+    }
 /**
  * Database installation variable
  * if set to TRUE, the database is installed

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
@@ -8,10 +8,10 @@
 
 class AppController extends BaseController
 {
-    public function beforeRender(EventInterface $event)
+    public function beforeRender(EventInterface $event): void
     {
         try {
-            return parent::beforeRender($event);
+            parent::beforeRender($event);
         } finally {
             $this->viewBuilder()->setTheme(null);
         }

diff --git a/src/Controller/InstallController.php b/src/Controller/InstallController.php
@@ -25,7 +25,7 @@ class InstallController extends AppController
      * @return void
      * @throws \Exception
      */
-    public function beforeFilter(EventInterface $event)
+    public function beforeFilter(EventInterface $event): void
     {
         parent::beforeFilter($event);
         $this->loadComponent('Auth');
@@ -56,7 +56,7 @@ protected function _check()
         if (Configure::read('Database.installed')) {
             $this->Flash->success(__('Website already configured'));
             // Removing redirect to allow user to re-configure application manually
-//            $this->redirect('/');
+//            return $this->redirect('/');
         }
     }
 
@@ -75,6 +75,7 @@ public function connection()
         if ($this->request->is('post')) {
             // Loads post form data
             $data = $this->request->getData();
+            unset($data['_Token']);
 
             // Check if import_database is checked
             $import_database = $this->request->getData('import_database') || Configure::read('Installer.Import.migrations');
@@ -179,9 +180,9 @@ public function connection()
 
                     // Import database if import_database is checked
                     if ($import_database) {
-                        $this->redirect(['action' => 'data']);
+                        return $this->redirect(['action' => 'data']);
                     } else {
-                        $this->redirect(['action' => 'finish']);
+                        return $this->redirect(['action' => 'finish']);
                     }
                 } else {
                     // Remove any config files that were written successfully, so that we try them again next time.
@@ -218,7 +219,7 @@ public function data()
 
             if ($this->request->is('post') && $this->_importSchema($db) && $this->_handleMigrations()) {
                 $this->Flash->success(__('Database imported'));
-                $this->redirect(['action' => 'finish']);
+                return $this->redirect(['action' => 'finish']);
             }
         } catch (Exception $connectionError) {
             $this->set(['database_connect' => false]);

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace CakePHPAppInstaller;
+
+use Cake\Core\BasePlugin;
+
+/**
+ * Plugin class for CakePHP.
+ */
+class Plugin extends BasePlugin
+{
+}
diff --git a/templates/Install/index.php b/templates/Install/index.php
@@ -98,15 +98,15 @@
     ?>
 
     <?php
-    if (version_compare(PHP_VERSION, '5.6.0') < 0) {
+    if (version_compare(PHP_VERSION, '7.4.0') < 0) {
         $check = false;
         $class = 'danger';
         $glyphicon = 'remove';
-        $message = __('Your PHP version must be equal or higher than 5.6.0 to use CakePHP (' . PHP_VERSION . ')');
+        $message = __('Your PHP version must be equal or higher than 7.4.0 to use CakePHP (' . PHP_VERSION . ')');
     } else {
         $class = 'success';
         $glyphicon = 'ok';
-        $message = __('Your PHP version is equal or higher than 5.6.0 to use CakePHP (' . PHP_VERSION . ')');
+        $message = __('Your PHP version is equal or higher than 7.4.0 to use CakePHP (' . PHP_VERSION . ')');
     }
 
     echo '<div class="alert alert-' . $class . '"><span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' . $message . '</div>';