Merge pull request #23426 from civicrm/5.50

5.50 to master
civicrm · May 10, 2022 · a29aaa9 · a29aaa9
2 parents 4b61b72 + 4aa7d2e
commit a29aaa9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 2 deletions.
diff --git a/mixin/afform-entity-php@1/mixin.php b/mixin/afform-entity-php@1/mixin.php
@@ -5,6 +5,7 @@
  *
  * @mixinName afform-entity-php
  * @mixinVersion 1.0.0
+ * @since 5.50
  *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.

diff --git a/mixin/ang-php@1/mixin.php b/mixin/ang-php@1/mixin.php
@@ -5,6 +5,7 @@
  *
  * @mixinName ang-php
  * @mixinVersion 1.0.0
+ * @since 5.45
  *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.

diff --git a/mixin/case-xml@1/mixin.php b/mixin/case-xml@1/mixin.php
@@ -5,6 +5,7 @@
  *
  * @mixinName case-xml
  * @mixinVersion 1.0.0
+ * @since 5.45
  *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.

diff --git a/mixin/menu-xml@1/mixin.php b/mixin/menu-xml@1/mixin.php
@@ -5,6 +5,7 @@
  *
  * @mixinName menu-xml
  * @mixinVersion 1.0.0
+ * @since 5.45
  *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.

diff --git a/mixin/mgd-php@1/mixin.php b/mixin/mgd-php@1/mixin.php
@@ -4,7 +4,8 @@
  * Auto-register "**.mgd.php" files.
  *
  * @mixinName mgd-php
- * @mixinVersion 1.0.0
+ * @mixinVersion 1.1.0
+ * @since 5.50
  *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.

diff --git a/mixin/setting-php@1/mixin.php b/mixin/setting-php@1/mixin.php
@@ -5,6 +5,7 @@
  *
  * @mixinName setting-php
  * @mixinVersion 1.0.0
+ * @since 5.45
  *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.

diff --git a/mixin/theme-php@1/mixin.php b/mixin/theme-php@1/mixin.php
@@ -5,6 +5,7 @@
  *
  * @mixinName theme-php
  * @mixinVersion 1.0.0
+ * @since 5.45
  *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.

diff --git a/tools/mixin/bin/mixer b/tools/mixin/bin/mixer
@@ -129,9 +129,15 @@ function task_test(array $options, string $targetDir, ...$args) {
 
 function task_list(array $options, ...$mixinNames) {
   $mixinNames = resolve_mixin_names($mixinNames);
+  fprintf(STDOUT, "%-20s %-8s %-8s %s\n", "NAME", "VERSION", "SINCE", "DESCRIPTION");
+  fprintf(STDOUT, "%-20s %-8s %-8s %s\n", "----", "-------", "-----", "-----------");
   foreach ($mixinNames as $mixinName) {
     $mixin = mixlib()->get($mixinName);
-    fprintf(STDOUT, "%-20s %-10s %s\n", $mixin['mixinName'], $mixin['mixinVersion'] ?? '', $mixin['description'] ?? '');
+    fprintf(STDOUT, "%-20s %-8s %-8s %s\n",
+      $mixin['mixinName'],
+      $mixin['mixinVersion'] ?? '',
+      $mixin['since'] ?? '',
+      $mixin['description'] ?? '');
   }
 }