Controller instance shall now be fetched from registry

diff --git a/application/ship-simu/main/filter/class_ b/application/ship-simu/main/filter/class_
index bb3547372dbc161f28218ee78c9740648bf76fe6..6a0bb7771b7761e3b3cb8b56807808ca39f3787a 100644 (file)
--- a/application/ship-simu/main/filter/class_
+++ b/application/ship-simu/main/filter/class_
@@ -35,16 +35,12 @@ class ???Filter extends BaseShipSimuFilter implements Filterable {
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function create???Filter (Controller $controllerInstance) {
+       public final static function create???Filter () {
                // Get a new instance
                $filterInstance = new ???Filter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }

diff --git a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php
index 74ef33d0b4d502c764c9535ec708c9893478c1c2..ed1cdea1fa2898c5bb076ab15f797f7e27971fc8 100644 (file)
--- a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php
+++ b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-3class ShipSimuGovermentPaysStartupHelpFilter extends BaseShipSimuFilter implements Filterable {
+class ShipSimuGovermentPaysStartupHelpFilter extends BaseShipSimuFilter implements Filterable {
        /**
         * Protected constructor
         *
@@ -35,16 +35,12 @@
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createShipSimuGovermentPaysStartupHelpFilter (Controller $controllerInstance) {
+       public final static function createShipSimuGovermentPaysStartupHelpFilter () {
                // Get a new instance
                $filterInstance = new ShipSimuGovermentPaysStartupHelpFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }

diff --git a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php
index 5b51ae387452596849fe1221f8a077873735d162..81464998b636eb293d3080265a5e9d8907e3ec8f 100644 (file)
--- a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php
+++ b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php
@@ -35,16 +35,12 @@ class ShipSimuGovermentPaysTrainingFilter extends BaseShipSimuFilter implements
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createShipSimuGovermentPaysTrainingFilter (Controller $controllerInstance) {
+       public final static function createShipSimuGovermentPaysTrainingFilter () {
                // Get a new instance
                $filterInstance = new ShipSimuGovermentPaysTrainingFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }

diff --git a/application/ship-simu/main/filter/page/class_RefillPageFilter.php b/application/ship-simu/main/filter/page/class_RefillPageFilter.php
index d33661e26ae551aa37e1caf6dc7c71223848eb38..1f3d3e88f5ad5b3339791dc56200b072f09a4fa1 100644 (file)
--- a/application/ship-simu/main/filter/page/class_RefillPageFilter.php
+++ b/application/ship-simu/main/filter/page/class_RefillPageFilter.php
@@ -35,16 +35,12 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable {
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createRefillPageFilter (Controller $controllerInstance) {
+       public final static function createRefillPageFilter () {
                // Get a new instance
                $filterInstance = new RefillPageFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }

diff --git a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
index 71e9b2ddbe80faf92febe758269138570f3c02bd..43dc7c6256e294206872af46fc79ffb5e9f967af 100644 (file)
--- a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
+++ b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
@@ -35,16 +35,12 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createRefillRequestValidatorFilter (Controller $controllerInstance) {
+       public final static function createRefillRequestValidatorFilter () {
                // Get a new instance
                $filterInstance = new RefillRequestValidatorFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }

diff --git a/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php b/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php
index 240b9a6429319ba1896bf67154ed7a3ab81173d1..db5a026db6928205a9a0029c40d236a9455a3469 100644 (file)
--- a/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php
+++ b/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php
@@ -35,16 +35,12 @@ class BirthdayVerifierFilter extends BaseShipSimuFilter implements Filterable {
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createBirthdayVerifierFilter (Controller $controllerInstance) {
+       public final static function createBirthdayVerifierFilter () {
                // Get a new instance
                $filterInstance = new BirthdayVerifierFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }