From: Roland Häder Date: Mon, 28 Feb 2011 00:18:45 +0000 (+0000) Subject: 'public static final' is correct X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b3d612dc053c999af135677df431f73d9d26154f;p=shipsimu.git 'public static final' is correct --- diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php index 150fa58..19c7c8c 100644 --- a/application/ship-simu/class_ApplicationHelper.php +++ b/application/ship-simu/class_ApplicationHelper.php @@ -80,7 +80,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication * * @return $thisInstance An instance of this class */ - public final static function getInstance () { + public static final function getInstance () { // Is the instance there? if (is_null(self::$thisInstance)) { self::$thisInstance = new ApplicationHelper(); diff --git a/application/ship-simu/main/actions/ship-simu/class_ShipSimuLoginAction.php b/application/ship-simu/main/actions/ship-simu/class_ShipSimuLoginAction.php index ac47143..84abffb 100644 --- a/application/ship-simu/main/actions/ship-simu/class_ShipSimuLoginAction.php +++ b/application/ship-simu/main/actions/ship-simu/class_ShipSimuLoginAction.php @@ -37,7 +37,7 @@ class ShipSimuLoginAction extends BaseShipSimuAction implements PerformableActio * * @return $actionInstance An instance of this action class */ - public final static function createShipSimuLoginAction () { + public static final function createShipSimuLoginAction () { // Get a new instance $actionInstance = new ShipSimuLoginAction(); diff --git a/application/ship-simu/main/actions/ship-simu/class_ShipSimuProfileAction.php b/application/ship-simu/main/actions/ship-simu/class_ShipSimuProfileAction.php index d9771cf..41569b2 100644 --- a/application/ship-simu/main/actions/ship-simu/class_ShipSimuProfileAction.php +++ b/application/ship-simu/main/actions/ship-simu/class_ShipSimuProfileAction.php @@ -37,7 +37,7 @@ class ShipSimuProfileAction extends BaseShipSimuAction implements PerformableAct * * @return $actionInstance An instance of this action class */ - public final static function createShipSimuProfileAction () { + public static final function createShipSimuProfileAction () { // Get a new instance $actionInstance = new ShipSimuProfileAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginCompanyAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginCompanyAction.php index f028f1c..5301f98 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginCompanyAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginCompanyAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginCompanyAction extends BaseShipSimuAction implements Comman * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginCompanyAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginCompanyAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginCompanyAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php index 91d585f..8e601aa 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginGovernmentStartupHelpAction extends BaseShipSimuAction imp * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginGovernmentStartupHelpAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginGovernmentStartupHelpAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginGovernmentStartupHelpAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php index b38ffba..abda7a3 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginGovernmentTrainingAction extends BaseShipSimuAction implem * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginGovernmentTrainingAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginGovernmentTrainingAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginGovernmentTrainingAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginLogoutAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginLogoutAction.php index c19f2ce..a02b9b0 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginLogoutAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginLogoutAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginLogoutAction extends BaseShipSimuAction implements Command * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginLogoutAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginLogoutAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginLogoutAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginProfileAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginProfileAction.php index 6ad4154..0d1e81b 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginProfileAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginProfileAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginProfileAction extends BaseShipSimuAction implements Comman * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginProfileAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginProfileAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginProfileAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginRefillAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginRefillAction.php index 02a087f..6505743 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginRefillAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginRefillAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginRefillAction extends BaseShipSimuAction implements Command * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginRefillAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginRefillAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginRefillAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php index b82d365..51b0860 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginStatusProblemAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginStatusProblemAction extends BaseShipSimuAction implements * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginStatusProblemAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginStatusProblemAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginStatusProblemAction(); diff --git a/application/ship-simu/main/actions/web/class_WebShipSimuLoginWelcomeAction.php b/application/ship-simu/main/actions/web/class_WebShipSimuLoginWelcomeAction.php index 0dff653..fb7fb64 100644 --- a/application/ship-simu/main/actions/web/class_WebShipSimuLoginWelcomeAction.php +++ b/application/ship-simu/main/actions/web/class_WebShipSimuLoginWelcomeAction.php @@ -38,7 +38,7 @@ class WebShipSimuLoginWelcomeAction extends BaseShipSimuAction implements Comman * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public final static function createWebShipSimuLoginWelcomeAction (ActionResolver $resolverInstance) { + public static final function createWebShipSimuLoginWelcomeAction (ActionResolver $resolverInstance) { // Get a new instance $actionInstance = new WebShipSimuLoginWelcomeAction(); diff --git a/application/ship-simu/main/bank/money/class_MoneyBank.php b/application/ship-simu/main/bank/money/class_MoneyBank.php index 1e9a510..5f9dbe4 100644 --- a/application/ship-simu/main/bank/money/class_MoneyBank.php +++ b/application/ship-simu/main/bank/money/class_MoneyBank.php @@ -38,7 +38,7 @@ class MoneyBank extends BaseBank implements Registerable { * @param $userInstance A class instance of a user object * @return $bankInstance An instance of this class */ - public final static function createMoneyBank (ManageableAccount $userInstance) { + public static final function createMoneyBank (ManageableAccount $userInstance) { // Get a new instance $moneyInstance = new MoneyBank(); diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php index 4d2926e..0b19aa9 100644 --- a/application/ship-simu/main/class_Merchant.php +++ b/application/ship-simu/main/class_Merchant.php @@ -38,7 +38,7 @@ class Merchant extends BaseFrameworkSystem { } // Haendler mit Namen erzeugen - public final static function createMerchant ($merchantName, Harbor $harborInstance) { + public static final function createMerchant ($merchantName, Harbor $harborInstance) { // String absichern $merchantName = (string) $merchantName; diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php index 48a3e35..8c596ab 100644 --- a/application/ship-simu/main/class_WorksContract.php +++ b/application/ship-simu/main/class_WorksContract.php @@ -47,7 +47,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { } // Neuen Bauvertrag generieren - public final static function createWorksContract ($shipType, $shipName, ContractPartner $partnerInstance) { + public static final function createWorksContract ($shipType, $shipName, ContractPartner $partnerInstance) { // Strings absichern $shipType = (string) $shipType; $shipName = (string) $shipName; diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php index b2d80a1..ff90a99 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php @@ -38,7 +38,7 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver * @return $commandInstance The created command instance */ - public final static function createWebShipsimuGuestLoginCommand (CommandResolver $resolverInstance) { + public static final function createWebShipsimuGuestLoginCommand (CommandResolver $resolverInstance) { // Get a new instance $commandInstance = new WebShipsimuGuestLoginCommand(); diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php index 1e37e8c..e946a2e 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php @@ -65,7 +65,7 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver * @return $commandInstance The created command instance */ - public final static function createWebShipsimuProfileCommand (CommandResolver $resolverInstance) { + public static final function createWebShipsimuProfileCommand (CommandResolver $resolverInstance) { // Get a new instance $commandInstance = new WebShipsimuProfileCommand(); diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php index 4be7256..2ea98be 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php @@ -38,7 +38,7 @@ class WebShipsimuRefillCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver * @return $commandInstance The created command instance */ - public final static function createWebShipsimuRefillCommand (CommandResolver $resolverInstance) { + public static final function createWebShipsimuRefillCommand (CommandResolver $resolverInstance) { // Get a new instance $commandInstance = new WebShipsimuRefillCommand(); diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php index fe2b5b9..39843e1 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php @@ -38,7 +38,7 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver * @return $commandInstance The created command instance */ - public final static function createWebShipsimuRegisterCommand (CommandResolver $resolverInstance) { + public static final function createWebShipsimuRegisterCommand (CommandResolver $resolverInstance) { // Get a new instance $commandInstance = new WebShipsimuRegisterCommand(); diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php index 67b1ea6..3614b82 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php @@ -38,7 +38,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver * @return $commandInstance The created command instance */ - public final static function createWebShipsimuUserLoginCommand (CommandResolver $resolverInstance) { + public static final function createWebShipsimuUserLoginCommand (CommandResolver $resolverInstance) { // Get a new instance $commandInstance = new WebShipsimuUserLoginCommand(); diff --git a/application/ship-simu/main/commands/web/company/class_WebShipSimuCompanyCommand.php b/application/ship-simu/main/commands/web/company/class_WebShipSimuCompanyCommand.php index 9f8cde8..a72f1a9 100644 --- a/application/ship-simu/main/commands/web/company/class_WebShipSimuCompanyCommand.php +++ b/application/ship-simu/main/commands/web/company/class_WebShipSimuCompanyCommand.php @@ -38,7 +38,7 @@ class WebShipSimuCompanyCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver * @return $commandInstance The created command instance */ - public final static function createWebShipSimuCompanyCommand (CommandResolver $resolverInstance) { + public static final function createWebShipSimuCompanyCommand (CommandResolver $resolverInstance) { // Get a new instance $commandInstance = new WebShipSimuCompanyCommand(); diff --git a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php index 4993989..2e81afc 100644 --- a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php +++ b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php @@ -39,7 +39,7 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public final static function createWebGovernmentFailedStartupCommand (CommandResolver $resolverInstance) { + public static final function createWebGovernmentFailedStartupCommand (CommandResolver $resolverInstance) { // Get new instance $commandInstance = new WebGovernmentFailedStartupCommand(); diff --git a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php index d79c2aa..8bd6c4d 100644 --- a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php +++ b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php @@ -39,7 +39,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public final static function createWebGovernmentFailedTrainingCommand (CommandResolver $resolverInstance) { + public static final function createWebGovernmentFailedTrainingCommand (CommandResolver $resolverInstance) { // Get new instance $commandInstance = new WebGovernmentFailedTrainingCommand(); diff --git a/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php b/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php index fd6cb12..fa41a2c 100644 --- a/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php +++ b/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php @@ -39,7 +39,7 @@ class WebShipsimuGovernmentStartupCommand extends BaseCommand implements Command * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public final static function createWebShipsimuGovernmentStartupCommand (CommandResolver $resolverInstance) { + public static final function createWebShipsimuGovernmentStartupCommand (CommandResolver $resolverInstance) { // Get new instance $commandInstance = new WebShipsimuGovernmentStartupCommand(); diff --git a/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php b/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php index a5ec956..d3cddf0 100644 --- a/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php +++ b/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php @@ -37,7 +37,7 @@ class WebShipsimuGovernmentTrainingCommand extends BaseCommand implements Comman * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public final static function createWebShipsimuGovernmentTrainingCommand (CommandResolver $resolverInstance) { + public static final function createWebShipsimuGovernmentTrainingCommand (CommandResolver $resolverInstance) { // Get new instance $commandInstance = new WebShipsimuGovernmentTrainingCommand(); diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php index 8891432..231d390 100644 --- a/application/ship-simu/main/companies/class_ShippingCompany.php +++ b/application/ship-simu/main/companies/class_ShippingCompany.php @@ -83,7 +83,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner * @return $companyInstance Prepared company instance * @todo Add functionality if user participates in a company */ - public final static function createShippingCompany (ManageableAccount $userInstance) { + public static final function createShippingCompany (ManageableAccount $userInstance) { // Get new instance $companyInstance = new ShippingCompany(); diff --git a/application/ship-simu/main/constructions/harbors/class_Harbor.php b/application/ship-simu/main/constructions/harbors/class_Harbor.php index 76aa521..99189bd 100644 --- a/application/ship-simu/main/constructions/harbors/class_Harbor.php +++ b/application/ship-simu/main/constructions/harbors/class_Harbor.php @@ -41,7 +41,7 @@ class Harbor extends BaseConstruction { } // Creates a harbor - public final static function createHarbor ($harborName) { + public static final function createHarbor ($harborName) { // Hafen-Instanz holen $harborInstance = new Harbor(); diff --git a/application/ship-simu/main/constructions/yards/class_Shipyard.php b/application/ship-simu/main/constructions/yards/class_Shipyard.php index 216d383..0807959 100644 --- a/application/ship-simu/main/constructions/yards/class_Shipyard.php +++ b/application/ship-simu/main/constructions/yards/class_Shipyard.php @@ -55,7 +55,7 @@ class Shipyard extends BaseConstruction { } // Create a shipyard and notify it about it's owner - public final static function createShipyardNotify (Harbor $harborInstance, $shipyardName, ShippingCompany $companyInstance) { + public static final function createShipyardNotify (Harbor $harborInstance, $shipyardName, ShippingCompany $companyInstance) { // Werft-Instanz holen $shipyardInstance = self::createShipyard($harborInstance, $shipyardName); @@ -70,7 +70,7 @@ class Shipyard extends BaseConstruction { } // Create a shipyard, first we need to create a harbor - public final static function createShipyard (Harbor $harborInstance, $shipyardName) { + public static final function createShipyard (Harbor $harborInstance, $shipyardName) { // Instanz temporaer holen $shipyardInstance = new Shipyard(); diff --git a/application/ship-simu/main/controller/web/class_WebCompanyController.php b/application/ship-simu/main/controller/web/class_WebCompanyController.php index 6e19673..b21da70 100644 --- a/application/ship-simu/main/controller/web/class_WebCompanyController.php +++ b/application/ship-simu/main/controller/web/class_WebCompanyController.php @@ -39,7 +39,7 @@ class WebCompanyController extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public final static function createWebCompanyController (CommandResolver $resolverInstance) { + public static final function createWebCompanyController (CommandResolver $resolverInstance) { // Create the instance $controllerInstance = new WebCompanyController(); diff --git a/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php b/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php index 3fc5cbd..86fbca6 100644 --- a/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php +++ b/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php @@ -39,7 +39,7 @@ class WebGovernmentFailedController extends BaseController implements Controller * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public final static function createWebGovernmentFailedController (CommandResolver $resolverInstance) { + public static final function createWebGovernmentFailedController (CommandResolver $resolverInstance) { // Create the instance $controllerInstance = new WebGovernmentFailedController(); diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php index 987d085..7b2e0ad 100644 --- a/application/ship-simu/main/drives/motor/class_Motor.php +++ b/application/ship-simu/main/drives/motor/class_Motor.php @@ -29,7 +29,7 @@ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart { } // Einen Motor erstellen - public final static function createMotor ($descr, $hp, $cams, $w, $h, $l) { + public static final function createMotor ($descr, $hp, $cams, $w, $h, $l) { // Get new instance $motorInstance = new Motor(); diff --git a/application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php b/application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php index ed2e308..4725a76 100644 --- a/application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php +++ b/application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php @@ -37,7 +37,7 @@ class ShipSimuWebNewsFactory extends BaseFrameworkSystem { * * @return $factoryInstance An instance of this class */ - public final static function createShipSimuWebNewsFactory () { + public static final function createShipSimuWebNewsFactory () { // Get a new instance $factoryInstance = new ShipSimuWebNewsFactory(); diff --git a/application/ship-simu/main/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php b/application/ship-simu/main/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php index d13ff0b..b527d3a 100644 --- a/application/ship-simu/main/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php +++ b/application/ship-simu/main/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php @@ -40,7 +40,7 @@ class RefillRequestCurrencyTestBookFilter extends BaseShipSimuFilter implements * * @return $filterInstance An instance of this filter class */ - public final static function createRefillRequestCurrencyTestBookFilter () { + public static final function createRefillRequestCurrencyTestBookFilter () { // Get a new instance $filterInstance = new RefillRequestCurrencyTestBookFilter(); diff --git a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php index 1079982..a64b623 100644 --- a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php +++ b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php @@ -37,7 +37,7 @@ class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter impleme * * @return $filterInstance An instance of this filter class */ - public final static function createShipSimuGovernmentPaysStartupHelpFilter () { + public static final function createShipSimuGovernmentPaysStartupHelpFilter () { // Get a new instance $filterInstance = new ShipSimuGovernmentPaysStartupHelpFilter(); diff --git a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php index ae26e1f..e36c977 100644 --- a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php +++ b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php @@ -37,7 +37,7 @@ class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements * * @return $filterInstance An instance of this filter class */ - public final static function createShipSimuGovernmentPaysTrainingFilter () { + public static final function createShipSimuGovernmentPaysTrainingFilter () { // Get a new instance $filterInstance = new ShipSimuGovernmentPaysTrainingFilter(); diff --git a/application/ship-simu/main/filter/page/class_RefillPageFilter.php b/application/ship-simu/main/filter/page/class_RefillPageFilter.php index 202316a..ecdd676 100644 --- a/application/ship-simu/main/filter/page/class_RefillPageFilter.php +++ b/application/ship-simu/main/filter/page/class_RefillPageFilter.php @@ -37,7 +37,7 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createRefillPageFilter () { + public static final function createRefillPageFilter () { // Get a new instance $filterInstance = new RefillPageFilter(); diff --git a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php index 50ed54e..59caecf 100644 --- a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php +++ b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php @@ -37,7 +37,7 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera * * @return $filterInstance An instance of this filter class */ - public final static function createRefillRequestValidatorFilter () { + public static final function createRefillRequestValidatorFilter () { // Get a new instance $filterInstance = new RefillRequestValidatorFilter(); diff --git a/application/ship-simu/main/filter/validator/class_ShipSimuUserStatusGuestFilter.php b/application/ship-simu/main/filter/validator/class_ShipSimuUserStatusGuestFilter.php index 261e188..e810817 100644 --- a/application/ship-simu/main/filter/validator/class_ShipSimuUserStatusGuestFilter.php +++ b/application/ship-simu/main/filter/validator/class_ShipSimuUserStatusGuestFilter.php @@ -37,7 +37,7 @@ class ShipSimuUserStatusGuestFilter extends BaseShipSimuFilter implements Filter * * @return $filterInstance An instance of this filter class */ - public final static function createShipSimuUserStatusGuestFilter () { + public static final function createShipSimuUserStatusGuestFilter () { // Get a new instance $filterInstance = new ShipSimuUserStatusGuestFilter(); diff --git a/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php b/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php index 012d098..625cd74 100644 --- a/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php +++ b/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php @@ -37,7 +37,7 @@ class BirthdayVerifierFilter extends BaseShipSimuFilter implements Filterable { * * @return $filterInstance An instance of this filter class */ - public final static function createBirthdayVerifierFilter () { + public static final function createBirthdayVerifierFilter () { // Get a new instance $filterInstance = new BirthdayVerifierFilter(); diff --git a/application/ship-simu/main/government/class_SimplifiedGovernment.php b/application/ship-simu/main/government/class_SimplifiedGovernment.php index d4b593b..03d3d9e 100644 --- a/application/ship-simu/main/government/class_SimplifiedGovernment.php +++ b/application/ship-simu/main/government/class_SimplifiedGovernment.php @@ -43,7 +43,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable { * @param $userInstance The user instance * @return $governmentInstance Instance of the prepared government instance */ - public final static function createSimplifiedGovernment (ManageableAccount $userInstance) { + public static final function createSimplifiedGovernment (ManageableAccount $userInstance) { // Get a new instance $governmentInstance = new SimplifiedGovernment(); diff --git a/application/ship-simu/main/login/class_ShipSimuGuestLogin.php b/application/ship-simu/main/login/class_ShipSimuGuestLogin.php index 96eed36..586652f 100644 --- a/application/ship-simu/main/login/class_ShipSimuGuestLogin.php +++ b/application/ship-simu/main/login/class_ShipSimuGuestLogin.php @@ -42,7 +42,7 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser { * * @return $loginInstance An instance of this login class */ - public final static function createShipSimuGuestLogin () { + public static final function createShipSimuGuestLogin () { // Get a new instance $loginInstance = new ShipSimuGuestLogin(); diff --git a/application/ship-simu/main/login/class_ShipSimuUserLogin.php b/application/ship-simu/main/login/class_ShipSimuUserLogin.php index 70c32e8..d6a4e6e 100644 --- a/application/ship-simu/main/login/class_ShipSimuUserLogin.php +++ b/application/ship-simu/main/login/class_ShipSimuUserLogin.php @@ -42,7 +42,7 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser { * * @return $loginInstance An instance of this login class */ - public final static function createShipSimuUserLogin () { + public static final function createShipSimuUserLogin () { // Get a new instance $loginInstance = new ShipSimuUserLogin(); diff --git a/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php b/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php index 32da33f..cc9098c 100644 --- a/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php +++ b/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php @@ -56,7 +56,7 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin { * @throws UserInstanceMissingException If the user instance in registry * is missing or invalid */ - public final static function createShipSimuLoginHelper (Requestable $requestInstance) { + public static final function createShipSimuLoginHelper (Requestable $requestInstance) { // Get a new instance first $helperInstance = new ShipSimuLoginHelper(); diff --git a/application/ship-simu/main/menu/class_ShipSimuConfirmMenu.php b/application/ship-simu/main/menu/class_ShipSimuConfirmMenu.php index 72d2ddb..5f73a06 100644 --- a/application/ship-simu/main/menu/class_ShipSimuConfirmMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuConfirmMenu.php @@ -37,7 +37,7 @@ class ShipSimuConfirmMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuConfirmMenu () { + public static final function createShipSimuConfirmMenu () { // Get a new instance $menuInstance = new ShipSimuConfirmMenu(); diff --git a/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php b/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php index 0987058..f39d0ca 100644 --- a/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuHomeMenu.php @@ -37,7 +37,7 @@ class ShipSimuHomeMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuHomeMenu () { + public static final function createShipSimuHomeMenu () { // Get a new instance $menuInstance = new ShipSimuHomeMenu(); diff --git a/application/ship-simu/main/menu/class_ShipSimuLoginAreaMenu.php b/application/ship-simu/main/menu/class_ShipSimuLoginAreaMenu.php index 23f661e..29ae5fa 100644 --- a/application/ship-simu/main/menu/class_ShipSimuLoginAreaMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuLoginAreaMenu.php @@ -37,7 +37,7 @@ class ShipSimuLoginAreaMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuLoginAreaMenu () { + public static final function createShipSimuLoginAreaMenu () { // Get a new instance $menuInstance = new ShipSimuLoginAreaMenu(); diff --git a/application/ship-simu/main/menu/class_ShipSimuLoginFailedMenu.php b/application/ship-simu/main/menu/class_ShipSimuLoginFailedMenu.php index 013dd84..0c5dc08 100644 --- a/application/ship-simu/main/menu/class_ShipSimuLoginFailedMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuLoginFailedMenu.php @@ -37,7 +37,7 @@ class ShipSimuLoginFailedMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuLoginFailedMenu () { + public static final function createShipSimuLoginFailedMenu () { // Get a new instance $menuInstance = new ShipSimuLoginFailedMenu(); diff --git a/application/ship-simu/main/menu/class_ShipSimuLoginMenu.php b/application/ship-simu/main/menu/class_ShipSimuLoginMenu.php index 75212e6..02892b6 100644 --- a/application/ship-simu/main/menu/class_ShipSimuLoginMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuLoginMenu.php @@ -37,7 +37,7 @@ class ShipSimuLoginMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuLoginMenu () { + public static final function createShipSimuLoginMenu () { // Get a new instance $menuInstance = new ShipSimuLoginMenu(); diff --git a/application/ship-simu/main/menu/class_ShipSimuLogoutMenu.php b/application/ship-simu/main/menu/class_ShipSimuLogoutMenu.php index f28d6a7..fc4579e 100644 --- a/application/ship-simu/main/menu/class_ShipSimuLogoutMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuLogoutMenu.php @@ -37,7 +37,7 @@ class ShipSimuLogoutMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuLogoutMenu () { + public static final function createShipSimuLogoutMenu () { // Get a new instance $menuInstance = new ShipSimuLogoutMenu(); diff --git a/application/ship-simu/main/menu/class_ShipSimuRegisterMenu.php b/application/ship-simu/main/menu/class_ShipSimuRegisterMenu.php index b6bd253..d0d8440 100644 --- a/application/ship-simu/main/menu/class_ShipSimuRegisterMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuRegisterMenu.php @@ -37,7 +37,7 @@ class ShipSimuRegisterMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuRegisterMenu () { + public static final function createShipSimuRegisterMenu () { // Get a new instance $menuInstance = new ShipSimuRegisterMenu(); diff --git a/application/ship-simu/main/menu/class_ShipSimuStatusMenu.php b/application/ship-simu/main/menu/class_ShipSimuStatusMenu.php index 9023c58..943ed10 100644 --- a/application/ship-simu/main/menu/class_ShipSimuStatusMenu.php +++ b/application/ship-simu/main/menu/class_ShipSimuStatusMenu.php @@ -37,7 +37,7 @@ class ShipSimuStatusMenu extends BaseMenu implements RenderableMenu { * * @return $menuInstance An instance of this class */ - public final static function createShipSimuStatusMenu () { + public static final function createShipSimuStatusMenu () { // Get a new instance $menuInstance = new ShipSimuStatusMenu(); diff --git a/application/ship-simu/main/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php b/application/ship-simu/main/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php index d70b5e2..e80255a 100644 --- a/application/ship-simu/main/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php +++ b/application/ship-simu/main/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php @@ -37,7 +37,7 @@ class ShipSimuGovernmentFailedAreaMenu extends BaseMenu implements RenderableMen * * @return $menuInstance An instance of this class */ - public final static function createShipSimuGovernmentFailedAreaMenu () { + public static final function createShipSimuGovernmentFailedAreaMenu () { // Get a new instance $menuInstance = new ShipSimuGovernmentFailedAreaMenu(); diff --git a/application/ship-simu/main/opening/bank/class_MoneyBankRealtimeOpening.php b/application/ship-simu/main/opening/bank/class_MoneyBankRealtimeOpening.php index 752d5b7..1d84e69 100644 --- a/application/ship-simu/main/opening/bank/class_MoneyBankRealtimeOpening.php +++ b/application/ship-simu/main/opening/bank/class_MoneyBankRealtimeOpening.php @@ -38,7 +38,7 @@ class MoneyBankRealtimeOpening extends BaseOpening { * @param $bankInstance An instance of a money bank * @return $openeningInstance An instance of this class */ - public final static function createMoneyBankRealtimeOpening (BaseBank $bankInstance) { + public static final function createMoneyBankRealtimeOpening (BaseBank $bankInstance) { // Get a new instance $openingInstance = new MoneyBankRealtimeOpening(); diff --git a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php index f1e2779..b0ee5c7 100644 --- a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php +++ b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php @@ -29,7 +29,7 @@ class MaschineRoom extends BaseShipPart { } // Maschinenraum erstellen - public final static function createMaschineRoom () { + public static final function createMaschineRoom () { // Get new instance $roomInstance = new MaschineRoom(); diff --git a/application/ship-simu/main/personell/class_SimulatorPersonell.php b/application/ship-simu/main/personell/class_SimulatorPersonell.php index b77d9d3..ba7883f 100644 --- a/application/ship-simu/main/personell/class_SimulatorPersonell.php +++ b/application/ship-simu/main/personell/class_SimulatorPersonell.php @@ -64,7 +64,7 @@ class SimulatorPersonell extends BasePersonell { * @return $personellInstance An instance of this object with a * list of personells */ - public final static function createSimulatorPersonell ($amountPersonell) { + public static final function createSimulatorPersonell ($amountPersonell) { // Make sure only integer can pass $amountPersonell = (int) $amountPersonell; @@ -117,7 +117,7 @@ class SimulatorPersonell extends BasePersonell { * @throws MissingSimulatorIdException If an ID number was not found * @deprecated */ - public final static function createSimulatorPersonellByID ($idNumber) { + public static final function createSimulatorPersonellByID ($idNumber) { // Get instance $personellInstance = new SimulatorPersonell(false); $personellInstance->makeDeprecated(); diff --git a/application/ship-simu/main/personell/company/class_CompanyEmployee.php b/application/ship-simu/main/personell/company/class_CompanyEmployee.php index ee2824e..8a32ad2 100644 --- a/application/ship-simu/main/personell/company/class_CompanyEmployee.php +++ b/application/ship-simu/main/personell/company/class_CompanyEmployee.php @@ -32,7 +32,7 @@ class CompanyEmployee extends SimulatorPersonell { } // Generate a specified amount of personell - public final static function createCompanyEmployee ($surname, $family, $gender, $year, $month, $day, $married, $salary) { + public static final function createCompanyEmployee ($surname, $family, $gender, $year, $month, $day, $married, $salary) { // Get instance $personellInstance = new CompanyEmployee(); diff --git a/application/ship-simu/main/registration/class_ShipSimuRegistration.php b/application/ship-simu/main/registration/class_ShipSimuRegistration.php index e870c00..8b01de4 100644 --- a/application/ship-simu/main/registration/class_ShipSimuRegistration.php +++ b/application/ship-simu/main/registration/class_ShipSimuRegistration.php @@ -64,7 +64,7 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { * * @return $registrationInstance An instance of this registration class */ - public final static function createShipSimuRegistration () { + public static final function createShipSimuRegistration () { // Get a new instance $registrationInstance = new ShipSimuRegistration(); diff --git a/application/ship-simu/main/resolver/web/class_WebCompanyCommandResolver.php b/application/ship-simu/main/resolver/web/class_WebCompanyCommandResolver.php index c560d4f..0b2908d 100644 --- a/application/ship-simu/main/resolver/web/class_WebCompanyCommandResolver.php +++ b/application/ship-simu/main/resolver/web/class_WebCompanyCommandResolver.php @@ -49,7 +49,7 @@ class WebCompanyCommandResolver extends BaseCommandResolver implements CommandRe * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidInterfaceException Thrown if command does not implement interface Commandable */ - public final static function createWebCompanyCommandResolver ($commandName, ManageableApplication $appInstance) { + public static final function createWebCompanyCommandResolver ($commandName, ManageableApplication $appInstance) { // Create the new instance $resolverInstance = new WebCompanyCommandResolver(); diff --git a/application/ship-simu/main/resolver/web/class_WebGovernmentFailedCommandResolver.php b/application/ship-simu/main/resolver/web/class_WebGovernmentFailedCommandResolver.php index 592e1a1..c26494a 100644 --- a/application/ship-simu/main/resolver/web/class_WebGovernmentFailedCommandResolver.php +++ b/application/ship-simu/main/resolver/web/class_WebGovernmentFailedCommandResolver.php @@ -49,7 +49,7 @@ class WebGovernmentFailedCommandResolver extends BaseCommandResolver implements * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidInterfaceException Thrown if command does not implement interface Commandable */ - public final static function createWebGovernmentFailedCommandResolver ($commandName, ManageableApplication $appInstance) { + public static final function createWebGovernmentFailedCommandResolver ($commandName, ManageableApplication $appInstance) { // Create the new instance $resolverInstance = new WebGovernmentFailedCommandResolver(); diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php index c45e0ae..3fd73cb 100644 --- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php +++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php @@ -30,7 +30,7 @@ class PassengerShip extends BaseShip implements ConstructableShip { } // Passagier-Schiff erstellen - public final static function createPassengerShip ($shipName) { + public static final function createPassengerShip ($shipName) { // Get new instance $passInstance = new PassengerShip(); diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php index 25021c7..6143b5e 100644 --- a/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php +++ b/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php @@ -29,7 +29,7 @@ class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShip } // Economy-Kabine erstellen - public final static function createEconomyCabin ($numLuxury, $numRooms, $numBeds, $dim) { + public static final function createEconomyCabin ($numLuxury, $numRooms, $numBeds, $dim) { // Get new instance $ecoInstance = new EconomyCabin(); diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php index c94fbae..39d8462 100644 --- a/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php +++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php @@ -29,7 +29,7 @@ class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart } // 2-Sterne-Klasse erstellen - public final static function createLowCabin ($numLuxury, $numRooms, $numBeds, $dim) { + public static final function createLowCabin ($numLuxury, $numRooms, $numBeds, $dim) { // Get new instance $lowInstance = new LowCabin(); diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php index 1c1054a..f6d12ae 100644 --- a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php +++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php @@ -29,7 +29,7 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP } // Eine Luxuskabine erstellen - public final static function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) { + public static final function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) { // Get new instance $luxuryInstance = new LuxuryCabin(); diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php index b948f20..e7dd75a 100644 --- a/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php +++ b/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php @@ -29,7 +29,7 @@ class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShip } // Premier-Kabine erstellen - public final static function createPremierCabin ($numLuxury, $numRooms, $numBeds, $dim) { + public static final function createPremierCabin ($numLuxury, $numRooms, $numBeds, $dim) { // Get new instance $premierInstance = new PremierCabin(); diff --git a/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php b/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php index 248a076..9c6da7a 100644 --- a/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php +++ b/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php @@ -29,7 +29,7 @@ class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { } // Autodeck erstellen - public final static function createCarDeck ($numDecks, $dim) { + public static final function createCarDeck ($numDecks, $dim) { // Get new instance $carInstance = new CarDeck(); diff --git a/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php b/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php index e22618b..63b83c3 100644 --- a/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php +++ b/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php @@ -29,7 +29,7 @@ class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart } // LKW-Deck erstellen - public final static function createTrainDeck ($numDecks, $dim) { + public static final function createTrainDeck ($numDecks, $dim) { // Get new instance $trainInstance = new TrainDeck(); diff --git a/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php b/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php index d3e3fcb..5bca437 100644 --- a/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php +++ b/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php @@ -30,7 +30,7 @@ class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart } // LKW-Deck erstellen - public final static function createTruckDeck ($numDecks, $dim) { + public static final function createTruckDeck ($numDecks, $dim) { // Get new instance $truckInstance = new TruckDeck(); diff --git a/application/ship-simu/main/structures/extended/upper/class_Bridge.php b/application/ship-simu/main/structures/extended/upper/class_Bridge.php index 955a3d1..42808e5 100644 --- a/application/ship-simu/main/structures/extended/upper/class_Bridge.php +++ b/application/ship-simu/main/structures/extended/upper/class_Bridge.php @@ -32,7 +32,7 @@ class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableS } // Eine Kommandobruecke erstellen - public final static function createBridge ($width, $height, $length) { + public static final function createBridge ($width, $height, $length) { // Get new instance $bridgeInstance = new Bridge(); diff --git a/application/ship-simu/main/user/extended/class_ShipSimuGuest.php b/application/ship-simu/main/user/extended/class_ShipSimuGuest.php index 30efa0d..0dd118d 100644 --- a/application/ship-simu/main/user/extended/class_ShipSimuGuest.php +++ b/application/ship-simu/main/user/extended/class_ShipSimuGuest.php @@ -47,7 +47,7 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest { * @return $userInstance An instance of this user class * @throws UsernameMissingException If the username does not exist */ - public final static function createGuestByUsername ($userName) { + public static final function createGuestByUsername ($userName) { // Get a new instance $userInstance = new ShipSimuGuest(); @@ -71,7 +71,7 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest { * @param $email Email address of the user * @return $userInstance An instance of this user class */ - public final static function createGuestByEmail ($email) { + public static final function createGuestByEmail ($email) { // Get a new instance $userInstance = new ShipSimuGuest(); diff --git a/application/ship-simu/main/user/extended/class_ShipSimuMember.php b/application/ship-simu/main/user/extended/class_ShipSimuMember.php index f0ccd90..387965d 100644 --- a/application/ship-simu/main/user/extended/class_ShipSimuMember.php +++ b/application/ship-simu/main/user/extended/class_ShipSimuMember.php @@ -55,7 +55,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka * @return $userInstance An instance of this user class * @throws UsernameMissingException If the username does not exist */ - public final static function createMemberByUsername ($userName) { + public static final function createMemberByUsername ($userName) { // Get a new instance $userInstance = new ShipSimuMember(); @@ -79,7 +79,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka * @param $email Email address of the user * @return $userInstance An instance of this user class */ - public final static function createMemberByEmail ($email) { + public static final function createMemberByEmail ($email) { // Get a new instance $userInstance = new ShipSimuMember(); @@ -97,7 +97,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka * @return $userInstance An instance of this user class * @todo Add more ways of creating user instances */ - public final static function createMemberByRequest (Requestable $requestInstance) { + public static final function createMemberByRequest (Requestable $requestInstance) { // Determine if by email or username if (!is_null($requestInstance->getRequestElement('username'))) { // Username supplied diff --git a/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php b/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php index 72e7844..757135e 100644 --- a/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php +++ b/application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php @@ -51,7 +51,7 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { * @return $wrapperInstance An instance of this wrapper class * @todo Find an interface which is suitable for all companies */ - public final static function createCompanyDatabaseWrapper (ShippingCompany $companyInstance = null) { + public static final function createCompanyDatabaseWrapper (ShippingCompany $companyInstance = null) { // Create a new instance $wrapperInstance = new CompanyDatabaseWrapper(); diff --git a/application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php b/application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php index 428b04e..82897bf 100644 --- a/application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php +++ b/application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php @@ -44,7 +44,7 @@ class UserGovernmentDatabaseWrapper extends BaseDatabaseWrapper { * * @return $wrapperInstance An instance of this wrapper class */ - public final static function createUserGovernmentDatabaseWrapper () { + public static final function createUserGovernmentDatabaseWrapper () { // Create a new instance $wrapperInstance = new UserGovernmentDatabaseWrapper();