From 7e1e676b53139f4415b6bfd7d64e39ef4b4d200f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 18 Jan 2022 15:19:36 +0100 Subject: [PATCH] src: style sweep --- src/etc/inc/IPv6.inc | 1 - src/etc/inc/plugins.inc.d/openssh.inc | 3 ++- .../mvc/app/controllers/OPNsense/Base/IndexController.php | 1 - .../OPNsense/CaptivePortal/Api/ServiceController.php | 1 - .../app/controllers/OPNsense/Cron/Api/ServiceController.php | 1 - .../app/controllers/OPNsense/Cron/Api/SettingsController.php | 1 - .../app/controllers/OPNsense/Diagnostics/Api/DnsController.php | 1 - .../OPNsense/Diagnostics/Api/FirewallController.php | 1 - .../OPNsense/Diagnostics/Api/SystemhealthController.php | 1 - .../controllers/OPNsense/Diagnostics/Api/TrafficController.php | 1 - .../app/controllers/OPNsense/Firewall/Api/AliasController.php | 1 - .../controllers/OPNsense/Firewall/Api/CategoryController.php | 1 - .../app/controllers/OPNsense/IPsec/Api/TunnelController.php | 1 - .../app/controllers/OPNsense/Routes/Api/RoutesController.php | 1 - .../OPNsense/TrafficShaper/Api/ServiceController.php | 1 - src/opnsense/mvc/app/library/OPNsense/Backup/BackupFactory.php | 1 - src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php | 1 - src/opnsense/mvc/app/library/OPNsense/Core/Backend.php | 3 ++- src/opnsense/mvc/app/library/OPNsense/Core/Config.php | 1 - src/opnsense/mvc/app/library/OPNsense/Core/Shell.php | 1 - .../mvc/app/library/OPNsense/OpenVPN/ExportFactory.php | 1 - .../app/models/OPNsense/Base/Constraints/DependConstraint.php | 1 - .../app/models/OPNsense/Base/FieldTypes/CertificateField.php | 1 - .../app/models/OPNsense/Base/FieldTypes/LegacyLinkField.php | 1 - .../app/models/OPNsense/Base/FieldTypes/NetworkAliasField.php | 1 - .../mvc/app/models/OPNsense/Base/FieldTypes/ProtocolField.php | 1 - .../mvc/app/models/OPNsense/Base/FieldTypes/VirtualIPField.php | 1 - .../app/models/OPNsense/Base/Validators/CallbackValidator.php | 1 - .../app/models/OPNsense/Base/Validators/CsvListValidator.php | 1 - .../app/models/OPNsense/Base/Validators/IntegerValidator.php | 1 - .../app/models/OPNsense/Base/FieldTypes/AuthGroupFieldTest.php | 1 - .../OPNsense/Base/FieldTypes/AuthenticationServerFieldTest.php | 1 - .../models/OPNsense/Base/FieldTypes/AutoNumberFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/BooleanFieldTest.php | 1 - .../models/OPNsense/Base/FieldTypes/CertificateFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/CountryFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/IntegerFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/InterfaceFieldTest.php | 1 - .../models/OPNsense/Base/FieldTypes/ModelRelationFieldTest.php | 2 -- .../models/OPNsense/Base/FieldTypes/NetworkAliasFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/OptionFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/PortFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/ProtocolFieldTest.php | 1 - .../app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest.php | 1 - 44 files changed, 4 insertions(+), 45 deletions(-) diff --git a/src/etc/inc/IPv6.inc b/src/etc/inc/IPv6.inc index 95aae0341..ac85b218e 100644 --- a/src/etc/inc/IPv6.inc +++ b/src/etc/inc/IPv6.inc @@ -120,7 +120,6 @@ define("NET_IPV6_UNKNOWN_TYPE", 1001); */ class Net_IPv6 { - // {{{ separate() /** * Separates an IPv6 address into the address and a prefix length part diff --git a/src/etc/inc/plugins.inc.d/openssh.inc b/src/etc/inc/plugins.inc.d/openssh.inc index 9b4290e89..1d4b8997f 100644 --- a/src/etc/inc/plugins.inc.d/openssh.inc +++ b/src/etc/inc/plugins.inc.d/openssh.inc @@ -87,7 +87,8 @@ function openssh_stop() mwexecf('/bin/pkill -af %s', '/usr/local/sbin/sshd', true); } -function openssh_check_querylist($list, $config) { +function openssh_check_querylist($list, $config) +{ $supported = json_decode(configd_run("openssh query {$list}")); $selected = []; foreach (explode(',', $config) as $elem) { diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php index 7501f38cd..34c8bfd09 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/IndexController.php @@ -36,7 +36,6 @@ namespace OPNsense\Base; */ class IndexController extends ControllerBase { - /** * default index action */ diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php index a49d96013..ed87f17ab 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/ServiceController.php @@ -43,7 +43,6 @@ use Phalcon\Filter\FilterFactory; */ class ServiceController extends ApiControllerBase { - /** * reconfigure captive portal */ diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/ServiceController.php b/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/ServiceController.php index d6e0ed343..0cd50a4c0 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/ServiceController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/ServiceController.php @@ -39,7 +39,6 @@ use OPNsense\Core\Backend; */ class ServiceController extends ApiControllerBase { - /** * restart cron service * @return array diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/SettingsController.php index dce5e0830..1d94338f7 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/SettingsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Cron/Api/SettingsController.php @@ -40,7 +40,6 @@ use OPNsense\Cron\Cron; */ class SettingsController extends ApiMutableModelControllerBase { - protected static $internalModelName = 'job'; protected static $internalModelClass = '\OPNsense\Cron\Cron'; diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsController.php index e96bf0f1c..64c12f3e9 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/DnsController.php @@ -38,7 +38,6 @@ use OPNsense\Core\Backend; */ class DnsController extends ApiControllerBase { - /** * perform a reverse dns lookup * @return array diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php index 535041a7a..a165bcdc4 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php @@ -39,7 +39,6 @@ use OPNsense\Core\Config; */ class FirewallController extends ApiControllerBase { - /** * retrieve firewall log * @return array diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/SystemhealthController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/SystemhealthController.php index de89c390d..e7e637a66 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/SystemhealthController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/SystemhealthController.php @@ -38,7 +38,6 @@ use OPNsense\Core\Config; */ class SystemhealthController extends ApiControllerBase { - /** * Return full archive information * @param \SimpleXMLElement $xml rrd data xml diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php index c084c3bc4..3a2cbdd61 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/TrafficController.php @@ -38,7 +38,6 @@ use OPNsense\Core\Backend; */ class TrafficController extends ApiControllerBase { - /** * retrieve interface traffic stats * @return array diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php index 540547bb0..4fc17445d 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; */ class AliasController extends ApiMutableModelControllerBase { - protected static $internalModelName = 'alias'; protected static $internalModelClass = 'OPNsense\Firewall\Alias'; diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/CategoryController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/CategoryController.php index 67e22f81c..d20d4e63e 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/CategoryController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/CategoryController.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; */ class CategoryController extends ApiMutableModelControllerBase { - protected static $internalModelName = 'category'; protected static $internalModelClass = 'OPNsense\Firewall\Category'; diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/TunnelController.php b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/TunnelController.php index 720961289..035b82e42 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/TunnelController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/TunnelController.php @@ -38,7 +38,6 @@ use OPNsense\Core\Config; */ class TunnelController extends ApiControllerBase { - /*** * generic legacy search action, reads post variables for filters and page navigation. */ diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Routes/Api/RoutesController.php b/src/opnsense/mvc/app/controllers/OPNsense/Routes/Api/RoutesController.php index 9a41df166..e9853d0c3 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Routes/Api/RoutesController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Routes/Api/RoutesController.php @@ -39,7 +39,6 @@ use OPNsense\Routes\Route; */ class RoutesController extends ApiMutableModelControllerBase { - protected static $internalModelName = 'route'; protected static $internalModelClass = '\OPNsense\Routes\Route'; diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/ServiceController.php b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/ServiceController.php index 5795b5af2..cb5292856 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/ServiceController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/Api/ServiceController.php @@ -40,7 +40,6 @@ use OPNsense\TrafficShaper\TrafficShaper; */ class ServiceController extends ApiControllerBase { - /** * reconfigure ipfw, generate config and reload */ diff --git a/src/opnsense/mvc/app/library/OPNsense/Backup/BackupFactory.php b/src/opnsense/mvc/app/library/OPNsense/Backup/BackupFactory.php index 46dfd0c8c..1ef43bc6e 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Backup/BackupFactory.php +++ b/src/opnsense/mvc/app/library/OPNsense/Backup/BackupFactory.php @@ -36,7 +36,6 @@ namespace OPNsense\Backup; */ class BackupFactory { - /** * list installed backup providers * @return array diff --git a/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php b/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php index 3e1dea3d0..94f031477 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php +++ b/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php @@ -38,7 +38,6 @@ use OPNsense\Core\Config; */ class Gdrive extends Base implements IBackupProvider { - /** * get required (user interface) fields for backup connector * @return array configuration fields, types and description diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Backend.php b/src/opnsense/mvc/app/library/OPNsense/Core/Backend.php index 6e046ed6c..45dda663a 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Core/Backend.php +++ b/src/opnsense/mvc/app/library/OPNsense/Core/Backend.php @@ -58,7 +58,8 @@ class Backend protected function getLogger($ident = 'configd.py') { $formatter = new Line('%message%'); - $adapter = new Syslog($ident, + $adapter = new Syslog( + $ident, [ 'option' => LOG_PID, 'facility' => LOG_LOCAL4, diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php index d360a41a9..d2e072c4e 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Core/Config.php +++ b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php @@ -38,7 +38,6 @@ use Phalcon\Logger\Adapter\Syslog; */ class Config extends Singleton { - /** * config file location ( path + name ) * @var string diff --git a/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php b/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php index 16f05a354..c067ff8d1 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php +++ b/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php @@ -36,7 +36,6 @@ use Phalcon\DI\FactoryDefault; */ class Shell { - /** * simulation mode, only print commands, dom not execute * @var bool diff --git a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ExportFactory.php b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ExportFactory.php index 990f1e870..addb0352a 100644 --- a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ExportFactory.php +++ b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ExportFactory.php @@ -34,7 +34,6 @@ namespace OPNsense\OpenVPN; */ class ExportFactory { - /** * list installed backup providers * @return array diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/DependConstraint.php b/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/DependConstraint.php index c94d5f4d1..b35d33247 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/DependConstraint.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/DependConstraint.php @@ -37,7 +37,6 @@ namespace OPNsense\Base\Constraints; */ class DependConstraint extends BaseConstraint { - /** * Executes validation, expects a list of fields in "addFields" which to check for content. * Fields are concerned empty if boolean false or containing an empty string diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php index a8b8ece9a..861ae93ab 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php @@ -37,7 +37,6 @@ use OPNsense\Core\Config; */ class CertificateField extends BaseListField { - /** * @var string certificate type cert/ca, reflects config section to use as source */ diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/LegacyLinkField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/LegacyLinkField.php index c0b6db762..56bbc7ee6 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/LegacyLinkField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/LegacyLinkField.php @@ -36,7 +36,6 @@ use OPNsense\Core\Config; */ class LegacyLinkField extends BaseField { - /** * @var null source referral (e.g. root.node.item) */ diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkAliasField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkAliasField.php index be59adb68..32a780dad 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkAliasField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkAliasField.php @@ -39,7 +39,6 @@ use OPNsense\Base\Validators\CallbackValidator; */ class NetworkAliasField extends BaseListField { - /** * @var array cached collected protocols */ diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ProtocolField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ProtocolField.php index a5a037ea4..318984251 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ProtocolField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ProtocolField.php @@ -34,7 +34,6 @@ namespace OPNsense\Base\FieldTypes; */ class ProtocolField extends BaseListField { - /** * @var array cached collected protocols */ diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/VirtualIPField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/VirtualIPField.php index 17ad30a12..4b0db34d9 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/VirtualIPField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/VirtualIPField.php @@ -36,7 +36,6 @@ use OPNsense\Core\Config; */ class VirtualIPField extends BaseListField { - /** * @var string virtual ip type */ diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CallbackValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CallbackValidator.php index 270a15f3d..dfcb2b2ab 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CallbackValidator.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CallbackValidator.php @@ -41,7 +41,6 @@ use Phalcon\Messages\Message; */ class CallbackValidator extends AbstractValidator implements ValidatorInterface { - /** * Executes callback validator, which should return validation messages on failure * diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CsvListValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CsvListValidator.php index 3c11faae9..e60d96af8 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CsvListValidator.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/CsvListValidator.php @@ -40,7 +40,6 @@ use Phalcon\Messages\Message; */ class CsvListValidator extends AbstractValidator implements ValidatorInterface { - /** * Executes validation * diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php index c657f5a4e..c204c4d45 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php @@ -40,7 +40,6 @@ use Phalcon\Messages\Message; */ class IntegerValidator extends AbstractValidator implements ValidatorInterface { - /** * Executes Integer validation * diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthGroupFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthGroupFieldTest.php index 48cf67840..e6956d674 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthGroupFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthGroupFieldTest.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; class AuthGroupFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthenticationServerFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthenticationServerFieldTest.php index e77d65f6b..26d80aeb1 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthenticationServerFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AuthenticationServerFieldTest.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; class AuthenticationServerFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AutoNumberFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AutoNumberFieldTest.php index 89cd25ce7..93ecb02c3 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AutoNumberFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/AutoNumberFieldTest.php @@ -40,7 +40,6 @@ use OPNsense\Base\FieldTypes\ArrayField; class AutoNumberFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/BooleanFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/BooleanFieldTest.php index 230f5b89e..fb573496b 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/BooleanFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/BooleanFieldTest.php @@ -38,7 +38,6 @@ use OPNsense\Base\FieldTypes\BooleanField; class BooleanFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CertificateFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CertificateFieldTest.php index f6f7f06cd..513211adc 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CertificateFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CertificateFieldTest.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; class CertificateFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CountryFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CountryFieldTest.php index edc091ff5..ce9b76260 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CountryFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/CountryFieldTest.php @@ -38,7 +38,6 @@ use OPNsense\Base\FieldTypes\CountryField; class CountryFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/IntegerFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/IntegerFieldTest.php index dd8953b75..d6349d148 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/IntegerFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/IntegerFieldTest.php @@ -38,7 +38,6 @@ use OPNsense\Base\FieldTypes\IntegerField; class IntegerFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/InterfaceFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/InterfaceFieldTest.php index 97b19de05..03a9d8ac8 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/InterfaceFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/InterfaceFieldTest.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; class InterfaceFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ModelRelationFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ModelRelationFieldTest.php index 971bbbbd6..71500eb72 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ModelRelationFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ModelRelationFieldTest.php @@ -228,7 +228,6 @@ class ModelRelationFieldTest extends Field_Framework_TestCase $field->setValue(""); $node_data = $field->getNodeData(); $this->assertEquals($node_data[""], array("value" => "No selection.","selected" => true)); - } /** @@ -251,7 +250,6 @@ class ModelRelationFieldTest extends Field_Framework_TestCase $field->setValue(""); $node_data = $field->getNodeData(); $this->assertEquals($node_data[""], array("value" => "none","selected" => true)); - } /** diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/NetworkAliasFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/NetworkAliasFieldTest.php index 86c9d92b5..79ec39c9b 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/NetworkAliasFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/NetworkAliasFieldTest.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; class NetworkAliasFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/OptionFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/OptionFieldTest.php index e2363fafc..6b96c0af4 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/OptionFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/OptionFieldTest.php @@ -38,7 +38,6 @@ use OPNsense\Base\FieldTypes\OptionField; class OptionFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/PortFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/PortFieldTest.php index 4130671db..03d2be560 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/PortFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/PortFieldTest.php @@ -38,7 +38,6 @@ use OPNsense\Base\FieldTypes\PortField; class PortFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ProtocolFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ProtocolFieldTest.php index fc9c7761b..dc4f12625 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ProtocolFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/ProtocolFieldTest.php @@ -38,7 +38,6 @@ use OPNsense\Base\FieldTypes\ProtocolField; class ProtocolFieldTest extends Field_Framework_TestCase { - /** * test construct */ diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest.php b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest.php index 05c50cd8f..9077cb100 100644 --- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest.php +++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/VirtualIPFieldTest.php @@ -40,7 +40,6 @@ use OPNsense\Core\Config; class VirtualIPFieldTest extends Field_Framework_TestCase { - /** * test construct */