Merge pull request #83 from magento/pre-release

Pre 2.0.0 release improvements and fixes

Author: lenaorobei

Diff for: Magento2/Sniffs/Performance/ForeachArrayMergeSniff.md

@@ -0,0 +1,26 @@
+# Rule: array_merge(...) is used in a loop and is a resources greedy construction
+
+## Reason
+Merging arrays in a loop is slow and causes high CPU usage.
+
+## How to Fix
+Typical example when `array_merge` is being used in the loop:
+``` php
+    $options = [];
+    foreach ($configurationSources as $source) {
+        // code here
+        $options = array_merge($options, $source->getOptions());
+    }
+```
+
+In order to reduce execution time `array_merge` can be called only once:
+``` php
+    $options = [[]];
+    foreach ($configurationSources as $source) {
+        // code here
+        $options[] = $source->getOptions();
+    }
+
+    // PHP 5.6+
+    $options = array_merge(...$options);
+```

Diff for: Magento2/ruleset.xml

@@ -31,7 +31,10 @@
     <rule ref="Magento2.Classes.DiscouragedDependencies">
         <severity>10</severity>
         <type>error</type>
+        <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
+        <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
     <rule ref="Magento2.Legacy.MageEntity">
         <severity>10</severity>
@@ -57,17 +60,23 @@
         <severity>10</severity>
         <type>error</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.LanguageConstruct">
         <severity>10</severity>
         <type>error</type>
     </rule>
+    <rule ref="Magento2.Security.LanguageConstruct.DirectOutput">
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
     <rule ref="Magento2.Security.Superglobal.SuperglobalUsageError">
         <severity>10</severity>
         <type>error</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
@@ -103,6 +112,7 @@
         <severity>9</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
@@ -116,6 +126,7 @@
         <severity>9</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
@@ -134,6 +145,7 @@
         <severity>8</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
@@ -145,6 +157,7 @@
         <severity>8</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
@@ -153,6 +166,7 @@
         <severity>8</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/lib/*</exclude-pattern>
         <exclude-pattern>*/Setup/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
@@ -224,6 +238,7 @@
         <severity>7</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
@@ -251,6 +266,7 @@
         <severity>7</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
@@ -266,6 +282,7 @@
         <severity>7</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
@@ -329,6 +346,7 @@
         <severity>6</severity>
         <type>warning</type>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Fixtures/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>

Diff for: composer.json

@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "1.0.2",
+    "version": "2.0.0",
     "require": {
         "php": ">=5.6.0",
         "squizlabs/php_codesniffer": "^3.4"