From 948235bc1d4cfd7e38a8cc6fbe8d4f03adbbd40b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 20 Apr 2022 10:13:46 +0200 Subject: [PATCH] mvc: style sweep et al --- plist | 13 +++++++++++++ src/opnsense/mvc/app/config/config.php | 1 - .../library/OPNsense/Phalcon/Autoload/Loader.php | 15 +++++++++------ .../library/OPNsense/Phalcon/Config/Config.php | 11 +++++++---- .../mvc/app/library/OPNsense/Phalcon/Di/Di.php | 11 +++++++---- .../Phalcon/Encryption/Security/Random.php | 11 +++++++---- .../library/OPNsense/Phalcon/Filter/Filter.php | 11 +++++++---- .../Phalcon/Filter/Validation/Exception.php | 11 +++++++---- .../Phalcon/Filter/Validation/Validator/Email.php | 11 +++++++---- .../Filter/Validation/Validator/ExclusionIn.php | 11 +++++++---- .../Filter/Validation/Validator/InclusionIn.php | 11 +++++++---- .../Filter/Validation/Validator/Numericality.php | 11 +++++++---- .../Filter/Validation/Validator/PresenceOf.php | 11 +++++++---- .../Phalcon/Filter/Validation/Validator/Regex.php | 11 +++++++---- .../library/OPNsense/Phalcon/Logger/Logger.php | 11 +++++++---- 15 files changed, 106 insertions(+), 55 deletions(-) diff --git a/plist b/plist index 79618f172..011dd61d7 100644 --- a/plist +++ b/plist @@ -436,6 +436,19 @@ /usr/local/opnsense/mvc/app/library/OPNsense/OpenVPN/TheGreenBow.php /usr/local/opnsense/mvc/app/library/OPNsense/OpenVPN/TheGreenBow.tgb /usr/local/opnsense/mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Autoload/Loader.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Config/Config.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Di/Di.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Encryption/Security/Random.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Filter.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Exception.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Email.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/ExclusionIn.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/InclusionIn.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Numericality.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/PresenceOf.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Regex.php +/usr/local/opnsense/mvc/app/library/OPNsense/Phalcon/Logger/Logger.php /usr/local/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php /usr/local/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php /usr/local/opnsense/mvc/app/models/OPNsense/Base/BaseModelMigration.php diff --git a/src/opnsense/mvc/app/config/config.php b/src/opnsense/mvc/app/config/config.php index ca525ae2b..ed0cb9778 100644 --- a/src/opnsense/mvc/app/config/config.php +++ b/src/opnsense/mvc/app/config/config.php @@ -21,4 +21,3 @@ return new OPNsense\Phalcon\Config\Config(array( 'simulate_mode' => false ) )); - diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Autoload/Loader.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Autoload/Loader.php index e9d5647c5..e6a05db45 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Autoload/Loader.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Autoload/Loader.php @@ -6,15 +6,19 @@ use Phalcon\Autoload\Loader as PhalconLoader; use Phalcon\Loader as PhalconLoader4; if (class_exists("Phalcon\Autoload\Loader", false)) { - class LoaderWrapper extends PhalconLoader {} + class LoaderWrapper extends PhalconLoader + { + } } else { - class LoaderWrapper extends PhalconLoader4 {} + class LoaderWrapper extends PhalconLoader4 + { + } } class Loader extends LoaderWrapper { - - public function __call($fName, $args) { + public function __call($fName, $args) + { if (method_exists($this, $fName)) { return $this->fName(...$args); } elseif ($fName == 'setDirectories') { @@ -22,5 +26,4 @@ class Loader extends LoaderWrapper return $this->registerDirs(...$args); } } - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Config/Config.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Config/Config.php index a7fdbef82..b6345f7e5 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Config/Config.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Config/Config.php @@ -6,12 +6,15 @@ use Phalcon\Config\Config as PhalconConfig; use Phalcon\Config as PhalconConfig4; if (class_exists("Phalcon\Config\Config", false)) { - class ConfigWrapper extends PhalconConfig {} + class ConfigWrapper extends PhalconConfig + { + } } else { - class ConfigWrapper extends PhalconConfig4 {} + class ConfigWrapper extends PhalconConfig4 + { + } } class Config extends ConfigWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Di/Di.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Di/Di.php index e671f5630..29d100992 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Di/Di.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Di/Di.php @@ -6,12 +6,15 @@ use Phalcon\Di\Di as PhalconDi; use Phalcon\Di as PhalconDi4; if (class_exists("Phalcon\Di\Di", false)) { - class DiWrapper extends PhalconDi {} + class DiWrapper extends PhalconDi + { + } } else { - class DiWrapper extends PhalconDi4 {} + class DiWrapper extends PhalconDi4 + { + } } class Di extends DiWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Encryption/Security/Random.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Encryption/Security/Random.php index c510b5fd9..c2e3a2e78 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Encryption/Security/Random.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Encryption/Security/Random.php @@ -6,12 +6,15 @@ use Phalcon\Encryption\Security\Random as PhalconRandom; use Phalcon\Security\Random as PhalconRandom4; if (class_exists("Phalcon\Encryption\Security\Random", false)) { - class RandomWrapper extends PhalconRandom {} + class RandomWrapper extends PhalconRandom + { + } } else { - class RandomWrapper extends PhalconRandom4 {} + class RandomWrapper extends PhalconRandom4 + { + } } class Random extends RandomWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Filter.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Filter.php index 923c15156..28bdd34c3 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Filter.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Filter.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Filter as PhalconFilter; use Phalcon\Filter as PhalconFilter4; if (class_exists("Phalcon\Filter\Filter", false)) { - class FilterWrapper extends PhalconFilter {} + class FilterWrapper extends PhalconFilter + { + } } else { - class FilterWrapper extends PhalconFilter4 {} + class FilterWrapper extends PhalconFilter4 + { + } } class Filter extends FilterWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Exception.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Exception.php index c51b5d9c0..500ca09fd 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Exception.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Exception.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Validation\Exception as PhalconException; use Phalcon\Validation\Exception as PhalconException4; if (class_exists("Phalcon\Filter\Validation\Exception", false)) { - class ExceptionWrapper extends PhalconException {} + class ExceptionWrapper extends PhalconException + { + } } else { - class ExceptionWrapper extends PhalconException4 {} + class ExceptionWrapper extends PhalconException4 + { + } } class Exception extends ExceptionWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Email.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Email.php index 544c8dfc3..51021ccfb 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Email.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Email.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Validation\Validator\Email as PhalconEmail; use Phalcon\Validation\Validator\Email as PhalconEmail4; if (class_exists("Phalcon\Filter\Validation\Validator\Email", false)) { - class EmailWrapper extends PhalconEmail {} + class EmailWrapper extends PhalconEmail + { + } } else { - class EmailWrapper extends PhalconEmail4 {} + class EmailWrapper extends PhalconEmail4 + { + } } class Email extends EmailWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/ExclusionIn.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/ExclusionIn.php index b3d6adabc..3428e33f5 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/ExclusionIn.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/ExclusionIn.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Validation\Validator\ExclusionIn as PhalconExclusionIn; use Phalcon\Validation\Validator\ExclusionIn as PhalconExclusionIn4; if (class_exists("Phalcon\Filter\Validation\Validator\ExclusionIn", false)) { - class ExclusionInWrapper extends PhalconExclusionIn {} + class ExclusionInWrapper extends PhalconExclusionIn + { + } } else { - class ExclusionInWrapper extends PhalconExclusionIn4 {} + class ExclusionInWrapper extends PhalconExclusionIn4 + { + } } class ExclusionIn extends ExclusionInWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/InclusionIn.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/InclusionIn.php index 9ad2d280c..2f5e5c012 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/InclusionIn.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/InclusionIn.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Validation\Validator\InclusionIn as PhalconInclusionIn; use Phalcon\Validation\Validator\InclusionIn as PhalconInclusionIn4; if (class_exists("Phalcon\Filter\Validation\Validator\InclusionIn", false)) { - class InclusionInWrapper extends PhalconInclusionIn {} + class InclusionInWrapper extends PhalconInclusionIn + { + } } else { - class InclusionInWrapper extends PhalconInclusionIn4 {} + class InclusionInWrapper extends PhalconInclusionIn4 + { + } } class InclusionIn extends InclusionInWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Numericality.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Numericality.php index 615406189..f3d524d7a 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Numericality.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Numericality.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Validation\Validator\Numericality as PhalconNumericality; use Phalcon\Validation\Validator\Numericality as PhalconNumericality4; if (class_exists("Phalcon\Filter\Validation\Validator\Numericality", false)) { - class NumericalityWrapper extends PhalconNumericality {} + class NumericalityWrapper extends PhalconNumericality + { + } } else { - class NumericalityWrapper extends PhalconNumericality4 {} + class NumericalityWrapper extends PhalconNumericality4 + { + } } class Numericality extends NumericalityWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/PresenceOf.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/PresenceOf.php index 9de044ad5..8694d3f3f 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/PresenceOf.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/PresenceOf.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Validation\Validator\PresenceOf as PhalconPresenceOf; use Phalcon\Validation\Validator\PresenceOf as PhalconPresenceOf4; if (class_exists("Phalcon\Filter\Validation\Validator\PresenceOf", false)) { - class PresenceOfWrapper extends PhalconPresenceOf {} + class PresenceOfWrapper extends PhalconPresenceOf + { + } } else { - class PresenceOfWrapper extends PhalconPresenceOf4 {} + class PresenceOfWrapper extends PhalconPresenceOf4 + { + } } class PresenceOf extends PresenceOfWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Regex.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Regex.php index be9f28792..e0e0d08ba 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Regex.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Filter/Validation/Validator/Regex.php @@ -6,12 +6,15 @@ use Phalcon\Filter\Validation\Validator\Regex as PhalconRegex; use Phalcon\Validation\Validator\Regex as PhalconRegex4; if (class_exists("Phalcon\Filter\Validation\Validator\Regex", false)) { - class RegexWrapper extends PhalconRegex {} + class RegexWrapper extends PhalconRegex + { + } } else { - class RegexWrapper extends PhalconRegex4 {} + class RegexWrapper extends PhalconRegex4 + { + } } class Regex extends RegexWrapper { - -} \ No newline at end of file +} diff --git a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Logger/Logger.php b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Logger/Logger.php index 28ea3c4af..148233fac 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Phalcon/Logger/Logger.php +++ b/src/opnsense/mvc/app/library/OPNsense/Phalcon/Logger/Logger.php @@ -6,12 +6,15 @@ use Phalcon\Logger\Logger as PhalconLogger; use Phalcon\Logger as PhalconLogger4; if (class_exists("Phalcon\Logger\Logger", false)) { - class LoggerWrapper extends PhalconLogger {} + class LoggerWrapper extends PhalconLogger + { + } } else { - class LoggerWrapper extends PhalconLogger4 {} + class LoggerWrapper extends PhalconLogger4 + { + } } class Logger extends LoggerWrapper { - -} \ No newline at end of file +}