Skip to content

[WIP] Remove mysql4 classes #2527

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
Closed
wants to merge 14 commits into from
Closed

[WIP] Remove mysql4 classes #2527

wants to merge 14 commits into from

Conversation

@sreichel
Copy link
Contributor

@sreichel sreichel commented Aug 31, 2022 •
edited
Loading

Description (*)

Just an idea to remove that deprecated mysql4-classes ...

Requires: #2165

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)
  • Add yourself to contributors list

Digital Pianism and others added 2 commits August 31, 2022 10:00
@fballiano @kiatng @sreichel
Implement the possibility to search for null in backend grids (#1203)
47bc35d 
* implement #1189

* Updated the code from luigifab comments

* Fixed baseline

* Fixed phpstan-baseline.neon

* Fixed PR

* Update README.md

Co-authored-by: Fabrizio Balliano <[email protected]>
Co-authored-by: Ng Kiat Siong <[email protected]>
Co-authored-by: sv3n <[email protected]>
@sreichel
Merge branch '1.9.4.x' into remove-mysql4
fe949b9
@sreichel sreichel marked this pull request as draft August 31, 2022 08:15
@github-actions github-actions bot added Component: AdminNotification Relates to Mage_AdminNotification Component: Admin Relates to Mage_Admin Component: Api PageRelates to Mage_Api Component: Backup Relates to Mage_Backup Component: Bundle Relates to Mage_Bundle Component: CatalogInventory Relates to Mage_CatalogInventory Component: CatalogRule Relates to Mage_CatalogRule Component: CatalogIndex Relates to Mage_CatalogIndex Component: CatalogSearch Relates to Mage_CatalogSearch Component: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms Component: Core Relates to Mage_Core Component: Cron Relates to Mage_Cron 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: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index Component: Log Relates to Mage_Log Component: Paygate Relates to Mage_Paygate Component: PayPal Relates to Mage_Paypal 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 labels Aug 31, 2022
@github-actions github-actions bot added the Mage.php Relates to app/Mage.php label Aug 31, 2022
@addison74
Copy link
Contributor

addison74 commented Aug 31, 2022

It is similar to this one #1470. I prefer yours because you created a backup in a repository for all the deleted files to prevent issues with BC.

You have to agree with @luigifab which one will remain open.

@fballiano
Copy link
Contributor

fballiano commented Aug 31, 2022 •
edited
Loading

ah! nice idea :-)

and we remove the "require" of this new repo from v20?

EDIT: actually why should this be in v19?

@sreichel
Copy link
Contributor Author

sreichel commented Aug 31, 2022 •
edited
Loading

and we remove the "require" of this new repo from v20?

EDIT: actually why should this be in v19?

Go away 😠

I prefer the current workflow with 19.x as the main branch, but it seems that i'm alone. It's WIP ... I'll join discussion about branching later :)

@addison74
Copy link
Contributor

addison74 commented Aug 31, 2022

However, a migration script and clear and concise information are mandatory. Please check the other PR where this script was also included. A combination of ideas is welcome.

@sreichel
Copy link
Contributor Author

sreichel commented Aug 31, 2022

@fballiano i would neither add it to 19.x, nor 20.x.

I'd add it to your release-builder to maintain BC. Everyone who uses composer can add it if necessary.

@sreichel
Copy link
Contributor Author

sreichel commented Sep 1, 2022 •
edited
Loading

However, a migration script and clear and concise information are mandatory. Please check the other PR where this script was also included. A combination of ideas is welcome.

i'm aware of #1470. I think we move into same direction ...

So two things are left. Removal of deprecated xml nodes and migration script?

@sreichel
Merge 1.9.4.x
25a701e
@sreichel
Merge branch '1.9.4.x' into remove-mysql4
48e5b5d
@sreichel
Merge branch '1.9.4.x' into remove-mysql4
225234a 
# Conflicts:
#	app/code/core/Mage/Admin/Model/Mysql4/Acl.php
#	app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
#	app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php
#	app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php
#	app/code/core/Mage/Admin/Model/Mysql4/Role.php
#	app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php
#	app/code/core/Mage/Admin/Model/Mysql4/Roles.php
#	app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php
#	app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php
#	app/code/core/Mage/Admin/Model/Mysql4/Rules.php
#	app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php
#	app/code/core/Mage/Admin/Model/Mysql4/User.php
#	app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php
#	app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php
#	app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php
#	app/code/core/Mage/Api/Model/Mysql4/Acl.php
#	app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php
#	app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php
#	app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php
#	app/code/core/Mage/Api/Model/Mysql4/Role.php
#	app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php
#	app/code/core/Mage/Api/Model/Mysql4/Roles.php
#	app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php
#	app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php
#	app/code/core/Mage/Api/Model/Mysql4/Rules.php
#	app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php
#	app/code/core/Mage/Api/Model/Mysql4/User.php
#	app/code/core/Mage/Api/Model/Mysql4/User/Collection.php
#	app/code/core/Mage/Backup/Model/Mysql4/Db.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Option.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Selection.php
#	app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
#	app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
#	app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php
#	app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
#	app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
#	app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
#	app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
#	app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
#	app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
#	app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
#	app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
#	app/code/core/Mage/Checkout/Model/Mysql4/Setup.php
#	app/code/core/Mage/Cms/Model/Mysql4/Block.php
#	app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
#	app/code/core/Mage/Cms/Model/Mysql4/Page.php
#	app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
#	app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php
#	app/code/core/Mage/Core/Model/Mysql4/Abstract.php
#	app/code/core/Mage/Core/Model/Mysql4/Cache.php
#	app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
#	app/code/core/Mage/Core/Model/Mysql4/Config.php
#	app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
#	app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Design.php
#	app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
#	app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php
#	app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php
#	app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php
#	app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php
#	app/code/core/Mage/Core/Model/Mysql4/Flag.php
#	app/code/core/Mage/Core/Model/Mysql4/Language.php
#	app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Layout.php
#	app/code/core/Mage/Core/Model/Mysql4/Resource.php
#	app/code/core/Mage/Core/Model/Mysql4/Session.php
#	app/code/core/Mage/Core/Model/Mysql4/Store.php
#	app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
#	app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Translate.php
#	app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
#	app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
#	app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Variable.php
#	app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php
#	app/code/core/Mage/Core/Model/Mysql4/Website.php
#	app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
#	app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
#	app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
#	app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
#	app/code/core/Mage/Directory/Model/Mysql4/Country.php
#	app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
#	app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
#	app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
#	app/code/core/Mage/Directory/Model/Mysql4/Currency.php
#	app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
#	app/code/core/Mage/Directory/Model/Mysql4/Region.php
#	app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Link.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php
#	app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Config.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
#	app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php
#	app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php
#	app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php
#	app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php
#	app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php
#	app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
#	app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
#	app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
#	app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php
#	app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php
#	app/code/core/Mage/Index/Model/Mysql4/Abstract.php
#	app/code/core/Mage/Index/Model/Mysql4/Event.php
#	app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php
#	app/code/core/Mage/Index/Model/Mysql4/Process.php
#	app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php
#	app/code/core/Mage/Index/Model/Mysql4/Setup.php
#	app/code/core/Mage/Log/Model/Mysql4/Aggregation.php
#	app/code/core/Mage/Log/Model/Mysql4/Customer.php
#	app/code/core/Mage/Log/Model/Mysql4/Log.php
#	app/code/core/Mage/Log/Model/Mysql4/Visitor.php
#	app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php
#	app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php
#	app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Template.php
#	app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php
#	app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php
#	app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php
#	app/code/core/Mage/Paypal/Model/Mysql4/Cert.php
#	app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php
#	app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php
#	app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php
#	app/code/core/Mage/Paypal/Model/Mysql4/Setup.php
#	app/code/core/Mage/Poll/Model/Mysql4/Poll.php
#	app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php
#	app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php
#	app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php
#	app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php
#	app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php
#	app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php
#	app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php
#	app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php
#	app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php
#	app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php
#	app/code/core/Mage/Rating/Model/Mysql4/Rating.php
#	app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php
#	app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php
#	app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php
#	app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php
#	app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php
#	app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php
#	app/code/core/Mage/Reports/Model/Mysql4/Event.php
#	app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php
#	app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php
#	app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php
#	app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php
#	app/code/core/Mage/Review/Model/Mysql4/Review.php
#	app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php
#	app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php
#	app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php
#	app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php
#	app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php
#	app/code/core/Mage/Rss/Model/Mysql4/Order.php
#	app/code/core/Mage/Rule/Model/Mysql4/Rule.php
#	app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Abstract.php
#	app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php
#	app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php
#	app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php
#	app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php
#	app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php
#	app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php
#	app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php
#	app/code/core/Mage/Sales/Model/Mysql4/Setup.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php
#	app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php
#	app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php
#	app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php
#	app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php
#	app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php
#	app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php
#	app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php
#	app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php
#	app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php
#	app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php
#	app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php
#	app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php
#	app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php
#	app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php
#	app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php
#	app/code/core/Mage/Tag/Model/Mysql4/Tag.php
#	app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php
#	app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php
#	app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Class.php
#	app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php
#	app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php
#	app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php
#	app/code/core/Mage/Tax/Model/Mysql4/Setup.php
#	app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php
#	app/code/core/Mage/Weee/Model/Mysql4/Setup.php
#	app/code/core/Mage/Weee/Model/Mysql4/Tax.php
#	app/code/core/Mage/Widget/Model/Mysql4/Widget.php
#	app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php
#	app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php
#	app/code/core/Mage/Wishlist/Model/Mysql4/Item.php
#	app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
#	app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php
#	app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php
#	app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php
#	app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php
#	app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php
@sreichel
Fixes composer.lock
f72c4e1 
Signed-off-by: Sven Reichel <[email protected]>
@sreichel
Updated phpstorm meta files
82e52aa 
Signed-off-by: Sven Reichel <[email protected]>
@sreichel
Merge branch '1.9.4.x' into remove-mysql4
0d9e025 
# Conflicts:
#	.gitignore
#	app/Mage.php
#	app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
#	composer.lock
@sreichel
Updated git ignore/composer.lock
21948f9
@sreichel sreichel marked this pull request as ready for review December 2, 2022 17:09
@sreichel sreichel marked this pull request as draft December 2, 2022 17:11
@sreichel sreichel mentioned this pull request Dec 10, 2022
Closed
4 tasks
@sreichel sreichel closed this by deleting the head repository Jan 8, 2023
@addison74 addison74 reopened this Jan 9, 2023
@sreichel sreichel closed this Jan 10, 2023
@addison74 addison74 mentioned this pull request Jul 17, 2023
Merged
4 tasks
@sreichel sreichel mentioned this pull request Feb 20, 2024
Open
32 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Component: Admin Relates to Mage_Admin Component: AdminNotification Relates to Mage_AdminNotification Component: Api PageRelates to Mage_Api Component: Backup Relates to Mage_Backup Component: Bundle Relates to Mage_Bundle 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: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms Component: Core Relates to Mage_Core Component: Cron Relates to Mage_Cron 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: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index Component: Log Relates to Mage_Log Component: Paygate Relates to Mage_Paygate Component: PayPal Relates to Mage_Paypal 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: Weee Relates to Mage_Weee Component: Widget Relates to Mage_Widget Component: Wishlist Relates to Mage_Wishlist composer Relates to composer.json Don't forget this PR environment Mage.php Relates to app/Mage.php PHPStorm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sreichel @addison74 @fballiano