Skip to content

Commit a324904

Browse files
authored
PHPCS: patched ECG standard (OpenMage#4149)
* Rector: CQ - UnusedForeachValueToArrayKeysRector (#1) * Rector: CQ - UnusedForeachValueToArrayKeysRector See Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector * fixes + phpstan See fix at rector: rectorphp/rector-src#6164 * Patched PHPCS-ECG * Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)" This reverts commit 3d7eaf6. * Updated baseline
1 parent 4e73e60 commit a324904

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

.phpcs.ecg.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php*</exclude-pattern>
6767
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php*</exclude-pattern>
6868
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Option/Value.php*</exclude-pattern>
69+
<exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php*</exclude-pattern>
6970
<exclude-pattern>*/core/Mage/CatalogIndex/Model/Indexer.php*</exclude-pattern>
7071
<exclude-pattern>*/core/Mage/CatalogInventory/Model/Observer.php*</exclude-pattern>
7172
<exclude-pattern>*/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php*</exclude-pattern>
@@ -111,6 +112,7 @@
111112
<exclude-pattern>*/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php*</exclude-pattern>
112113
<exclude-pattern>*/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php*</exclude-pattern>
113114
<exclude-pattern>*/core/Mage/Index/controllers/Adminhtml/ProcessController.php*</exclude-pattern>
115+
<exclude-pattern>*/core/Mage/Index/Model/Observer.php*</exclude-pattern>
114116
<exclude-pattern>*/core/Mage/Index/Model/Process.php*</exclude-pattern>
115117
<exclude-pattern>*/core/Mage/Index/Model/Resource/Event.php*</exclude-pattern>
116118
<exclude-pattern>*/core/Mage/Log/Model/Resource/Log.php*</exclude-pattern>
@@ -148,6 +150,7 @@
148150
<exclude-pattern>*/core/Mage/Sales/Model/Order/Shipment.php*</exclude-pattern>
149151
<exclude-pattern>*/core/Mage/SalesRule/Model/Observer.php*</exclude-pattern>
150152
<exclude-pattern>*/core/Mage/SalesRule/Model/Rule.php*</exclude-pattern>
153+
<exclude-pattern>*/core/Mage/SalesRule/Model/Coupon/Massgenerator.php*</exclude-pattern>
151154
<exclude-pattern>*/core/Mage/Tag/controllers/IndexController.php*</exclude-pattern>
152155
<exclude-pattern>*/core/Mage/Tag/Model/Api.php*</exclude-pattern>
153156
<exclude-pattern>*/core/Mage/Tag/Model/Resource/Product/Collection.php*</exclude-pattern>
@@ -163,6 +166,7 @@
163166
<exclude-pattern>*/lib/Varien/Cache/Backend/Memcached.php*</exclude-pattern>
164167
<exclude-pattern>*/lib/Varien/Convert/Parser/Csv.php*</exclude-pattern>
165168
<exclude-pattern>*/lib/Varien/Object/Cache.php*</exclude-pattern>
169+
<exclude-pattern>*/shell/indexer.php*</exclude-pattern>
166170
<exclude-pattern>*/core/Mage/*/data/*</exclude-pattern>
167171
<exclude-pattern>*/core/Mage/*/sql/*</exclude-pattern>
168172
</rule>

composer.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"n98/n98_layouthelper": "*"
5454
},
5555
"minimum-stability": "dev",
56-
"prefer-stable" : true,
56+
"prefer-stable": true,
5757
"authors": [
5858
{
5959
"name": "Lee Saferite",
@@ -92,16 +92,10 @@
9292
}
9393
},
9494
"extra": {
95-
"magento-root-dir": ".",
96-
"magento-deploystrategy": "copy",
97-
"magento-deploystrategy-dev": "symlink",
98-
"magento-deploystrategy-overwrite": {
99-
"openmage/dev-copyright": "copy",
100-
"openmage/dev-translations": "copy",
101-
"openmage/legacy-frontend-themes": "copy"
102-
},
103-
"magento-force": true,
10495
"patches": {
96+
"magento-ecg/coding-standard": {
97+
"PR-72 - Fix LoopSniff": "https://patch-diff.githubusercontent.com/raw/magento-ecg/coding-standard/pull/72.patch"
98+
},
10599
"shardj/zf1-future": {
106100
"MAG-1.1.1": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.1.1.patch",
107101
"MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.9.3.0.patch",
@@ -111,7 +105,16 @@
111105
"OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch",
112106
"OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2050.patch"
113107
}
114-
}
108+
},
109+
"magento-root-dir": ".",
110+
"magento-deploystrategy": "copy",
111+
"magento-deploystrategy-dev": "symlink",
112+
"magento-deploystrategy-overwrite": {
113+
"openmage/dev-copyright": "copy",
114+
"openmage/dev-translations": "copy",
115+
"openmage/legacy-frontend-themes": "copy"
116+
},
117+
"magento-force": true
115118
},
116119
"config": {
117120
"allow-plugins": {

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)