phpstorm - Re-enable standard civix bits

diff --git a/tools/extensions/phpstorm/info.xml b/tools/extensions/phpstorm/info.xml
index 6ae54c75c0df63da71737f3117727aaccbb30f6c..dc9f4ec610106a11f6d9054621ee01bdfa13f72f 100644 (file)
--- a/tools/extensions/phpstorm/info.xml
+++ b/tools/extensions/phpstorm/info.xml
@@ -31,10 +31,8 @@
     <angularModule>crmPhpstorm</angularModule>
   </civix>
   <mixins>
-    <!--
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
     <mixin>smarty-v2@1.0.1</mixin>
-    -->
   </mixins>
 </extension>

diff --git a/tools/extensions/phpstorm/phpstorm.php b/tools/extensions/phpstorm/phpstorm.php
index e833d24d2fe5bfcae92f9511ada63501243b41c6..320245c99cd23714e1e9a758a2a8429105d19e95 100644 (file)
--- a/tools/extensions/phpstorm/phpstorm.php
+++ b/tools/extensions/phpstorm/phpstorm.php
@@ -1,10 +1,11 @@
 <?php
 
-// require_once 'phpstorm.civix.php';
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+
+require_once 'phpstorm.civix.php';
 // phpcs:disable
-// use CRM_Phpstorm_ExtensionUtil as E;
+use CRM_Phpstorm_ExtensionUtil as E;
 // phpcs:enable
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 
 /**
  * Determine the folder where we will store PhpStorm metadata files.
@@ -25,9 +26,9 @@ function phpstorm_metadata_dir(): string {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config/
  */
-// function phpstorm_civicrm_config(&$config): void {
-//  _phpstorm_civix_civicrm_config($config);
-// }
+function phpstorm_civicrm_config(&$config): void {
+ _phpstorm_civix_civicrm_config($config);
+}
 
 function phpstorm_civicrm_container(\Symfony\Component\DependencyInjection\ContainerBuilder $container) {
   $container->addCompilerPass(new \Civi\PhpStorm\PhpStormCompilePass(), PassConfig::TYPE_AFTER_REMOVING, 2000);