From 8661848f0c7b9797167bb0b78bf88c2a8a84bcdd Mon Sep 17 00:00:00 2001 From: Joshua Ramon Enslin Date: Tue, 15 Mar 2022 10:30:09 +0100 Subject: [PATCH] Update git submodules, run phpcbf --- classes/CSVXMLValidator.php | 31 ++++++++++++++++++------------- classes/CsvxmlAvailableFields.php | 16 ++++++++-------- classes/FieldEntry.php | 17 ++++++++--------- classes/MDAllowedValueSets | 2 +- classes/MDMailer | 2 +- classes/MD_QA | 2 +- classes/MD_STD | 2 +- l10n/musdb | 2 +- 8 files changed, 39 insertions(+), 35 deletions(-) diff --git a/classes/CSVXMLValidator.php b/classes/CSVXMLValidator.php index 238ecf6..4447e3e 100644 --- a/classes/CSVXMLValidator.php +++ b/classes/CSVXMLValidator.php @@ -7,37 +7,30 @@ declare(strict_types = 1); /** * Class holding the information about various errors - * that can occur during validation + * that can occur during validation */ -final class CSVXMLValidator -{ +final class CSVXMLValidator { + public array $error_msgs; public array $inv_errors; public array $depcon_errors; - - /** - * Constructor - */ - public function __construct() - { - $this->error_msgs = []; - $this->inv_errors = []; - $this->depcon_errors = []; - } public function addError(String $error) { $this->error_msgs[] = $error; + } public function addInvError(String $error) { $this->inv_errors[] = $error; + } public function addDepconError(String $error) { $this->depcon_errors[] = $error; + } public function overallErrorCount(): int @@ -45,5 +38,17 @@ final class CSVXMLValidator return count($this->error_msgs) + count($this->inv_errors) + count($this->depcon_errors); + + } + + /** + * Constructor + */ + public function __construct() + { + $this->error_msgs = []; + $this->inv_errors = []; + $this->depcon_errors = []; + } } diff --git a/classes/CsvxmlAvailableFields.php b/classes/CsvxmlAvailableFields.php index 44687ca..386f9a8 100644 --- a/classes/CsvxmlAvailableFields.php +++ b/classes/CsvxmlAvailableFields.php @@ -13,7 +13,7 @@ final class CsvxmlAvailableFields { const EVENT_MULTIPLIER = 3; - /** @var array + /** @var array */ private array $_availableFields; @@ -22,7 +22,7 @@ final class CsvxmlAvailableFields { * * @return array */ - public function getFields():array + public function getFields():array { return $this->_availableFields; @@ -42,7 +42,7 @@ final class CsvxmlAvailableFields { * * @return FieldEntry */ - private function _getSimpleAvailableFieldEntry(string $nameTL = "", string $explica = "", array $dependsOn = [], array $allowedValues = [], string $remark = "", bool $required = false):FieldEntry + private function _getSimpleAvailableFieldEntry(string $nameTL = "", string $explica = "", array $dependsOn = [], array $allowedValues = [], string $remark = "", bool $required = false):FieldEntry { return new FieldEntry( $required, @@ -66,7 +66,7 @@ final class CsvxmlAvailableFields { * * @return FieldEntry */ - private function _generateGenericFullEvent(array $event, MDTlLoader $tlLoader, string $typeName, string $type, int $number):array + private function _generateGenericFullEvent(array $event, MDTlLoader $tlLoader, string $typeName, string $type, int $number):array { return [ @@ -833,10 +833,10 @@ final class CsvxmlAvailableFields { $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "4") => [], $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "5") => [], $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "36") => [], - $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "6")=> [], - $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "7")=> [], - $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "8")=> [], - $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "9")=> [], + $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "6") => [], + $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "7") => [], + $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "8") => [], + $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "9") => [], $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "10") => [], $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "11") => [], $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "12") => [], diff --git a/classes/FieldEntry.php b/classes/FieldEntry.php index 9e33aa7..274c51f 100644 --- a/classes/FieldEntry.php +++ b/classes/FieldEntry.php @@ -9,8 +9,8 @@ declare(strict_types = 1); /** * Class holding the information for a field entry. */ -final class FieldEntry -{ +final class FieldEntry { + public bool $required; public array $allowedValues; public array $dependsOn; @@ -21,12 +21,12 @@ final class FieldEntry /** * Function for constructing a new FieldEntry Object. * - * @param bool $required True if the field is required. - * @param array $allowedValues Array of allowed values. - * @param array $dependsOn Array of fields the entry depends on. - * @param string $remark String variable. - * @param string $name_human_readable Human readable translation. - * @param string $explica String variable + * @param boolean $required True if the field is required. + * @param array $allowedValues Array of allowed values. + * @param array $dependsOn Array of fields the entry depends on. + * @param string $remark String variable. + * @param string $name_human_readable Human readable translation. + * @param string $explica String variable */ public function __construct( bool $required, array $allowedValues, @@ -41,5 +41,4 @@ final class FieldEntry $this->explica = $explica; } - } diff --git a/classes/MDAllowedValueSets b/classes/MDAllowedValueSets index 2764200..70dea64 160000 --- a/classes/MDAllowedValueSets +++ b/classes/MDAllowedValueSets @@ -1 +1 @@ -Subproject commit 276420017d1e21a8453eb2ae37a095a4b827201c +Subproject commit 70dea64c3c51cba32557b5977194e71f95c0ff91 diff --git a/classes/MDMailer b/classes/MDMailer index cfcae5f..942de26 160000 --- a/classes/MDMailer +++ b/classes/MDMailer @@ -1 +1 @@ -Subproject commit cfcae5fb2b82846bae27a49ec5147aa1e2090ade +Subproject commit 942de26411feb446955d6198255e348ee68c0323 diff --git a/classes/MD_QA b/classes/MD_QA index cc7990b..8018f73 160000 --- a/classes/MD_QA +++ b/classes/MD_QA @@ -1 +1 @@ -Subproject commit cc7990b6f88d53ae7ef6530a2f65cee4a5448b62 +Subproject commit 8018f7309ae68048e0d0b57be2a44d82f0693881 diff --git a/classes/MD_STD b/classes/MD_STD index aa7a3c5..9507387 160000 --- a/classes/MD_STD +++ b/classes/MD_STD @@ -1 +1 @@ -Subproject commit aa7a3c50128ccf605c078c14a0ce45f355acfa77 +Subproject commit 9507387c8a69c88a1aa684fb6d87026671885ded diff --git a/l10n/musdb b/l10n/musdb index f419b53..9acd4aa 160000 --- a/l10n/musdb +++ b/l10n/musdb @@ -1 +1 @@ -Subproject commit f419b535e4d1eff1e1352e38ce2da11290788df3 +Subproject commit 9acd4aa1db706fc4f0213c49528ba1ee8bf93291