Update how to get project types.

l-helmus-youwe · l-helmus-youwe · commit b6dc18e061da · 2022-04-22T12:10:55.000+02:00
diff --git a/files/default/inspectionProfiles/Global.xml b/files/default/inspectionProfiles/Global.xml
@@ -1,6 +1,6 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
-    <option name="myName" value="Youwe" />
+    <option name="myName" value="Global" />
     <inspection_tool class="AmdModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="BadExpressionStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BladeControlDirectives" enabled="false" level="WARNING" enabled_by_default="false" />
diff --git a/files/default/inspectionProfiles/profiles_settings.xml b/files/default/inspectionProfiles/profiles_settings.xml
@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <settings>
-    <option name="projectProfile" value="Youwe" />
-    <option name="PROJECT_PROFILE" value="Youwe" />
+    <option name="projectProfile" value="Global" />
+    <option name="PROJECT_PROFILE" value="Global" />
     <version value="1.0" />
   </settings>
-</component>
+</component>
diff --git a/src/Patcher/CodeStylePatcher.php b/src/Patcher/CodeStylePatcher.php
@@ -28,7 +28,7 @@ public function patch(
         $this->copyFile(
             $environment->getDefaultsFilesystem(),
             $environment->getIdeConfigFilesystem(),
-            'codeStyleSettings.xml'
+             'codeStyleSettings.xml'
         );
     }
 }
diff --git a/src/Patcher/CopyFilesTrait.php b/src/Patcher/CopyFilesTrait.php
@@ -10,6 +10,7 @@
 namespace Youwe\CodingStandard\PhpStorm\Patcher;
 
 use Youwe\CodingStandard\PhpStorm\FilesystemInterface;
+use Youwe\CodingStandard\PhpStorm\ProjectTypeResolver;
 
 trait CopyFilesTrait
 {
@@ -19,15 +20,17 @@ trait CopyFilesTrait
      * @param FilesystemInterface $source
      * @param FilesystemInterface $destination
      * @param string              $path
+     * @param string              $type
      *
      * @return void
      */
     private function copyDirectory(
         FilesystemInterface $source,
         FilesystemInterface $destination,
-        string $path
+        string $path,
+        string $type = ProjectTypeResolver::DEFAULT_PROJECT_TYPE
     ): void {
-        foreach ($source->listFiles($path) as $filePath) {
+        foreach ($source->listFiles($type . DIRECTORY_SEPARATOR . $path) as $filePath) {
             $this->copyFile($source, $destination, $filePath);
         }
     }
@@ -38,17 +41,21 @@ private function copyDirectory(
      * @param FilesystemInterface $source
      * @param FilesystemInterface $destination
      * @param string              $path
+     * @param string              $type
      *
      * @return void
      */
     private function copyFile(
         FilesystemInterface $source,
         FilesystemInterface $destination,
-        string $path
+        string $path,
+        string $type = ProjectTypeResolver::DEFAULT_PROJECT_TYPE
     ): void {
+        $projectPath = $type . DIRECTORY_SEPARATOR . $path;
+
         $destination->put(
-            $path,
-            $source->read($path)
+            $projectPath,
+            $source->read($projectPath)
         );
     }
 }
diff --git a/src/Patcher/FileTemplatesPatcher.php b/src/Patcher/FileTemplatesPatcher.php
@@ -45,7 +45,7 @@ public function patch(
         $this->copyDirectory(
             $environment->getDefaultsFilesystem(),
             $environment->getIdeConfigFilesystem(),
-            'default/fileTemplates'
+            'fileTemplates'
         );
 
         $this->patchWorkspaceConfig(
diff --git a/src/Patcher/InspectionsPatcher.php b/src/Patcher/InspectionsPatcher.php
@@ -18,7 +18,7 @@ class InspectionsPatcher implements ConfigPatcherInterface
     use CopyFilesTrait;
 
     public const PROJECT_PHPCS      = 'phpcs.xml';
-    public const INSPECTION_PROFILE = 'default/inspectionProfiles/Global.xml';
+    public const INSPECTION_PROFILE = 'inspectionProfiles/Global.xml';
 
     /**
      * @var XmlAccessorInterface
diff --git a/src/Patcher/Magento2/FileTemplatesPatcher.php b/src/Patcher/Magento2/FileTemplatesPatcher.php
@@ -30,7 +30,8 @@ public function patch(
         $this->copyDirectory(
             $environment->getDefaultsFilesystem(),
             $environment->getIdeConfigFilesystem(),
-            $environment->getProjectTypeResolver()->resolve() . DIRECTORY_SEPARATOR . 'fileTemplates'
+            DIRECTORY_SEPARATOR . 'fileTemplates',
+            $environment->getProjectTypeResolver()->resolve()
         );
     }
 }
diff --git a/src/Patcher/Magento2/LiveTemplatesPatcher.php b/src/Patcher/Magento2/LiveTemplatesPatcher.php
@@ -32,7 +32,8 @@ public function patch(
             $this->copyDirectory(
                 $environment->getDefaultsFilesystem(),
                 $environment->getIdeDefaultConfigFilesystem(),
-                $environment->getProjectTypeResolver()->resolve() . DIRECTORY_SEPARATOR . 'templates'
+                'templates',
+                $environment->getProjectTypeResolver()->resolve()
             );
         }
     }
diff --git a/src/Patcher/Magento2/TemplateSettingsPatcher.php b/src/Patcher/Magento2/TemplateSettingsPatcher.php
@@ -71,12 +71,13 @@ public function patch(
     public function patchFileTemplateSettings(
         EnvironmentInterface $environment
     ): void {
-        $path = $environment->getProjectTypeResolver()->resolve() . DIRECTORY_SEPARATOR . 'file.template.settings.xml';
+        $path = 'file.template.settings.xml';
         if (!$environment->getIdeConfigFilesystem()->has($path)) {
             $this->copyFile(
                 $environment->getDefaultsFilesystem(),
                 $environment->getIdeConfigFilesystem(),
-                $path
+                $path,
+                $environment->getProjectTypeResolver()->resolve()
             );
         } else {
             $xml = simplexml_load_string(
diff --git a/tests/Patcher/CodeStylePatcherTest.php b/tests/Patcher/CodeStylePatcherTest.php
@@ -31,13 +31,13 @@ public function testPatch()
         $ideConfigFs
             ->expects($this->once())
             ->method('put')
-            ->with('codeStyleSettings.xml', '<xml/>');
+            ->with('default/codeStyleSettings.xml', '<xml/>');
 
         $defaultsFs = $this->createMock(FilesystemInterface::class);
         $defaultsFs
             ->expects($this->once())
             ->method('read')
-            ->with('codeStyleSettings.xml')
+            ->with('default/codeStyleSettings.xml')
             ->willReturn('<xml/>');
 
         $environment = $this->createConfiguredMock(
diff --git a/tests/Patcher/CopyFilesTraitTest.php b/tests/Patcher/CopyFilesTraitTest.php
@@ -33,15 +33,15 @@ public function testPatch()
             ->expects($this->exactly(2))
             ->method('put')
             ->withConsecutive(
-                ['foo/foo.xml', '<foo/>'],
-                ['foo/bar.xml', '<bar/>']
+                ['default/foo/foo.xml', '<foo/>'],
+                ['default/foo/bar.xml', '<bar/>']
             );
 
         $source = $this->createMock(FilesystemInterface::class);
         $source
             ->expects($this->once())
             ->method('listFiles')
-            ->with('foo')
+            ->with('default/foo')
             ->willReturn(
                 [
                     'foo/foo.xml',
@@ -54,8 +54,8 @@ public function testPatch()
             ->method('read')
             ->willReturnMap(
                 [
-                    ['foo/foo.xml', '<foo/>'],
-                    ['foo/bar.xml', '<bar/>']
+                    ['default/foo/foo.xml', '<foo/>'],
+                    ['default/foo/bar.xml', '<bar/>']
                 ]
             );
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function patch(`
`28`	`28`	`$this->copyFile(`
`29`	`29`	`$environment->getDefaultsFilesystem(),`
`30`	`30`	`$environment->getIdeConfigFilesystem(),`
`31`		`- 'codeStyleSettings.xml'`
	`31`	`+ 'codeStyleSettings.xml'`
`32`	`32`	`);`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ public function patch(`
`30`	`30`	`$this->copyDirectory(`
`31`	`31`	`$environment->getDefaultsFilesystem(),`
`32`	`32`	`$environment->getIdeConfigFilesystem(),`
`33`		`- $environment->getProjectTypeResolver()->resolve() . DIRECTORY_SEPARATOR . 'fileTemplates'`
	`33`	`+ DIRECTORY_SEPARATOR . 'fileTemplates',`
	`34`	`+ $environment->getProjectTypeResolver()->resolve()`
`34`	`35`	`);`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ public function patch(`
`32`	`32`	`$this->copyDirectory(`
`33`	`33`	`$environment->getDefaultsFilesystem(),`
`34`	`34`	`$environment->getIdeDefaultConfigFilesystem(),`
`35`		`- $environment->getProjectTypeResolver()->resolve() . DIRECTORY_SEPARATOR . 'templates'`
	`35`	`+ 'templates',`
	`36`	`+ $environment->getProjectTypeResolver()->resolve()`
`36`	`37`	`);`
`37`	`38`	`}`
`38`	`39`	`}`