diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2024-09-29 16:17:26 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-09-29 16:17:26 +0200 |
| commit | a792c195d23390f4b23c95cca2071045915b0d5c (patch) | |
| tree | 5f2ad8a2fa37393b456f9c60b0671335c07540ce /lib/simplepie | |
| parent | 496d3a1a486c23345ca5e9022980a9f89151bb49 (diff) | |
Sync SimplePie (#6840)
FreshRSS upstream PR merged https://github.com/simplepie/simplepie/pull/883
Diffstat (limited to 'lib/simplepie')
| -rw-r--r-- | lib/simplepie/simplepie/phpcs.xml | 10 | ||||
| -rw-r--r-- | lib/simplepie/simplepie/src/SimplePie.php | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/simplepie/simplepie/phpcs.xml b/lib/simplepie/simplepie/phpcs.xml index f77624289..6ec1797bf 100644 --- a/lib/simplepie/simplepie/phpcs.xml +++ b/lib/simplepie/simplepie/phpcs.xml @@ -7,6 +7,7 @@ <rule ref="PSR12"> <exclude name="PSR1.Files.SideEffects.FoundWithSymbols"/> <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/> + <exclude name="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisLine"/> <exclude name="PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine"/> <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace"/> </rule> @@ -16,4 +17,13 @@ <property name="absoluteLineLimit" value="400"/> </properties> </rule> + <rule ref="Generic.WhiteSpace.DisallowTabIndent.TabsUsed"> + <exclude-pattern>./demo/</exclude-pattern> + </rule> + <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace"> + <exclude-pattern>./library/</exclude-pattern> + </rule> + <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps"> + <exclude-pattern>./library/</exclude-pattern> + </rule> </ruleset> diff --git a/lib/simplepie/simplepie/src/SimplePie.php b/lib/simplepie/simplepie/src/SimplePie.php index 455a90a2f..a02138ecd 100644 --- a/lib/simplepie/simplepie/src/SimplePie.php +++ b/lib/simplepie/simplepie/src/SimplePie.php @@ -1978,7 +1978,7 @@ class SimplePie $this->data = []; } // Check if the cache has been updated - elseif (empty($this->data['cache_expiration_time']) || $this->data['cache_expiration_time'] < time()) { // FreshRSS https://github.com/simplepie/simplepie/pull/846 + elseif (!isset($this->data['cache_expiration_time']) || $this->data['cache_expiration_time'] < time()) { // Want to know if we tried to send last-modified and/or etag headers // when requesting this file. (Note that it's up to the file to // support this, but we don't always send the headers either.) |