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
      */

Spacing +29 added lines, -29 removed lines

@@ -65,17 +65,17 @@ 
 
         $regions = $regions->findAll();
 
-        $titles = [];
-        $regions_with_codes = [];
+        $titles = [ ];
+        $regions_with_codes = [ ];
 
         foreach ($regions as $v) {
-            $regions_with_codes[$v['title']] = $v['code'];
-            $titles[] = $v['title'];
+            $regions_with_codes[ $v[ 'title' ] ] = $v[ 'code' ];
+            $titles[ ] = $v[ 'title' ];
         }
 
         $result = $this->findSimilarWord($region, $titles);
 
-        return $result ? $regions_with_codes[$result] : false;
+        return $result ? $regions_with_codes[ $result ] : false;
     }
 
     /**
@@ -95,17 +95,17 @@ 
 
         $settlements = $settlements->findAll();
 
-        $titles = [];
-        $settlements_with_id = [];
+        $titles = [ ];
+        $settlements_with_id = [ ];
 
         foreach ($settlements as $v) {
-            $settlements_with_id[$v['title']] = $v['address_id'];
-            $titles[] = $v['title'];
+            $settlements_with_id[ $v[ 'title' ] ] = $v[ 'address_id' ];
+            $titles[ ] = $v[ 'title' ];
         }
 
         $result = $this->findSimilarWord($city, $titles);
 
-        return $result ? $settlements_with_id[$result] : false;
+        return $result ? $settlements_with_id[ $result ] : false;
     }
 
     /**
@@ -125,12 +125,12 @@ 
 
         $settlements = $settlements->findAll();
 
-        $titles = [];
-        $settlements_with_id = [];
+        $titles = [ ];
+        $settlements_with_id = [ ];
 
         foreach ($settlements as $v) {
-            $settlements_with_id[$v['title']] = $v['code'];
-            $titles[] = $v['title'];
+            $settlements_with_id[ $v[ 'title' ] ] = $v[ 'code' ];
+            $titles[ ] = $v[ 'title' ];
         }
 
         $result = $this->findSimilarWord($city, $titles);
@@ -138,11 +138,11 @@ 
         if (!$result) {
             return false;
         }
-        if (is_null($settlements_with_id[$result])) {
+        if (is_null($settlements_with_id[ $result ])) {
             return false;
         }
 
-        return $settlements_with_id[$result];
+        return $settlements_with_id[ $result ];
     }
 
     /**
@@ -162,17 +162,17 @@ 
 
         $streets = $streets->findAll();
 
-        $titles = [];
-        $streets_with_id = [];
+        $titles = [ ];
+        $streets_with_id = [ ];
 
         foreach ($streets as $v) {
-            $streets_with_id[$v['title']] = $v['address_id'];
-            $titles[] = $v['title'];
+            $streets_with_id[ $v[ 'title' ] ] = $v[ 'address_id' ];
+            $titles[ ] = $v[ 'title' ];
         }
 
         $result = $this->findSimilarWord($street, $titles);
 
-        return $result ? $streets_with_id[$result] : false;
+        return $result ? $streets_with_id[ $result ] : false;
     }
 
     /**
@@ -187,7 +187,7 @@ 
         $city = new SettlementsDatabaseQuery();
         $city_id = $city->getSettlements()->addressLevel(true)->kladrCode($city_code)->findOne();
         if ($city_id) {
-            $city_id = $city_id['address_id'];
+            $city_id = $city_id[ 'address_id' ];
         } else {
             return false;
         }
@@ -199,12 +199,12 @@ 
 
         $streets = $streets->findAll();
 
-        $titles = [];
-        $streets_with_id = [];
+        $titles = [ ];
+        $streets_with_id = [ ];
 
         foreach ($streets as $v) {
-            $streets_with_id[$v['title']] = $v['code'];
-            $titles[] = $v['title'];
+            $streets_with_id[ $v[ 'title' ] ] = $v[ 'code' ];
+            $titles[ ] = $v[ 'title' ];
         }
 
         $result = $this->findSimilarWord($street, $titles);
@@ -212,11 +212,11 @@ 
         if (!$result) {
             return false;
         }
-        if (is_null($streets_with_id[$result])) {
+        if (is_null($streets_with_id[ $result ])) {
             return false;
         }
 
-        return $streets_with_id[$result];
+        return $streets_with_id[ $result ];
     }
 
     /**
@@ -236,7 +236,7 @@ 
 
         $house_id = $house_id->findOne();
 
-        return $house_id ? $house_id['house_id'] : false;
+        return $house_id ? $house_id[ 'house_id' ] : false;
     }
 
     /**

app/models/queries/AbstractDatabaseQuery.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function firstLetters($letters)
     {
-        $this->db = $this->db->andWhere(['title LIKE' => $letters . '%']);
+        $this->db = $this->db->andWhere([ 'title LIKE' => $letters . '%' ]);
 
         return $this;
     }
@@ -57,7 +57,7 @@ 
      */
     public function regionCode($code)
     {
-        $this->db = $this->db->andWhere(['region_code' => $code]);
+        $this->db = $this->db->andWhere([ 'region_code' => $code ]);
 
         return $this;
     }
@@ -71,7 +71,7 @@ 
      */
     public function kladrCode($code)
     {
-        $this->db = $this->db->andWhere(['code' => $code]);
+        $this->db = $this->db->andWhere([ 'code' => $code ]);
 
         return $this;
     }
@@ -85,7 +85,7 @@ 
      */
     public function parentId($id)
     {
-        $this->db = $this->db->andWhere(['parent_id' => $id]);
+        $this->db = $this->db->andWhere([ 'parent_id' => $id ]);
 
         return $this;
     }

app/models/queries/StreetsDatabaseQuery.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function getStreets()
     {
-        $this->db = $this->db->select(['address_id', 'title', 'code'])->from('fias_address_object');
+        $this->db = $this->db->select([ 'address_id', 'title', 'code' ])->from('fias_address_object');
 
         return $this;
     }
@@ -36,7 +36,7 @@ 
      */
     public function addressLevel()
     {
-        $this->db = $this->db->andWhere(['address_level' => self::STREET]);
+        $this->db = $this->db->andWhere([ 'address_level' => self::STREET ]);
 
         return $this;
     }

app/models/queries/SettlementsDatabaseQuery.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function getSettlements()
     {
-        $this->db = $this->db->select(['address_id', 'title', 'code'])->from('fias_address_object');
+        $this->db = $this->db->select([ 'address_id', 'title', 'code' ])->from('fias_address_object');
 
         return $this;
     }
@@ -39,9 +39,9 @@ 
     public function addressLevel($full_settlements = false)
     {
         if ($full_settlements == false) {
-            $this->db = $this->db->andWhere(['address_level' => self::CITY]);
+            $this->db = $this->db->andWhere([ 'address_level' => self::CITY ]);
         } else {
-            $this->db = $this->db->andWhere(['OR' => [['address_level' => self::CITY], ['address_level' => self::SETTLEMENT]]]);
+            $this->db = $this->db->andWhere([ 'OR' => [ [ 'address_level' => self::CITY ], [ 'address_level' => self::SETTLEMENT ] ] ]);
         }
 
         return $this;