magento/magento2: Fixes for the schema cache.xsd #27307

andrewbess · 2020-03-17T08:25:22Z

Description (*)

This PR fixes the schema "cache.xsd" from Magento\Framework\Cache.

The attribute "instance" has changed on required because if a developer won't be to use it new cache type will not be created;
The parameters "label" and "description" have changed on required because of the class "Magento\Framework\App\Cache\TypeList" gets theirs without checking for existing. Please take a look at this code;
Checking on unique of the type name has added;
The configuration reader class has fixed for more informative during to run CLI commands;
The class SchemaLocator has been fixed to check the cache configuration during configuration merging;
The unnecessary checking has removed from the class TypeList;
Unit tests have been covered.

Fixed Issues (if relevant)

Fixes: #26224

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)

ghost · 2020-03-17T08:25:29Z

@andrewbess unfortunately, only members of the maintainers team are allowed to assign developers to the pull request

lbajsarowicz · 2020-03-17T10:58:48Z

Just add WIP: prefix to your PR name.

swnsma

Failed function tests do not related to the improved functionality.

magento-engcom-team · 2020-03-17T14:08:43Z

Hi @swnsma, thank you for the review.
ENGCOM-7114 has been created to process this Pull Request
✳️ @swnsma, 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

lbajsarowicz · 2020-03-17T14:08:58Z

@swnsma It's not finished yet? :-)

swnsma · 2020-03-17T14:09:58Z

@lbajsarowicz endless story :)

andrewbess · 2020-03-17T19:48:15Z

Hello @lbajsarowicz
It has already finished.

lbajsarowicz · 2020-03-17T20:19:23Z

dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php

+/**
+ * Unit test of the cache configuration
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase


You can definately import the classes :-)

Hello @lbajsarowicz
Thank you for your remark.
I have fixed it. Please check.
Thank you in advance.

lbajsarowicz · 2020-03-17T20:22:26Z

dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php

+     */
+    public function schemaCorrectlyIdentifiesInvalidXmlDataProvider(): array
+    {
+        return include __DIR__ . '/_files/invalidCacheConfigXmlArray.php';


Interesting approach to provide code samples.

Hello @lbajsarowicz
Thank you for your remark.
Magento already has the same data providers. Please take a look at the screenshot

Thank you in advance.

lbajsarowicz

Requesting changes due to use of deprecated MockObject. Please replace it with proper one :-)

lbajsarowicz · 2020-03-17T20:23:36Z

lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php

     */
    protected $_typeList;

    /**
-     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheInterface|PHPUnit_Framework_MockObject_MockObject


Replace with \PHPUnit\Framework\MockObject\MockObject

Hello @lbajsarowicz
Thank you for your remark.
I have fixed it. Please check.
Thank you in advance.

lbajsarowicz · 2020-03-17T20:27:40Z

lib/internal/Magento/Framework/Cache/Config/Reader.php

     * @param string $defaultScope
     */
-    public function __construct(
+    public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod


Move that to DocBlock above.

Hello @lbajsarowicz
Thank you for your remark.
I have fixed it. Please check.
Thank you in advance.

lbajsarowicz · 2020-03-17T20:27:55Z

lib/internal/Magento/Framework/Cache/Config/Reader.php

        \Magento\Framework\Config\FileResolverInterface $fileResolver,
        \Magento\Framework\Cache\Config\Converter $converter,
        \Magento\Framework\Cache\Config\SchemaLocator $schemaLocator,


Import classes

Hello @lbajsarowicz
Thank you for your remark.
I have fixed it. Please check.
Thank you in advance.

lbajsarowicz

✔️ Thank you for your contribution

magento-engcom-team · 2020-03-19T14:57:35Z

Hi @lbajsarowicz, thank you for the review.
ENGCOM-7114 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

andrewbess · 2020-03-20T06:37:41Z

Hello @lbajsarowicz
Perhaps, current PR is covered tests.
I have made the new test and fixed the existing test.

swnsma · 2020-03-20T07:48:11Z

Integrity tests were introduced in this PR to check updated XSD schema.

engcom-Alfa · 2020-03-23T14:12:42Z

✔️ QA Passed

Before:

After:

engcom-Echo · 2020-03-24T08:36:03Z

Failed static tests not related to the changes in this PR

…ERGE YET] #27307

m2-assistant · 2020-03-25T17:32:20Z

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.

andrewbess requested a review from swnsma March 17, 2020 08:25

andrewbess assigned swnsma Mar 17, 2020

ghost added the Progress: pending review label Mar 17, 2020

ghost unassigned swnsma Mar 17, 2020

magento-engcom-team added Component: App Component: Cache Release Line: 2.4 Partner: Atwix Pull Request is created by partner Atwix partners-contribution Pull Request is created by Magento Partner labels Mar 17, 2020

swnsma self-assigned this Mar 17, 2020

swnsma approved these changes Mar 17, 2020

View reviewed changes

ghost added Progress: ready for testing and removed Progress: pending review labels Mar 17, 2020

swnsma added Award: bug fix Award: special achievement Award: test coverage labels Mar 17, 2020

andrewbess changed the title ~~magento/magento2: Fixes for the schema cache.xsd [DONT MERGE YET]~~ magento/magento2: Fixes for the schema cache.xsd Mar 17, 2020

andrewbess mentioned this pull request Mar 17, 2020

magento/magento2: Fixes for the schema cache.xsd #26933

Closed

4 tasks

lbajsarowicz reviewed Mar 17, 2020

View reviewed changes

ghost assigned lbajsarowicz Mar 17, 2020

lbajsarowicz reviewed Mar 17, 2020

View reviewed changes

lbajsarowicz suggested changes Mar 17, 2020

View reviewed changes

ghost removed the Progress: ready for testing label Mar 17, 2020

lbajsarowicz approved these changes Mar 19, 2020

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels Mar 19, 2020

lbajsarowicz added the Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests label Mar 19, 2020

swnsma added Auto-Tests: Covered All changes in Pull Request is covered by auto-tests and removed Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests labels Mar 20, 2020

swnsma and others added 2 commits March 20, 2020 09:48

Merge branch '2.4-develop' into cache-schema-improvements

34c2b6a

Merge branch '2.4-develop' into cache-schema-improvements

c1662ff

engcom-Alfa self-assigned this Mar 23, 2020

ghost added Progress: testing in progress and removed Progress: ready for testing labels Mar 23, 2020

ghost added Progress: extended testing and removed Progress: testing in progress labels Mar 23, 2020

engcom-Echo self-assigned this Mar 23, 2020

ghost added Progress: accept and removed Progress: extended testing labels Mar 24, 2020

magento-engcom-team pushed a commit that referenced this pull request Mar 25, 2020

ENGCOM-7114: magento/magento2: Fixes for the schema cache.xsd [DONT M…

feb94f9

…ERGE YET] #27307

magento-engcom-team merged commit b1275d2 into magento:2.4-develop Mar 25, 2020

magento-engcom-team mentioned this pull request May 1, 2020

Cache type without "instance" causes exception when disabling the module through "Cache Management" in the backend #26224

Closed

andrewbess deleted the cache-schema-improvements branch October 28, 2020 09:57

sdzhepa mentioned this pull request May 9, 2022

tyutyu sdzhepa/magento2#5

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

magento/magento2: Fixes for the schema cache.xsd #27307

magento/magento2: Fixes for the schema cache.xsd #27307

andrewbess commented Mar 17, 2020

ghost commented Mar 17, 2020

lbajsarowicz commented Mar 17, 2020

swnsma left a comment

magento-engcom-team commented Mar 17, 2020

lbajsarowicz commented Mar 17, 2020

swnsma commented Mar 17, 2020

andrewbess commented Mar 17, 2020

lbajsarowicz Mar 17, 2020

andrewbess Mar 18, 2020

lbajsarowicz Mar 17, 2020

andrewbess Mar 18, 2020

lbajsarowicz left a comment

lbajsarowicz Mar 17, 2020

andrewbess Mar 18, 2020

lbajsarowicz Mar 17, 2020

andrewbess Mar 18, 2020

lbajsarowicz Mar 17, 2020

andrewbess Mar 18, 2020

lbajsarowicz left a comment

magento-engcom-team commented Mar 19, 2020

andrewbess commented Mar 20, 2020

swnsma commented Mar 20, 2020

engcom-Alfa commented Mar 23, 2020

engcom-Echo commented Mar 24, 2020

m2-assistant bot commented Mar 25, 2020

magento/magento2: Fixes for the schema cache.xsd #27307

magento/magento2: Fixes for the schema cache.xsd #27307

Conversation

andrewbess commented Mar 17, 2020

Description (*)

Fixed Issues (if relevant)

Contribution checklist (*)

ghost commented Mar 17, 2020

lbajsarowicz commented Mar 17, 2020

swnsma left a comment

Choose a reason for hiding this comment

magento-engcom-team commented Mar 17, 2020

lbajsarowicz commented Mar 17, 2020

swnsma commented Mar 17, 2020

andrewbess commented Mar 17, 2020

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

lbajsarowicz left a 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

lbajsarowicz left a comment

Choose a reason for hiding this comment

magento-engcom-team commented Mar 19, 2020

andrewbess commented Mar 20, 2020

swnsma commented Mar 20, 2020

engcom-Alfa commented Mar 23, 2020

engcom-Echo commented Mar 24, 2020

m2-assistant bot commented Mar 25, 2020