From edb3c0470f00a457ab3d5b253aad2a3c087b3f2c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Aug 2023 15:58:25 -0700
Subject: [PATCH] phpstorm - Re-enable standard civix bits

---
 tools/extensions/phpstorm/info.xml     |  2 --
 tools/extensions/phpstorm/phpstorm.php | 13 +++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/extensions/phpstorm/info.xml b/tools/extensions/phpstorm/info.xml
index 6ae54c75c0..dc9f4ec610 100644
--- 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 e833d24d2f..320245c99c 100644
--- 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);
-- 
2.25.1