Skip to content

Commit db2cc37

Browse files
leonhelmusleonhelmus
authored
Merge pull request #1 from YouweGit/feature/OTPBBBBBZP-117
Change vendor name from Mediact to Youwe.
2 parents c06a734 + b2bfe21 commit db2cc37

File tree

6 files changed

+137
-82
lines changed

6 files changed

+137
-82
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
## 1.7.0 - 2021-12-24
8+
### Changed
9+
- Vendor from MediactMagento2 to Magento2
10+
- Copyrights.
11+
12+
### Removed
13+
- Dependency squizlabs/php_codesniffer.

‎composer.json‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
{
2-
"name": "mediact/coding-standard-magento2",
3-
"description": "MediaCT PHP Coding Standard for Magento2",
4-
"type": "phpcs-sniffs",
5-
"homepage": "https://bitbucket.org/mediactbv/coding-standard-magento2",
6-
"license": "proprietary",
7-
"authors": [
8-
{
9-
"name": "MediaCT",
10-
"email": "contact@mediact.nl"
2+
"name": "youwe/coding-standard-magento2",
3+
"description": "Youwe PHP Coding Standard for Magento2",
4+
"type": "phpcs-sniffs",
5+
"homepage": "https://github.com/YouweGit/coding-standard-magento2",
6+
"license": "proprietary",
7+
"authors": [
8+
{
9+
"name": "Youwe",
10+
"email": "support@youweagency.com"
11+
}
12+
],
13+
"require": {
14+
"youwe/coding-standard": "dev-master"
15+
},
16+
"repositories": [
17+
{
18+
"type": "vcs",
19+
"url": "https://github.com/YouweGit/coding-standard"
20+
}
21+
],
22+
"autoload": {
23+
"psr-0": {
24+
"MediactMagento2": "src/MediactMagento2",
25+
"Magento2": "src/Magento2"
26+
}
1127
}
12-
],
13-
"require": {
14-
"mediact/coding-standard": "^3.0",
15-
"squizlabs/php_codesniffer": "^3.5"
16-
},
17-
"autoload": {
18-
"psr-0": {
19-
"MediactMagento2": "src/MediactMagento2"
20-
}
21-
}
2228
}

‎src/Magento2/phpmd.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright Youwe. All rights reserved.
5+
* https://www.youweagency.com
6+
*/
7+
-->
8+
<ruleset name="Youwe PHPMD rules"
9+
xmlns="http://pmd.sf.net/ruleset/1.0.0"
10+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
12+
http://pmd.sf.net/ruleset_xml_schema.xsd"
13+
xsi:noNamespaceSchemaLocation="
14+
http://pmd.sf.net/ruleset_xml_schema.xsd">
15+
<description>Youwe defined PHPMD rules</description>
16+
17+
<rule ref="rulesets/cleancode.xml">
18+
<exclude name="ElseExpression"/>
19+
<exclude name="StaticAccess"/>
20+
<exclude name="UndefinedVariable"/>
21+
<exclude name="BooleanArgumentFlag"/>
22+
</rule>
23+
<rule ref="rulesets/codesize.xml">
24+
<exclude name="ExcessiveParameterList"/>
25+
</rule>
26+
<rule ref="rulesets/design.xml">
27+
<exclude name="CouplingBetweenObjects"/>
28+
</rule>
29+
<rule ref="rulesets/naming.xml">
30+
<exclude name="ShortVariable"/>
31+
<exclude name="LongVariable"/>
32+
</rule>
33+
<rule ref="rulesets/unusedcode.xml">
34+
<exclude name="UnusedFormalParameter"/>
35+
<exclude name="UnusedLocalVariable"/>
36+
</rule>
37+
</ruleset>

‎src/Magento2/ruleset.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright Youwe. All rights reserved.
5+
* https://www.youweagency.com
6+
*/
7+
-->
8+
<ruleset name="Magento2">
9+
<description>Youwe coding standards for Magento2.</description>
10+
<arg name="colors" />
11+
<arg name="extensions" value="php/PHP,phtml/PHP,js/JS,css/CSS" />
12+
13+
<!-- Base rules on Youwe -->
14+
<rule ref="../../../coding-standard/src/GlobalCommon">
15+
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
16+
<exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing" />
17+
<exclude name="GlobalCommon.Php7.ReturnType" />
18+
<exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing" />
19+
<exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
20+
<exclude name="Squiz.Commenting.FunctionComment.EmptyThrows" />
21+
</rule>
22+
23+
<rule ref="Generic.Files.LineLength.TooLong">
24+
<exclude-pattern>*.phtml</exclude-pattern>
25+
</rule>
26+
27+
<rule ref="Squiz.ControlStructures.ControlSignature">
28+
<exclude-pattern>*.phtml</exclude-pattern>
29+
</rule>
30+
31+
<rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
32+
<exclude-pattern>*.phtml</exclude-pattern>
33+
</rule>
34+
35+
<rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed">
36+
<exclude-pattern>*.phtml</exclude-pattern>
37+
</rule>
38+
39+
<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
40+
<exclude-pattern>*.phtml</exclude-pattern>
41+
</rule>
42+
43+
<rule ref="Squiz.WhiteSpace.MemberVarSpacing" >
44+
<properties>
45+
<property name="spacingBeforeFirst" value="0"/>
46+
</properties>
47+
</rule>
48+
49+
<rule ref="PSR12.Functions.ReturnTypeDeclaration" />
50+
</ruleset>

‎src/MediactMagento2/phpmd.xml‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
11
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright Youwe. All rights reserved.
5+
* https://www.youweagency.com
6+
*/
7+
-->
28
<ruleset name="MediaCT PHPMD rules"
39
xmlns="http://pmd.sf.net/ruleset/1.0.0"
410
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
511
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
612
http://pmd.sf.net/ruleset_xml_schema.xsd"
713
xsi:noNamespaceSchemaLocation="
814
http://pmd.sf.net/ruleset_xml_schema.xsd">
9-
<description>
10-
MediaCT defined PHPMD rules
11-
</description>
12-
13-
<rule ref="rulesets/cleancode.xml">
14-
<exclude name="ElseExpression"/>
15-
<exclude name="StaticAccess"/>
16-
<exclude name="UndefinedVariable"/>
17-
<exclude name="BooleanArgumentFlag"/>
18-
</rule>
19-
<rule ref="rulesets/codesize.xml">
20-
<exclude name="ExcessiveParameterList"/>
21-
</rule>
22-
<rule ref="rulesets/design.xml">
23-
<exclude name="CouplingBetweenObjects"/>
24-
</rule>
25-
<rule ref="rulesets/naming.xml">
26-
<exclude name="ShortVariable"/>
27-
<exclude name="LongVariable"/>
28-
</rule>
29-
<rule ref="rulesets/unusedcode.xml">
30-
<exclude name="UnusedFormalParameter"/>
31-
<exclude name="UnusedLocalVariable"/>
32-
</rule>
15+
<description>Mediact coding standards for Magento2 is deprecated please use Magento2.</description>
16+
<rule ref="../Magento2/phpmd.xml" />
3317
</ruleset>

‎src/MediactMagento2/ruleset.xml‎

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,11 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright MediaCT. All rights reserved.
5-
* https://www.mediact.nl
4+
* Copyright Youwe. All rights reserved.
5+
* https://www.youweagency.com
66
*/
77
-->
88
<ruleset name="Mediact/Magento2">
9-
<description>MediaCT coding standards for Magento2.</description>
10-
<arg name="colors" />
11-
<arg name="extensions" value="php/PHP,phtml/PHP,js/JS,css/CSS" />
12-
13-
<!-- Base rules on MediaCT -->
14-
<rule ref="../../../coding-standard/src/MediactCommon">
15-
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
16-
<exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing" />
17-
<exclude name="MediactCommon.Php7.ReturnType" />
18-
<exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing" />
19-
<exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
20-
<exclude name="Squiz.Commenting.FunctionComment.EmptyThrows" />
21-
</rule>
22-
23-
<rule ref="Generic.Files.LineLength.TooLong">
24-
<exclude-pattern>*.phtml</exclude-pattern>
25-
</rule>
26-
<rule ref="Squiz.ControlStructures.ControlSignature">
27-
<exclude-pattern>*.phtml</exclude-pattern>
28-
</rule>
29-
<rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
30-
<exclude-pattern>*.phtml</exclude-pattern>
31-
</rule>
32-
<rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed">
33-
<exclude-pattern>*.phtml</exclude-pattern>
34-
</rule>
35-
<rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
36-
<exclude-pattern>*.phtml</exclude-pattern>
37-
</rule>
38-
39-
<rule ref="Squiz.WhiteSpace.MemberVarSpacing" >
40-
<properties>
41-
<property name="spacingBeforeFirst" value="0"/>
42-
</properties>
43-
</rule>
44-
45-
<rule ref="PSR12.Functions.ReturnTypeDeclaration" />
9+
<description>Mediact coding standards for Magento2 is deprecated please use Magento2.</description>
10+
<rule ref="../Magento2"/>
4611
</ruleset>

0 commit comments

Comments
 (0)