Skip to content

Commit dfad7ec

Browse files
author
Klaas Sangers
authored
Merge pull request #2 from mediact/feature/MAGE2-92
1.2.0 Remove marketplace standard until it is compatible with PHPCS3
2 parents 2228b20 + 79737f8 commit dfad7ec

File tree

3 files changed

+5
-42
lines changed

3 files changed

+5
-42
lines changed

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
# Introduction
22

3-
This is the MediaCT coding standard for Magento 1 projects. It is a mix of the
4-
default MediaCT coding standard and the Magento marketplace standard.
5-
6-
Some tests have been removed from both of the standards to create a workable
7-
and fast standard.
3+
This is the MediaCT coding standard for Magento 1 projects. It is based on
4+
the default MediaCT coding standard but some tests have been removed to create
5+
a workable and fast standard.
86

97
# Installation
108

119
Use composer to require the standard in a project.
1210

1311
```shell
14-
$ composer require --dev mediact/coding-standard-magento1
12+
composer require --dev mediact/coding-standard-magento1
1513
```
1614

1715
To let PHPCS know that this standard should be used add a phpcs.xml file in the
@@ -30,7 +28,7 @@ The recommended way to enable the coding standard in PHPStorm and automatic
3028
testing is by requiring the MediaCT testing suite in a project.
3129

3230
```shell
33-
$ composer require --dev mediact/testing-suite
31+
composer require --dev mediact/testing-suite
3432
```
3533

3634
For more information go to [MediaCT Testing Suite](https://github.com/mediact/testing-suite).

composer.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,7 @@
1010
"email": "[email protected]"
1111
}
1212
],
13-
"repositories": [
14-
{
15-
"type": "composer",
16-
"url": "https://composer.mediact.nl"
17-
},
18-
{
19-
"type": "composer",
20-
"url": "https://repo.magento.com"
21-
}
22-
],
2313
"require": {
24-
"magento/marketplace-eqp": "^1.0",
2514
"mediact/coding-standard": "@stable"
2615
}
2716
}

src/MediactMagento1/ruleset.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,12 @@
2727
<exclude name="Generic.PHP.Syntax"/>
2828
</rule>
2929

30-
<!-- Base rules on Magento Marketplace -->
31-
<rule ref="../../../../magento/marketplace-eqp/MEQP1">
32-
<exclude name="PSR1.Classes.ClassDeclaration" />
33-
<exclude name="Zend.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
34-
<exclude name="Generic.Arrays.DisallowShortArraySyntax" />
35-
<exclude name="MEQP1.PHP.PrivateClassMember" />
36-
<exclude name="MEQP1.Security.DiscouragedFunction" />
37-
<exclude name="MEQP1.Performance.Loop" />
38-
<exclude name="MEQP1.SQL.SlowQuery" />
39-
<exclude name="Generic.Functions.OpeningFunctionBraceBsdAllman" />
40-
<exclude name="MEQP1.Performance.CollectionCount"/>
41-
<exclude name="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket"/>
42-
<exclude name="MEQP1.PHP.Syntax"/>
43-
<exclude name="MEQP1.Stdlib.DateTime"/>
44-
</rule>
45-
46-
<rule ref="MEQP1.Classes.ResourceModel.OutsideOfResourceModel">
47-
<exclude-pattern>Model/Resource</exclude-pattern>
48-
</rule>
4930
<rule ref="MediactCommon.NamingConventions.ValidVariableName">
5031
<properties>
5132
<property name="allowedNames" type="array" value="_eventPrefix,_eventObject,_cacheTag,_addButtonLabel,_backButtonLabel,_blockGroup,_GET,_POST,_COOKIE,_FILES,_REQUEST,_SERVER,_SESSION"/>
5233
</properties>
5334
<exclude-pattern>*.phtml</exclude-pattern>
5435
</rule>
55-
<rule ref="Squiz.PHP.CommentedOutCode">
56-
<properties>
57-
<property name="maxPercentage" value="80"/>
58-
</properties>
59-
</rule>
6036
<rule ref="Zend.NamingConventions.ValidVariableName.NotCamelCaps">
6137
<exclude-pattern>*.phtml</exclude-pattern>
6238
</rule>

0 commit comments

Comments
 (0)