Revize 395eced7

Re #7327 regexp quote, datové typy u parametrů

app/FrontModule/component/Transliteration/TransliterationSearchForm.php

@@ -6 +6 @@
 use App\Model\TransliterationSearchModel;
 use Nette\Application\UI\Control;
 use Nette\Application\UI\Form;
+use Nette\Utils\ArrayHash;
 
 class TransliterationSearchForm extends Control
 {
@@ -50 +51 @@
 
     public function formSuccess(Form $form)
     {
+        /** @var ArrayHash $values */
         $values = $form->getValues();
         $this->transliterationSearchModel->setSearchTerms($values);
         $this->presenter->redirect('Transliteration:searchResult');

app/FrontModule/presenters/TransliterationPresenter.php

@@ -11 +11 @@
 use App\Model\Repository\TransliterationRepository;
 use App\Model\TransliterationSearchModel;
 use Nette\Application\UI\Presenter;
-use Nette\SmartObject;
-use Tracy\Debugger;
 
 class TransliterationPresenter extends Presenter
 {

app/model/TransliterationSearchModel.php

@@ -5 +5 @@
 
 use Nette\Http\Session;
 use Nette\Http\SessionSection;
+use Nette\Utils\ArrayHash;
 
 class TransliterationSearchModel
 {
@@ -28 +29 @@
         return $this->section;
     }
 
-    public function setSearchTerms($searchTerms)
+    public function setSearchTerms(ArrayHash $searchTerms)
     {
         $this->section->searchTerms = $searchTerms;
     }
 
+    /**
+     * @return null|ArrayHash
+     */
     public function getSearchTerms()
     {
         return $this->section->searchTerms;

app/model/repository/TransliterationRepository.php

@@ -3 +3 @@
 namespace App\Model\Repository;
 
 use App\Enum\ELogicalConditions;
-use Tracy\Debugger;
+use Nette\Utils\ArrayHash;
 
 /**
  * Repository pro práci s tabulkou `transliteration`
@@ -31 +31 @@
 
     /**
      * Vyhledává texty podle slov v řádcích textu
-     * @param $queryParams array podmínky pro hledaný text
+     * @param ArrayHash $queryParams objekt s podmínkami pro hledaný text
      * @return \Nette\Database\ResultSet
      */
-    public function transliterationsFulltextSearch($queryParams)
+    public function transliterationsFulltextSearch(ArrayHash $queryParams)
     {
         $where = '';
         $whereArgs = [];
@@ -93 +93 @@
         return $this->context->queryArgs($query, $whereArgs);
     }
 
-    private function prepareSearchRegExp($word)
+    /**
+     * Vytváří regulární výraz z hledaného slova, escapuje regexp znaky
+     * @param $word string hledané slovo
+     * @return string Regexp
+     */
+    private function prepareSearchRegExp(string $word)
     {
         $splitWord = preg_split('//u',$word, -1, PREG_SPLIT_NO_EMPTY);
+        foreach ($splitWord as &$char)
+        {
+            $char = preg_quote($char);
+        }
         $regex = implode("[\[\]⌈⌉?!><\.₁₂₃₄₅₆₇₈₉₀\-\s]*?", $splitWord);
         return $regex;
     }
 
-    public function getTransliterationDetail($id)
+    /**
+     * @param int $id id transliterace
+     * @return bool|\Nette\Database\IRow|\Nette\Database\Row
+     */
+    public function getTransliterationDetail(int $id)
     {
         return $this->context->query(
             "SELECT