Fixes phpcs errors and warnings for Magento\Framework\Image #26036

krisdante · 2019-12-13T23:10:46Z

Description (*)

I was working with those classes and spotted a few warnings and errors
that prevent smooth pull requests. This PR fixes them.
It introduces Localized Exceptions in place of \Exception too.

Manual testing scenarios (*)

vendor/bin/phpcs --standard=dev/tests/static/framework/Magento/ruleset.xml lib/internal/Magento/Framework/Image/

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

m2-assistant · 2019-12-13T23:10:49Z

Hi @krisdante. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Guide documentation.

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

lbajsarowicz · 2019-12-14T20:24:29Z

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

     * If some folders of path does not exist they will be created
     *
     * @param null|string $destination
     * @param null|string $newName
     * @return void
-     * @throws \Exception  If destination path is not writable
+     * @throws \Magento\Framework\Exception\LocalizedException If destination path is not writable


Use imported class name

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

lib/internal/Magento/Framework/Image/Factory.php

lbajsarowicz · 2019-12-14T20:25:59Z

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

@@ -241,7 +253,7 @@ public function crop($top = 0, $left = 0, $right = 0, $bottom = 0)
     * @param bool $tile
     * @return void
     * @throws \LogicException


Import class.

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

lib/internal/Magento/Framework/Image/Adapter/Config.php

lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php

lbajsarowicz · 2019-12-18T09:31:16Z

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

+     *
+     * @param $positionX
+     * @param $positionY
+     * @param \Imagick $watermark


I'd import the \Imagick class.

What is the benefit of such import?

The imports are consistent.

I followed this suggestion and phpstan raged. Reversing

lbajsarowicz · 2019-12-18T09:32:08Z

@krisdante Fix the Static tests and import Imagick class, then I'll approve PR 👍

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

lbajsarowicz · 2020-01-13T17:15:56Z

@magento run tests

krisdante · 2020-01-15T20:47:06Z

Jezus this is boring.... what now. Why the way to test is locally is not documented. phpcs is passing for me.

I was working with those classes and spotted a few warnings and errors that prevent from smooth pull requests. This PR fixes them. It introduces Localized Exceptions in place of \Exception too. Watermark method was to long so it was devided to separate parts

krisdante · 2020-01-18T15:54:28Z

/usr/bin/php /var/www/magentosrc/./vendor/phpunit/phpunit/phpunit -v --testdox testsuite/Magento/Test/Php/LiveCodeTest.php
PHPUnit 6.5.14 by Sebastian Bergmann and contributors.

Runtime:       PHP 7.1.27 with Xdebug 2.7.2
Configuration: /var/www/creativeshop/magentosrc/dev/tests/static/phpunit.xml.dist

Magento\Test\Php\LiveCode
 [x] Code style
 [x] Code mess
 [x] Copy paste
 [x] Strict types
 [x] Php compatibility
 [x] Php stan

Those tests are passing with my clone of Magento. I do not know why they are failing for B2B test here. I cannot reproduce it. Also, the failed functional test has nothing to do with the change here .

lbajsarowicz · 2020-01-18T16:10:59Z

@krisdante Don't worry about Functional Tests - this is known bug of Magento 2.4-develop branch and will be merged soon to 2.4-develop (then you'll be able to rebase your branch onto it). Unless - just fix static tests.or optionally restart them if you believe that your code is fine.

Use

@magento run Static Tests

krisdante · 2020-01-22T12:08:25Z

I do not know how to fix them. They are passing on local. See my message.

lbajsarowicz · 2020-01-22T12:30:42Z

@krisdante Let me ping the right person for that kind of issue.
Looks like a missing library in the Testing environment...

lenaorobei · 2020-02-06T21:31:22Z

This issue is caused because ImageMagick adapter is non default one and can be configured.

Please add lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php to the dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt.

ImageMagick adapter is non default one and can be configured It is not included in Test Enviroment

krisdante · 2020-04-04T18:44:10Z

@lbajsarowicz I did. Static tests are now passing. Failing B2B test is irrelevant.

lbajsarowicz

Thank you for the great contribution!

magento-engcom-team · 2020-04-04T22:32:26Z

Hi @lbajsarowicz, thank you for the review.
ENGCOM-7260 has been created to process this Pull Request
✳️ @lbajsarowicz, could you please add one of the following labels to the Pull Request?

Label	Description
`Auto-Tests: Covered`	All changes in Pull Request is covered by auto-tests
`Auto-Tests: Not Covered`	Changes in Pull Request requires coverage by auto-tests
`Auto-Tests: Not Required`	Changes in Pull Request does not require coverage by auto-tests

krisdante · 2020-04-06T06:40:04Z

This DB error is false. I am not going to re-run this test anymore. Merge it or delete the whole PR.

lbajsarowicz · 2020-04-06T10:41:01Z

@krisdante Don't worry about false negatives. These are also verified manually by Commeng team, so as long as it's false negative, we're able to skip it.

engcom-Alfa · 2020-04-07T12:09:48Z

✔️ QA Passed

vendor/bin/phpcs --standard=dev/tests/static/framework/Magento/ruleset.xml lib/internal/Magento/Framework/Image/

Before:

After:

engcom-Echo · 2020-04-08T09:22:06Z

Failed Database Compare not related to the changes in this PR

…age #26036

m2-assistant · 2020-04-10T06:13:00Z

Hi @krisdante, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

krisdante requested review from buskamuza and melnikovi as code owners December 13, 2019 23:10

magento-engcom-team added Partner: creativestyle partners-contribution Pull Request is created by Magento Partner labels Dec 13, 2019

krisdante changed the title ~~Fixes phpcs errors and warnings for Magento\Framework\View\Element~~ Fixes phpcs errors and warnings for Magento\Framework\Image Dec 13, 2019

krisdante force-pushed the csfix-fw-image branch from bfab420 to c1ce202 Compare December 13, 2019 23:16

krisdante added the Component: Image label Dec 13, 2019

krisdante force-pushed the csfix-fw-image branch 2 times, most recently from 947174b to 9131cff Compare December 14, 2019 12:43

lbajsarowicz suggested changes Dec 14, 2019

View reviewed changes

ghost assigned lbajsarowicz Dec 14, 2019

ghost added the Progress: needs update label Dec 14, 2019

krisdante force-pushed the csfix-fw-image branch 3 times, most recently from 8360c5a to 61d5a4b Compare December 17, 2019 22:43

lbajsarowicz reviewed Dec 18, 2019

View reviewed changes

rodde177 reviewed Jan 6, 2020

View reviewed changes

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php Outdated Show resolved Hide resolved

krisdante force-pushed the csfix-fw-image branch from 61d5a4b to d8df6af Compare January 15, 2020 20:07

krisdante force-pushed the csfix-fw-image branch 2 times, most recently from 9a2190a to a54e356 Compare January 18, 2020 10:33

Adds ImageMagick.php to blacklist of phpstan

4ced5da

ImageMagick adapter is non default one and can be configured It is not included in Test Enviroment

krisdante force-pushed the csfix-fw-image branch from a54e356 to 4ced5da Compare April 4, 2020 15:34

krisdante added the Event: Global-Contribution-Day label Apr 4, 2020

lbajsarowicz approved these changes Apr 4, 2020

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels Apr 4, 2020

magento-engcom-team added Release Line: 2.4 Component: View labels Apr 4, 2020

engcom-Alfa self-assigned this Apr 7, 2020

ghost added Progress: testing in progress and removed Progress: ready for testing labels Apr 7, 2020

ghost added Progress: extended testing and removed Progress: testing in progress labels Apr 7, 2020

engcom-Echo self-assigned this Apr 8, 2020

ghost added Progress: accept and removed Progress: extended testing labels Apr 8, 2020

VladimirZaets added this to the 2.4.0 milestone Apr 8, 2020

VladimirZaets added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Apr 8, 2020

slavvka added the Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests label Apr 8, 2020

magento-engcom-team pushed a commit that referenced this pull request Apr 10, 2020

ENGCOM-7260: Fixes phpcs errors and warnings for Magento\Framework\Im…

ab93d52

…age #26036

magento-engcom-team merged commit bd3d7eb into magento:2.4-develop Apr 10, 2020

krisdante deleted the csfix-fw-image branch April 10, 2020 09:16

Fixes phpcs errors and warnings for Magento\Framework\Image #26036

Fixes phpcs errors and warnings for Magento\Framework\Image #26036

Uh oh!

Conversation

krisdante commented Dec 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (*)

Manual testing scenarios (*)

Contribution checklist (*)

Uh oh!

m2-assistant bot commented Dec 13, 2019

Uh oh!

Uh oh!

Uh oh!

lbajsarowicz Dec 14, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lbajsarowicz Dec 14, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lbajsarowicz Dec 18, 2019

Choose a reason for hiding this comment

Uh oh!

krisdante Dec 18, 2019

Choose a reason for hiding this comment

Uh oh!

lbajsarowicz Dec 18, 2019

Choose a reason for hiding this comment

Uh oh!

krisdante Jan 15, 2020

Choose a reason for hiding this comment

Uh oh!

lbajsarowicz commented Dec 18, 2019

Uh oh!

Uh oh!

lbajsarowicz commented Jan 13, 2020

Uh oh!

krisdante commented Jan 15, 2020

Uh oh!

krisdante commented Jan 18, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lbajsarowicz commented Jan 18, 2020

Uh oh!

krisdante commented Jan 22, 2020

Uh oh!

lbajsarowicz commented Jan 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lenaorobei commented Feb 6, 2020

Uh oh!

krisdante commented Apr 4, 2020

Uh oh!

lbajsarowicz left a comment

Choose a reason for hiding this comment

Uh oh!

magento-engcom-team commented Apr 4, 2020

Uh oh!

krisdante commented Apr 6, 2020

Uh oh!

lbajsarowicz commented Apr 6, 2020

Uh oh!

engcom-Alfa commented Apr 7, 2020

Uh oh!

engcom-Echo commented Apr 8, 2020

Uh oh!

m2-assistant bot commented Apr 10, 2020

Uh oh!

Uh oh!

krisdante commented Dec 13, 2019 •

edited

Loading

krisdante commented Jan 18, 2020 •

edited

Loading

lbajsarowicz commented Jan 22, 2020 •

edited

Loading