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.

Sign up for GitHub

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

Jump to bottom

Merge v19 into v20 #2370

Merged
merged 40 commits into from
Aug 12, 2022
Merged

Merge v19 into v20 #2370

merged 40 commits into from
Aug 12, 2022

Conversation

fballiano
Copy link
Contributor

@fballiano fballiano commented Aug 5, 2022 •
edited
Loading

This time I cherry picked the single commits using v19.4.17...1.9.4.x as a reference.

Notes:

If you know a better way of knowing which commits still need cherry-picking please let me know

sreichel and others added 10 commits August 5, 2022 16:54
@sreichel @fballiano
Merge PR #2342
250eb1f
@fballiano
Revert "Add basic text for Ukraine (#2074)" (#2325)
2e02eab 
This reverts commit 33dfa26.
@fballiano
Mage_Catalog_Model_Product_Attribute_Backend_Groupprice_Abstract: avo…
58de841 
…id loading all websites when using only the current one (#2351)
@Schrank @fballiano
Added support for HTTP2 to Mage_HTTP_Client_Curl (#1137)
a3fdffc
@colinmollenhour @fballiano
Blocked access to all dot files (#2349)
ac1fa93
@Sdfendor @fballiano
Capitalization Adjustment Regarding CamelCase in Method Names (#2365)
44c7c0f 
* 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.
@sreichel @fballiano
Some microoptimization (#2335)
f6dcc38 
* Avoid duplicate method calls

* Replaced array_push()

* Changed substr() third parameter

* Use array_key_exists()

* php7 opcode - internal functions
@kiatng @fballiano
Enclosed error with <pre> tag for prettier error print (if developer …
64dd9b0 
…mode is enabled). (#2368)
@sreichel @fballiano
Updated phpstan to 1.8.2 (#2367)
4fb7615
@discountscott @fballiano
Escape product titles in MSRP JavaScript (#2366)
ef45711 
* Product names were not escaped. If contained a double quote, would break the JavaScript for MSRP/MAP

* update contribution list
@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Component: Api2 Relates to Mage_Api2 Component: Bundle Relates to Mage_Bundle Component: Captcha Relates to Mage_Captcha Component: Catalog Relates to Mage_Catalog Component: CatalogInventory Relates to Mage_CatalogInventory Component: Centinel Relates to Mage_Centinel Component: Checkout Relates to Mage_Checkout Component: Core Relates to Mage_Core Component: CurrencySymbol Relates to Mage_CurrencySymbol Component: Customer Relates to Mage_Customer Component: Downloadable Relates to Mage_Downloadable Component: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index Component: lib/Varien Relates to lib/Varien Component: lib/Mage Relates to lib/Mage Component: lib/* Relates to lib/* Component: Oauth Relates to Mage_Oauth Component: Paygate Relates to Mage_Paygate Component: PayPal Relates to Mage_Paypal labels Aug 5, 2022
luigifab and others added 8 commits August 10, 2022 11:26
@luigifab @fballiano
Hidden empty sub menu from backend (#2391)
8981f6b
@luigifab @fballiano
Remove Thumbs.db file (#2394)
64c7d0e
@addison74 @fballiano
Support PHP 8.1 in composer.json (#2378)
11a1379 
* 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
@colinmollenhour @fballiano
Blocked various file types in .htaccess (#2359)
f7fff3c
@luigifab @fballiano
Color swatches work with disparate product IDs (#2390)
ec83040
@luigifab @fballiano
Move Credit Memo at the end of the buttons list (#2392)
bca37b0
@fballiano
Version bump (#2387)
7633af6
@kiatng @fballiano
Minor fixes on 'filter_condition_callback' method _filterStoreConditi…
fc33598 
…on() (#2362)
Flyingmana and others added 3 commits August 11, 2022 08:05
@Flyingmana @fballiano
add ReturnTypeWillChange to various Files catched by code style checker
fd5e602 
#2302
@sreichel @fballiano
Phpstan fixes (#2396)
b58675d 
* Fixed addCrumb()

* Fixed initForm() and _needToAddDummy()

* Fixed addLink()

* Fixed addLinkRel()

* Fixed canUseCanonicalTag()

* Fixed getAddUrl...()
@sreichel @fballiano
Fixed rollBack() camelCase error reported by phpstan (#2403)
361d027
@fballiano
Copy link
Contributor Author

more updates and had to fix 2 conflicts

@fballiano
Copy link
Contributor Author

@sreichel can you help me check what's phpstan complaining about?

@fballiano
Copy link
Contributor Author

guys I'm wondering, what's the best way to merge this: rebase or merge? squash for sure not, that's easy :-D

@sreichel sreichel merged commit 71998f5 into OpenMage:20.0 Aug 12, 2022
@sreichel
Copy link
Contributor

sreichel commented Aug 12, 2022 •
edited
Loading

Ahhh ... fu** smartph...

Should i revert?

@fballiano fballiano deleted the merge_v19_into_v20 branch August 12, 2022 08:05
@fballiano fballiano restored the merge_v19_into_v20 branch August 12, 2022 08:06
@github-actions
Copy link
Contributor

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  7 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 71998f5. ± Comparison against base commit b1098b2.

@fballiano fballiano deleted the merge_v19_into_v20 branch August 12, 2022 08:11
sreichel added a commit that referenced this pull request Aug 12, 2022
@sreichel
Revert "Merge v19 into v20 (#2370)"
5d1f581 
This reverts commit 71998f5.
@addison74
Copy link
Contributor

@sreichel - did you forget to merge with squash?

@fballiano fballiano mentioned this pull request Aug 12, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sreichel sreichel sreichel approved these changes

@kiatng kiatng kiatng approved these changes

Assignees
No one assigned
Labels
Component: Admin Relates to Mage_Admin Component: Adminhtml Relates to Mage_Adminhtml Component: AdminNotification Relates to Mage_AdminNotification Component: Api PageRelates to Mage_Api Component: Api2 Relates to Mage_Api2 Component: Authorizenet Relates to Mage_Authorizenet Component: Backup Relates to Mage_Backup Component: Bundle Relates to Mage_Bundle Component: Captcha Relates to Mage_Captcha Component: Catalog Relates to Mage_Catalog Component: CatalogIndex Relates to Mage_CatalogIndex Component: CatalogInventory Relates to Mage_CatalogInventory Component: CatalogRule Relates to Mage_CatalogRule Component: CatalogSearch Relates to Mage_CatalogSearch Component: Centinel Relates to Mage_Centinel Component: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms Component: ConfigurableSwatches Relates to Mage_ConfigurableSwatches Component: Contacts Relates to Mage_Contacts Component: Core Relates to Mage_Core Component: Cron Relates to Mage_Cron Component: CurrencySymbol Relates to Mage_CurrencySymbol Component: Customer Relates to Mage_Customer Component: Dataflow Relates to Mage_Dataflow Component: Directory Relates to Mage_Directory Component: Downloadable Relates to Mage_Downloadable Component: PayPal Relates to Mage_Paypal documentation environment htaccess Mage.php Relates to app/Mage.php
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.