src: style sweep

2026-03-15 17:14:46 +00:00 · 2022-01-18 15:19:36 +01:00 · 2022-01-18 15:19:36 +01:00 · 7e1e676b53
commit 7e1e676b53
parent 3b164749d3
44 changed files with 4 additions and 45 deletions
--- 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
--- 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) {
--- 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
     */
--- 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
     */
--- 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
--- 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';

--- 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
--- 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
--- 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
--- 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
--- 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';

--- 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';

--- 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.
     */
--- 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';

--- 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
     */
--- 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
--- 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
--- 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,
--- 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
--- 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
--- 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
--- 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
--- 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
     */
--- 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)
     */
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
    *
--- 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
     *
--- 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
    *
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
     */
--- 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));
-
    }

    /**
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
     */
--- 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
     */