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 -> v20 #2416

Merged
merged 150 commits into from
Sep 3, 2022
Merged

Merge v19 -> v20 #2416

merged 150 commits into from
Sep 3, 2022

Conversation

fballiano
Copy link
Contributor

Since there are new commits since #2370 we need another forward port PR before the next release

@fballiano fballiano changed the title Merge v19 v20 Merge v19 -> v20 Aug 12, 2022
Sdfendor
Sdfendor previously approved these changes Aug 12, 2022
View reviewed changes
tmewes
tmewes previously approved these changes Aug 12, 2022
View reviewed changes
@fballiano fballiano dismissed stale reviews from tmewes and Sdfendor via fd66407 August 12, 2022 11:29
@github-actions github-actions bot added the Component: Adminhtml Relates to Mage_Adminhtml label Aug 12, 2022
Sdfendor
Sdfendor previously approved these changes Aug 12, 2022
View reviewed changes
kiatng
kiatng previously approved these changes Aug 12, 2022
View reviewed changes
ADDISON74
ADDISON74 previously approved these changes Aug 12, 2022
View reviewed changes
@fballiano
Copy link
Contributor Author

Thanks guys, I'd wait until release day to merge, just in case more PRs get approved.

elidrissidev
elidrissidev previously approved these changes Aug 12, 2022
View reviewed changes
Copy link
Member

@elidrissidev elidrissidev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another approval just because :)

Sdfendor and others added 2 commits August 12, 2022 22:50
@Sdfendor @fballiano
fix: Added #[ReturnTypeWillChange] in more places. (OpenMage#2409)
60055e0
@holozaen @fballiano
Add null check before method_exists (OpenMage#2417)
67365e4 
Beginning with version 8.0, PHP throws a type error if the first parameter is neither an object or a class, so the translate method breaks if the translator key is not set to the editor config (which can be the case by the way). We could also use an early return to fix the issue here, but in my opinion the translation method stays understandable and simple enough so the additional check for an existing translator can be added to the IF-statement.
@github-actions github-actions bot added Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* labels Aug 12, 2022
@github-actions github-actions bot added Component: Admin Relates to Mage_Admin Component: Api PageRelates to Mage_Api labels Aug 12, 2022
@fballiano
Copy link
Contributor Author

updated and fixed various conflicts

@github-actions github-actions bot removed the Component: Install Relates to Mage_Install label Sep 1, 2022
@lgtm-com
Copy link

lgtm-com bot commented Sep 1, 2022

This pull request fixes 10 alerts when merging d425ca8 into 59faedd - view on LGTM.com

fixed alerts:

  • 5 for Missing variable declaration
  • 2 for Self assignment
  • 1 for Call to eval-like DOM function
  • 1 for Unused variable, import, function or class
  • 1 for Unknown directive

ADDISON74
ADDISON74 previously approved these changes Sep 1, 2022
View reviewed changes
fballiano and others added 7 commits September 3, 2022 08:24
@fballiano
Fixed README with information that was only on branch 20.0 (OpenMage#…
7b82726 
…2536)
@sreichel @fballiano
Fixed admin grid filter (OpenMage#2537)
b116995 
E.g. customer review: filter by customer group
@eneiasramos @fballiano
Bugfix to avoid newline character in customFormSubmit URL (OpenMage#2518
b6fcc39 
)
@sreichel @kiatng @fballiano
PHPStan: fixed some unknown types (OpenMage#2538)
1bf8ef0 
* Fixed typo

* Fixed unknown types

* Updated phpstan-baseline.neon

* Update app/code/core/Zend/Validate/EmailAddress.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>

* Update app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>

* Update app/code/core/Mage/Paypal/Model/Express/Checkout.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
@sreichel @fballiano
Updated PHPStan to 1.8.3 (OpenMage#2540)
f42d5d8
@fballiano
Updated jQuery Cycle for rwd theme (OpenMage#2505)
cc7d552
@fballiano
Fixed whitespace for docblocks (OpenMage#2542)
726865a
@github-actions github-actions bot removed Component: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index labels Sep 3, 2022
@lgtm-com
Copy link

lgtm-com bot commented Sep 3, 2022

This pull request fixes 10 alerts when merging 726865a into 59faedd - view on LGTM.com

fixed alerts:

  • 5 for Missing variable declaration
  • 2 for Self assignment
  • 1 for Call to eval-like DOM function
  • 1 for Unused variable, import, function or class
  • 1 for Unknown directive

@fballiano fballiano mentioned this pull request Sep 3, 2022
Closed
@fballiano
Copy link
Contributor Author

@sreichel @ADDISON74 @Flyingmana This PR should be up to date now, if we approve it and merge it I can make a release later today or tomorrow (probably tomorrow, I've a wedding today)

@lgtm-com
Copy link

lgtm-com bot commented Sep 3, 2022

This pull request fixes 10 alerts when merging b885d69 into 59faedd - view on LGTM.com

fixed alerts:

  • 5 for Missing variable declaration
  • 2 for Self assignment
  • 1 for Call to eval-like DOM function
  • 1 for Unused variable, import, function or class
  • 1 for Unknown directive

@fballiano
Copy link
Contributor Author

waiting for the checks to finish and I'll merge and tag a draft release

@fballiano fballiano merged commit d448eeb into OpenMage:20.0 Sep 3, 2022
@fballiano fballiano deleted the merge_v19_v20 branch September 3, 2022 09:07
@github-actions

This comment has been minimized.

Sign in to view
1 similar comment
@github-actions
Copy link

github-actions bot commented Sep 4, 2022

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 d448eeb. ± Comparison against base commit 59faedd.

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

@ADDISON74 ADDISON74 ADDISON74 approved these changes

@kiatng kiatng kiatng left review comments

@Sdfendor Sdfendor Sdfendor left review comments

@tmewes tmewes tmewes left review comments

@elidrissidev elidrissidev elidrissidev left review comments

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: Eav Relates to Mage_Eav Component: GoogleAnalytics Relates to Mage_GoogleAnalytics Component: PayPal Relates to Mage_Paypal documentation environment JavaScript Relates to js/* Mage.php Relates to app/Mage.php phpstan
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet