Skip to content

Conversation

@sreichel
Copy link
Contributor

@sreichel sreichel commented Nov 7, 2025

# Conflicts:
#	app/code/core/Mage/Admin/Model/Acl/Role.php
#	app/code/core/Mage/Admin/Model/Variable.php
#	app/code/core/Mage/Api/Model/Acl/Role.php
#	app/code/core/Mage/Api/Model/Role.php
#	app/code/core/Mage/Api/Model/Roles.php
#	app/code/core/Mage/Api/Model/Rules.php
#	app/code/core/Mage/Api/Model/User.php
#	app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php
#	app/code/core/Mage/Api2/Model/Acl/Global/Role.php
#	app/code/core/Mage/Api2/Model/Acl/Global/Rule.php
#	app/code/core/Mage/Bundle/Model/Price/Index.php
#	app/code/core/Mage/Bundle/Model/Selection.php
#	app/code/core/Mage/Catalog/Model/Category.php
#	app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php
#	app/code/core/Mage/Catalog/Model/Entity/Attribute.php
#	app/code/core/Mage/Catalog/Model/Product.php
#	app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
#	app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php
#	app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php
#	app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php
#	app/code/core/Mage/Catalog/Model/Product/Link.php
#	app/code/core/Mage/Catalog/Model/Product/Option.php
#	app/code/core/Mage/Catalog/Model/Product/Status.php
#	app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php
#	app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php
#	app/code/core/Mage/CatalogIndex/Model/Attribute.php
#	app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
#	app/code/core/Mage/CatalogIndex/Model/Indexer.php
#	app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
#	app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
#	app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php
#	app/code/core/Mage/CatalogIndex/Model/Price.php
#	app/code/core/Mage/CatalogIndex/Model/Retreiver.php
#	app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php
#	app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
#	app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
#	app/code/core/Mage/CatalogSearch/Model/Fulltext.php
#	app/code/core/Mage/Checkout/Model/Session.php
#	app/code/core/Mage/Cms/Model/Page.php
#	app/code/core/Mage/Core/Model/Config/Data.php
#	app/code/core/Mage/Core/Model/Email/Queue.php
#	app/code/core/Mage/Core/Model/Email/Template.php
#	app/code/core/Mage/Core/Model/File/Storage/Database.php
#	app/code/core/Mage/Core/Model/Flag.php
#	app/code/core/Mage/Core/Model/Layout/Data.php
#	app/code/core/Mage/Core/Model/Store/Group.php
#	app/code/core/Mage/Core/Model/Variable.php
#	app/code/core/Mage/Cron/Model/Schedule.php
#	app/code/core/Mage/Customer/Model/Address.php
#	app/code/core/Mage/Customer/Model/Attribute.php
#	app/code/core/Mage/Customer/Model/Customer.php
#	app/code/core/Mage/Dataflow/Model/Batch.php
#	app/code/core/Mage/Dataflow/Model/Batch/Export.php
#	app/code/core/Mage/Dataflow/Model/Batch/Import.php
#	app/code/core/Mage/Dataflow/Model/Import.php
#	app/code/core/Mage/Dataflow/Model/Profile.php
#	app/code/core/Mage/Dataflow/Model/Profile/History.php
#	app/code/core/Mage/Dataflow/Model/Session.php
#	app/code/core/Mage/Directory/Model/Country.php
#	app/code/core/Mage/Downloadable/Model/Link.php
#	app/code/core/Mage/Downloadable/Model/Link/Purchased.php
#	app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php
#	app/code/core/Mage/Downloadable/Model/Sample.php
#	app/code/core/Mage/Eav/Model/Entity/Store.php
#	app/code/core/Mage/Eav/Model/Form/Element.php
#	app/code/core/Mage/Eav/Model/Form/Fieldset.php
#	app/code/core/Mage/Eav/Model/Form/Type.php
#	app/code/core/Mage/GiftMessage/Model/Message.php
#	app/code/core/Mage/Index/Model/Event.php
#	app/code/core/Mage/Index/Model/Process.php
#	app/code/core/Mage/Log/Model/Customer.php
#	app/code/core/Mage/Log/Model/Visitor.php
#	app/code/core/Mage/Newsletter/Model/Problem.php
#	app/code/core/Mage/Newsletter/Model/Queue.php
#	app/code/core/Mage/Newsletter/Model/Subscriber.php
#	app/code/core/Mage/Newsletter/Model/Template.php
#	app/code/core/Mage/Oauth/Model/Consumer.php
#	app/code/core/Mage/Oauth/Model/Token.php
#	app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php
#	app/code/core/Mage/Payment/Model/Info.php
#	app/code/core/Mage/Paypal/Model/Report/Settlement.php
#	app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php
#	app/code/core/Mage/Persistent/Model/Session.php
#	app/code/core/Mage/Rating/Model/Rating/Entity.php
#	app/code/core/Mage/Rating/Model/Rating/Option.php
#	app/code/core/Mage/Rating/Model/Rating/Option/Vote.php
#	app/code/core/Mage/Reports/Model/Event.php
#	app/code/core/Mage/Reports/Model/Event/Type.php
#	app/code/core/Mage/Reports/Model/Product/Index/Compared.php
#	app/code/core/Mage/Reports/Model/Product/Index/Viewed.php
#	app/code/core/Mage/Review/Model/Review.php
#	app/code/core/Mage/Sales/Model/Abstract.php
#	app/code/core/Mage/Sales/Model/Billing/Agreement.php
#	app/code/core/Mage/Sales/Model/Order.php
#	app/code/core/Mage/Sales/Model/Order/Address.php
#	app/code/core/Mage/Sales/Model/Order/Creditmemo.php
#	app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php
#	app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php
#	app/code/core/Mage/Sales/Model/Order/Invoice.php
#	app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php
#	app/code/core/Mage/Sales/Model/Order/Invoice/Item.php
#	app/code/core/Mage/Sales/Model/Order/Item.php
#	app/code/core/Mage/Sales/Model/Order/Payment.php
#	app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
#	app/code/core/Mage/Sales/Model/Order/Shipment.php
#	app/code/core/Mage/Sales/Model/Order/Shipment/Item.php
#	app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
#	app/code/core/Mage/Sales/Model/Order/Status.php
#	app/code/core/Mage/Sales/Model/Order/Status/History.php
#	app/code/core/Mage/Sales/Model/Order/Tax.php
#	app/code/core/Mage/Sales/Model/Quote.php
#	app/code/core/Mage/Sales/Model/Quote/Address.php
#	app/code/core/Mage/Sales/Model/Quote/Address/Item.php
#	app/code/core/Mage/Sales/Model/Quote/Address/Rate.php
#	app/code/core/Mage/Sales/Model/Quote/Item.php
#	app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
#	app/code/core/Mage/Sales/Model/Quote/Payment.php
#	app/code/core/Mage/Sales/Model/Recurring/Profile.php
#	app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php
#	app/code/core/Mage/Shipping/Model/Rate/Request.php
#	app/code/core/Mage/Shipping/Model/Shipment/Request.php
#	app/code/core/Mage/Sitemap/Model/Sitemap.php
#	app/code/core/Mage/Tag/Model/Indexer/Summary.php
#	app/code/core/Mage/Tag/Model/Tag/Relation.php
#	app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php
#	app/code/core/Mage/Tax/Model/Class.php
#	app/code/core/Mage/Tax/Model/Sales/Order/Tax.php
#	app/code/core/Mage/Widget/Model/Widget/Instance.php
#	app/code/core/Mage/Wishlist/Model/Item/Option.php
# Conflicts:
#	app/code/core/Mage/Rule/Model/Condition/Combine.php
Copilot AI review requested due to automatic review settings November 7, 2025 05:38
@sreichel sreichel added the chore label Nov 7, 2025
@github-actions github-actions bot added Component: PayPal Relates to Mage_Paypal Component: Core Relates to Mage_Core Component: Catalog Relates to Mage_Catalog Component: Cms Relates to Mage_Cms Component: Reports Relates to Mage_Reports Component: CatalogInventory Relates to Mage_CatalogInventory Component: Checkout Relates to Mage_Checkout Component: AdminNotification Relates to Mage_AdminNotification Component: lib/Varien Relates to lib/Varien Component: Sales Relates to Mage_Sales Component: Usa Relates to Mage_Usa Component: Customer Relates to Mage_Customer Component: Eav Relates to Mage_Eav Component: Adminhtml Relates to Mage_Adminhtml Component: ProductAlert Relates to Mage_ProductAlert Component: Sitemap Relates to Mage_Sitemap Component: Page Relates to Mage_Page Component: Api PageRelates to Mage_Api Component: Cron Relates to Mage_Cron Component: Tag Relates to Mage_Tag Component: CatalogRule Relates to Mage_CatalogRule Component: Admin Relates to Mage_Admin Component: SalesRule Relates to Mage_SalesRule Component: Wishlist Relates to Mage_Wishlist labels Nov 7, 2025
@github-actions github-actions bot added Component: Widget Relates to Mage_Widget Component: Tax Relates to Mage_Tax Component: Shipping Relates to Mage_Shipping Component: Rule Relates to Mage_Rule Component: Review Relates to Mage_Review Component: Rating Relates to Mage_Rating Component: Payment Relates to Mage_Payment Component: Oauth Relates to Mage_Oauth Component: Newsletter Relates to Mage_Newsletter Component: Index Relates to Mage_Index Component: Downloadable Relates to Mage_Downloadable Component: Bundle Relates to Mage_Bundle Component: CatalogIndex Relates to Mage_CatalogIndex Component: Api2 Relates to Mage_Api2 Component: Log Relates to Mage_Log Component: ImportExport Relates to Mage_ImportExport Component: Directory Relates to Mage_Directory Component: ConfigurableSwatches Relates to Mage_ConfigurableSwatches Component: CatalogSearch Relates to Mage_CatalogSearch Component: Dataflow Relates to Mage_Dataflow Component: Uploader Relates to Mage_Uploader Component: Rss Relates to Mage_Rss Component: Paygate Relates to Mage_Paygate Component: lib/* Relates to lib/* php-cs-fixer labels Nov 7, 2025
@sreichel sreichel merged commit f094b41 into OpenMage:main Nov 7, 2025
20 checks passed
@sreichel sreichel deleted the cleanup/phpdoc_order_by_value branch November 7, 2025 05:44
@sonarqubecloud
Copy link

sonarqubecloud bot commented Nov 7, 2025

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

Labels

chore 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: Bundle Relates to Mage_Bundle 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: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms Component: ConfigurableSwatches Relates to Mage_ConfigurableSwatches Component: Core Relates to Mage_Core Component: Cron Relates to Mage_Cron 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: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Log Relates to Mage_Log Component: Newsletter Relates to Mage_Newsletter 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: 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: 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: Widget Relates to Mage_Widget Component: Wishlist Relates to Mage_Wishlist php-cs-fixer

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant