File tree Expand file tree Collapse file tree 9 files changed +27
-120
lines changed
Expand file tree Collapse file tree 9 files changed +27
-120
lines changed Original file line number Diff line number Diff line change @@ -22,4 +22,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2222- Declare strict type.
2323
2424### Changed
25- - Vendor name from Mediact to Youwe
25+ - Vendor name from Mediact to Youwe
Original file line number Diff line number Diff line change 44 "type" : " composer-plugin" ,
55 "license" : " MIT" ,
66 "prefer-stable" : true ,
7- "minimum-stability" : " stable " ,
7+ "minimum-stability" : " dev " ,
88 "authors" : [
99 {
1010 "name" : " Youwe B.V." ,
1919 "composer/composer" : " @stable" ,
2020 "ext-simplexml" : " *" ,
2121 "kint-php/kint" : " @stable" ,
22- "mikey179/vfsstream" : " ^1.6"
22+ "mikey179/vfsstream" : " ^1.6" ,
23+ "phpunit/phpunit" : " @stable"
2324 },
2425 "autoload" : {
2526 "psr-4" : {
2627 "Youwe\\ CodingStandard\\ PhpStorm\\ " : " src"
2728 }
2829 },
30+ "replace" : {
31+ "youwe/coding-standard-phpstorm" : " *"
32+ },
2933 "autoload-dev" : {
3034 "psr-4" : {
3135 "Youwe\\ CodingStandard\\ PhpStorm\\ Tests\\ " : " tests"
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1818class ConfigPatcher implements ConfigPatcherInterface
1919{
2020 /**
21- * @var ConfigPatcherInterface[]
21+ * @var array
2222 */
2323 private $ patchers ;
2424
@@ -57,15 +57,17 @@ public function __construct(array $patchers = null)
5757 public function patch (
5858 EnvironmentInterface $ environment
5959 ): void {
60- foreach ($ this ->patchers as $ projectType => $ patcher ) {
61- if ($ environment ->getProjectTypeResolver ()->resolve () === $ projectType ) {
62- $ patcher ->patch ($ environment );
63- } elseif ($ projectType === 'default ' ) {
64- /**
65- * Patches that are default are configured for all projects.
66- * TODO:: Add function to overwrite default patches.
67- **/
68- $ patcher ->patch ($ environment );
60+ foreach ($ this ->patchers as $ projectType => $ patchers ) {
61+ foreach ($ patchers as $ patcher ) {
62+ if ($ environment ->getProjectTypeResolver ()->resolve () === $ projectType ) {
63+ $ patcher ->patch ($ environment );
64+ } elseif ($ projectType === 'default ' ) {
65+ /**
66+ * Patches that are default are configured for all projects.
67+ * TODO:: Add function to overwrite default patches.
68+ **/
69+ $ patcher ->patch ($ environment );
70+ }
6971 }
7072 }
7173 }
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ class InspectionsPatcher implements ConfigPatcherInterface
1818 use CopyFilesTrait;
1919
2020 public const PROJECT_PHPCS = 'phpcs.xml ' ;
21- public const INSPECTION_PROFILE = 'inspectionProfiles/MediaCT .xml ' ;
21+ public const INSPECTION_PROFILE = 'default/ inspectionProfiles/Global .xml ' ;
2222
2323 /**
2424 * @var XmlAccessorInterface
Original file line number Diff line number Diff line change 1414use Youwe \CodingStandard \PhpStorm \FilesystemInterface ;
1515use PHPUnit \Framework \TestCase ;
1616use Youwe \CodingStandard \PhpStorm \Environment ;
17+ use Youwe \CodingStandard \PhpStorm \ProjectTypeResolver ;
1718
1819/**
1920 * @coversDefaultClass \Youwe\CodingStandard\PhpStorm\Environment
@@ -37,14 +38,16 @@ public function testAccess()
3738 $ projectFs = $ this ->createMock (FilesystemInterface::class);
3839 $ inputOutput = $ this ->createMock (IOInterface::class);
3940 $ composer = $ this ->createMock (Composer::class);
41+ $ projectTypeResolver = $ this ->createMock (ProjectTypeResolver::class);
4042
4143 $ environment = new Environment (
4244 $ ideConfigFs ,
4345 $ ideDefaultFs ,
4446 $ defaultsFs ,
4547 $ projectFs ,
4648 $ inputOutput ,
47- $ composer
49+ $ composer ,
50+ $ projectTypeResolver
4851 );
4952
5053 $ this ->assertSame ($ ideConfigFs , $ environment ->getIdeConfigFilesystem ());
@@ -53,5 +56,6 @@ public function testAccess()
5356 $ this ->assertSame ($ projectFs , $ environment ->getProjectFilesystem ());
5457 $ this ->assertSame ($ inputOutput , $ environment ->getInputOutput ());
5558 $ this ->assertSame ($ composer , $ environment ->getComposer ());
59+ $ this ->assertSame ($ projectTypeResolver , $ environment ->getProjectTypeResolver ());
5660 }
5761}
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ public function testOnNewCodeEvent()
7070
7171 $ event = $ this ->createMock (Event::class);
7272 $ event
73- ->expects ($ this ->exactly (2 ))
73+ ->expects ($ this ->atLeast (2 ))
7474 ->method ('getComposer ' )
7575 ->willReturn ($ composer );
7676
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ public function testPatch()
3737
3838 foreach ($ patchers as $ patcher ) {
3939 $ patcher
40- ->expects ($ this ->once ( ))
40+ ->expects ($ this ->exactly ( 0 ))
4141 ->method ('patch ' )
4242 ->with ($ environment );
4343 }
You can’t perform that action at this time.
0 commit comments