From 4645ab19967e33a54c1c9258be9525120f81f108 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 10 May 2022 14:26:06 -0700 Subject: [PATCH 1/3] ManagedEntities - Update version number for mgd-php This is a follow-up/correction for #22959 (circa 5.50.alpha1; specifically fdc67a75b2f20aea9f0961683bd8a59c78755d5f). The prior revision had updated the behavior of `mgd-php`, so it should have also updated the version-number. --- mixin/mgd-php@1/mixin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mixin/mgd-php@1/mixin.php b/mixin/mgd-php@1/mixin.php index 676860848ea1..42ccf8606b99 100644 --- a/mixin/mgd-php@1/mixin.php +++ b/mixin/mgd-php@1/mixin.php @@ -4,7 +4,7 @@ * Auto-register "**.mgd.php" files. * * @mixinName mgd-php - * @mixinVersion 1.0.0 + * @mixinVersion 1.1.0 * * @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. From 5956419b2edc54bf7e83c8898ffe3421be621f14 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 10 May 2022 14:36:46 -0700 Subject: [PATCH 2/3] (NFC) mixin - Add `@since` tags --- mixin/afform-entity-php@1/mixin.php | 1 + mixin/ang-php@1/mixin.php | 1 + mixin/case-xml@1/mixin.php | 1 + mixin/menu-xml@1/mixin.php | 1 + mixin/mgd-php@1/mixin.php | 1 + mixin/setting-php@1/mixin.php | 1 + mixin/theme-php@1/mixin.php | 1 + 7 files changed, 7 insertions(+) diff --git a/mixin/afform-entity-php@1/mixin.php b/mixin/afform-entity-php@1/mixin.php index 04d637f32a00..15b7400b8b0c 100644 --- 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 index 6719db357117..c75326b5dd93 100644 --- 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 index 649c51e3c6d8..d1d0d6b5abf0 100644 --- 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 index 4c0b2276c0a0..46324608124e 100644 --- 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 index 42ccf8606b99..fcb2a29e6c77 100644 --- a/mixin/mgd-php@1/mixin.php +++ b/mixin/mgd-php@1/mixin.php @@ -5,6 +5,7 @@ * * @mixinName mgd-php * @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 index 7195af40dee3..dff70f3d5b32 100644 --- 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 index c49b60538f82..726d2187adf4 100644 --- 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. From 4c7f216710663e25ab090970a26a4052e9216d0f Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 10 May 2022 14:50:56 -0700 Subject: [PATCH 3/3] tools/mixin/bin/mixer - Display the `@since` data --- tools/mixin/bin/mixer | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/mixin/bin/mixer b/tools/mixin/bin/mixer index e7207adc980f..627fdaa9b64d 100755 --- 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'] ?? ''); } }