mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-14 10:13:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix PHPCS ControlSignature (#6896)

Browse Source 
Regression from https://github.com/FreshRSS/FreshRSS/pull/6666
We were not checking anymore for whitespace rules in e.g. `if (true) {`
This commit is contained in:
Alexandre Alapetite
2024-10-15 10:56:33 +02:00
committed by GitHub
parent 93346bc3b3
commit b552d9f4bc
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/feedController.php
View File

@@ -209,7 +209,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
}
}
}
if(!empty($headers)) {
if (!empty($headers)) {
$headers = array_filter(array_map('trim', $headers));
$opts[CURLOPT_HTTPHEADER] = array_merge($headers, $opts[CURLOPT_HTTPHEADER] ?? []);
}

2
app/Controllers/subscriptionController.php
View File

@@ -190,7 +190,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
}
}
if(!empty($headers)) {
if (!empty($headers)) {
$headers = array_filter(array_map('trim', $headers));
$opts[CURLOPT_HTTPHEADER] = array_merge($headers, $opts[CURLOPT_HTTPHEADER] ?? []);
}

5
phpcs.xml
View File

@@ -88,12 +88,17 @@
<exclude-pattern>*\.phtml$</exclude-pattern>
</rule>
<!-- <rule ref="Squiz.Commenting.ClassComment.Missing"/> --><!-- Consider adding -->
<rule ref="Squiz.ControlStructures.ControlSignature">
<include-pattern>*\.phtml$</include-pattern>
<properties>
<property name="requiredSpacesBeforeColon" value="0" />
</properties>
</rule>
<rule ref="Squiz.ControlStructures.ControlSignature">
<include-pattern>*\.php$</include-pattern>
</rule>
<rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
<exclude-pattern>*\.phtml$</exclude-pattern>
</rule>