-
-
Notifications
You must be signed in to change notification settings - Fork 436
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
Remove DISCLAIMER and change Magento -> OpenMage in header #2297
Conversation
Here's the output of the git diff line to verify only comment changes were made in this PR: $ git diff -U0 HEAD~1 | grep '^[+-]' | grep -Ev '^(--- a/|\+\+\+ b/)' | awk '!x[$0]++'
- * Magento
+ * OpenMage
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magento.com for more information.
-# Magento
+# OpenMage
-# DISCLAIMER
-#
-# Do not edit or add to this file if you wish to upgrade Magento to newer
-# versions in the future. If you wish to customize Magento for your
-# needs please refer to http://www.magento.com for more information.
-// Magento
+// OpenMage
-// DISCLAIMER
-//
-// Do not edit or add to this file if you wish to upgrade Magento to newer
-// versions in the future. If you wish to customize Magento for your
-// needs please refer to http://www.magento.com for more information. |
0869778
to
8dff748
Compare
Here is the script I used to create this PR in case anyone is interested: https://gist.github.com/justinbeaty/9e34aaa02958f14127288c930ea2ea7f Pretty similar to the script included in #2295 |
I agree with this PR but to approve it I have to go through all the 5000 files. The bad part is that in the browser GitHub loads only 3000 files and it takes time. In the future such big changes should be limited to a number of files in order to be browsed. PS - It is funny to see how slow it is my desktop loading the diff page. Chrome uses 2.2 GB of memory and the processor is running at 10% (Ryzen 9 5000). |
@ADDISON74 I think your eyes will bleed if you try to manually check all 8,416 files and your computer will melt if you try and load it in the browser. This is why I provided the command to condense the changes to only unique lines. I used these two StackOverflow links for the command: https://stackoverflow.com/a/26622262 and https://stackoverflow.com/a/11532197 Edit: Another way to quickly check is this: $ git diff --stat HEAD~1 | cut -f2 -d"|" | sort -u
8 +-------
8416 files changed, 8416 insertions(+), 58912 deletions(-) This will show every file that was modified had exactly 8 changes (-1 line Magento, +1 line OpenMage, -6 lines DISCLAIMER) |
8dff748
to
976c6b6
Compare
Rebased after #2296 and all checks are green! ✅ |
checked it and everything seems ok, @justinbeaty do you want me to fix the conflict or you prefer rebasing it? |
976c6b6
to
54c2751
Compare
@fballiano I've rebased and fixed the conflict. |
54c2751
to
2d127e0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
checked the diff and looks fine
* Merge PR #2342 * Revert "Add basic text for Ukraine (#2074)" (#2325) This reverts commit 33dfa26. * Mage_Catalog_Model_Product_Attribute_Backend_Groupprice_Abstract: avoid loading all websites when using only the current one (#2351) * Added support for HTTP2 to Mage_HTTP_Client_Curl (#1137) * Blocked access to all dot files (#2349) * Capitalization Adjustment Regarding CamelCase in Method Names (#2365) * refactor: Adjusted capitalization of two public methods. * refactor: Adjusted capitalization of one protected method. * refactor: Adjusted capitalization of where call. * chore: Removed fixed error from phpstan baseline. * Some microoptimization (#2335) * Avoid duplicate method calls * Replaced array_push() * Changed substr() third parameter * Use array_key_exists() * php7 opcode - internal functions * Enclosed error with <pre> tag for prettier error print (if developer mode is enabled). (#2368) * Updated phpstan to 1.8.2 (#2367) * Escape product titles in MSRP JavaScript (#2366) * Product names were not escaped. If contained a double quote, would break the JavaScript for MSRP/MAP * update contribution list * Update boxes.css (#2330) * Force describeTable() to use read DB adapter (#2371) * Do not install n98/n98_layouthelper (#2373) * Add apt update to XML validation workflow (#2376) * Merged PR #2375 * Replace remaining "sizeof" calls with "count" (#2369) * Remove DISCLAIMER and change Magento -> OpenMage in header (#2297) * Added label for phpstan cosmetic changes (#2384) * Added weight to salesOrderShipmentAddTrack API (#1377) * PHPStan/DOCBlock fixes (#2336) * Updated docs for email addTo() (#2382) * Updated phpstan experimental (#2386) * Cosmetic changes to Mage_Payment_Model_Method_Abstract::validate() (#2388) * Replaced join() calls with implode() (#2389) * Hidden empty sub menu from backend (#2391) * Remove Thumbs.db file (#2394) * Support PHP 8.1 in composer.json (#2378) * php condition in composer.json This solves the issue related to php versions > 8.1 * Reduced condition for PHP requirement * Changed PHP requirement * Updated version in Ubuntu 22.04 based on PHP 8.1.2 * Composer.lock updated in Ubuntu 20.04 (PHP 8.1.2) * Update composer.lock * Update composer.lock * Blocked various file types in .htaccess (#2359) * Color swatches work with disparate product IDs (#2390) * Move Credit Memo at the end of the buttons list (#2392) * Version bump (#2387) * Minor fixes on 'filter_condition_callback' method _filterStoreCondition() (#2362) * add ReturnTypeWillChange to various Files catched by code style checker #2302 * Phpstan fixes (#2396) * Fixed addCrumb() * Fixed initForm() and _needToAddDummy() * Fixed addLink() * Fixed addLinkRel() * Fixed canUseCanonicalTag() * Fixed getAddUrl...() * Fixed rollBack() camelCase error reported by phpstan (#2403) * Changes default root dir in composer.json (#2401) * Fixed targetNamespace for WS-I Compliant SOAP APIs (#2405) * Updated phpstan baseline Co-authored-by: sv3n <[email protected]> Co-authored-by: Fabian Blechschmidt <[email protected]> Co-authored-by: Colin Mollenhour <[email protected]> Co-authored-by: Kevin Jakob <[email protected]> Co-authored-by: Ng Kiat Siong <[email protected]> Co-authored-by: Scott Moore <[email protected]> Co-authored-by: ADDISON <[email protected]> Co-authored-by: Justin Beaty <[email protected]> Co-authored-by: luigifab <[email protected]> Co-authored-by: Daniel Fahlke <[email protected]> Co-authored-by: leissbua <[email protected]>
Description (*)
From discussion #2276
Updated file headers to change Magento -> OpenMage and remove the DISCLAIMER about modifying core files. This removed about 1.9MB in disk space.
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/)' | awk '!x[$0]++'
That will print all unique changes made in this PR. You should only see comment changes. I will post the output in a follow up comment.
Questions or comments
Contribution checklist (*)