dev/core#3961 - Modify psr-0 namespaces of component extensions to match core

diff --git a/ext/civi_campaign/civi_campaign.civix.php b/ext/civi_campaign/civi_campaign.civix.php
index 79fb176c4665d2bbfcae6a3eb535e0dc32ee3ab5..442c2451325cb61a9e0009869b253db4129447b8 100644 (file)
--- a/ext/civi_campaign/civi_campaign.civix.php
+++ b/ext/civi_campaign/civi_campaign.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviCampaign_ExtensionUtil {
+class CRM_Campaign_ExtensionUtil {
   const SHORT_NAME = 'civi_campaign';
   const LONG_NAME = 'civi_campaign';
-  const CLASS_PREFIX = 'CRM_CiviCampaign';
+  const CLASS_PREFIX = 'CRM_Campaign';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviCampaign_ExtensionUtil {
 
 }
 
-use CRM_CiviCampaign_ExtensionUtil as E;
+use CRM_Campaign_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_campaign/civi_campaign.php b/ext/civi_campaign/civi_campaign.php
index f989d1ccddf90ddaf9cdd20ef902e0609c23254f..6b7713484ebc80ca4034ebbd6121d5f209b3c92b 100644 (file)
--- a/ext/civi_campaign/civi_campaign.php
+++ b/ext/civi_campaign/civi_campaign.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_campaign.civix.php';
-// phpcs:disable
-use CRM_CiviCampaign_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_campaign/info.xml b/ext/civi_campaign/info.xml
index ca6c1ec40340a009fbb0717cad18ddc60bfe65f1..1e99aabf0cda1e916a8b579fa4e0feb536f54857 100644 (file)
--- a/ext/civi_campaign/info.xml
+++ b/ext/civi_campaign/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviCampaign</namespace>
+    <namespace>CRM/Campaign</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviCampaign</angularModule>
+    <angularModule>civiCampaign</angularModule>
   </civix>
 </extension>

diff --git a/ext/civi_case/civi_case.civix.php b/ext/civi_case/civi_case.civix.php
index 0dbfc0c207e62ca18a2cecf6f70f2e9fff96e6c4..12da1fbcb2d1d0fa2ad67ce9626fc73a3be83537 100644 (file)
--- a/ext/civi_case/civi_case.civix.php
+++ b/ext/civi_case/civi_case.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviCase_ExtensionUtil {
+class CRM_Case_ExtensionUtil {
   const SHORT_NAME = 'civi_case';
   const LONG_NAME = 'civi_case';
-  const CLASS_PREFIX = 'CRM_CiviCase';
+  const CLASS_PREFIX = 'CRM_Case';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviCase_ExtensionUtil {
 
 }
 
-use CRM_CiviCase_ExtensionUtil as E;
+use CRM_Case_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_case/civi_case.php b/ext/civi_case/civi_case.php
index 048dd4a9d46e6c728f31a0f620a4fa559634374f..444ef886e7dd2381ad6a596079265ef96352446b 100644 (file)
--- a/ext/civi_case/civi_case.php
+++ b/ext/civi_case/civi_case.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_case.civix.php';
-// phpcs:disable
-use CRM_CiviCase_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_case/info.xml b/ext/civi_case/info.xml
index 36b2e64646c2c64a691cb375320ff66ca843c6cb..bc10e5f890ef4936c98ede09b737151fcdf0a5cf 100644 (file)
--- a/ext/civi_case/info.xml
+++ b/ext/civi_case/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviCase</namespace>
+    <namespace>CRM/Case</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviCase</angularModule>
+    <angularModule>civiCase</angularModule>
   </civix>
 </extension>

diff --git a/ext/civi_contribute/civi_contribute.civix.php b/ext/civi_contribute/civi_contribute.civix.php
index 28a36aaa6e9294635a02eb13cd27db54f48eef99..215801a0d6f0a9b807b5b1b7f1118ac1d35ee29a 100644 (file)
--- a/ext/civi_contribute/civi_contribute.civix.php
+++ b/ext/civi_contribute/civi_contribute.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviContribute_ExtensionUtil {
+class CRM_Contribute_ExtensionUtil {
   const SHORT_NAME = 'civi_contribute';
   const LONG_NAME = 'civi_contribute';
-  const CLASS_PREFIX = 'CRM_CiviContribute';
+  const CLASS_PREFIX = 'CRM_Contribute';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviContribute_ExtensionUtil {
 
 }
 
-use CRM_CiviContribute_ExtensionUtil as E;
+use CRM_Contribute_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_contribute/civi_contribute.php b/ext/civi_contribute/civi_contribute.php
index 1d283c25767573164001c7abf5fd1fc911818b55..2402844a72f8b5b15b06bb0ac64f86e22982b895 100644 (file)
--- a/ext/civi_contribute/civi_contribute.php
+++ b/ext/civi_contribute/civi_contribute.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_contribute.civix.php';
-// phpcs:disable
-use CRM_CiviContribute_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_contribute/info.xml b/ext/civi_contribute/info.xml
index 195220c3a2eeffe88484d163547e1005c744de71..8da59e4cb4d5f7fd9dc4e715fc4446ebdf715eb6 100644 (file)
--- a/ext/civi_contribute/info.xml
+++ b/ext/civi_contribute/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviContribute</namespace>
+    <namespace>CRM/Contribute</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviContribute</angularModule>
+    <angularModule>civiContribute</angularModule>
   </civix>
 </extension>

diff --git a/ext/civi_event/civi_event.civix.php b/ext/civi_event/civi_event.civix.php
index e2d6a3e8e6a8a438f7de2e0a02df28a97676c716..5a8787ae40cddf6dd9820971fd961b4dd67b717c 100644 (file)
--- a/ext/civi_event/civi_event.civix.php
+++ b/ext/civi_event/civi_event.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviEvent_ExtensionUtil {
+class CRM_Event_ExtensionUtil {
   const SHORT_NAME = 'civi_event';
   const LONG_NAME = 'civi_event';
-  const CLASS_PREFIX = 'CRM_CiviEvent';
+  const CLASS_PREFIX = 'CRM_Event';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviEvent_ExtensionUtil {
 
 }
 
-use CRM_CiviEvent_ExtensionUtil as E;
+use CRM_Event_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_event/civi_event.php b/ext/civi_event/civi_event.php
index 33a761b89d24e4baded3250c9cae98962dc7544a..f201f3421e3e7d9c5c1b57c616491d710a49b2f6 100644 (file)
--- a/ext/civi_event/civi_event.php
+++ b/ext/civi_event/civi_event.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_event.civix.php';
-// phpcs:disable
-use CRM_CiviEvent_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_event/info.xml b/ext/civi_event/info.xml
index 015dd41e091d4773e67e3e18407106c2f92eab21..ea2ba491bfc78b7bc57d9c389153615fe30a00c4 100644 (file)
--- a/ext/civi_event/info.xml
+++ b/ext/civi_event/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviEvent</namespace>
+    <namespace>CRM/Event</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviEvent</angularModule>
+    <angularModule>civiEvent</angularModule>
   </civix>
 </extension>

diff --git a/ext/civi_mail/civi_mail.civix.php b/ext/civi_mail/civi_mail.civix.php
index 5fcae19e0f624a43c89c1c29b02bb408643b722e..6031c7e60fe274c812f51b667fe7cc1a4b972d7e 100644 (file)
--- a/ext/civi_mail/civi_mail.civix.php
+++ b/ext/civi_mail/civi_mail.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviMail_ExtensionUtil {
+class CRM_Mailing_ExtensionUtil {
   const SHORT_NAME = 'civi_mail';
   const LONG_NAME = 'civi_mail';
-  const CLASS_PREFIX = 'CRM_CiviMail';
+  const CLASS_PREFIX = 'CRM_Mailing';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviMail_ExtensionUtil {
 
 }
 
-use CRM_CiviMail_ExtensionUtil as E;
+use CRM_Mailing_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_mail/civi_mail.php b/ext/civi_mail/civi_mail.php
index 9d5555c2daeb7b2c680449ed5ccf454eea105219..54ab9ba24ba76fe64afbe9b95e9318aec1cd912e 100644 (file)
--- a/ext/civi_mail/civi_mail.php
+++ b/ext/civi_mail/civi_mail.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_mail.civix.php';
-// phpcs:disable
-use CRM_CiviMail_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_mail/info.xml b/ext/civi_mail/info.xml
index cfb627fc73a591c5a649e3d2af5307716b9c7686..1f61dee9897d5a22bff63bbaf161c36540a70f6a 100644 (file)
--- a/ext/civi_mail/info.xml
+++ b/ext/civi_mail/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviMail</namespace>
+    <namespace>CRM/Mailing</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviMail</angularModule>
+    <angularModule>civiMail</angularModule>
   </civix>
 </extension>

diff --git a/ext/civi_member/civi_member.civix.php b/ext/civi_member/civi_member.civix.php
index 4ed00a0564ad07d98437e1e8e92d52ddf3a5885c..21fe9cbd23905a888462118bf8c346161061cb26 100644 (file)
--- a/ext/civi_member/civi_member.civix.php
+++ b/ext/civi_member/civi_member.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviMember_ExtensionUtil {
+class CRM_Member_ExtensionUtil {
   const SHORT_NAME = 'civi_member';
   const LONG_NAME = 'civi_member';
-  const CLASS_PREFIX = 'CRM_CiviMember';
+  const CLASS_PREFIX = 'CRM_Member';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviMember_ExtensionUtil {
 
 }
 
-use CRM_CiviMember_ExtensionUtil as E;
+use CRM_Member_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_member/civi_member.php b/ext/civi_member/civi_member.php
index fd42f5b609f0b07e1744b64323a6ec6371e66115..41ad6469a8688c31f04e3d5d5fb54106723bec9c 100644 (file)
--- a/ext/civi_member/civi_member.php
+++ b/ext/civi_member/civi_member.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_member.civix.php';
-// phpcs:disable
-use CRM_CiviMember_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_member/info.xml b/ext/civi_member/info.xml
index 6065ff6df8e18e52be8d1ee9f619511525160493..eeed44dd869047f6c7ce0bd01f7a3f7a254dbfea 100644 (file)
--- a/ext/civi_member/info.xml
+++ b/ext/civi_member/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviMember</namespace>
+    <namespace>CRM/Member</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviMember</angularModule>
+    <angularModule>civiMember</angularModule>
   </civix>
 </extension>

diff --git a/ext/civi_pledge/civi_pledge.civix.php b/ext/civi_pledge/civi_pledge.civix.php
index 27c4b73cca0c8c501f475250800e6472b0192ef0..136301b427181dd7b280ff25c1ec39d8be7ff8a7 100644 (file)
--- a/ext/civi_pledge/civi_pledge.civix.php
+++ b/ext/civi_pledge/civi_pledge.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviPledge_ExtensionUtil {
+class CRM_Pledge_ExtensionUtil {
   const SHORT_NAME = 'civi_pledge';
   const LONG_NAME = 'civi_pledge';
-  const CLASS_PREFIX = 'CRM_CiviPledge';
+  const CLASS_PREFIX = 'CRM_Pledge';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviPledge_ExtensionUtil {
 
 }
 
-use CRM_CiviPledge_ExtensionUtil as E;
+use CRM_Pledge_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_pledge/civi_pledge.php b/ext/civi_pledge/civi_pledge.php
index 9f3a75a28ecdeec63b9218d6ec61e21955552407..bbe0403bb3b6e206e38548db53f642e01aa742e8 100644 (file)
--- a/ext/civi_pledge/civi_pledge.php
+++ b/ext/civi_pledge/civi_pledge.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_pledge.civix.php';
-// phpcs:disable
-use CRM_CiviPledge_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_pledge/info.xml b/ext/civi_pledge/info.xml
index 4a73f93a88edc5e1d6cd7cdca6ebe5c7ecf766a4..be1508f4ea7c9335e6cb5b5323adee96cf4850f6 100644 (file)
--- a/ext/civi_pledge/info.xml
+++ b/ext/civi_pledge/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviPledge</namespace>
+    <namespace>CRM/Pledge</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviPledge</angularModule>
+    <angularModule>civiPledge</angularModule>
   </civix>
 </extension>

diff --git a/ext/civi_report/civi_report.civix.php b/ext/civi_report/civi_report.civix.php
index 02dec7b83b1b6737ace43e67c43e628c8c5e7c51..bc9eb1dfa34b940a4d7af35aee26dcb1d3c494f9 100644 (file)
--- a/ext/civi_report/civi_report.civix.php
+++ b/ext/civi_report/civi_report.civix.php
@@ -6,10 +6,10 @@
  * The ExtensionUtil class provides small stubs for accessing resources of this
  * extension.
  */
-class CRM_CiviReport_ExtensionUtil {
+class CRM_Report_ExtensionUtil {
   const SHORT_NAME = 'civi_report';
   const LONG_NAME = 'civi_report';
-  const CLASS_PREFIX = 'CRM_CiviReport';
+  const CLASS_PREFIX = 'CRM_Report';
 
   /**
    * Translate a string using the extension's domain.
@@ -77,7 +77,7 @@ class CRM_CiviReport_ExtensionUtil {
 
 }
 
-use CRM_CiviReport_ExtensionUtil as E;
+use CRM_Report_ExtensionUtil as E;
 
 /**
  * (Delegated) Implements hook_civicrm_config().

diff --git a/ext/civi_report/civi_report.php b/ext/civi_report/civi_report.php
index dfd7038a752f21a6c213354ecd2a737ef5dfa2d2..1a49342b2285cbbec76619bc2e35b70fc31678b6 100644 (file)
--- a/ext/civi_report/civi_report.php
+++ b/ext/civi_report/civi_report.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once 'civi_report.civix.php';
-// phpcs:disable
-use CRM_CiviReport_ExtensionUtil as E;
-// phpcs:enable

diff --git a/ext/civi_report/info.xml b/ext/civi_report/info.xml
index 5003a4150239d4f6c48309fdaa490f3e63afddc0..6a7cbe5fb0bc86632a16af995a9ddf1004263f27 100644 (file)
--- a/ext/civi_report/info.xml
+++ b/ext/civi_report/info.xml
@@ -25,8 +25,8 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <civix>
-    <namespace>CRM/CiviReport</namespace>
+    <namespace>CRM/Report</namespace>
     <format>23.02.1</format>
-    <angularModule>crmCiviReport</angularModule>
+    <angularModule>civiReport</angularModule>
   </civix>
 </extension>