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 #2766

Merged
merged 95 commits into from
Jan 3, 2023
Merged

Merge v19 -> v20 #2766

merged 95 commits into from
Jan 3, 2023

Conversation

fballiano
Copy link
Contributor

@fballiano fballiano commented Dec 1, 2022 •
edited
Loading

Cherry picking from v19.4.20...1.9.4.x

@fballiano
Copy link
Contributor Author

#2744 had conflicts

@github-actions github-actions bot added Component: AdminNotification Relates to Mage_AdminNotification Component: Adminhtml Relates to Mage_Adminhtml Component: Admin Relates to Mage_Admin 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: Catalog Relates to Mage_Catalog Component: CatalogInventory Relates to Mage_CatalogInventory Component: CatalogIndex Relates to Mage_CatalogIndex 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: Core Relates to Mage_Core Component: Customer Relates to Mage_Customer Component: Dataflow Relates to Mage_Dataflow Component: Downloadable Relates to Mage_Downloadable Component: Eav Relates to Mage_Eav Component: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index Component: Install Relates to Mage_Install Component: lib/Varien Relates to lib/Varien labels Dec 1, 2022
fballiano and others added 5 commits December 30, 2022 12:38
@fballiano
Rewrote Mage_Reports_Model_Resource_Review_Product_Collection/Mage_Re…
588ed1a 
…ports_Model_Resource_Order_Collection queries for a correct use of Zend_Db_Expr (#2864)

* Rewrote Mage_Reports_Model_Resource_Review_Product_Collection query for a correct use of Zend_Db_Expr

* Fixed Mage_Reports_Model_Resource_Order_Collection

* shouldnt be here
@fballiano
Backport 2271, removed lib/flex (#2862)
350c0d8
@sreichel @fballiano
Updated copyright blocks (#2866)
c8ecedd
@sreichel @fballiano
Apply fix in #2300 to all autoloaders (#2867)
9181dbe
@loekvangool @fballiano
Added more log information to Gd2.php exceptions (#1339)
965b4d0
@fballiano
Copy link
Contributor Author

I've synced everything, notes:

@sreichel
Copy link
Contributor

Sync v20 can be move to next release imho.

@sreichel
Copy link
Contributor

sreichel commented Jan 2, 2023 •
edited
Loading

CI / Check files / Changed (pull_request)

Think we can ignore it for this release.

Problems:

  • workflows should run when files are deleted, but ...
  • we deleted lib/Zend at the same time ...

... output seems to be to large.

Dont know if it is worth to raise an issue at https://github.com/tj-actions/changed-files

@fballiano
Copy link
Contributor Author

updated this today, still misses #2810 that will be handled separately.

please review and let's merge it, it's already too huge.

@fballiano fballiano merged commit 5621eac into OpenMage:20.0 Jan 3, 2023
@fballiano fballiano deleted the merge_v19_v20 branch January 3, 2023 08:30
@fballiano
Copy link
Contributor Author

Note: I directly pushed these two

Screenshot 2023-01-03 alle 10 30 25

to 20.0 because there were no conflicts

@fballiano fballiano mentioned this pull request Jan 3, 2023
Closed
@fballiano
Copy link
Contributor Author

pushed these directly to v20 since there were no conflicts

Screenshot 2023-01-03 alle 22 50 21

@fballiano
Copy link
Contributor Author

just pushed all the new merged PRs on "20.0" branch

@luigifab
Copy link
Contributor

I think there is something wrong on branch 20 for Mage.php: setIsDownloader is back, getOpenMageVersion return 19, @http_response_code(500); is removed.
Not sure if other files have problems or not.

@ADDISON74
Copy link
Contributor

@luigifab is right. Method setIsDownloader was removed here b1098b2 but if you check the code in OM 20 is still there.

@fballiano
Copy link
Contributor Author

@luigifab the getOpenMageVersion bug is coming from #2839, it should be fixed already on branch 20.0, I've committed the right number for that method to return.

I'm checking the downloader thing now.

@fballiano
Copy link
Contributor Author

So, setIsDownloader was coming from that same PR, this is the commit 7c5b68e

The PR was correctly forward ported (it should have been) but we should have modified the v20 version, which we didn't.

I now have removed the setIsDownloader which seems to me the only thing we should have done in v20 with PR #2839.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kiatng kiatng kiatng approved these changes

@sreichel sreichel sreichel 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: Catalog Relates to Mage_Catalog Component: CatalogIndex Relates to Mage_CatalogIndex Component: CatalogInventory Relates to Mage_CatalogInventory 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: Core Relates to Mage_Core Component: Customer Relates to Mage_Customer Component: Dataflow Relates to Mage_Dataflow Component: Downloadable Relates to Mage_Downloadable Component: Eav Relates to Mage_Eav Component: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index Component: Install Relates to Mage_Install Component: lib/Mage Relates to lib/Mage Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Log Relates to Mage_Log Component: Oauth Relates to Mage_Oauth Component: Page Relates to Mage_Page Component: Paygate Relates to Mage_Paygate Component: Payment Relates to Mage_Payment Component: PayPal Relates to Mage_Paypal Component: PaypalUk Relates to Mage_PaypalUk Component: ProductAlert Relates to Mage_ProductAlert Component: Reports Relates to Mage_Reports Component: Rss Relates to Mage_Rss Component: Rule Relates to Mage_Rule Component: Sales Relates to Mage_Sales Component: SalesRule Relates to Mage_SalesRule Component: Sendfriend Relates to Mage_Sendfriend Component: Tag Relates to Mage_Tag Component: Usa Relates to Mage_Usa Component: Weee Relates to Mage_Weee Component: Widget Relates to Mage_Widget Component: Wishlist Relates to Mage_Wishlist composer Relates to composer.json environment Mage.php Relates to app/Mage.php phpstan
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.