Skip to content

Commit 9d44b9a

Browse files
rossaddisonrossaddison
committed
Simplify php-cs-fixer config
Too many potential psalm level 1 errors were being generated by the current config. Removed initial AI suggested config's additions to the Rules. Exclude 3 specfic files from the finder using relative not absolute paths to the 'in' function Increase the timeout period in the ParallelConfig detect function from 120 to 200. Additional rules can be implemented relative to psalm level 1 potential errors.
1 parent 3301e63 commit 9d44b9a

File tree

4 files changed

+164
-168
lines changed

4 files changed

+164
-168
lines changed

‎.php-cs-fixer.php‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,31 @@
1111
$root = __DIR__;
1212
$finder = (new Finder())
1313
->in([
14-
$root. '/config',
15-
$root. '/dev-scripts-psalm-1',
16-
$root . '/src',
17-
$root . '/resources/views',
14+
$root.'/config',
15+
$root.'/dev-scripts-psalm-1',
16+
$root.'/src',
17+
$root.'/resources/views',
1818
])
19+
// relative not absolute paths
20+
->exclude([
21+
'invoice/del',
22+
'invoice/generatorrelation',
23+
])
1924
->append([
20-
$root . '/public/index.php',
25+
$root.'/public/index.php',
2126
]);
2227

2328
return (new Config())
2429
->setCacheFile(__DIR__ . '/runtime/cache/.php-cs-fixer.cache')
25-
->setParallelConfig(ParallelConfigFactory::detect())
30+
->setParallelConfig(ParallelConfigFactory::detect(
31+
// $filesPerProcess
32+
10,
33+
// $processTimeout in seconds
34+
200,
35+
// $maxProcesses
36+
10
37+
))
2638
->setRules([
2739
'@PER-CS2.0' => true,
28-
'@Symfony' => true,
29-
'no_unused_imports' => true,
30-
'array_syntax' => [
31-
'syntax' => 'short'
32-
],
33-
'ordered_imports' => [
34-
'sort_algorithm' => 'alpha'
35-
],
36-
'single_quote' => true,
37-
'binary_operator_spaces' => [
38-
'default' => 'align_single_space_minimal'
39-
],
40-
'blank_line_before_statement' => [
41-
'statements' => ['return']
42-
],
43-
'method_chaining_indentation' => true,
4440
])
4541
->setFinder($finder);

‎resources/views/invoice/del/_form.php‎

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -49,106 +49,106 @@
4949
->header($translator->translate('error.summary'))
5050
// all properties
5151
->onlyCommonErrors()
52-
?>
52+
?>
5353
<?= Html::closeTag('div'); ?>
5454
<?= Html::openTag('div'); ?>
5555
<?= Field::text($form, 'date_created')
56-
->label($translator->translate('common.date.created'))
57-
->value(Html::encode(($form->getDate_created())->format('Y-m-d')))
58-
->addInputAttributes([
59-
'placeholder' => $translator->translate('common.date.created'),
60-
'readonly' => 'readonly',
61-
])
62-
?>
56+
->label($translator->translate('common.date.created'))
57+
->value(Html::encode(($form->getDate_created())->format('Y-m-d')))
58+
->addInputAttributes([
59+
'placeholder' => $translator->translate('common.date.created'),
60+
'readonly' => 'readonly',
61+
])
62+
?>
6363
<?= Html::closeTag('div'); ?>
6464
<?= Html::openTag('div'); ?>
6565
<?= Field::text($form, 'date_modified')
66-
->label($translator->translate('common.date.modified'))
67-
->value(Html::encode(($form->getDate_modified())->format('Y-m-d')))
68-
->addInputAttributes([
69-
'placeholder' => $translator->translate('common.date.modified'),
70-
'readonly' => 'readonly',
71-
])
72-
?>
66+
->label($translator->translate('common.date.modified'))
67+
->value(Html::encode(($form->getDate_modified())->format('Y-m-d')))
68+
->addInputAttributes([
69+
'placeholder' => $translator->translate('common.date.modified'),
70+
'readonly' => 'readonly',
71+
])
72+
?>
7373
<?= Html::closeTag('div'); ?>
7474
<?= Html::openTag('div'); ?>
7575
<?= Field::text($form, 'name')
76-
->label($translator->translate('name'))
77-
->addInputAttributes([
78-
'placeholder' => $translator->translate('name'),
79-
])
80-
->value(Html::encode($form->getName() ?? ''))
81-
->hint($translator->translate('hint.this.field.is.required'));
82-
?>
76+
->label($translator->translate('name'))
77+
->addInputAttributes([
78+
'placeholder' => $translator->translate('name'),
79+
])
80+
->value(Html::encode($form->getName() ?? ''))
81+
->hint($translator->translate('hint.this.field.is.required'));
82+
?>
8383
<?= Html::closeTag('div'); ?>
8484
<?= Html::openTag('div'); ?>
8585
<?= Field::text($form, 'building_number')
86-
->label($translator->translate('delivery.location.building.number'))
87-
->addInputAttributes([
88-
'placeholder' => $translator->translate('delivery.location.building.number'),
89-
])
90-
->value(Html::encode($form->getBuildingNumber() ?? ''))
91-
?>
86+
->label($translator->translate('delivery.location.building.number'))
87+
->addInputAttributes([
88+
'placeholder' => $translator->translate('delivery.location.building.number'),
89+
])
90+
->value(Html::encode($form->getBuildingNumber() ?? ''))
91+
?>
9292
<?= Html::closeTag('div'); ?>
9393
<?= Html::openTag('div'); ?>
9494
<?= Field::text($form, 'address_1')
95-
->label($translator->translate('street.address'))
96-
->addInputAttributes([
97-
'placeholder' => $translator->translate('street.address'),
98-
])
99-
->value(Html::encode($form->getAddress_1() ?? ''))
100-
->hint($translator->translate('hint.this.field.is.required'));
101-
?>
95+
->label($translator->translate('street.address'))
96+
->addInputAttributes([
97+
'placeholder' => $translator->translate('street.address'),
98+
])
99+
->value(Html::encode($form->getAddress_1() ?? ''))
100+
->hint($translator->translate('hint.this.field.is.required'));
101+
?>
102102
<?= Html::closeTag('div'); ?>
103103
<?= Html::openTag('div'); ?>
104104
<?= Field::text($form, 'address_2')
105-
->label($translator->translate('street.address.2'))
106-
->addInputAttributes([
107-
'placeholder' => $translator->translate('street.address.2'),
108-
'value' => Html::encode($form->getAddress_2() ?? ''),
109-
])
110-
->hint($translator->translate('hint.this.field.is.required'));
111-
?>
105+
->label($translator->translate('street.address.2'))
106+
->addInputAttributes([
107+
'placeholder' => $translator->translate('street.address.2'),
108+
'value' => Html::encode($form->getAddress_2() ?? ''),
109+
])
110+
->hint($translator->translate('hint.this.field.is.required'));
111+
?>
112112
<?= Html::closeTag('div'); ?>
113113
<?= Html::openTag('div'); ?>
114114
<?= Field::text($form, 'city')
115-
->label($translator->translate('city'))
116-
->addInputAttributes([
117-
'placeholder' => $translator->translate('city'),
118-
'value' => Html::encode($form->getCity() ?? ''),
119-
])
120-
->hint($translator->translate('hint.this.field.is.required'));
121-
?>
115+
->label($translator->translate('city'))
116+
->addInputAttributes([
117+
'placeholder' => $translator->translate('city'),
118+
'value' => Html::encode($form->getCity() ?? ''),
119+
])
120+
->hint($translator->translate('hint.this.field.is.required'));
121+
?>
122122
<?= Html::closeTag('div'); ?>
123123
<?= Html::openTag('div'); ?>
124124
<?= Field::text($form, 'state')
125-
->label($translator->translate('state'))
126-
->addInputAttributes([
127-
'placeholder' => $translator->translate('state'),
128-
'value' => Html::encode($form->getState() ?? ''),
129-
])
130-
->hint($translator->translate('hint.this.field.is.required'));
131-
?>
125+
->label($translator->translate('state'))
126+
->addInputAttributes([
127+
'placeholder' => $translator->translate('state'),
128+
'value' => Html::encode($form->getState() ?? ''),
129+
])
130+
->hint($translator->translate('hint.this.field.is.required'));
131+
?>
132132
<?= Html::closeTag('div'); ?>
133133
<?= Html::openTag('div'); ?>
134134
<?= Field::text($form, 'zip')
135-
->label($translator->translate('zip'))
136-
->addInputAttributes([
137-
'placeholder' => $translator->translate('zip'),
138-
'value' => Html::encode($form->getZip() ?? ''),
139-
])
140-
->hint($translator->translate('hint.this.field.is.required'));
141-
?>
135+
->label($translator->translate('zip'))
136+
->addInputAttributes([
137+
'placeholder' => $translator->translate('zip'),
138+
'value' => Html::encode($form->getZip() ?? ''),
139+
])
140+
->hint($translator->translate('hint.this.field.is.required'));
141+
?>
142142
<?= Html::closeTag('div'); ?>
143143
<?= Html::openTag('div'); ?>
144144
<?= Field::text($form, 'country')
145-
->label($translator->translate('country'))
146-
->addInputAttributes([
147-
'placeholder' => $translator->translate('country'),
148-
])
149-
->value(Html::encode($form->getCountry() ?? ''))
150-
->hint($translator->translate('hint.this.field.is.required'));
151-
?>
145+
->label($translator->translate('country'))
146+
->addInputAttributes([
147+
'placeholder' => $translator->translate('country'),
148+
])
149+
->value(Html::encode($form->getCountry() ?? ''))
150+
->hint($translator->translate('hint.this.field.is.required'));
151+
?>
152152
<?= Html::closeTag('div'); ?>
153153
<?= Html::openTag('div'); ?>
154154
<?= Html::a(
@@ -157,32 +157,32 @@
157157
['style' => 'text-decoration:none'],
158158
); ?>
159159
<?= Field::text($form, 'global_location_number')
160-
->label($translator->translate('delivery.location.global.location.number'))
161-
->addInputAttributes([
162-
'placeholder' => $translator->translate('delivery.location.global.location.number'),
163-
'value' => Html::encode($form->getGlobal_location_number() ?? ''),
164-
]) ->hint($translator->translate('hint.this.field.is.not.required'));
165-
?>
160+
->label($translator->translate('delivery.location.global.location.number'))
161+
->addInputAttributes([
162+
'placeholder' => $translator->translate('delivery.location.global.location.number'),
163+
'value' => Html::encode($form->getGlobal_location_number() ?? ''),
164+
]) ->hint($translator->translate('hint.this.field.is.not.required'));
165+
?>
166166
<?= Html::closeTag('div'); ?>
167167
<?= Html::openTag('div'); ?>
168168
<?php
169-
$optionsDataEAS = [];
170-
/**
171-
* Related logic: see src/Invoice/Helpers/Peppol/PeppolArrays.php function electronic_address_scheme
172-
* Related logic: see https://docs.peppol.eu/poacc/billing/3.0/syntax/ubl-invoice/cac-Delivery/cac-DeliveryLocation/cbc-ID/
173-
* @var int $key
174-
* @var array $value
175-
*/
176-
foreach ($electronic_address_scheme as $key => $value) {
177-
$optionsDataEAS[(string) $value['code']] = (string) $value['code'] . str_repeat("-", 10) . (string) $value['description'];
178-
}
179-
?>
169+
$optionsDataEAS = [];
170+
/**
171+
* Related logic: see src/Invoice/Helpers/Peppol/PeppolArrays.php function electronic_address_scheme
172+
* Related logic: see https://docs.peppol.eu/poacc/billing/3.0/syntax/ubl-invoice/cac-Delivery/cac-DeliveryLocation/cbc-ID/
173+
* @var int $key
174+
* @var array $value
175+
*/
176+
foreach ($electronic_address_scheme as $key => $value) {
177+
$optionsDataEAS[(string) $value['code']] = (string) $value['code'] . str_repeat("-", 10) . (string) $value['description'];
178+
}
179+
?>
180180
<?= Html::a('EAS', 'https://docs.peppol.eu/poacc/upgrade-3/codelist/eas'); ?>
181181
<?= Field::select($form, 'electronic_address_scheme')
182-
->label($translator->translate('delivery.location.electronic.address.scheme'))
183-
->optionsData($optionsDataEAS)
184-
->hint($translator->translate('hint.this.field.is.not.required'));
185-
?>
182+
->label($translator->translate('delivery.location.electronic.address.scheme'))
183+
->optionsData($optionsDataEAS)
184+
->hint($translator->translate('hint.this.field.is.not.required'));
185+
?>
186186
<?= Html::closeTag('div'); ?>
187187
<?= Html::closeTag('div'); ?>
188188
<?= Html::closeTag('div'); ?>

‎resources/views/invoice/del/_view.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@
149149
['style' => 'text-decoration:none'],
150150
); ?>
151151
<?= Field::text($form, 'global_location_number')
152-
->label($translator->translate('delivery.location.global.location.number'))
153-
->addInputAttributes([
154-
'placeholder' => $translator->translate('delivery.location.global.location.number'),
155-
'disabled' => 'disabled',
156-
'value' => Html::encode($form->getGlobal_location_number() ?? ''),
157-
]);
152+
->label($translator->translate('delivery.location.global.location.number'))
153+
->addInputAttributes([
154+
'placeholder' => $translator->translate('delivery.location.global.location.number'),
155+
'disabled' => 'disabled',
156+
'value' => Html::encode($form->getGlobal_location_number() ?? ''),
157+
]);
158158
?>
159159
<?= Html::closeTag('div'); ?>
160160
<?= Html::openTag('div'); ?>

0 commit comments

Comments
 (0)