Shorter copyright header #4767
Merged
Shorter copyright header #4767
+19,773
−70,029
Conversation
This file contains hidden or 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
environment
Component: Core
This comment was marked as off-topic.
This comment was marked as off-topic.
|
If a developer or third party extracts a single source file without also copying the COPYING.txt file, they might not see the copyright information. The risk lies in potential misattribution if files become separated from the central notice. |
This comment was marked as off-topic.
This comment was marked as off-topic.
|
My opinion is that when a developer extracts a file from the OM package, he should be careful about copyright. It is not my responsibility to check whether he respects copyright or not. @sreichl - please don't close any PR's without waiting for other opinions. |
This comment was marked as off-topic.
This comment was marked as off-topic.
# Conflicts: # app/code/core/Mage/Adminhtml/Block/Widget/Container.php # app/code/core/Mage/Eav/Model/Entity/Type.php # app/code/core/Mage/Newsletter/Model/Template.php # app/code/core/Mage/Sitemap/etc/system.xml # app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml # app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml # app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml # app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml # app/design/adminhtml/default/default/template/system/config/tabs.phtml # app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml # app/design/frontend/base/default/template/bundle/catalog/product/price.phtml # app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml # app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml # app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml # app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml # app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml # app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml # app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml # app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml # app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml # app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml # app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml # app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml # app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml # app/design/frontend/base/default/template/shipping/tracking/popup.phtml # app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml # app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml # app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml # app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml # app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml # app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml # lib/Varien/Db/Adapter/Interface.php
colinmollenhour
pushed a commit
that referenced
this pull request
May 7, 2025
* tests * rector * updated test groups * updated tests * updated tests * updated tests * updated tests * updated tests * updated tests * updated tests * updated tests * updated tests * updated tests * updated tests * update * update * update * update * update * typo * updated tests * updated tests * updated tests * updated tests * sonar 1 * sonar 2 * phpcs/phpstan * sonar 4 * sonar 5 * sonar 6 * phpcs * copyright, ref #4767 * added Makefile * merge fix * reverted all changes to core files * Revert "reverted all changes to core files" This reverts commit 63e5f77.
colinmollenhour
previously approved these changes
May 7, 2025
|
There are some conflicts reported to this PR that need to be resolved. |
# Conflicts: # tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php # tests/unit/Mage/Customer/Model/CustomerTest.php # tests/unit/Mage/Reports/Helper/DataTest.php # tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php # tests/unit/Mage/Rule/Model/AbstractTest.php # tests/unit/Mage/Rule/Model/EnvironmentTest.php # tests/unit/Mage/Rule/Model/RuleTest.php # tests/unit/Traits/DataProvider/Base/BoolTrait.php # tests/unit/Traits/DataProvider/Base/IntOrNullTrait.php # tests/unit/Traits/DataProvider/Base/ModulesTrait.php # tests/unit/Traits/DataProvider/Base/NumericStringTrait.php # tests/unit/Traits/DataProvider/Mage/Catalog/CatalogTrait.php # tests/unit/Traits/DataProvider/Mage/Catalog/Model/LocaleTrait.php # tests/unit/Traits/DataProvider/Mage/Cms/CmsTrait.php # tests/unit/Traits/DataProvider/Mage/Core/CoreTrait.php # tests/unit/Traits/DataProvider/Mage/Downloadable/DownloadableTrait.php # tests/unit/Traits/DataProvider/Mage/Reports/ReportsTrait.php # tests/unit/Traits/DataProvider/Mage/Rule/RuleTrait.php # tests/unit/Traits/DataProvider/Mage/Uploader/UploaderTrait.php
|
addison74
approved these changes
May 7, 2025
|
@addison74 thats why I have closed some PRs. As longer they stay open it becomes more likely to run into merge conflicts. I had to fix ~40 files yesterday, plus latest conflicts today. I'll re-open step by step to avoid this. |
colinmollenhour
approved these changes
May 8, 2025
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.
Related Pull Requests