Skip to content

Commit d5fb1e6

Browse files
leonhelmusleonhelmus
authored
Merge pull request #2 from YouweGit/feature/OTPBBBBBZP-117
Changed vendor from Mediact to Youwe.
2 parents e0c6ccb + ee992d0 commit d5fb1e6

35 files changed

+196
-167
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## 2.2.1 - 2021-03-10
8-
### Fixed
9-
- PhpStorm 2020 has changed there config folder to a different path.
10-
7+
## 2.3.0 - 2021-03-10
118
### Added
12-
- Compatibility for latest testing suite 2.4.2.
9+
- Copyright.
10+
- Declare strict type.
1311

1412
### Changed
15-
- phpunits to test the code. Some old functions were deprecated.
13+
- Vendor name from Mediact to Youwe

‎composer.json

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "mediact/coding-standard-phpstorm",
3-
"description": "MediaCT PHP Coding Standard PHPStorm integration",
2+
"name": "youwe/coding-standard-phpstorm",
3+
"description": "Youwe PHP Coding Standard PHPStorm integration",
44
"type": "composer-plugin",
55
"license": "MIT",
66
"authors": [
77
{
8-
"name": "MediaCT",
9-
"email": "contact@mediact.nl"
8+
"name": "Youwe",
9+
"email": "support@youweagency.com"
1010
}
1111
],
1212
"require": {
@@ -15,25 +15,33 @@
1515
},
1616
"require-dev": {
1717
"mediact/testing-suite": "@stable",
18-
"composer/composer": "^1.3 || ^2.0",
1918
"kint-php/kint": "@stable",
20-
"mediact/coding-standard": "@stable",
21-
"phpstan/phpstan": "@stable",
19+
"youwe/coding-standard": "dev-master",
2220
"mikey179/vfsstream": "^1.6",
2321
"ext-simplexml": "*"
2422
},
23+
"repositories": [
24+
{
25+
"type": "vcs",
26+
"url": "https://github.com/YouweGit/coding-standard"
27+
},
28+
{
29+
"type": "vcs",
30+
"url": "https://github.com/YouweGit/testing-suite"
31+
}
32+
],
2533
"autoload": {
2634
"psr-4": {
27-
"Mediact\\CodingStandard\\PhpStorm\\": "src"
35+
"Youwe\\CodingStandard\\PhpStorm\\": "src"
2836
}
2937
},
3038
"autoload-dev": {
3139
"psr-4": {
32-
"Mediact\\CodingStandard\\PhpStorm\\Tests\\": "tests"
40+
"Youwe\\CodingStandard\\PhpStorm\\Tests\\": "tests"
3341
}
3442
},
3543
"extra": {
36-
"class": "Mediact\\CodingStandard\\PhpStorm\\InstallerPlugin"
44+
"class": "Youwe\\CodingStandard\\PhpStorm\\InstallerPlugin"
3745
},
3846
"archive": {
3947
"exclude": [

‎files/fileTemplates/includes/Company Settings.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#set( $Company = "MediaCT" )
2-
#set( $Vendor = "MediaCT" )
3-
#set( $Website = "https://www.mediact.nl")
1+
#set( $Company = "Youwe" )
2+
#set( $Vendor = "Youwe" )
3+
#set( $Website = "https://www.youweagency.com")

‎files/includes/M2-Settings.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#set( $Company = "MediaCT" )
2-
#set( $Vendor = "MediaCT" )
3-
#set( $Website = "https://www.mediact.nl")
1+
#set( $Company = "Youwe" )
2+
#set( $Vendor = "Youwe" )
3+
#set( $Website = "https://www.youweagency.com")

‎files/inspectionProfiles/MediaCT.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<component name="InspectionProjectProfileManager">
22
<profile version="1.0">
3-
<option name="myName" value="MediaCT" />
3+
<option name="myName" value="Youwe" />
44
<inspection_tool class="AmdModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
55
<inspection_tool class="BadExpressionStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
66
<inspection_tool class="BladeControlDirectives" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -192,14 +192,14 @@
192192
<list>
193193
<RulesetDescriptor>
194194
<option name="name" value="MediaCT PHPMD rules" />
195-
<option name="path" value="$PROJECT_DIR$/vendor/mediact/coding-standard/src/MediaCT/phpmd.xml" />
195+
<option name="path" value="$PROJECT_DIR$/vendor/youwe/coding-standard/src/Global/phpmd.xml" />
196196
</RulesetDescriptor>
197197
</list>
198198
</option>
199199
</inspection_tool>
200200
<inspection_tool class="PhpCSValidationInspection" enabled="true" level="WARNING" enabled_by_default="true">
201201
<option name="CODING_STANDARD" value="Custom" />
202-
<option name="CUSTOM_RULESET_PATH" value="$PROJECT_DIR$/vendor/mediact/coding-standard/src/MediaCT/ruleset.xml" />
202+
<option name="CUSTOM_RULESET_PATH" value="$PROJECT_DIR$/vendor/youwe/coding-standard/src/Global/ruleset.xml" />
203203
<option name="WARNING_HIGHLIGHT_LEVEL_NAME" value="WEAK WARNING" />
204204
<option name="SHOW_SNIFF_NAMES" value="true" />
205205
</inspection_tool>

‎files/inspectionProfiles/profiles_settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="InspectionProjectProfileManager">
22
<settings>
3-
<option name="projectProfile" value="MediaCT" />
4-
<option name="PROJECT_PROFILE" value="MediaCT" />
3+
<option name="projectProfile" value="Youwe" />
4+
<option name="PROJECT_PROFILE" value="Youwe" />
55
<version value="1.0" />
66
</settings>
77
</component>

‎grumphp.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
imports:
22
- resource: 'vendor/mediact/testing-suite/config/default/grumphp.yml'
33
parameters:
4+
phplint.ignore_patterns:
5+
- /^files/
46
xmllint.ignore_patterns:
57
# Uses an incomplete definition, which conflicts when <exclude-pattern>
68
# is defined.
79
- /^phpcs.xml$/
810
- /^phpmd.xml$/
911
- /^phpunit.xml$/
1012
- /^pdepend.xml$/
11-
- /^files/
13+
- /^files/

‎phpcs.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
77
<description>PHPCS</description>
88
<exclude-pattern>files/*</exclude-pattern>
9-
<rule ref="./vendor/mediact/coding-standard/src/MediaCT">
10-
<exclude name="MediactCommon.Php7.ReturnType.MissingReturnType"/>
9+
<rule ref="./vendor/mediact/coding-standard/src/Global">
10+
<exclude name="GlobalCommon.Php7.ReturnType.MissingReturnType"/>
1111
<exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing"/>
1212
</rule>
1313
</ruleset>

‎phpmd.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
77
<description>PHPMD</description>
88
<exclude-pattern>files/fileTemplates/*.php</exclude-pattern>
9-
<rule ref="./vendor/mediact/coding-standard/src/MediaCT/phpmd.xml" />
9+
<rule ref="./vendor/mediact/coding-standard/src/Global/phpmd.xml" />
1010
</ruleset>

‎src/Environment.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?php
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

8-
namespace Mediact\CodingStandard\PhpStorm;
8+
declare(strict_types=1);
9+
10+
namespace Youwe\CodingStandard\PhpStorm;
911

1012
use Composer\Composer;
1113
use Composer\IO\IOInterface;

‎src/EnvironmentInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm;
10+
namespace Youwe\CodingStandard\PhpStorm;
1111

1212
use Composer\Composer;
1313
use Composer\IO\IOInterface;

‎src/Filesystem.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm;
10+
namespace Youwe\CodingStandard\PhpStorm;
1111

1212
use RecursiveDirectoryIterator;
1313
use RecursiveIteratorIterator;

‎src/FilesystemInterface.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?php
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

8-
namespace Mediact\CodingStandard\PhpStorm;
8+
declare(strict_types=1);
9+
10+
namespace Youwe\CodingStandard\PhpStorm;
911

1012
interface FilesystemInterface
1113
{

‎src/InstallerPlugin.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
<?php
22

33
/**
4-
* Copyright MediaCT. All rights reserved.
5-
* https://www.mediact.nl
6-
* @deprecated
4+
* Copyright Youwe. All rights reserved.
5+
* https://www.youweagency.com
76
*/
87

98
declare(strict_types=1);
109

11-
namespace Mediact\CodingStandard\PhpStorm;
10+
namespace Youwe\CodingStandard\PhpStorm;
1211

1312
use Composer\Composer;
1413
use Composer\EventDispatcher\EventSubscriberInterface;
1514
use Composer\IO\IOInterface;
1615
use Composer\Plugin\PluginInterface;
1716
use Composer\Script\Event;
1817
use Composer\Script\ScriptEvents;
19-
use Mediact\CodingStandard\PhpStorm\Patcher\ConfigPatcher;
20-
use Mediact\CodingStandard\PhpStorm\Patcher\ConfigPatcherInterface;
18+
use Youwe\CodingStandard\PhpStorm\Patcher\ConfigPatcher;
19+
use Youwe\CodingStandard\PhpStorm\Patcher\ConfigPatcherInterface;
2120

2221
class InstallerPlugin implements PluginInterface, EventSubscriberInterface
2322
{

‎src/Patcher/CodeStylePatcher.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm\Patcher;
10+
namespace Youwe\CodingStandard\PhpStorm\Patcher;
1111

12-
use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;
12+
use Youwe\CodingStandard\PhpStorm\EnvironmentInterface;
1313

1414
class CodeStylePatcher implements ConfigPatcherInterface
1515
{

‎src/Patcher/ConfigPatcher.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm\Patcher;
10+
namespace Youwe\CodingStandard\PhpStorm\Patcher;
1111

12-
use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;
13-
use Mediact\CodingStandard\PhpStorm\XmlAccessor;
12+
use Youwe\CodingStandard\PhpStorm\EnvironmentInterface;
13+
use Youwe\CodingStandard\PhpStorm\XmlAccessor;
1414

1515
class ConfigPatcher implements ConfigPatcherInterface
1616
{

‎src/Patcher/ConfigPatcherInterface.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm\Patcher;
10+
namespace Youwe\CodingStandard\PhpStorm\Patcher;
1111

12-
use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;
12+
use Youwe\CodingStandard\PhpStorm\EnvironmentInterface;
1313

1414
interface ConfigPatcherInterface
1515
{

‎src/Patcher/CopyFilesTrait.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm\Patcher;
10+
namespace Youwe\CodingStandard\PhpStorm\Patcher;
1111

12-
use Mediact\CodingStandard\PhpStorm\FilesystemInterface;
12+
use Youwe\CodingStandard\PhpStorm\FilesystemInterface;
1313

1414
trait CopyFilesTrait
1515
{

‎src/Patcher/FileTemplatesPatcher.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm\Patcher;
10+
namespace Youwe\CodingStandard\PhpStorm\Patcher;
1111

12-
use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;
13-
use Mediact\CodingStandard\PhpStorm\FilesystemInterface;
14-
use Mediact\CodingStandard\PhpStorm\XmlAccessorInterface;
12+
use Youwe\CodingStandard\PhpStorm\EnvironmentInterface;
13+
use Youwe\CodingStandard\PhpStorm\FilesystemInterface;
14+
use Youwe\CodingStandard\PhpStorm\XmlAccessorInterface;
1515

1616
class FileTemplatesPatcher implements ConfigPatcherInterface
1717
{

‎src/Patcher/InspectionsPatcher.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?php
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
declare(strict_types=1);
99

10-
namespace Mediact\CodingStandard\PhpStorm\Patcher;
10+
namespace Youwe\CodingStandard\PhpStorm\Patcher;
1111

12-
use Mediact\CodingStandard\PhpStorm\EnvironmentInterface;
13-
use Mediact\CodingStandard\PhpStorm\XmlAccessorInterface;
12+
use Youwe\CodingStandard\PhpStorm\EnvironmentInterface;
13+
use Youwe\CodingStandard\PhpStorm\XmlAccessorInterface;
1414
use SimpleXMLElement;
1515

1616
class InspectionsPatcher implements ConfigPatcherInterface

0 commit comments

Comments
 (0)