Phrlog / GeoFixer

app/GeoFixerFacade.php

Doc Comments +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
      * @param $street_id
      * @param bool $building
      *
-     * @return string|false
+     * @return boolean
      */
     public function findFiasHouse($house, $street_id, $building = false)
     {

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 
 use GeoFixer\models\GeoFixer;
 use GeoFixer\models\DatabaseConnection;
-
 use Katzgrau\KLogger;
 use Exception;
 

Spacing +19 added lines, -19 removed lines

@@ -68,7 +68,7 @@ 
 
         if ($result == false) {
             $this->logger->warning('Не найдено похожее слово: ' . $word);
-            $this->logger->warning('Строгий режим: ' . (int)$strict_search);
+            $this->logger->warning('Строгий режим: ' . (int) $strict_search);
             $this->logger->warning('Массива для поиска: ' . implode($search_array, ', ') . PHP_EOL);
         }
 
@@ -90,12 +90,12 @@ 
         $this->geo->isStrict($strict_search);
         $this->geo->isFirstLetters($first_letters);
 
-        $result =  $this->geo->findFiasRegion($region);
+        $result = $this->geo->findFiasRegion($region);
 
         if ($result == false) {
             $this->logger->warning('Не найден регион ' . $region . ' в базе ФИАС');
-            $this->logger->warning('Строгий режим: ' . (int)$strict_search);
-            $this->logger->warning('Режим "совпадают первые буквы": ' . (int)$first_letters . PHP_EOL);
+            $this->logger->warning('Строгий режим: ' . (int) $strict_search);
+            $this->logger->warning('Режим "совпадают первые буквы": ' . (int) $first_letters . PHP_EOL);
         }
 
         return $result;
@@ -139,12 +139,12 @@ 
         $this->geo->isFirstLetters($first_letters);
         $this->geo->isFullSettlements($full_settlements);
 
-        $result =  $this->geo->findFiasSettlements($city, $region_code);
+        $result = $this->geo->findFiasSettlements($city, $region_code);
 
         if ($result == false) {
             $this->logger->warning('Не найден город ' . $city . ' в регионе с кодом ' . $region_code . ' базы ФИАС');
-            $this->logger->warning('Строгий режим: ' . (int)$strict_search);
-            $this->logger->warning('Режим "совпадают первые буквы": ' . (int)$first_letters . PHP_EOL);
+            $this->logger->warning('Строгий режим: ' . (int) $strict_search);
+            $this->logger->warning('Режим "совпадают первые буквы": ' . (int) $first_letters . PHP_EOL);
         }
 
         return $result;
@@ -169,12 +169,12 @@ 
 
         $region_code = substr($region_code, 0, 2);
 
-        $result =  $this->geo->findKladrSettlements($city, $region_code);
+        $result = $this->geo->findKladrSettlements($city, $region_code);
 
         if ($result == false) {
             $this->logger->warning('Не найден город ' . $city . ' в регионе с кодом ' . $region_code . ' базы ФИАС');
-            $this->logger->warning('Строгий режим: ' . (int)$strict_search);
-            $this->logger->warning('Режим "совпадают первые буквы": ' . (int)$first_letters . PHP_EOL);
+            $this->logger->warning('Строгий режим: ' . (int) $strict_search);
+            $this->logger->warning('Режим "совпадают первые буквы": ' . (int) $first_letters . PHP_EOL);
         }
 
         return $result;
@@ -196,12 +196,12 @@ 
         $this->geo->isStrict($strict_search);
         $this->geo->isFirstLetters($first_letters);
 
-        $result =  $this->geo->findFiasStreets($street, $city_id);
+        $result = $this->geo->findFiasStreets($street, $city_id);
 
         if ($result == false) {
             $this->logger->warning('Не найдена улица ' . $street . ' в городе с id ' . $city_id . ' базы ФИАС');
-            $this->logger->warning('Строгий режим: ' . (int)$strict_search);
-            $this->logger->warning('Режим "совпадают первые буквы": ' . (int)$first_letters . PHP_EOL);
+            $this->logger->warning('Строгий режим: ' . (int) $strict_search);
+            $this->logger->warning('Режим "совпадают первые буквы": ' . (int) $first_letters . PHP_EOL);
         }
 
         return $result;
@@ -223,12 +223,12 @@ 
         $this->geo->isStrict($strict_search);
         $this->geo->isFirstLetters($first_letters);
 
-        $result =  $this->geo->findKladrStreets($street, $city_code);
+        $result = $this->geo->findKladrStreets($street, $city_code);
 
         if ($result == false) {
             $this->logger->warning('Не найдена улица ' . $street . ' в городе с кодом ' . $city_code . ' базы КЛАДР');
-            $this->logger->warning('Строгий режим: ' . (int)$strict_search);
-            $this->logger->warning('Режим "совпадают первые буквы": ' . (int)$first_letters . PHP_EOL);
+            $this->logger->warning('Строгий режим: ' . (int) $strict_search);
+            $this->logger->warning('Режим "совпадают первые буквы": ' . (int) $first_letters . PHP_EOL);
         }
 
         return $result;
@@ -246,13 +246,13 @@ 
      */
     public function findFiasHouse($house, $street_id, $building = false)
     {
-        $result =  $this->geo->findFiasHouses($house, $street_id, $building);
+        $result = $this->geo->findFiasHouses($house, $street_id, $building);
 
         if ($result == false) {
             if ($building) {
-                $this->logger->warning('Не найден дом ' .  $house . ', корпус ' . $building . ' на улице с id ' . $street_id . ' базы ФИАС' . PHP_EOL);
+                $this->logger->warning('Не найден дом ' . $house . ', корпус ' . $building . ' на улице с id ' . $street_id . ' базы ФИАС' . PHP_EOL);
             } else {
-                $this->logger->warning('Не найден дом ' .  $house . ' на улице с id ' . $street_id . ' базы ФИАС: ' . $house . PHP_EOL);
+                $this->logger->warning('Не найден дом ' . $house . ' на улице с id ' . $street_id . ' базы ФИАС: ' . $house . PHP_EOL);
             }
         }
 

app/models/GeoFixer.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 
     /**
      * @param $city
-     * @param $region_code
+     * @param string $region_code
      *
      * @return bool|mixed
      */

Indentation +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
     protected $fuzzy_helper;
 
     /**
-    * GeoFixer construct
-    */
+     * GeoFixer construct
+     */
     public function __construct()
     {
         $this->string_helper = new StringHelper();

app/models/DatabaseConnection.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     public function __construct()
     {
-       self::makeConnection();
+        self::makeConnection();
     }
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace GeoFixer\models;
 
 use Cake\Database\Connection;
-use Cake\Database\Driver\Mysql;;
+use Cake\Database\Driver\Mysql; ;
 use Exception;
 
 /**

index.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 /* кол-во первых букв в регионе, которые должны совпадать */
 $first_letters = 2;
-$code = $geo->findFiasRegion($region, $first_letters,  $strict_search = true);
+$code = $geo->findFiasRegion($region, $first_letters, $strict_search = true);
 
 /* -------------------------------------------------------------------- */
 

app/helpers/FuzzySearchHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**
      * Строгий поиск
      *
-     * @param $word
+     * @param string $word
      * @param $translited_words
      *
      * @return bool|mixed

app/helpers/StringHelper.php

Spacing +13 added lines, -13 removed lines

@@ -15,19 +15,19 @@
      * @var array
      */
     public $alphabet = [
-        "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G",
-        "Д"=>"D","Е"=>"E","Ж"=>"J","З"=>"Z","И"=>"I",
-        "Й"=>"Y","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N",
-        "О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T",
-        "У"=>"U","Ф"=>"F","Х"=>"Kh","Ц"=>"Ts","Ч"=>"Ch",
-        "Ш"=>"Sh","Щ"=>"Sch","Ъ"=>"","Ы"=>"Yi","Ь"=>"",
-        "Э"=>"E","Ю"=>"Yu","Я"=>"Ya","а"=>"a","б"=>"b",
-        "в"=>"v","г"=>"g","д"=>"d","е"=>"e","ж"=>"j",
-        "з"=>"z","и"=>"i","й"=>"y","к"=>"k","л"=>"l",
-        "м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r",
-        "с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h",
-        "ц"=>"ts","ч"=>"ch","ш"=>"sh","щ"=>"sch","ъ"=>"y",
-        "ы"=>"yi","ь"=>"'","э"=>"e","ю"=>"yu","я"=>"ya"
+        "А"=>"A", "Б"=>"B", "В"=>"V", "Г"=>"G",
+        "Д"=>"D", "Е"=>"E", "Ж"=>"J", "З"=>"Z", "И"=>"I",
+        "Й"=>"Y", "К"=>"K", "Л"=>"L", "М"=>"M", "Н"=>"N",
+        "О"=>"O", "П"=>"P", "Р"=>"R", "С"=>"S", "Т"=>"T",
+        "У"=>"U", "Ф"=>"F", "Х"=>"Kh", "Ц"=>"Ts", "Ч"=>"Ch",
+        "Ш"=>"Sh", "Щ"=>"Sch", "Ъ"=>"", "Ы"=>"Yi", "Ь"=>"",
+        "Э"=>"E", "Ю"=>"Yu", "Я"=>"Ya", "а"=>"a", "б"=>"b",
+        "в"=>"v", "г"=>"g", "д"=>"d", "е"=>"e", "ж"=>"j",
+        "з"=>"z", "и"=>"i", "й"=>"y", "к"=>"k", "л"=>"l",
+        "м"=>"m", "н"=>"n", "о"=>"o", "п"=>"p", "р"=>"r",
+        "с"=>"s", "т"=>"t", "у"=>"u", "ф"=>"f", "х"=>"h",
+        "ц"=>"ts", "ч"=>"ch", "ш"=>"sh", "щ"=>"sch", "ъ"=>"y",
+        "ы"=>"yi", "ь"=>"'", "э"=>"e", "ю"=>"yu", "я"=>"ya"
     ];
 
     /**