Update phpcpd to ~6.0.3 to be PHP8 compatible #32196

hws47a · 2021-02-16T20:29:55Z

Description (*)

Update phpcpd to ~6.0.3 with minimal changes to other dependencies including update phpunit/php-timer from ^3.0 to ^5.0 and phpunit from 9.1 to 9.2

Changes included:

  - Updating phpunit/php-timer (3.1.4 => 5.0.3)
  - Installing sebastian/cli-parser (1.0.1)
  - Updating sebastian/phpcpd (5.0.2 => 6.0.3)
  - Updating phpunit/phpunit (9.1.5 => 9.2.6)

Related Pull Requests

https://github.com/magento/partners-magento2ee/pull/501
https://github.com/magento/partners-magento2b2b/pull/563

Fixed Issues (if relevant)

Fixes Update sebastian/phpcpd dependency version to "~6.0.3" #31344

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 · 2021-02-16T20:29:57Z

Hi @hws47a. Thank you for your contribution
Here are 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 php8-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests
Semantic Version Checker

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

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

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

hws47a · 2021-02-16T21:07:35Z

@sivaschenko Static Tests passed 👏
and phpcpd is not used anywhere else.

Also I've run static tests locally and phpcpd worked fine.

hws47a · 2021-02-16T22:52:52Z

@sivaschenko some integration test has failed for Integration B2B but I cannot find it in partners-b2b repository and php8-develop branch is not available there.

Could you help me with this?

ihor-sviziev · 2021-02-17T08:14:44Z

@magento run Integration Tests

hws47a · 2021-02-17T11:28:15Z

@ihor-sviziev it seems that all passed

ihor-sviziev · 2021-02-17T12:41:05Z

@hws47a, could you explain why we need to update PHPUnit in the scope of this PR?

hws47a · 2021-02-17T12:58:05Z

@ihor-sviziev

You may see that in composer.json only phpcpd was changed and PHPUnit was allowed to be any ^9 version.
phpcpd was not updating without phpunit as they had different dependencies for phpunit/php-timer.
I found that PHPUnit 9.2 is the first version which allows required phpunit/php-timer and updated to it.

So a bit newer PHPUnit is a requirement for phpcpd 6.0.3

sivaschenko · 2021-02-17T15:49:34Z

@hws47a thanks for the update, can you please also update the composer.json and lock in EE repo and link the EE PR as related

sivaschenko · 2021-02-17T15:51:58Z

@hws47a btw, the php8-develop should be present for all repositories, i.e here is B2B branch https://github.com/magento/partners-magento2b2b/tree/php8-develop

hws47a · 2021-02-17T20:18:20Z

@hws47a thanks for the update, can you please also update the composer.json and lock in EE repo and link the EE PR as related

Done

ihor-sviziev · 2021-02-18T05:47:35Z

@magento run Functional Tests B2B, Static Tests

ihor-sviziev · 2021-02-18T07:45:24Z

@hws47a, static tests are still failing. Could you check, please?

ihor-sviziev · 2021-02-19T07:22:50Z

@sivaschenko any thoughts why tests are failing with no build results?

sivaschenko · 2021-02-19T12:31:23Z

@hws47a @ihor-sviziev tests have failed due to conflict in the EE PR

hws47a · 2021-02-19T20:54:50Z

@magento run all tests

ihor-sviziev · 2021-02-22T10:28:23Z

@magento run all tests

ihor-sviziev

Could you resolve conflicts in EE repo and run all tests again?

ihor-sviziev · 2021-03-03T14:33:31Z

@magento run Functional Tests B2B, Functional Tests EE, Static Tests

ihor-sviziev · 2021-03-09T09:52:19Z

@magento run Functional Tests B2B, Functional Tests EE, Static Tests

hws47a · 2021-04-18T13:34:50Z

@magento run Static Tests

hws47a · 2021-04-18T14:35:53Z

@magento run Static Tests

hws47a · 2021-04-18T16:13:15Z

@magento run Static Tests

hws47a · 2021-04-18T17:40:23Z

@magento run all tests

hws47a · 2021-04-18T17:41:45Z

Hi @sivaschenko, I've fixed phpcpd locally including ee and b2b, however it still failing in the pipeline. I've added output of the command and you may see in the pipeline that there is no output at all. So it seems like the command doesn't run a all. Could you please check it?

ihor-sviziev · 2021-04-27T06:19:46Z

Let's try to re-run the tests
@magento run all tests

sivaschenko · 2021-04-28T10:39:20Z

@magento run Static Tests

sivaschenko · 2021-04-28T12:15:39Z

Executing PHPCPD in the phpunit process for debugging purpose

@magento run Static Tests

sivaschenko · 2021-04-28T13:15:06Z

@hws47a looks like phpcpd fails to compare bitmap files also it does find a number of copy-pastes, mostly in Inventory modules

sivaschenko · 2021-04-28T14:42:20Z

@magento run Static Tests

sivaschenko · 2021-04-28T14:58:07Z

@magento run Static Tests

sivaschenko · 2021-04-28T15:41:11Z

@magento run Static Tests

ihor-sviziev

Please review my comments

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php

ihor-sviziev · 2021-04-28T17:20:25Z

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php

+            $exclude[] = $files;
+        }
+
+        return array_unique(array_merge(...$exclude));


Technically, there might be empty array in the $exclude, so it's better to replace it with return array_unique(array_merge([], ...$exclude));

I've tried in interactive shell and it seems that array_merge(...[]) doesn't throw any warnings and just returns an empty array. Do you see some PHP error while testing?

… usage

hws47a · 2021-05-03T22:54:40Z

Changed implementation of canRun which now checks if required packages are installed.
Also squashed all commits into one as requested by @sivaschenko

hws47a · 2021-05-03T22:55:19Z

@magento run all tests

magento-automated-testing · 2021-05-03T22:55:24Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

sivaschenko · 2021-05-04T09:26:49Z

@magento run all tests

magento-automated-testing · 2021-05-04T09:26:54Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please re-request them if they don't show in a reasonable amount of time.

m2-assistant · 2021-05-05T07:13:41Z

Hi @hws47a, 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.

magento-engcom-team added Partner: Monsoon partners-contribution Pull Request is created by Magento Partner labels Feb 16, 2021

m2-community-project bot added the Progress: pending review label Feb 16, 2021

hws47a added the Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests label Feb 16, 2021

ihor-sviziev added the Project: PHP8 label Feb 17, 2021

ihor-sviziev self-assigned this Feb 17, 2021

m2-community-project bot added Progress: review and removed Progress: pending review labels Feb 17, 2021

ihor-sviziev added the Progress: needs update label Feb 18, 2021

m2-community-project bot removed the Progress: review label Feb 18, 2021

hws47a force-pushed the 31344-php8-update-phpcpd branch from 172fde2 to e2ca21a Compare February 18, 2021 20:26

ihor-sviziev requested changes Feb 26, 2021

View reviewed changes

m2-community-project bot added Progress: needs update and removed Progress: dev in progress labels Apr 18, 2021

ihor-sviziev requested changes Apr 28, 2021

View reviewed changes

hws47a force-pushed the 31344-php8-update-phpcpd branch from 10a5700 to 6cf8a8b Compare May 3, 2021 22:16

magento#31344 Update phpcpd to ^6.0.3 to be PHP8 compatible + change…

5b7bf7e

… usage

hws47a force-pushed the 31344-php8-update-phpcpd branch from 6cf8a8b to 5b7bf7e Compare May 3, 2021 22:53

m2-community-project bot added Progress: review and removed Progress: needs update labels May 3, 2021

magento#31344: Updated phpcpd blacklist

8ba14cb

magento-engcom-team merged commit 0aab4aa into magento:2.4-develop May 5, 2021

sivaschenko added Award: advanced Award: category of expertise labels May 5, 2021

Update phpcpd to ~6.0.3 to be PHP8 compatible #32196

Update phpcpd to ~6.0.3 to be PHP8 compatible #32196

Conversation

hws47a commented Feb 16, 2021 • edited Loading

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Contribution checklist (*)

m2-assistant bot commented Feb 16, 2021

hws47a commented Feb 16, 2021 • edited Loading

hws47a commented Feb 16, 2021

ihor-sviziev commented Feb 17, 2021

hws47a commented Feb 17, 2021

ihor-sviziev commented Feb 17, 2021

hws47a commented Feb 17, 2021

sivaschenko commented Feb 17, 2021

sivaschenko commented Feb 17, 2021

hws47a commented Feb 17, 2021

ihor-sviziev commented Feb 18, 2021

ihor-sviziev commented Feb 18, 2021

ihor-sviziev commented Feb 19, 2021

sivaschenko commented Feb 19, 2021

hws47a commented Feb 19, 2021

ihor-sviziev commented Feb 22, 2021

ihor-sviziev left a comment

Choose a reason for hiding this comment

ihor-sviziev commented Mar 3, 2021

ihor-sviziev commented Mar 9, 2021

hws47a commented Apr 18, 2021

hws47a commented Apr 18, 2021

hws47a commented Apr 18, 2021

hws47a commented Apr 18, 2021

hws47a commented Apr 18, 2021

ihor-sviziev commented Apr 27, 2021

sivaschenko commented Apr 28, 2021

sivaschenko commented Apr 28, 2021

sivaschenko commented Apr 28, 2021

sivaschenko commented Apr 28, 2021

sivaschenko commented Apr 28, 2021

sivaschenko commented Apr 28, 2021

ihor-sviziev left a comment

Choose a reason for hiding this comment

ihor-sviziev Apr 28, 2021

Choose a reason for hiding this comment

hws47a May 3, 2021

Choose a reason for hiding this comment

hws47a commented May 3, 2021

hws47a commented May 3, 2021

magento-automated-testing bot commented May 3, 2021

sivaschenko commented May 4, 2021

magento-automated-testing bot commented May 4, 2021

m2-assistant bot commented May 5, 2021

hws47a commented Feb 16, 2021 •

edited

Loading

hws47a commented Feb 16, 2021 •

edited

Loading