From 0e63a68955e1d93cf9fcb1c5ddf35d8f9d04e994 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 1 Mar 2024 08:31:38 +0100 Subject: [PATCH] mvc: style sweep --- .../mvc/app/library/OPNsense/Trust/Store.php | 6 +++--- .../Trust/FieldTypes/CertificatesField.php | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Trust/Store.php b/src/opnsense/mvc/app/library/OPNsense/Trust/Store.php index 0d44f1d77..941aceac8 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Trust/Store.php +++ b/src/opnsense/mvc/app/library/OPNsense/Trust/Store.php @@ -36,7 +36,7 @@ use OPNsense\Core\Config; */ class Store { - private static $issuer_map = [ + private static $issuer_map = [ 'L' => 'city', 'ST' => 'state', 'O' => 'organization', @@ -150,7 +150,7 @@ class Store * @param array|null You can by options. See openssl_csr_new() for more information about options. * @return array containing generated certificate or returned errors */ - private static function _signCert($csr, $caref, $lifetime, $options=null) + private static function _signCert($csr, $caref, $lifetime, $options = null) { $ca = null; $ca_res_crt = null; @@ -337,7 +337,7 @@ class Store } } foreach ($csr_subj as $key => $value) { - $result['name'] .= ('/'.$key.'='.$value); + $result['name'] .= ('/' . $key . '=' . $value); } return $result; diff --git a/src/opnsense/mvc/app/models/OPNsense/Trust/FieldTypes/CertificatesField.php b/src/opnsense/mvc/app/models/OPNsense/Trust/FieldTypes/CertificatesField.php index c8fb5f619..e39de0094 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Trust/FieldTypes/CertificatesField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Trust/FieldTypes/CertificatesField.php @@ -44,15 +44,17 @@ class CertificateContainerField extends ContainerField public function dn() { $dn = []; - foreach ([ - 'country' => 'countryName', - 'state' => 'stateOrProvinceName', - 'city' => 'localityName', - 'organization' => 'organizationName', - 'organizationalunit' => 'organizationalUnitName', - 'email' => 'emailAddress', - 'commonname' => 'commonName', - ] as $source => $target) { + foreach ( + [ + 'country' => 'countryName', + 'state' => 'stateOrProvinceName', + 'city' => 'localityName', + 'organization' => 'organizationName', + 'organizationalunit' => 'organizationalUnitName', + 'email' => 'emailAddress', + 'commonname' => 'commonName', + ] as $source => $target + ) { if (!empty((string)$this->$source)) { $dn[$target] = (string)$this->$source; } @@ -91,7 +93,6 @@ class CertificateContainerField extends ContainerField */ class CertificatesField extends ArrayField { - /** * @inheritDoc */