Updated monolog/monolog to 2.3.1 #33497

andrewbess · 2021-07-15T20:15:36Z

Description (*)

This PR (pull request) updates the monolog/monolog library to the latest version 2.3.1.
Also, it fixes the codebase to take compatibility after updating the library.

Related Pull Requests

https://github.com/magento/partners-magento2ee/pull/561

Fixed Issues (if relevant)

Fixes Update monolog/monolog to the latest version #32868

Questions or comments

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)
README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
All automated tests passed successfully (all builds are green)

m2-assistant · 2021-07-15T20:15:39Z

Hi @andrewbess. 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 platform-health 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

andrewbess · 2021-07-15T20:16:24Z

@magento run all tests

magento-automated-testing · 2021-07-15T20:16:32Z

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.

andrewbess · 2021-07-16T02:21:55Z

@magento run Static Tests

magento-automated-testing · 2021-07-16T02:22:01Z

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.

andrewbess · 2021-07-16T03:19:57Z

@magento run Unit Tests

magento-automated-testing · 2021-07-16T03:20:01Z

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.

andrewbess · 2021-07-16T07:29:33Z

@magento run Static Tests

magento-automated-testing · 2021-07-16T07:29:37Z

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.

ihor-sviziev · 2021-07-16T08:01:19Z

app/code/Magento/Developer/Model/Logger/Handler/Debug.php

        if ($configValue === null) {
            $isEnabled = $this->state->getMode() !== State::MODE_PRODUCTION;
        } else {
-            $isEnabled = (bool)$configValue;
+            $isEnabled = (bool) $configValue;


Suggested change

$isEnabled = (bool) $configValue;

$isEnabled = (bool)$configValue;

Hello @ihor-sviziev.
Thank you for your suggestion, but space symbol is exist in examples from PSR-12. Also codesniffer proposes to have space symbol here.
Thank you again )))

ihor-sviziev · 2021-07-16T08:02:57Z

dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php

+    public function addRecord(
+        int $level,
+        string $message,
+        array $context = []
+    ): bool {


Let's not spend space vertically, when it's not needed. Before it looked much better.

Suggested change

public function addRecord(

int $level,

string $message,

array $context = []

): bool {

public function addRecord(int $level, string $message, array $context = []): bool

{

ihor-sviziev · 2021-07-16T08:03:37Z

dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php

+    public function __construct(
+        $name,
+        array $handlers = [],
+        array $processors = []
+    ) {


Suggested change

public function __construct(

$name,

array $handlers = [],

array $processors = []

) {

public function __construct($name, array $handlers = [], array $processors = [] )

{

Hello @ihor-sviziev
Thank you for your suggestion.
I strive for perfection and try to write my code according to PSR-12 (p.2.3).
This line contains more than 80 symbols.

ihor-sviziev · 2021-07-16T08:04:12Z

lib/internal/Magento/Framework/Logger/Handler/Base.php

+            throw new InvalidArgumentException(
+                'Filename expected to be a string'
+            );


Suggested change

throw new InvalidArgumentException(

'Filename expected to be a string'

);

throw new InvalidArgumentException('Filename expected to be a string');

ihor-sviziev · 2021-07-16T08:05:11Z

lib/internal/Magento/Framework/Logger/Handler/System.php

 use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Logger\Handler\Exception as ExceptionHandler;


I think it's better to name it HandlerException, as ExceptionHandler means that it will handle some exception(s).

Suggested change

use Magento\Framework\Logger\Handler\Exception as ExceptionHandler;

use Magento\Framework\Logger\Handler\Exception as HandlerException;

Hello @ihor-sviziev
Thank you for your suggestion.
The property of this class has already been named $exceptionHandler. Why do we need to change the style of the alias?
Also, the style of alias naming like xxxxxHandler has already existed in Magento.

@ihor-sviziev I think ExceptionHandler is the better name, as this class is a handler, not an exception

@sivaschenko @andrewbess it definitely make sense. From the class name I just thought it’s opposite

ihor-sviziev · 2021-07-16T08:08:45Z

lib/internal/Magento/Framework/Logger/Monolog.php

+        $message = $message instanceof Exception
+            ? $message->getMessage()
+            : $message;


Suggested change

$message = $message instanceof Exception

? $message->getMessage()

: $message;

$message = $message instanceof Exception ? $message->getMessage() : $message;

ihor-sviziev · 2021-07-16T08:09:35Z

lib/internal/Magento/Framework/Logger/Test/Unit/Handler/SystemTest.php

+        $this->exceptionHandlerMock = $this->getMockBuilder(
+            ExceptionHandler::class
+        )->disableOriginalConstructor()->getMock();


Can we replace it with the following?

Suggested change

$this->exceptionHandlerMock = $this->getMockBuilder(

ExceptionHandler::class

)->disableOriginalConstructor()->getMock();

$this->exceptionHandlerMock = $this->createMock(ExceptionHandler::class);

ihor-sviziev · 2021-07-16T08:09:58Z

lib/internal/Magento/Framework/Logger/Test/Unit/Handler/SystemTest.php

        $this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
            ->getMockForAbstractClass();


Suggested change

$this->filesystemMock = $this->getMockBuilder(DriverInterface::class)

->getMockForAbstractClass();

$this->filesystemMock = $this->createMock(DriverInterface::class);

Hello @ihor-sviziev
Thank you for your notice.
I fixed it.

ihor-sviziev · 2021-07-16T08:10:46Z

lib/internal/Magento/Framework/Logger/Test/Unit/Handler/SystemTest.php

+            'datetime' => DateTime::createFromFormat(
+                'U.u',
+                sprintf('%.6F', microtime(true))
+            ),


Suggested change

'datetime' => DateTime::createFromFormat(

'U.u',

sprintf('%.6F', microtime(true))

),

'datetime' => DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true))),

ihor-sviziev · 2021-07-16T08:11:02Z

lib/internal/Magento/Framework/Logger/Test/Unit/Handler/SystemTest.php

+        int $level = Logger::WARNING,
+        string $message = 'test',
+        array $context = []
+    ):array {


Suggested change

):array {

): array {

Hello @ihor-sviziev
Thank you for your notice.
I fixed it.

eduard13 · 2021-07-26T08:25:29Z

@magento run Unit Tests, WebAPI Tests

magento-automated-testing · 2021-07-26T08:25:37Z

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.

magento-automated-testing · 2021-07-26T12:47:48Z

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.

andrewbess · 2021-07-26T14:13:07Z

@magento run all tests

magento-automated-testing · 2021-07-26T14:13:18Z

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.

andrewbess · 2021-07-26T15:42:00Z

The external currency service still unavailable.

So functional tests will be failed with 1 error of "MC-28786: Currency Converter API configuration".
Please don't re-run these tests if it has only one error.

m2-assistant · 2021-07-26T18:57:14Z

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

m2-community-project bot added the Priority: P2 A defect with this priority could have functionality issues which are not to expectations. label Jul 15, 2021

magento-engcom-team added Partner: Atwix Pull Request is created by partner Atwix partners-contribution Pull Request is created by Magento Partner labels Jul 15, 2021

andrewbess requested a review from sivaschenko July 15, 2021 20:15

m2-community-project bot added the Progress: pending review label Jul 15, 2021

andrewbess added the Project: Platform Health label Jul 15, 2021

andrewbess force-pushed the improvement/CE-32868-update-monolog-to-latest-version branch from ab6ef75 to 249d587 Compare July 16, 2021 07:01

ihor-sviziev self-assigned this Jul 16, 2021

m2-community-project bot added Progress: review and removed Progress: pending review labels Jul 16, 2021

ihor-sviziev requested changes Jul 16, 2021

View reviewed changes

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

andrewbess mentioned this pull request Jul 16, 2021

CE-32868: Updated "monolog" to the latest version 2.3.1 magento/magento2-functional-testing-framework#854

Merged

5 tasks

m2-community-project bot removed the Progress: needs update label Jul 16, 2021

m2-community-project bot added Progress: needs update and removed Progress: ready for testing labels Jul 26, 2021

CE-32868: Rebuilt composer.lock after releasing MFTF

4eca2e2

andrewbess force-pushed the improvement/CE-32868-update-monolog-to-latest-version branch from fc32670 to 4eca2e2 Compare July 26, 2021 14:12

ihor-sviziev added Progress: review and removed has dependency labels Jul 26, 2021

m2-community-project bot removed the Progress: needs update label Jul 26, 2021

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

andrewbess requested review from fascinosum and sivaschenko July 26, 2021 16:10

ihor-sviziev approved these changes Jul 26, 2021

View reviewed changes

m2-community-project bot added Progress: ready for testing and removed Progress: needs update labels Jul 26, 2021

andrewbess merged commit b2a9e91 into magento:platform-health Jul 26, 2021

andrewbess deleted the improvement/CE-32868-update-monolog-to-latest-version branch July 29, 2021 09:38

This was referenced Apr 7, 2022

Migration Tool conflict with 2.4.4 (Monolog) #35280

Closed

Dependency conflict with Magento 2.4.4 magento/data-migration-tool#891

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated monolog/monolog to 2.3.1 #33497

Updated monolog/monolog to 2.3.1 #33497

andrewbess commented Jul 15, 2021 •

edited

Loading

m2-assistant bot commented Jul 15, 2021

andrewbess commented Jul 15, 2021

magento-automated-testing bot commented Jul 15, 2021

andrewbess commented Jul 16, 2021

magento-automated-testing bot commented Jul 16, 2021

andrewbess commented Jul 16, 2021

magento-automated-testing bot commented Jul 16, 2021

andrewbess commented Jul 16, 2021

magento-automated-testing bot commented Jul 16, 2021

ihor-sviziev Jul 16, 2021

andrewbess Jul 16, 2021 •

edited

Loading

ihor-sviziev Jul 16, 2021

ihor-sviziev Jul 16, 2021

andrewbess Jul 16, 2021

ihor-sviziev Jul 16, 2021

ihor-sviziev Jul 16, 2021

andrewbess Jul 16, 2021

sivaschenko Jul 19, 2021

ihor-sviziev Jul 19, 2021

ihor-sviziev Jul 16, 2021

ihor-sviziev Jul 16, 2021

ihor-sviziev Jul 16, 2021

andrewbess Jul 16, 2021

ihor-sviziev Jul 16, 2021

ihor-sviziev Jul 16, 2021

andrewbess Jul 16, 2021

eduard13 commented Jul 26, 2021

magento-automated-testing bot commented Jul 26, 2021

magento-automated-testing bot commented Jul 26, 2021

andrewbess commented Jul 26, 2021

magento-automated-testing bot commented Jul 26, 2021

andrewbess commented Jul 26, 2021

m2-assistant bot commented Jul 26, 2021

	$isEnabled = (bool) $configValue;
	$isEnabled = (bool)$configValue;

		use Magento\Framework\Filesystem\DriverInterface;
		use Magento\Framework\Logger\Handler\Exception as ExceptionHandler;

		$this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
		->getMockForAbstractClass();

	$this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
	->getMockForAbstractClass();
	$this->filesystemMock = $this->createMock(DriverInterface::class);

Updated monolog/monolog to 2.3.1 #33497

Updated monolog/monolog to 2.3.1 #33497

Conversation

andrewbess commented Jul 15, 2021 • edited Loading

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Questions or comments

Contribution checklist (*)

m2-assistant bot commented Jul 15, 2021

andrewbess commented Jul 15, 2021

magento-automated-testing bot commented Jul 15, 2021

andrewbess commented Jul 16, 2021

magento-automated-testing bot commented Jul 16, 2021

andrewbess commented Jul 16, 2021

magento-automated-testing bot commented Jul 16, 2021

andrewbess commented Jul 16, 2021

magento-automated-testing bot commented Jul 16, 2021

Choose a reason for hiding this comment

andrewbess Jul 16, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eduard13 commented Jul 26, 2021

magento-automated-testing bot commented Jul 26, 2021

magento-automated-testing bot commented Jul 26, 2021

andrewbess commented Jul 26, 2021

magento-automated-testing bot commented Jul 26, 2021

andrewbess commented Jul 26, 2021

m2-assistant bot commented Jul 26, 2021

andrewbess commented Jul 15, 2021 •

edited

Loading

andrewbess Jul 16, 2021 •

edited

Loading