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

Merged
merged 32 commits into from
Nov 30, 2022
Merged

Merge v19 -> v20 #2697

merged 32 commits into from
Nov 30, 2022

Conversation

fballiano
Copy link
Contributor

Cherry picking from v19.4.19...1.9.4.x

luigifab and others added 11 commits November 16, 2022 13:52
@luigifab @fballiano
Do not autoload captcha class when disabled
cb8fdbb
@sreichel @fballiano
Added helper method
bf4433b
@luigifab @kiatng @fballiano
Do not crash when shipment does not exist (#2683)
04b666f 
* Do not crash when shipment does not exist

* Redirect to grid if shipment doesn't exist.

Co-authored-by: Ng Kiat Siong <[email protected]>
@luigifab @fballiano
Trimmed whitespace from some files (#2698)
f114484
@luigifab @fballiano
Reduced getId() calls again (#2699)
bc09dde
@luigifab @fballiano
Backend: when editing a bundle product you now have a link to the "bu…
17a9e0b 
…ndled" products edit page (#2701)
@sreichel @kiatng @fballiano
Remove obsolete ACL resources from DB (#2706)
e6dc7dc 
* Remove obsolete ACL resources from DB

* Update app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.3-1.6.1.4.php

Co-authored-by: Ng Kiat Siong <[email protected]>
@sreichel @fballiano
Allow labeler to fail (#2710)
ef1cb3e
@dbachmann @sreichel @fballiano
Bugfix to make exchange rate data with fixer.io work again (#2694)
57ecfe5 
* Bugfix to make exchange rate data with fixer.io work again

* Added service URL to system config.xml

* Use $_url property

* Added $_url property to abstract class

* Invalid closing tag

Co-authored-by: Sven Reichel <[email protected]>
@rubanooo @fballiano
Fixes typo in join alias in EAV Indexer (#2711)
09b4736
@fballiano
Removed support for eAccelerator Cache Backend (#2712)
da44d97
@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Component: Admin Relates to Mage_Admin Component: Api PageRelates to Mage_Api Component: Bundle Relates to Mage_Bundle Component: Captcha Relates to Mage_Captcha Component: Catalog Relates to Mage_Catalog Component: Core Relates to Mage_Core Component: Directory Relates to Mage_Directory Component: Eav Relates to Mage_Eav Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: SalesRule Relates to Mage_SalesRule Template : admin Relates to admin template translations Relates to app/locale labels Nov 16, 2022
@fballiano fballiano mentioned this pull request Nov 16, 2022
Merged
@fballiano
Copy link
Contributor Author

everything should be ok, 28 modified files, same as what you can see here: v19.4.19...1.9.4.x

if we merge it we can do a quick hotfix release for the indexer typo

@fballiano
Copy link
Contributor Author

sorry guys, I had to merge last PRs from today :-(

and #2697 had some conficts I hope I merged correctly, these were the files:

CONFLICT (content): Merge conflict in app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
CONFLICT (content): Merge conflict in app/code/core/Mage/Core/Model/Abstract.php
CONFLICT (content): Merge conflict in app/code/core/Mage/Page/Block/Html/Head.php
CONFLICT (content): Merge conflict in app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php
CONFLICT (content): Merge conflict in lib/Varien/Object.php

expecially lib/Varien/Object.php was tricky, there were a lot of conflicts

@sreichel
Copy link
Contributor

sreichel commented Nov 18, 2022 •
edited
Loading

Something went wrong. E.g. d889083 has been removed.

@fballiano
Copy link
Contributor Author

@sreichel that "phpVersion: 80000" line is included in the 1.9.4.x branch: https://github.com/OpenMage/magento-lts/blob/1.9.4.x/.github/phpstan.neon and in this PR: https://github.com/OpenMage/magento-lts/pull/2697/files, am I missing something?

@sreichel
Copy link
Contributor

Sorry, i was on wrong branch.

@fballiano
Copy link
Contributor Author

updated, didn't port #2745 since it's a backport from v20

@sreichel
Copy link
Contributor

@fballiano i've added a PR to your repo.

@fballiano
Copy link
Contributor Author

@sreichel merged!

@fballiano
Copy link
Contributor Author

merged the new ones, #2697 had conflicts, hope the merge is ok :-)

@fballiano
Copy link
Contributor Author

@sreichel @kiatng question, these kind of PR should be merged with "create a merge commit" right? for sure they shouldn't be squashed, but what about "rebase and merge"?

Also (calling @Flyingmana here too), I'd merge and do a release, since the 2 PRs that have been merged in 1.9.4.x are not really about the code but only about the workflows, is that ok?

@sreichel
Copy link
Contributor

sreichel commented Nov 30, 2022 •
edited
Loading

I'd merge and do a release, since the 2 PRs that have been merged in 1.9.4.x are not really about the code but only about the workflows, is that ok?

I'd merge them normaly to avoid differences between branches. (My next step would be to fix phpstan to work on both)

@fballiano fballiano merged commit 77dd049 into OpenMage:20.0 Nov 30, 2022
@fballiano fballiano deleted the merge_v19_v20 branch November 30, 2022 11:41
@github-actions

This comment has been minimized.

Sign in to view
@fballiano fballiano mentioned this pull request Dec 1, 2022
Merged
@github-actions
Copy link
Contributor

github-actions bot commented Dec 1, 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 77dd049. ± Comparison against base commit 82e5168.

@elidrissidev elidrissidev mentioned this pull request Jun 1, 2023
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elidrissidev elidrissidev elidrissidev approved these changes

@sreichel sreichel sreichel approved these changes

@kiatng kiatng kiatng 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: GoogleCheckout Relates to Mage_GoogleCheckout 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 Component: lib/* Relates to lib/* Component: Log Relates to Mage_Log Component: Media Relates to Mage_Media 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: Poll Relates to Mage_Poll Component: ProductAlert Relates to Mage_ProductAlert Component: Rating Relates to Mage_Rating Component: Reports Relates to Mage_Reports Component: Review Relates to Mage_Review 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: Shipping Relates to Mage_Shipping Component: Sitemap Relates to Mage_Sitemap Component: Tag Relates to Mage_Tag Component: Tax Relates to Mage_Tax Component: Uploader Relates to Mage_Uploader Component: Usa Relates to Mage_Usa Component: Weee Relates to Mage_Weee Component: Widget Relates to Mage_Widget Component: Wishlist Relates to Mage_Wishlist environment Mage.php Relates to app/Mage.php phpstan Template : admin Relates to admin template translations Relates to app/locale
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@fballiano @sreichel @kiatng @elidrissidev @luigifab @dbachmann @rubanooo