From 99a34576a650a506f4a891b6de0242cb067dff26 Mon Sep 17 00:00:00 2001
From: Alexey Rogachev <arogachev90@gmail.com>
Date: Sat, 19 Feb 2022 12:29:09 +0600
Subject: [PATCH 1/2] Fix encoding in non English guides

---
 templates/bootstrap/GuideRenderer.php | 3 ---
 templates/html/GuideRenderer.php      | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/bootstrap/GuideRenderer.php b/templates/bootstrap/GuideRenderer.php
index 21a2bb63..6c69eb1a 100644
--- a/templates/bootstrap/GuideRenderer.php
+++ b/templates/bootstrap/GuideRenderer.php
@@ -31,14 +31,11 @@ public function render($files, $targetDir)
     {
         $types = array_merge($this->apiContext->classes, $this->apiContext->interfaces, $this->apiContext->traits);
 
-        $extTypes = [];
         foreach ($this->extensions as $k => $ext) {
             $extType = $this->filterTypes($types, $ext);
             if (empty($extType)) {
                 unset($this->extensions[$k]);
-                continue;
             }
-            $extTypes[$ext] = $extType;
         }
 
         parent::render($files, $targetDir);
diff --git a/templates/html/GuideRenderer.php b/templates/html/GuideRenderer.php
index 1796e24e..e73d3ce4 100644
--- a/templates/html/GuideRenderer.php
+++ b/templates/html/GuideRenderer.php
@@ -164,6 +164,7 @@ public function getGuideReferences()
      */
     protected function fixMarkdownLinks($content)
     {
+        $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
         $doc = new DOMDocument();
         $doc->loadHTML($content);
 

From 61bcf83e38d2ee3be9b53b56894349fc959797c2 Mon Sep 17 00:00:00 2001
From: Alexey Rogachev <arogachev90@gmail.com>
Date: Sat, 19 Feb 2022 12:43:28 +0600
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8283d3bf..a076d27b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,18 @@
 Yii Framework 2 apidoc extension Change Log
 ===========================================
 
-3.0.3 under development
+3.0.4 under development
 -----------------------
 
 - no changes in this release.
 
 
+3.0.3 under development
+-----------------------
+
+- Bug #281: Fix encoding in non English guides (arogachev)
+
+
 3.0.2 February 16, 2022
 -----------------------