ignatenkovnikita / parserYandexWeather

src/Models/Detail.php

Doc Comments +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 
     /**
      * Get current time
-     * @return bool|string
+     * @return string
      */
     public function getObservationTime() {
         return $time = date("H:i",strtotime($this->observation_time));
@@ -80,7 +80,7 @@ 
 
     /**
      * Get wind direction
-     * @return mixed
+     * @return string|null
      */
     public function getWindDirection() {
         $windDirection =  [

Spacing +6 added lines, -6 removed lines

@@ -52,7 +52,7 @@ 
     }
 
     public function getTemperatureFromTo() {
-        if($this->temperature_from && $this->temperature_to)
+        if ($this->temperature_from && $this->temperature_to)
             return $this->getTemperatureFromStr().'...'.$this->getTemperatureToStr();
         else
             return $this->getTemperatureAvgStr();
@@ -63,7 +63,7 @@ 
      * @return bool|string
      */
     public function getObservationTime() {
-        return $time = date("H:i",strtotime($this->observation_time));
+        return $time = date("H:i", strtotime($this->observation_time));
     }
 
     /**
@@ -71,8 +71,8 @@ 
      * @return mixed
      */
     public function getIcon() {
-        if(substr($this->image_v3,  -3, 1) == "-") {
-            $this->image_v3 =  str_replace("-", "", $this->image_v3);
+        if (substr($this->image_v3, -3, 1) == "-") {
+            $this->image_v3 = str_replace("-", "", $this->image_v3);
         }
         $this->image_v3 = str_replace("+", "", $this->image_v3);
         return str_replace("_", "-", $this->image_v3);
@@ -83,7 +83,7 @@ 
      * @return mixed
      */
     public function getWindDirection() {
-        $windDirection =  [
+        $windDirection = [
             's'=>'Ю',
             'n'=>'С',
             'w'=>'З',
@@ -93,7 +93,7 @@ 
             'nw'=>'СЗ',
             'ne'=>'СВ'];
 
-        if(isset($windDirection[$this->wind_direction]))
+        if (isset($windDirection[$this->wind_direction]))
             return $windDirection[$this->wind_direction];
 
         return null;

Braces +8 added lines, -6 removed lines

@@ -52,10 +52,11 @@ 
     }
 
     public function getTemperatureFromTo() {
-        if($this->temperature_from && $this->temperature_to)
-            return $this->getTemperatureFromStr().'...'.$this->getTemperatureToStr();
-        else
-            return $this->getTemperatureAvgStr();
+        if($this->temperature_from && $this->temperature_to) {
+                    return $this->getTemperatureFromStr().'...'.$this->getTemperatureToStr();
+        } else {
+                    return $this->getTemperatureAvgStr();
+        }
     }
 
     /**
@@ -93,8 +94,9 @@ 
             'nw'=>'СЗ',
             'ne'=>'СВ'];
 
-        if(isset($windDirection[$this->wind_direction]))
-            return $windDirection[$this->wind_direction];
+        if(isset($windDirection[$this->wind_direction])) {
+                    return $windDirection[$this->wind_direction];
+        }
 
         return null;
 

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: ignatenkov
- * Date: 23.08.15
- * Time: 4:56
- */
+     * Created by PhpStorm.
+     * User: ignatenkov
+     * Date: 23.08.15
+     * Time: 4:56
+     */
 
 namespace YaWeather\Models;
 

ParseCss.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
             //echo $this->getFilePath($value);
             $contents = file_get_contents($this->getFilePath($value));
 
-            if(preg_match_all($this->pattern, $contents, $matches)){
+            if (preg_match_all($this->pattern, $contents, $matches)) {
                 //echo "Found matches:\n";
                 //echo implode("\n", $matches[0]);
                 foreach ($matches[0] as $val) {

Braces +3 added lines, -2 removed lines

@@ -39,8 +39,9 @@
                     $path = "img/".$path;
                     //echo $path . " - " . $fileName."<br>";
 
-                    if (!file_exists($path))
-                        mkdir($path, 0777, true);
+                    if (!file_exists($path)) {
+                                            mkdir($path, 0777, true);
+                    }
 
                     $image = file_get_contents("https://".$val);
                     file_put_contents($path.$fileName, $image);

index.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 <?php
 
-require_once(__DIR__ . '/vendor/autoload.php');
+require_once(__DIR__.'/vendor/autoload.php');
 
 use YaWeather\YaWeather;
 

src/YaWeather.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
          * Construct $id is cityId
          * @param int $id
          */
-        public function __construct($id = 27643, $url = "https://export.yandex.ru/weather-ng/forecasts/"){
+        public function __construct($id = 27643, $url = "https://export.yandex.ru/weather-ng/forecasts/") {
             $this->_citiyId = $id;
             $this->_url = $url;
         }
@@ -41,8 +41,8 @@ 
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
             $output = curl_exec($ch);
 
-            if(curl_errno($ch))
-                $this->_error[] = "Error load weather from web. curl_error output: " .curl_error($ch).".";
+            if (curl_errno($ch))
+                $this->_error[] = "Error load weather from web. curl_error output: ".curl_error($ch).".";
             else
                 $this->_success[] = "Load weather from web OK.";
             $this->saveToFile($output);
@@ -57,7 +57,7 @@ 
 
             $fh = fopen($fileName, 'w');
 
-            if(fwrite($fh, $output))
+            if (fwrite($fh, $output))
                 $this->_success[] = "File success write.";
             else
                 $this->_error[] = "Error file save.";
@@ -71,9 +71,9 @@ 
         public function logFormat() {
             $str = "";
 
-            if($this->_error)
+            if ($this->_error)
                 $str .= "Error: ".implode(" ", $this->_error)."<br>";
-            if($this->_success)
+            if ($this->_success)
                 $str .= "Success: ".implode(" ", $this->_success)."<br>";
 
             return $str;
@@ -91,7 +91,7 @@ 
          * Get success
          * @return array
          */
-        public function getSuccess(){
+        public function getSuccess() {
             return $this->_success;
         }
 
@@ -104,7 +104,7 @@ 
 
             $parse = new ParseXml($this->getFileName());
 
-            if($parse->parse())
+            if ($parse->parse())
                 return $parse->parse();
             else
                 return false;
@@ -117,14 +117,14 @@ 
          */
         public function show($cp1251 = false) {
             $file = "html.php";
-            if($cp1251)
+            if ($cp1251)
                 $file = "htmlcp1251.php";
 
             $city = $this->getResult();
 
             $path = str_replace($_SERVER['DOCUMENT_ROOT'], "", __DIR__)."./../css";
 
-            if($city != null)
+            if ($city != null)
                 require_once(dirname(__DIR__).'/'.$file);
         }
 
@@ -133,7 +133,7 @@ 
          * @return string
          */
         private function CreateUrl() {
-            return $this->_url . $this->_citiyId .".xml";
+            return $this->_url.$this->_citiyId.".xml";
         }
 
         /**
@@ -141,7 +141,7 @@ 
          * @return string
          */
         public function getFileName() {
-            return dirname(__DIR__)."/city_" . $this->_citiyId . ".xml";
+            return dirname(__DIR__)."/city_".$this->_citiyId.".xml";
         }
 
     }

Braces +27 added lines, -20 removed lines

@@ -41,10 +41,11 @@ 
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
             $output = curl_exec($ch);
 
-            if(curl_errno($ch))
-                $this->_error[] = "Error load weather from web. curl_error output: " .curl_error($ch).".";
-            else
-                $this->_success[] = "Load weather from web OK.";
+            if(curl_errno($ch)) {
+                            $this->_error[] = "Error load weather from web. curl_error output: " .curl_error($ch).".";
+            } else {
+                            $this->_success[] = "Load weather from web OK.";
+            }
             $this->saveToFile($output);
         }
 
@@ -57,10 +58,11 @@ 
 
             $fh = fopen($fileName, 'w');
 
-            if(fwrite($fh, $output))
-                $this->_success[] = "File success write.";
-            else
-                $this->_error[] = "Error file save.";
+            if(fwrite($fh, $output)) {
+                            $this->_success[] = "File success write.";
+            } else {
+                            $this->_error[] = "Error file save.";
+            }
             fclose($fh);
         }
 
@@ -71,10 +73,12 @@ 
         public function logFormat() {
             $str = "";
 
-            if($this->_error)
-                $str .= "Error: ".implode(" ", $this->_error)."<br>";
-            if($this->_success)
-                $str .= "Success: ".implode(" ", $this->_success)."<br>";
+            if($this->_error) {
+                            $str .= "Error: ".implode(" ", $this->_error)."<br>";
+            }
+            if($this->_success) {
+                            $str .= "Success: ".implode(" ", $this->_success)."<br>";
+            }
 
             return $str;
         }
@@ -104,10 +108,11 @@ 
 
             $parse = new ParseXml($this->getFileName());
 
-            if($parse->parse())
-                return $parse->parse();
-            else
-                return false;
+            if($parse->parse()) {
+                            return $parse->parse();
+            } else {
+                            return false;
+            }
 
         }
 
@@ -117,15 +122,17 @@ 
          */
         public function show($cp1251 = false) {
             $file = "html.php";
-            if($cp1251)
-                $file = "htmlcp1251.php";
+            if($cp1251) {
+                            $file = "htmlcp1251.php";
+            }
 
             $city = $this->getResult();
 
             $path = str_replace($_SERVER['DOCUMENT_ROOT'], "", __DIR__)."./../css";
 
-            if($city != null)
-                require_once(dirname(__DIR__).'/'.$file);
+            if($city != null) {
+                            require_once(dirname(__DIR__).'/'.$file);
+            }
         }
 
         /**

src/Models/City.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
      */
     public function getCurrentDay() {
         $current = date("Y-m-d");
-        if(isset($this->days[$current]))
+        if (isset($this->days[$current]))
             return $this->days[$current];
         else
             return "not found current day";
@@ -39,7 +39,7 @@ 
      */
     public function getListDays() {
         $current = date("Y-m-d");
-        if(isset($this->days[$current]))
+        if (isset($this->days[$current]))
             unset($this->days[$current]);
 
         return $this->days;
@@ -52,7 +52,7 @@ 
     public function getYesterday() {
         $yesterday = date("Y-m-d", time() - 86400);
 
-        if(isset($this->days[$yesterday]))
+        if (isset($this->days[$yesterday]))
             return $this->days[$yesterday];
         else
             return "not found yesterday day";

Braces +13 added lines, -10 removed lines

@@ -27,10 +27,11 @@ 
      */
     public function getCurrentDay() {
         $current = date("Y-m-d");
-        if(isset($this->days[$current]))
-            return $this->days[$current];
-        else
-            return "not found current day";
+        if(isset($this->days[$current])) {
+                    return $this->days[$current];
+        } else {
+                    return "not found current day";
+        }
     }
 
     /**
@@ -39,8 +40,9 @@ 
      */
     public function getListDays() {
         $current = date("Y-m-d");
-        if(isset($this->days[$current]))
-            unset($this->days[$current]);
+        if(isset($this->days[$current])) {
+                    unset($this->days[$current]);
+        }
 
         return $this->days;
     }
@@ -52,10 +54,11 @@ 
     public function getYesterday() {
         $yesterday = date("Y-m-d", time() - 86400);
 
-        if(isset($this->days[$yesterday]))
-            return $this->days[$yesterday];
-        else
-            return "not found yesterday day";
+        if(isset($this->days[$yesterday])) {
+                    return $this->days[$yesterday];
+        } else {
+                    return "not found yesterday day";
+        }
     }
 
 

src/Models/Day.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 namespace YaWeather\Models;
 
 
-class Day{
+class Day {
 
     const TYPE_MORNING = 1;
     const TYPE_DAY = 2;
@@ -44,7 +44,7 @@ 
     public static function CheckWeekend($value, $weekend = false)
     {
         $dayNumber = date('w', strtotime($value));
-        if($weekend && ($dayNumber == 0 || $dayNumber == 6))
+        if ($weekend && ($dayNumber == 0 || $dayNumber == 6))
             return true;
         elseif ($weekend == false && $dayNumber == 0)
             return true;
@@ -57,19 +57,19 @@ 
     }
 
     public static function getMonthName($value) {
-        $listMonths = ['','января','февраля','марта','апреля','мая','июня','июля','августа','сентября','октября','ноября','декабря'];
+        $listMonths = ['', 'января', 'февраля', 'марта', 'апреля', 'мая', 'июня', 'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'];
         return $listMonths[date("n", strtotime($value))];
     }
 
     public static function getDayName($value) {
         $str = "";
 
-        $listDays = ['вс','пн', 'вт', 'ср', 'чт', 'пт', 'сб'];
+        $listDays = ['вс', 'пн', 'вт', 'ср', 'чт', 'пт', 'сб'];
 
         $date = Date('d.m.Y', strtotime("+1 days"));
         $match_date = date('d.m.Y', strtotime($value));
 
-        if($date == $match_date)
+        if ($date == $match_date)
             $str = "Завтра";
         else {
             $str = $listDays[date("w", strtotime($value))];

Braces +10 added lines, -9 removed lines

@@ -44,12 +44,13 @@ 
     public static function CheckWeekend($value, $weekend = false)
     {
         $dayNumber = date('w', strtotime($value));
-        if($weekend && ($dayNumber == 0 || $dayNumber == 6))
-            return true;
-        elseif ($weekend == false && $dayNumber == 0)
-            return true;
-        else
-            return false;
+        if($weekend && ($dayNumber == 0 || $dayNumber == 6)) {
+                    return true;
+        } elseif ($weekend == false && $dayNumber == 0) {
+                    return true;
+        } else {
+                    return false;
+        }
     }
 
     public static function getDayNumber($value) {
@@ -69,9 +70,9 @@ 
         $date = Date('d.m.Y', strtotime("+1 days"));
         $match_date = date('d.m.Y', strtotime($value));
 
-        if($date == $match_date)
-            $str = "Завтра";
-        else {
+        if($date == $match_date) {
+                    $str = "Завтра";
+        } else {
             $str = $listDays[date("w", strtotime($value))];
 
             //return $this->days[date('w', $date)].', '.(int)date('d',$date).' '.$this->months[date('n', $date)];

src/ParseXml.php

Spacing +11 added lines, -11 removed lines

@@ -36,18 +36,18 @@ 
     public function parse() {
 
         // check xml load
-        if(!$this->xml)
+        if (!$this->xml)
             return false;
 
         $city = new City();
-        foreach($this->xml->attributes() as $key => $value) {
-            if(isset(Mapping::mapCity()[$key]))
+        foreach ($this->xml->attributes() as $key => $value) {
+            if (isset(Mapping::mapCity()[$key]))
                 $city->{Mapping::mapCity()[$key]} = (string) $value;
         }
 
         $fact = new Detail();
         foreach ($this->xml->fact[0] as $key => $value) {
-            if(isset(Mapping::mapDetail()[$key])) {
+            if (isset(Mapping::mapDetail()[$key])) {
                 $fact->{Mapping::mapDetail()[$key]} = (string) $value;
             }
 
@@ -56,7 +56,7 @@ 
 
         $fact = new Detail();
         foreach ($this->xml->yesterday[0] as $key => $value) {
-            if(isset(Mapping::mapDetail()[$key])) {
+            if (isset(Mapping::mapDetail()[$key])) {
                 $fact->{Mapping::mapDetail()[$key]} = (string) $value;
             }
 
@@ -64,10 +64,10 @@ 
         $city->yesterday = $fact;
 
         $days = array();
-        foreach($this->xml->day as $value) {
+        foreach ($this->xml->day as $value) {
             $day = new Day();
             foreach ($value as $key => $value1) {
-                if(isset(Mapping::mapDay()[$key])) {
+                if (isset(Mapping::mapDay()[$key])) {
                     $day->{Mapping::mapDay()[$key]} = (string) $value1;
                 }
                 //var_dump($value1->attributes()["typeid"]);
@@ -77,16 +77,16 @@ 
             foreach ($value->day_part as $key2 => $value2) {
                 $detail = new Detail();
                 foreach ($value2 as $key3 => $value3) {
-                    if(isset(Mapping::mapDetail()[$key3])) {
+                    if (isset(Mapping::mapDetail()[$key3])) {
                         $detail->{Mapping::mapDetail()[$key3]} = (string) $value3;
                     }
-                    if(isset(Mapping::mapDetail()["inner"][$key3])) {
+                    if (isset(Mapping::mapDetail()["inner"][$key3])) {
                         $detail->{Mapping::mapDetail()["inner"][$key3]} = (string) $value3->avg;
                     }
                 }
                 $day->{$value2->attributes()["type"]} = $detail;
             }
-            $days[(string)$value->attributes()["date"]] = $day;
+            $days[(string) $value->attributes()["date"]] = $day;
         }
         $city->days = $days;
 
@@ -99,7 +99,7 @@ 
      * @return string
      */
     public static function encoding($value) {
-        return iconv( "UTF-8", "windows-1251//TRANSLIT", $value);
+        return iconv("UTF-8", "windows-1251//TRANSLIT", $value);
     }
 
 

Braces +6 added lines, -4 removed lines

@@ -36,13 +36,15 @@
     public function parse() {
 
         // check xml load
-        if(!$this->xml)
-            return false;
+        if(!$this->xml) {
+                    return false;
+        }
 
         $city = new City();
         foreach($this->xml->attributes() as $key => $value) {
-            if(isset(Mapping::mapCity()[$key]))
-                $city->{Mapping::mapCity()[$key]} = (string) $value;
+            if(isset(Mapping::mapCity()[$key])) {
+                            $city->{Mapping::mapCity()[$key]} = (string) $value;
+            }
         }
 
         $fact = new Detail();

html.php

Spacing +18 added lines, -18 removed lines

@@ -58,21 +58,21 @@ 
 
 
                         echo '<li class="forecast-brief__item">
-                        <div class="forecast-brief__item-date ' . ($day->checkWeekend($key, true) ? "forecast-brief__item-date_weekend_yes" : "") . '"><span
-                                class="forecast-brief__item-dayname">' . $day->getDayName($key) . '</span><span
-                                class="forecast-brief__item-day">' . $day->getDayNumber($key) . ' ' . ($i > 0 ? "" : $day->getMonthName($key)) . '</span></div>
-                        <div class="forecast-brief__item-description t_c_' . $day->day->temperature_avg . '"><i
-                                class="icon icon_thumb_' . $day->day->getIcon() . ' icon_size_30" data-width="30"></i>
+                        <div class="forecast-brief__item-date ' . ($day->checkWeekend($key, true) ? "forecast-brief__item-date_weekend_yes" : "").'"><span
+                                class="forecast-brief__item-dayname">' . $day->getDayName($key).'</span><span
+                                class="forecast-brief__item-day">' . $day->getDayNumber($key).' '.($i > 0 ? "" : $day->getMonthName($key)).'</span></div>
+                        <div class="forecast-brief__item-description t_c_' . $day->day->temperature_avg.'"><i
+                                class="icon icon_thumb_' . $day->day->getIcon().' icon_size_30" data-width="30"></i>
 
-                            <div class="forecast-brief__item-comment">' . $day->day->weather_type . '</div>
+                            <div class="forecast-brief__item-comment">' . $day->day->weather_type.'</div>
                             <div class="forecast-brief__item-temp-day" title="Максимальная температура днём">
-                             ' . $day->day->getTemperatureAvgStr() . '
-                             ' . ($i > 0 ? "" : "днём") . '
+                             ' . $day->day->getTemperatureAvgStr().'
+                             ' . ($i > 0 ? "" : "днём").'
                             </div>
                         </div>
-                        <div class="forecast-brief__item-temp-night t_c_' . $day->night->temperature_avg . '" title="Минимальная температура ночью">
-                            ' . $day->night->getTemperatureAvgStr() . '
-                            ' . ($i > 0 ? "" : "ночью") . '
+                        <div class="forecast-brief__item-temp-night t_c_' . $day->night->temperature_avg.'" title="Минимальная температура ночью">
+                            ' . $day->night->getTemperatureAvgStr().'
+                            ' . ($i > 0 ? "" : "ночью").'
                         </div>
                     </li>';
 
@@ -98,14 +98,14 @@ 
 
                     <?php
                     $i = 0;
-                    foreach($city->getListDays() as $key => $day){
+                    foreach ($city->getListDays() as $key => $day) {
 
-                        echo '<dt class="forecast-detailed__day ' . ($day->checkWeekend($key, true) ? "forecast-detailed__day_weekend" : "") . '">
-                                <small class="forecast-detailed__weekday">' . $day->getDayName($key) . '</small>
-                                <strong class="forecast-detailed__day-number">' . $day->getDayNumber($key) . '<span class="forecast-detailed__day-month">'.$day->getMonthName($key).'</span></strong>
+                        echo '<dt class="forecast-detailed__day '.($day->checkWeekend($key, true) ? "forecast-detailed__day_weekend" : "").'">
+                                <small class="forecast-detailed__weekday">' . $day->getDayName($key).'</small>
+                                <strong class="forecast-detailed__day-number">' . $day->getDayNumber($key).'<span class="forecast-detailed__day-month">'.$day->getMonthName($key).'</span></strong>
                             </dt>';
 
-                        echo '<dd class="forecast-detailed__day-info '.($i<1 ? "forecast-detailed__day-info_first": "").'">
+                        echo '<dd class="forecast-detailed__day-info '.($i < 1 ? "forecast-detailed__day-info_first" : "").'">
                                 <table class="weather-table">
                                     <thead class="weather-table__head">
                                     <tr>
@@ -126,7 +126,7 @@ 
 
                         foreach ($day->getListDetail() as $key => $detail) {
 
-                            echo '<tr class="weather-table__row t t_c_' . $detail->temperature_avg . '">
+                            echo '<tr class="weather-table__row t t_c_'.$detail->temperature_avg.'">
                                 <td class="weather-table__body-cell weather-table__body-cell_type_daypart">
                                     <div class="weather-table__daypart">'.$key.'</div>
                                     <div class="weather-table__temp">'.$detail->getTemperatureFromTo().'</div>
@@ -136,7 +136,7 @@ 
                                                                          data-width="30"></i></div>
                                 </td>
                                 <td class="weather-table__body-cell weather-table__body-cell_type_condition">
-                                    <div class="weather-table__value">' . $detail->weather_type . '</div>
+                                    <div class="weather-table__value">' . $detail->weather_type.'</div>
                                 </td>
                                 <td class="weather-table__body-cell weather-table__body-cell_type_air-pressure">
                                     <div class="weather-table__value">'.$detail->pressure.'</div>