Installation: move getOptions() to base class (#43356)

joomla · Aug 13, 2024 · c1054fd · c1054fd
1 parent 42680c6
commit c1054fd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 52 deletions.
diff --git a/installation/src/Model/BaseInstallationModel.php b/installation/src/Model/BaseInstallationModel.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\CMS\Installation\Model;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 
@@ -40,4 +41,16 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
 
         parent::__construct($config, $factory);
     }
+
+    /**
+     * Get the current setup options from the session.
+     *
+     * @return  array  An array of options from the session.
+     *
+     * @since   3.1
+     */
+    public function getOptions()
+    {
+        return Factory::getSession()->get('setup.options', []);
+    }
 }
diff --git a/installation/src/Model/ChecksModel.php b/installation/src/Model/ChecksModel.php
@@ -217,20 +217,6 @@ public function getPhpSettings()
         return $settings;
     }
 
-    /**
-     * Get the current setup options from the session.
-     *
-     * @return  array  An array of options from the session.
-     *
-     * @since   3.1
-     */
-    public function getOptions()
-    {
-        if (!empty(Factory::getSession()->get('setup.options', []))) {
-            return Factory::getSession()->get('setup.options', []);
-        }
-    }
-
     /**
      * Method to get the form.
      *

diff --git a/installation/src/Model/DatabaseModel.php b/installation/src/Model/DatabaseModel.php
@@ -29,18 +29,6 @@
  */
 class DatabaseModel extends BaseInstallationModel
 {
-    /**
-     * Get the current setup options from the session.
-     *
-     * @return  array  An array of options from the session.
-     *
-     * @since   4.0.0
-     */
-    public function getOptions()
-    {
-        return Factory::getSession()->get('setup.options', []);
-    }
-
     /**
      * Method to initialise the database.
      *

diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
@@ -490,18 +490,6 @@ public function setDefault($language, $clientName = 'administrator')
         return true;
     }
 
-    /**
-     * Get the current setup options from the session.
-     *
-     * @return  array
-     *
-     * @since   3.1
-     */
-    public function getOptions()
-    {
-        return Factory::getSession()->get('setup.options', []);
-    }
-
     /**
      * Get the model form.
      *

diff --git a/installation/src/Model/SetupModel.php b/installation/src/Model/SetupModel.php
@@ -28,20 +28,6 @@
  */
 class SetupModel extends BaseInstallationModel
 {
-    /**
-     * Get the current setup options from the session.
-     *
-     * @return  array  An array of options from the session.
-     *
-     * @since   3.1
-     */
-    public function getOptions()
-    {
-        if (!empty(Factory::getSession()->get('setup.options', []))) {
-            return Factory::getSession()->get('setup.options', []);
-        }
-    }
-
     /**
      * Store the current setup options in the session.
      *