Afform - Upgrade ext to civix 22.10.0

diff --git a/ext/afform/admin/afform_admin.civix.php b/ext/afform/admin/afform_admin.civix.php
index 3071d542f3a9dd5ab293ab4d6e50eb2e61f92506..82e009d93c321469959665cc85ff457734d18d77 100644 (file)
--- a/ext/afform/admin/afform_admin.civix.php
+++ b/ext/afform/admin/afform_admin.civix.php
@@ -24,7 +24,7 @@ class CRM_AfformAdmin_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = []) {
+  public static function ts($text, $params = []): string {
     if (!array_key_exists('domain', $params)) {
       $params['domain'] = [self::LONG_NAME, NULL];
     }
@@ -41,7 +41,7 @@ class CRM_AfformAdmin_ExtensionUtil {
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
    */
-  public static function url($file = NULL) {
+  public static function url($file = NULL): string {
     if ($file === NULL) {
       return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
     }
@@ -138,7 +138,7 @@ function _afform_admin_civix_civicrm_postInstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
-function _afform_admin_civix_civicrm_uninstall() {
+function _afform_admin_civix_civicrm_uninstall(): void {
   _afform_admin_civix_civicrm_config();
   if ($upgrader = _afform_admin_civix_upgrader()) {
     $upgrader->onUninstall();
@@ -150,7 +150,7 @@ function _afform_admin_civix_civicrm_uninstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
-function _afform_admin_civix_civicrm_enable() {
+function _afform_admin_civix_civicrm_enable(): void {
   _afform_admin_civix_civicrm_config();
   if ($upgrader = _afform_admin_civix_upgrader()) {
     if (is_callable([$upgrader, 'onEnable'])) {
@@ -165,7 +165,7 @@ function _afform_admin_civix_civicrm_enable() {
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
-function _afform_admin_civix_civicrm_disable() {
+function _afform_admin_civix_civicrm_disable(): void {
   _afform_admin_civix_civicrm_config();
   if ($upgrader = _afform_admin_civix_upgrader()) {
     if (is_callable([$upgrader, 'onDisable'])) {

diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml
index 6b81a6f9606a1a112518a54ca17f3eaf5cdb8d88..cdd86abcd06094bfcf6ae99c1130d80c799e22dc 100644 (file)
--- a/ext/afform/admin/info.xml
+++ b/ext/afform/admin/info.xml
@@ -25,6 +25,7 @@
   </requires>
   <civix>
     <namespace>CRM/AfformAdmin</namespace>
+    <format>22.10.0</format>
   </civix>
   <classloader>
     <psr4 prefix="Civi\" path="Civi"/>
@@ -33,7 +34,7 @@
   <mixins>
     <mixin>ang-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
-    <mixin>mgd-php@1.1.0</mixin>
+    <mixin>mgd-php@1.0.0</mixin>
     <mixin>afform-entity-php@1.0.0</mixin>
   </mixins>
 </extension>

diff --git a/ext/afform/core/afform.civix.php b/ext/afform/core/afform.civix.php
index ae7b0c0fa4b77d7ca67f748811b7f4e7aab22b73..11006a5f58ccbff8a0a3b045fe48b2ce6eadf236 100644 (file)
--- a/ext/afform/core/afform.civix.php
+++ b/ext/afform/core/afform.civix.php
@@ -24,7 +24,7 @@ class CRM_Afform_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = []) {
+  public static function ts($text, $params = []): string {
     if (!array_key_exists('domain', $params)) {
       $params['domain'] = [self::LONG_NAME, NULL];
     }
@@ -41,7 +41,7 @@ class CRM_Afform_ExtensionUtil {
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
    */
-  public static function url($file = NULL) {
+  public static function url($file = NULL): string {
     if ($file === NULL) {
       return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
     }
@@ -138,7 +138,7 @@ function _afform_civix_civicrm_postInstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
-function _afform_civix_civicrm_uninstall() {
+function _afform_civix_civicrm_uninstall(): void {
   _afform_civix_civicrm_config();
   if ($upgrader = _afform_civix_upgrader()) {
     $upgrader->onUninstall();
@@ -150,7 +150,7 @@ function _afform_civix_civicrm_uninstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
-function _afform_civix_civicrm_enable() {
+function _afform_civix_civicrm_enable(): void {
   _afform_civix_civicrm_config();
   if ($upgrader = _afform_civix_upgrader()) {
     if (is_callable([$upgrader, 'onEnable'])) {
@@ -165,7 +165,7 @@ function _afform_civix_civicrm_enable() {
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
-function _afform_civix_civicrm_disable() {
+function _afform_civix_civicrm_disable(): void {
   _afform_civix_civicrm_config();
   if ($upgrader = _afform_civix_upgrader()) {
     if (is_callable([$upgrader, 'onDisable'])) {

diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 5b363a408380ec3921199b471902b9d4fca289ac..0c88317cca692b42cfe738dd2b6c8ee864a8ff11 100644 (file)
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -21,6 +21,7 @@
   <comments>The Form Core extension is required to use any dynamic form. To administer and edit forms, also install the FormBuilder extension.</comments>
   <civix>
     <namespace>CRM/Afform</namespace>
+    <format>22.10.0</format>
   </civix>
   <classloader>
     <psr0 prefix="CRM_" path=""/>
@@ -32,7 +33,7 @@
   </requires>
   <mixins>
     <mixin>ang-php@1.0.0</mixin>
-    <mixin>mgd-php@1.1.0</mixin>
+    <mixin>mgd-php@1.0.0</mixin>
     <mixin>scan-classes@1.0.0</mixin>
   </mixins>
 </extension>

diff --git a/ext/afform/html/afform_html.civix.php b/ext/afform/html/afform_html.civix.php
index 80d673e53a4a4bccb8292af25d88148c8c7b5787..31c33437bb694c252b0da5598b9b1b549063051d 100644 (file)
--- a/ext/afform/html/afform_html.civix.php
+++ b/ext/afform/html/afform_html.civix.php
@@ -24,7 +24,7 @@ class CRM_AfformHtml_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = []) {
+  public static function ts($text, $params = []): string {
     if (!array_key_exists('domain', $params)) {
       $params['domain'] = [self::LONG_NAME, NULL];
     }
@@ -41,7 +41,7 @@ class CRM_AfformHtml_ExtensionUtil {
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
    */
-  public static function url($file = NULL) {
+  public static function url($file = NULL): string {
     if ($file === NULL) {
       return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
     }
@@ -138,7 +138,7 @@ function _afform_html_civix_civicrm_postInstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
-function _afform_html_civix_civicrm_uninstall() {
+function _afform_html_civix_civicrm_uninstall(): void {
   _afform_html_civix_civicrm_config();
   if ($upgrader = _afform_html_civix_upgrader()) {
     $upgrader->onUninstall();
@@ -150,7 +150,7 @@ function _afform_html_civix_civicrm_uninstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
-function _afform_html_civix_civicrm_enable() {
+function _afform_html_civix_civicrm_enable(): void {
   _afform_html_civix_civicrm_config();
   if ($upgrader = _afform_html_civix_upgrader()) {
     if (is_callable([$upgrader, 'onEnable'])) {
@@ -165,7 +165,7 @@ function _afform_html_civix_civicrm_enable() {
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
-function _afform_html_civix_civicrm_disable() {
+function _afform_html_civix_civicrm_disable(): void {
   _afform_html_civix_civicrm_config();
   if ($upgrader = _afform_html_civix_upgrader()) {
     if (is_callable([$upgrader, 'onDisable'])) {

diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index 62fe25f6e7b0ab8389770248455dbc95117b053e..69d64da0f62bb1fa5908bc8e8da51dc8dfcc5b94 100644 (file)
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -27,5 +27,6 @@
   </mixins>
   <civix>
     <namespace>CRM/AfformHtml</namespace>
+    <format>22.10.0</format>
   </civix>
 </extension>

diff --git a/ext/afform/mock/afform_mock.civix.php b/ext/afform/mock/afform_mock.civix.php
index b28d2639015720e3caeea2205003f93d006af5d7..74c34428b1b6dbdb4ffbf3a8fcd82e4cf4a9b982 100644 (file)
--- a/ext/afform/mock/afform_mock.civix.php
+++ b/ext/afform/mock/afform_mock.civix.php
@@ -24,7 +24,7 @@ class CRM_AfformMock_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = []) {
+  public static function ts($text, $params = []): string {
     if (!array_key_exists('domain', $params)) {
       $params['domain'] = [self::LONG_NAME, NULL];
     }
@@ -41,7 +41,7 @@ class CRM_AfformMock_ExtensionUtil {
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
    *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
    */
-  public static function url($file = NULL) {
+  public static function url($file = NULL): string {
     if ($file === NULL) {
       return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
     }
@@ -138,7 +138,7 @@ function _afform_mock_civix_civicrm_postInstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
-function _afform_mock_civix_civicrm_uninstall() {
+function _afform_mock_civix_civicrm_uninstall(): void {
   _afform_mock_civix_civicrm_config();
   if ($upgrader = _afform_mock_civix_upgrader()) {
     $upgrader->onUninstall();
@@ -150,7 +150,7 @@ function _afform_mock_civix_civicrm_uninstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
-function _afform_mock_civix_civicrm_enable() {
+function _afform_mock_civix_civicrm_enable(): void {
   _afform_mock_civix_civicrm_config();
   if ($upgrader = _afform_mock_civix_upgrader()) {
     if (is_callable([$upgrader, 'onEnable'])) {
@@ -165,7 +165,7 @@ function _afform_mock_civix_civicrm_enable() {
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
-function _afform_mock_civix_civicrm_disable() {
+function _afform_mock_civix_civicrm_disable(): void {
   _afform_mock_civix_civicrm_config();
   if ($upgrader = _afform_mock_civix_upgrader()) {
     if (is_callable([$upgrader, 'onDisable'])) {

diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
index b94656d3fa5ba1feda3847396bc068b0462e062d..5b720648e05a38c64050daf9d144702c452a6ca3 100644 (file)
--- a/ext/afform/mock/info.xml
+++ b/ext/afform/mock/info.xml
@@ -29,5 +29,6 @@
   </mixins>
   <civix>
     <namespace>CRM/AfformMock</namespace>
+    <format>22.10.0</format>
   </civix>
 </extension>