refactor: simplified code

Author: thorsten

phpmyfaq/src/phpMyFAQ/Category.php

@@ -35,10 +35,9 @@ class Category
 {
     /**
      * The categories as an array.
-     * @deprecated Will be removed in a future version. Use query methods (e.g., getOrderedCategories) instead.
      * @var array<int, array<string, mixed>>
      */
-    public array $categories = [];
+    private array $categories = [];
 
     /**
      * The category names as an array indexed by category ID.
@@ -47,13 +46,6 @@ class Category
      */
     public array $categoryNames = [];
 
-    /**
-     * The image as an array.
-     * @deprecated Will be removed in a future version.
-     * @var array<int, string>
-     */
-    public array $image = [];
-
     /**
      * The tree with the tabs.
      * @deprecated Will be removed in a future version.
@@ -266,7 +258,7 @@ public function getOrderedCategories(bool $withPermission = true, bool $withInac
     /**
      * Get the level of the item id.
      */
-    private function getLevelOf(int $categoryId): int
+    public function getLevelOf(int $categoryId): int
     {
         return $this->getTreeBuilder()->computeLevel($this->categoryNames, $categoryId);
     }
@@ -342,11 +334,11 @@ private function getSymbol(int $categoryId, int $parentId): string
     {
         $siblings = $this->children[$parentId] ?? [];
         $array = array_keys($siblings);
-        return $categoryId == end($array) ? 'angle' : 'medium';
+        return $categoryId === end($array) ? 'angle' : 'medium';
     }
 
     /**
-     * List in array the root, super-root, ... of the $id.
+     * List in an array the root, super-root, ... of the $id.
      */
     private function getNodes(int $categoryId): array
     {
@@ -547,10 +539,13 @@ public function getCategoryLanguagesTranslated(int $categoryId): array
     public function getCategoryLanguagesToTranslate(int $categoryId, string $selectedLanguage): string
     {
         $output = '';
-        $existingLanguage = $this->configuration->getLanguage()->isLanguageAvailable($categoryId, 'faqcategories');
+        $existingLanguage = $this->configuration->getLanguage()->isLanguageAvailable(
+            identifier: $categoryId,
+            table: 'faqcategories',
+        );
 
         foreach (LanguageHelper::getAvailableLanguages() as $lang => $langname) {
-            if (!in_array(strtolower((string) $lang), $existingLanguage)) {
+            if (!in_array(strtolower((string) $lang), $existingLanguage, strict: true)) {
                 $output .= "\t<option value=\"" . strtolower((string) $lang) . '"';
                 if ($lang === $selectedLanguage) {
                     $output .= ' selected="selected"';
@@ -601,13 +596,13 @@ public function getCategoryTree(): array
         return $this->catTree;
     }
 
-    public function getCategoryName(int $categoryId): array
+    public function getCategoryName(int $categoryId): string
     {
-        return $this->categoryNames[$categoryId]['name'] ?? [];
+        return $this->categoryNames[$categoryId]['name'] ?? '';
     }
 
-    public function getCategoryDescription(int $categoryId): array
+    public function getCategoryDescription(int $categoryId): string
     {
-        return $this->categoryNames[$categoryId]['description'] ?? [];
+        return $this->categoryNames[$categoryId]['description'] ?? '';
     }
 }

phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php

@@ -518,9 +518,7 @@ public function translate(Request $request): Response
             'langToTranslate' => $langOptions, // deprecated in the future; generated from data service now
             'categoryDescriptionLabel' => Translation::get('categoryDescriptionLabel'),
             'categoryOwnerLabel' => Translation::get('categoryOwnerLabel'),
-            'userSelection' => $userHelper->getAllUsersForTemplate(
-                (int) $category->categoryNames[$categoryId]['user_id'],
-            ),
+            'userSelection' => $userHelper->getAllUsersForTemplate($category->getOwner($categoryId),),
             'ad_categ_transalready' => Translation::get('ad_categ_transalready'),
             'langTranslated' => $category->getCategoryLanguagesTranslated($categoryId),
             'ad_categ_translatecateg' => Translation::get('ad_categ_translatecateg'),

phpmyfaq/src/phpMyFAQ/Export/Pdf.php

@@ -109,22 +109,22 @@ public function generate(int $categoryId = 0, bool $downwards = true, string $la
             $this->wrapper->AddPage();
 
             // Bookmark for categories
-            if ($currentCategory !== $this->category->categoryNames[$faq['category_id']]['id']) {
+            if ($currentCategory !== $faq['category_id']) {
                 $this->wrapper->Bookmark(
                     html_entity_decode(
-                        (string) $this->category->categoryNames[$faq['category_id']]['name'],
+                        (string) $this->category->getCategoryName($faq['category_id']),
                         ENT_QUOTES,
                         'utf-8',
                     ),
-                    $this->category->categoryNames[$faq['category_id']]['level'] - 1,
+                    $this->category->getLevelOf($faq['category_id']) - 1,
                     0,
                 );
             }
 
             // Bookmark for FAQs
             $this->wrapper->Bookmark(
                 html_entity_decode((string) $faq['topic'], ENT_QUOTES, 'utf-8'),
-                $this->category->categoryNames[$faq['category_id']]['level'],
+                $this->category->getLevelOf($faq['category_id']),
                 0,
             );
 
@@ -133,7 +133,7 @@ public function generate(int $categoryId = 0, bool $downwards = true, string $la
             }
 
             $this->wrapper->SetFont($this->wrapper->getCurrentFont(), 'b', 12);
-            $this->wrapper->WriteHTML('<h1>' . $this->category->categoryNames[$faq['category_id']]['name'] . '</h1>');
+            $this->wrapper->WriteHTML('<h1>' . $this->category->getCategoryName($faq['category_id']) . '</h1>');
             $this->wrapper->WriteHTML('<h2>' . $faq['topic'] . '</h2>');
             $this->wrapper->Ln(10);
 
@@ -164,7 +164,7 @@ public function generate(int $categoryId = 0, bool $downwards = true, string $la
                 Translation::get('msgLastUpdateArticle') . Date::createIsoDate($faq['lastmodified']),
             );
 
-            $currentCategory = $this->category->categoryNames[$faq['category_id']]['id'];
+            $currentCategory = $faq['category_id'];
         }
 
         // remove default header/footer

phpmyfaq/src/phpMyFAQ/Helper/QuestionHelper.php

@@ -104,7 +104,7 @@ public function getOpenQuestions(): stdClass
                 $question->email = $mail->safeEmail($row->email);
                 $question->userName = $row->username;
                 $question->categoryId = $row->category_id;
-                $question->categoryName = $this->getCategory()->categoryNames[$row->category_id]['name'] ?? '';
+                $question->categoryName = $this->getCategory()->getCategoryName($row->category_id);
                 $question->question = $row->question;
                 $question->answerId = $row->answer_id;
 

phpmyfaq/src/phpMyFAQ/Language.php

@@ -55,20 +55,20 @@ public function __construct(
      * Returns an array of country codes for a specific FAQ record ID,
      * specific category ID or all languages used by FAQ records, categories.
      *
-     * @param int    $faqId    ID
-     * @param string $table Specifies table
+     * @param int    $identifier ID
+     * @param string $table      Specifies table
      * @return string[]
      */
-    public function isLanguageAvailable(int $faqId, string $table = 'faqdata'): array
+    public function isLanguageAvailable(int $identifier, string $table = 'faqdata'): array
     {
         $output = [];
 
-        if ($faqId === 0) {
+        if ($identifier === 0) {
             $distinct = ' DISTINCT ';
             $where = '';
         } else {
             $distinct = '';
-            $where = ' WHERE id = ' . $faqId;
+            $where = ' WHERE id = ' . $identifier;
         }
 
         $query = sprintf('SELECT %s lang FROM %s%s %s', $distinct, Database::getTablePrefix(), $table, $where);