mvc: style sweep et al

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

src/opnsense/mvc/app/config/config.php

@@ -21,4 +21,3 @@ return new OPNsense\Phalcon\Config\Config(array(
         'simulate_mode'  => false
     )
 ));
-

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);
         }
     }
-
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}

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
 {
-    
-}
+}