Add OpenMage Contributors Copyright #2295
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Component: AdminNotification
fballiano
previously approved these changes
Aug 25, 2022
|
we'll have to run the script every once in a while, on all the active branches, but that's kind of expected for this tasks |
That is how this PR already is -- no changes needed.
Yes, ideally before each release I suppose. That makes the diff between versions more clear. But even if it is less often, I still think it's a good idea to have these in the code. |
|
My appreciation for the effort. If I sit and analyze better it was quite simple to understand legal aspects. If I create a version in 2014, then update it in 2015 and 2016 and someone takes over the version from 2015, I best protect myself by mentioning the copyright in the 2014-2016 time range. If I specified only 2014 I would omit the variants from 2015 or 2016. We are now talking as if we were selling the products of the largest software corporation in the world, but I understand that at any time someone can either come to take over our work or accuse us of illegalities and that is why good to protect ourselves. It's like taking a commercial extension and integrating it into OpenMage, obviously the developer will ask us for explanations and compensation. |
|
I don't want to cause panic or be misunderstood but being a project in which everyone can bring something we have to be careful with what we contribute. The work must be our own creation not taken from someone else who has been protected by copyright. |
We should definitely have thorough discussions about this topic. I would say lets wait for a second approval and also wait some days in case anyone else has feedback to this change. |
justinbeaty
force-pushed
the
topic-copyright
branch
from
d1d2cb1
to
c61ffaa
Compare
|
Fixed conflicts from #2514 |
|
I would make a change as follows: * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)* @license Open Software License (OSL 3.0) http://opensource.org/licenses/osl-3.0.phpIt looks much better. |
|
But it is not correct;) https://docs.phpdoc.org/3.0/guide/references/phpdoc/tags/license.html |
|
also le's add the https while we're at it ;-) |
|
@sreichel - that argument is clear, I didn't check it before because I was more interested in the visual aspect in relation to the other lines. |
justinbeaty
force-pushed
the
topic-copyright
branch
from
c61ffaa
to
466d428
Compare
|
Rebased. Verification command below: |
|
@justinbeaty do you need to rerun the scripts or can we merge it as it is (as it's been waiting for a while)? |
fballiano
approved these changes
Sep 27, 2022
|
@fballiano It's okay to merge now. Maybe there were a few more copyright changes it would pick up if I ran it again, but they will be picked up next time the script is run. |
sreichel
approved these changes
Oct 3, 2022
sreichel
added a commit
that referenced
this pull request
Oct 17, 2022
* Fixed "should return string but returns false" * Fixed "should return XYZ but returns false" * Fixed "should return array but returns null" * Fixed "should return string but returns null" * Fixed "should return int but returns null" * Fixed "should return bool but returns" * Fixed docs (see comments) * Fixed "should return array" * Update app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com> * Update app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com> * Update app/code/core/Mage/Tag/Model/Resource/Tag.php Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com> * Update app/code/core/Mage/Customer/Block/Form/Register.php Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com> * Added module names to helper(#2617) * Get catalog search result collection from engine (#2634) * Add PHP dependencies security check workflow (#2639) * [security-workflow] Fixed cron syntax (#2640) * Added OpenMage Contributors Copyright (#2295) * Added ddev snippets to docs (#2575) * Improve dev/openmage/install.sh script for newer versions of Docker - no longer requires separate compose. * Only run workflows when relevant files change (#2641) * Add back notification popup severity icons URL (#2633) * Reduce reprocessed jpeg file size by defaulting quality to 85% (#2629) * Fixed issue #475. * Removed <frontend_type>text</frontend_type> as it is the default. * Fixed bug on users not able to modify image quality in backend if deprecated config exists. * Fixed bug on incorrect check if image quality was not set in backend. * Improved note in system.xml. * Prevented editing of a non-editable order (#2632) * Fix dev/openmage/install.sh script setting permissions on var directory. * Allowed automatic full invoice from API (#2393) * Add check if array key isset before using it (#2649) * Fixed phpstan-baseline.neon * Fixed phpstan-baseline.neon (updated dev tools) * Revert "Fixed phpstan-baseline.neon" This reverts commit 3c82e76. * Fixed getRegion() Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com> Co-authored-by: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com> Co-authored-by: Justin Beaty <51970393+justinbeaty@users.noreply.github.com> Co-authored-by: Colin Mollenhour <colin@mollenhour.com> Co-authored-by: luigifab <31816829+luigifab@users.noreply.github.com> Co-authored-by: Przemysław Piotrowski <przemyslaw.p@deligo.pl>
This was referenced Dec 25, 2022
seifer7
added a commit
to seifer7/magento-lts
that referenced
this pull request
Feb 1, 2024
This reverts commit cdf15ee.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description (*)
From discussion #2276
Added
@copyrightheader to 4,687 files that have been modified by the OpenMage project since 2015. The OpenMage project has done great work and deserves its copyright notice.Instead of a generic 2015-2022 year range, each file has its own specific year, or year range, based on the git history of that file. I've included the script that I used to generate this commit.
The script has comments explaining what it does, but here's an overview:
git log --pretty='%H %cs %s'@copyrightand find the first and last commit hash from our results in step 2@copyright The OpenMage Contributorsline in each fileTo see a list of commits attributed to either Magento or OpenMage, run
php shell/update-copyright.php dump. I will post the results of that in the next comment so you can see the output here, too.The rationale behind not using a generic date range is for ease of
git diffbetween versions as suggested by @fballiano. Instead, if the script is run before a version is tagged, then it will only be modifying files that were already changed by a commit in that version.Here is the output from when I ran the script:
It did take a few minutes, maybe the reading of
git logon each of the 4,000+ files can be optimized.Also, this PR is made to 1.9.4.x. I can also make a smaller PR to 20.0 since there will be discrepencies. This could create some merge conflicts in the future, but I don't think it will be too bad. For example assume some file has '2015-2019' in 1.9.4.x and '2015-2020' in 20.0 (because there was a 20.0 branch only commit in 2020 to that file). If the file was then changed in 1.9.4.x in 2022, it would conflict I think when v19 is merged into v20. I ask the maintainers to weigh in on that.
Related Pull Requests
Fixed Issues (if relevant)
Manual testing scenarios (*)
Check out this branch and run:
git diff -U0 HEAD~1 | grep '^[+-]' | grep -Ev '^(--- a/|\+\+\+ b/)' | sort -uThat will print all unique changes made in the second commit of this PR. You should only see copyright changes. I will post the output in a follow up comment.
Questions or comments
I have intentionally made two commits in this PR. I think it is best to not squash them.
Other changes from #2276 will be made in a second PR.
Contribution checklist (*)