Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manual update to SimplePie 1.5.3 #2702

Merged
merged 1 commit into from
Dec 6, 2019
Merged

Conversation

candrews
Copy link
Contributor

@candrews candrews commented Dec 4, 2019

Changelogs:

I've manually applied these changes:
https://github.com/simplepie/simplepie/compare/1.5.2..1.5.3

This is of particular interest as it eliminates some warnings when run with PHP 7.4:

PHP Deprecated:  implode(): Passing glue string after array is deprecated. Swap the parameters in /var/www/localhost/htdocs/FreshRSS/lib/SimplePie/SimplePie/Parse/Date.php on line 544
PHP Deprecated:  implode(): Passing glue string after array is deprecated. Swap the parameters in /var/www/localhost/htdocs/FreshRSS/lib/SimplePie/SimplePie/Parse/Date.php on line 545

See simplepie/simplepie@38b5049

@Alkarex Alkarex added this to the 1.16.0 milestone Dec 4, 2019
@Alkarex Alkarex self-requested a review December 4, 2019 13:55
@Alkarex Alkarex added the Work in progress 🚧 Wait before merging label Dec 4, 2019
@candrews
Copy link
Contributor Author

candrews commented Dec 5, 2019

Is there anything else that I can / should do to help this along?

@Alkarex
Copy link
Member

Alkarex commented Dec 5, 2019

Hello,
The update must be done much more carefully. The version of SimplePie shipped with FreshRSS contains a number of additional features and modifications which have not been accepted upstream, or for which we have not taken the time to make a pull request upstream (e.g. hash-based caching, forced HTTPs, syslog logging, handling of some encodings...).
The current PR would crash FreshRSS.

@candrews
Copy link
Contributor Author

candrews commented Dec 5, 2019

I've updated this PR.

I now started with the current files in FreshRSS's repo and manually applied the SimpliePie 1.5.2->1.5.3 changes from https://github.com/simplepie/simplepie/compare/1.5.2..1.5.3

I believe that should be much more acceptable :)

Copy link
Member

@marienfressinaud marienfressinaud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good to me. Note for the other reviewers that the fix of SimplePie/Cache/File.php was already applied in 0fb21e1

@Alkarex
Copy link
Member

Alkarex commented Dec 6, 2019

Thanks @candrews

@Alkarex Alkarex removed the Work in progress 🚧 Wait before merging label Dec 6, 2019
@Alkarex Alkarex merged commit ecd0085 into FreshRSS:dev Dec 6, 2019
javerous pushed a commit to javerous/FreshRSS that referenced this pull request Jan 20, 2020
Alkarex added a commit to Alkarex/FreshRSS that referenced this pull request Feb 29, 2020
@Alkarex Alkarex mentioned this pull request Feb 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants