? ? Pending

User tests: Successful: Unsuccessful:

avatar PhilETaylor
PhilETaylor
22 Aug 2021

Removes 20 duplicates the following, while still remaining compliant. I believe the duplicates originated as each class was originally its own file, and merged by a build process to create this single file. The same duplicated copyright/license statements, including the @note are also at the top of the file, covering all the classes in the file, so the duplicates are not necessary.

/**
 * Akeeba Restore
 * A JSON-powered JPA, JPS and ZIP archive extraction library
 *
 * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
 * @license     GNU GPL v2 or - at your option - any later version
 * @package     akeebabackup
 * @subpackage  kickstart
 */

No PHP code changes.

@nikosdion

avatar PhilETaylor PhilETaylor - open - 22 Aug 2021
avatar PhilETaylor PhilETaylor - change - 22 Aug 2021
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 22 Aug 2021
Category Administration com_joomlaupdate
avatar PhilETaylor PhilETaylor - change - 22 Aug 2021
The description was changed
avatar PhilETaylor PhilETaylor - edited - 22 Aug 2021
avatar nikosdion
nikosdion - comment - 22 Aug 2021

Correct, this was generated by concatenating files. Duplicate copyright headers have long since been fixed in Kickstart but the version Joomla is using is what I'd written 4+ years ago. You can remove the duplicates. You only need one instance of the copyright header.

avatar PhilETaylor PhilETaylor - change - 22 Aug 2021
Title
[4] Cleanup of restore.php duplicated copyright/license blocks.
[4] Cleanup of restore.php - duplicated copyright/license blocks.
avatar PhilETaylor PhilETaylor - edited - 22 Aug 2021
avatar richard67
richard67 - comment - 22 Aug 2021

Correct, this was generated by concatenating files. Duplicate copyright headers have long since been fixed in Kickstart but the version Joomla is using is what I'd written 4+ years ago. You can remove the duplicates. You only need one instance of the copyright header.

@nikosdion Can I count your comment as successful test?

avatar richard67 richard67 - test_item - 22 Aug 2021 - Tested successfully
avatar richard67
richard67 - comment - 22 Aug 2021

I have tested this item successfully on 8e9096c

Code review: We have a copyright header at the top of the file here https://github.com/joomla/joomla-cms/blob/4.0-dev/administrator/components/com_joomlaupdate/restore.php#L2-L10 , and according to @nikosdion that one is sufficient.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35290.

avatar PhilETaylor
PhilETaylor - comment - 22 Aug 2021

I asked him to comment, more out of authorisation, due to copyright and before anyone commented here that I was not allowed to remove these ;-)

avatar richard67
richard67 - comment - 22 Aug 2021

I asked him to comment, more out of authorisation, due to copyright and before anyone commented here that I was not allowed to remove these ;-)

@PhilETaylor I understood that and am happy he has answered positive. I only thought we could count that as a test, too, so we don't need to wait for testers.

avatar richard67 richard67 - alter_testresult - 22 Aug 2021 - nikosdion: Tested successfully
avatar richard67 richard67 - change - 22 Aug 2021
Status Pending Ready to Commit
avatar richard67
richard67 - comment - 22 Aug 2021

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35290.

avatar wilsonge wilsonge - change - 22 Aug 2021
Status Ready to Commit Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2021-08-22 21:45:55
Closed_By wilsonge
Labels Added: ? ?
avatar wilsonge wilsonge - close - 22 Aug 2021
avatar wilsonge wilsonge - merge - 22 Aug 2021
avatar wilsonge
wilsonge - comment - 22 Aug 2021

Thanks!

Add a Comment

Login with GitHub to post a comment