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

phpstan: fixes for Mage_Catalog_Model_Product_Type_Abstract #2605

Merged
merged 10 commits into from
Sep 20, 2022
Merged

phpstan: fixes for Mage_Catalog_Model_Product_Type_Abstract #2605

merged 10 commits into from
Sep 20, 2022

Conversation

sreichel
Copy link
Contributor

@sreichel sreichel commented Sep 17, 2022 •
edited
Loading

Description (*)

Fixes call to undefined method on Mage_Catalog_Model_Product_Type_Abstract ...

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)

@sreichel sreichel changed the title Fixes for Mage_Catalog_Model_Product_Type_Abstract phpstan: fixes for Mage_Catalog_Model_Product_Type_Abstract Sep 17, 2022
@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml 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: Checkout Relates to Mage_Checkout Component: ConfigurableSwatches Relates to Mage_ConfigurableSwatches Component: Downloadable Relates to Mage_Downloadable environment phpstan labels Sep 17, 2022
@github-actions github-actions bot added Component: Paygate Relates to Mage_Paygate Component: Payment Relates to Mage_Payment Component: PayPal Relates to Mage_Paypal Component: Sales Relates to Mage_Sales labels Sep 17, 2022
kiatng
kiatng reviewed Sep 19, 2022
View reviewed changes
Copy link
Contributor

@kiatng kiatng left a comment

Choose a reason for hiding this comment

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

Reviewed Mage/Adminhtml. To do the rest.

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php Outdated Show resolved Hide resolved
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php Outdated Show resolved Hide resolved
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php Show resolved Hide resolved
app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php Outdated Show resolved Hide resolved
app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php Outdated Show resolved Hide resolved
app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php Outdated Show resolved Hide resolved
sreichel and others added 6 commits September 20, 2022 01:33
@sreichel @kiatng
Update app/code/core/Mage/Adminhtml/controllers/Catalog/ProductContro…
d3017a8 
…ller.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
@sreichel @kiatng
Update app/code/core/Mage/Adminhtml/controllers/Catalog/ProductContro…
9b7e710 
…ller.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
@sreichel @kiatng
Update app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Su…
7156f9b 
…per/Config/Simple.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
@sreichel @kiatng
Update app/code/core/Mage/Adminhtml/controllers/Catalog/ProductContro…
4da466a 
…ller.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
@sreichel
Fixed return type
bbf361b
@sreichel
Followed suggestion
3699f52
@fballiano fballiano merged commit 37642ed into OpenMage:1.9.4.x Sep 20, 2022
@github-actions
Copy link
Contributor

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  5 ✔️ ±0  2 💤 ±0  0 ❌ ±0 

Results for commit 37642ed. ± Comparison against base commit 8604a6d.

@shaughnlgh
Copy link

shaughnlgh commented Sep 29, 2022 •
edited
Loading

A bug has been introduced with this commit: 37642ed#r85358437

app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php

line 1063, $productType = $product->getTypeInstance(); should be $productType = $configurableProduct->getTypeInstance();. The current product object is the simple product.

@fballiano fballiano mentioned this pull request Sep 29, 2022
Merged
fballiano added a commit that referenced this pull request Sep 29, 2022
@fballiano
Fixed bug caused by #2605 (#2625)
b315f85
@sreichel sreichel deleted the phpstan-daily branch September 30, 2022 01:03
@discountscott discountscott mentioned this pull request Jun 21, 2023
Merged
4 tasks
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

@fballiano fballiano fballiano approved these changes

Assignees
No one assigned
Labels
Component: Adminhtml Relates to Mage_Adminhtml 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: Checkout Relates to Mage_Checkout Component: ConfigurableSwatches Relates to Mage_ConfigurableSwatches Component: Downloadable Relates to Mage_Downloadable Component: Paygate Relates to Mage_Paygate Component: Payment Relates to Mage_Payment Component: PayPal Relates to Mage_Paypal Component: Sales Relates to Mage_Sales environment phpstan
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sreichel @shaughnlgh @fballiano @kiatng