Merge pull request #2678 from magento-commerce/12-3_integration

12 3 integration

Author: dobooth

src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-2.png

@@ -6,22 +6,11 @@ functional_areas:
 ---
 
 The built-in Upgrade Compatibility Tool aims to achieve the same issues coverage as original Adobe Commerce [Upgrade Compatibility Tool]({{site.baseurl}}/upgrade-compatibility-tool/introduction.html).
-There are issues that covered by this MVP version:
-
-| Code | Name |
-| ----- | ------ |
-| 1131 | extending from @deprecated class |
-| 1132 | importing @deprecated class |
-| 1332 | importing @deprecated interface |
-| 1134 | using @deprecated class |
-| 1334 | using @deprecated interface |
-| 1234 | using @deprecated constant |
-| 1534 | using @deprecated property |
-| 1235 | overriding @deprecated constant |
-| 1535 | overriding @deprecated property |
-| 1337 | inherited from @deprecated interface |
-| 1338 | implemented @deprecated interface |
-| 1439 | call @deprecated method |
+There are three types of inspections covered by this MVP version:
+
+*  Deprecation (severity level: WARNING)
+*  API coverage (severity level: ERROR)
+*  Existence (severity level: CRITICAL)
 
 A complete list of inspections that are already available in the original tool, can be found by the [following link]({{site.baseurl}}/upgrade-compatibility-tool/errors.html).
 
@@ -41,6 +30,9 @@ It allows you to see the problematic code just in real time, without running it
 **The result of the real time inspection is most suitable for use during development, to be always compatible with future versions**:
 
 ![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting.png)
+![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-2.png)
+![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-3.png)
+![]({{site.baseurl}}/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-4.png)
 
 The second IntelliJ IDEA tool that we can use for running UCT inspections is called **Inspect Code**. It is available under menu item
 `Code -> Inspect Code`. Also, you can open a context menu under the target directory that allows IntelliJ IDEA to populate the path to analyse for you automatically:

src/common/images/phpstorm/built-in-uct/uct-inspections-highlighting-3.png

@@ -7,7 +7,7 @@ functional_areas:
 
 ## What's in this topic {#fedg_layout_override_overview}
 
-Not all layout customizations can be performed by [extending layouts]. If the amount of customizations is large, you can use the overriding function for the needed layout file. This means that the new file that you place in the theme will be used instead of the parent [theme] layout file of [base] layout file.
+Not all layout customizations can be performed by [extending layouts]. If the amount of customizations is large, you can use the overriding function for the needed layout file. This means that the new file that you place in the theme will be used instead of the parent [theme] layout file or [base] layout file.
 
 In this article, [page layouts], [page configurations], and [generic layouts] are referred to as *layout files*, as the mechanism of overriding is similar for all of them.