From 9a51b16a4fd914d9f049b9a5ef9c291b96327b2d Mon Sep 17 00:00:00 2001
From: Rutger Hertogh <r.hertogh@mycademy.com>
Date: Sun, 2 Jun 2024 14:55:52 +0200
Subject: [PATCH 1/2] Updated release cycle for Yii2

Copied release cycle info from https://github.com/yiisoft/yii2/pull/20142
---
 config/release-cycle.php          | 18 +++++++++++++++---
 widgets/VersionCalendar.php       |  4 ++--
 widgets/views/versionCalendar.php |  4 ++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/config/release-cycle.php b/config/release-cycle.php
index bcc0b612..e4c7c9d8 100644
--- a/config/release-cycle.php
+++ b/config/release-cycle.php
@@ -5,10 +5,22 @@
     '3.x' => [
         'php' => '>=8.0.0'
     ],
-    '2.0' => [
+    '2.2.x' => [
+        'php' => '>=8.1.0'
+    ],
+    '>= 2.0.50' => [
+        'release' => '2024-05-30',
+        'enhancements' => '2024-05-30',
+        'bugfixes' => '2026-11-23',
+        'eol' => '2027-11-23',
+        'php' => '>= 7.3, <= 8.4'
+    ],
+    '<= 2.0.49.x' => [
         'release' => '2014-10-12',
-        'enhancements' => '2018-02-19',
-        'php' => '>=5.4.0'
+        'enhancements' => '2023-08-29',
+        'bugfixes' => '2023-10-31',
+        'eol' => '2026-11-23',
+        'php' => '>= 5.4, <= 8.3'
     ],
     '1.1' => [
         'release' => '2010-01-10',
diff --git a/widgets/VersionCalendar.php b/widgets/VersionCalendar.php
index 5b340278..a9aac4d7 100644
--- a/widgets/VersionCalendar.php
+++ b/widgets/VersionCalendar.php
@@ -17,7 +17,7 @@ class VersionCalendar extends Widget
 {
     public $versions = [];
 
-    private $marginLeft = 80;
+    private $marginLeft = 100;
     private $marginRight = 50;
     private $headerHeight = 24;
     private $yearWidth = 120;
@@ -96,4 +96,4 @@ public function getBranchSupportState($version)
 
         return 'future';
     }
-}
\ No newline at end of file
+}
diff --git a/widgets/views/versionCalendar.php b/widgets/views/versionCalendar.php
index 2bcf43b5..cbe0dde9 100644
--- a/widgets/views/versionCalendar.php
+++ b/widgets/views/versionCalendar.php
@@ -84,8 +84,8 @@
 	<g class="branch-labels">
 		<?php foreach ($versions as $branch => $version): ?>
 			<g class="<?= $widget->getBranchSupportState($version) ?>">
-				<rect x="0" y="<?= $version['top'] ?>" width="<?= 0.5 * $marginLeft ?>" height="<?= $branchHeight ?>" />
-				<text x="<?= 0.25 * $marginLeft ?>" y="<?= $version['top'] + (0.5 * $branchHeight) ?>">
+				<rect x="0" y="<?= $version['top'] ?>" width="<?= 0.85 * $marginLeft ?>" height="<?= $branchHeight ?>" />
+				<text x="<?= 0.42 * $marginLeft ?>" y="<?= $version['top'] + (0.5 * $branchHeight) ?>">
 					<?= Html::encode($branch) ?>
 				</text>
 			</g>

From d5a02b4575d9bcfb6d2c334fc88da9baf9e5d12f Mon Sep 17 00:00:00 2001
From: Rutger Hertogh <r.hertogh@mycademy.com>
Date: Sun, 2 Jun 2024 17:15:21 +0200
Subject: [PATCH 2/2] Yii 2.1 footnote in release-cycle

---
 config/release-cycle.php     | 2 +-
 views/site/release-cycle.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/release-cycle.php b/config/release-cycle.php
index e4c7c9d8..5b5e3e5a 100644
--- a/config/release-cycle.php
+++ b/config/release-cycle.php
@@ -5,7 +5,7 @@
     '3.x' => [
         'php' => '>=8.0.0'
     ],
-    '2.2.x' => [
+    '2.2.x ¹' => [
         'php' => '>=8.1.0'
     ],
     '>= 2.0.50' => [
diff --git a/views/site/release-cycle.php b/views/site/release-cycle.php
index eca11d34..31f2eaec 100644
--- a/views/site/release-cycle.php
+++ b/views/site/release-cycle.php
@@ -100,6 +100,7 @@
                     </tbody>
                 </table>
             </div>
+            ¹ Note: Yii <a href="https://github.com/yiisoft/yii2/discussions/19831#discussioncomment-5858046" target="_blank">2.1</a> was skipped.
         </div>
     </div>
 </div>