@@ -34,8 +34,9 @@ discard block |
||
| 34 | 34 | /** |
| 35 | 35 | * SimpleDiff Class constructure |
| 36 | 36 | * |
| 37 | - * @param DateTime $time_difference The time to calculate with now |
|
| 38 | - * @param string $lang Language |
|
| 37 | + * @param DateTime $difference The time to calculate with now |
|
| 38 | + * @param \DateTime $start |
|
| 39 | + * @param \DateTime $end |
|
| 39 | 40 | */ |
| 40 | 41 | public function __construct($start, $end, $difference ) |
| 41 | 42 | { |
@@ -65,8 +66,8 @@ discard block |
||
| 65 | 66 | /** |
| 66 | 67 | * Read ago config file |
| 67 | 68 | * |
| 68 | - * @param integer $date date index in ago config file |
|
| 69 | 69 | * @param string $type duration type on ago config file |
| 70 | + * @param integer $value |
|
| 70 | 71 | */ |
| 71 | 72 | public function read( $value, $type ) |
| 72 | 73 | { |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | private $blockList; |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | - * SimpleDiff Class constructure |
|
| 36 | - * |
|
| 37 | - * @param DateTime $time_difference The time to calculate with now |
|
| 38 | - * @param string $lang Language |
|
| 39 | - */ |
|
| 35 | + * SimpleDiff Class constructure |
|
| 36 | + * |
|
| 37 | + * @param DateTime $time_difference The time to calculate with now |
|
| 38 | + * @param string $lang Language |
|
| 39 | + */ |
|
| 40 | 40 | public function __construct($start, $end, $difference ) |
| 41 | 41 | { |
| 42 | 42 | |
@@ -51,10 +51,10 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | - * Return difference period as an object |
|
| 55 | - * |
|
| 56 | - * @return object |
|
| 57 | - */ |
|
| 54 | + * Return difference period as an object |
|
| 55 | + * |
|
| 56 | + * @return object |
|
| 57 | + */ |
|
| 58 | 58 | public function all() |
| 59 | 59 | { |
| 60 | 60 | |
@@ -63,11 +63,11 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * Read ago config file |
|
| 67 | - * |
|
| 68 | - * @param integer $date date index in ago config file |
|
| 69 | - * @param string $type duration type on ago config file |
|
| 70 | - */ |
|
| 66 | + * Read ago config file |
|
| 67 | + * |
|
| 68 | + * @param integer $date date index in ago config file |
|
| 69 | + * @param string $type duration type on ago config file |
|
| 70 | + */ |
|
| 71 | 71 | public function read( $value, $type ) |
| 72 | 72 | { |
| 73 | 73 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | if( array_key_exists( $value, $config[ $type ] ) ) { |
| 99 | 99 | |
| 100 | 100 | $str = Lang::get( $this->language, $config[ $type ][ $value ] ) |
| 101 | - . $time; |
|
| 101 | + . $time; |
|
| 102 | 102 | |
| 103 | 103 | return $str; |
| 104 | 104 | |
@@ -114,11 +114,11 @@ discard block |
||
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | /** |
| 117 | - * Show priority of duration |
|
| 118 | - * |
|
| 119 | - * @param integer $date date index in ago config file |
|
| 120 | - * @param string $type duration type on ago config file |
|
| 121 | - */ |
|
| 117 | + * Show priority of duration |
|
| 118 | + * |
|
| 119 | + * @param integer $date date index in ago config file |
|
| 120 | + * @param string $type duration type on ago config file |
|
| 121 | + */ |
|
| 122 | 122 | public function priority( $date, $type ) |
| 123 | 123 | { |
| 124 | 124 | |
@@ -144,10 +144,10 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | /** |
| 147 | - * Return fainal SimpleDiff result |
|
| 148 | - * |
|
| 149 | - * @return string |
|
| 150 | - */ |
|
| 147 | + * Return fainal SimpleDiff result |
|
| 148 | + * |
|
| 149 | + * @return string |
|
| 150 | + */ |
|
| 151 | 151 | public function get() |
| 152 | 152 | { |
| 153 | 153 | |
@@ -37,12 +37,12 @@ discard block |
||
| 37 | 37 | * @param DateTime $time_difference The time to calculate with now |
| 38 | 38 | * @param string $lang Language |
| 39 | 39 | */ |
| 40 | - public function __construct($start, $end, $difference ) |
|
| 40 | + public function __construct($start, $end, $difference) |
|
| 41 | 41 | { |
| 42 | 42 | |
| 43 | 43 | $this->language = 'en'; |
| 44 | 44 | |
| 45 | - $this->result = $difference; |
|
| 45 | + $this->result = $difference; |
|
| 46 | 46 | |
| 47 | 47 | $this->blockList = [ |
| 48 | 48 | 'just-now' |
@@ -68,46 +68,46 @@ discard block |
||
| 68 | 68 | * @param integer $date date index in ago config file |
| 69 | 69 | * @param string $type duration type on ago config file |
| 70 | 70 | */ |
| 71 | - public function read( $value, $type ) |
|
| 71 | + public function read($value, $type) |
|
| 72 | 72 | { |
| 73 | 73 | |
| 74 | - $config = include __DIR__ . '/config/diff.php'; |
|
| 74 | + $config = include __DIR__.'/config/diff.php'; |
|
| 75 | 75 | |
| 76 | - if( $this->result->invert ) { |
|
| 76 | + if ($this->result->invert) { |
|
| 77 | 77 | |
| 78 | - $time = ' ' . Lang::get( $this->language, 'remaining' ); |
|
| 78 | + $time = ' '.Lang::get($this->language, 'remaining'); |
|
| 79 | 79 | |
| 80 | 80 | } else { |
| 81 | 81 | |
| 82 | - $time = ' ' . Lang::get( $this->language, 'ago' ); |
|
| 82 | + $time = ' '.Lang::get($this->language, 'ago'); |
|
| 83 | 83 | |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - if( isset( $config[ $type ][ $value ] ) && in_array( |
|
| 86 | + if (isset($config[$type][$value]) && in_array( |
|
| 87 | 87 | |
| 88 | - $config[ $type ][ $value ], |
|
| 88 | + $config[$type][$value], |
|
| 89 | 89 | |
| 90 | 90 | $this->blockList |
| 91 | 91 | |
| 92 | - ) ) { |
|
| 92 | + )) { |
|
| 93 | 93 | |
| 94 | 94 | $time = null; |
| 95 | 95 | |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - if( array_key_exists( $value, $config[ $type ] ) ) { |
|
| 98 | + if (array_key_exists($value, $config[$type])) { |
|
| 99 | 99 | |
| 100 | - $str = Lang::get( $this->language, $config[ $type ][ $value ] ) |
|
| 100 | + $str = Lang::get($this->language, $config[$type][$value]) |
|
| 101 | 101 | . $time; |
| 102 | 102 | |
| 103 | 103 | return $str; |
| 104 | 104 | |
| 105 | 105 | } else { |
| 106 | 106 | |
| 107 | - return Lang::getNumbers( $this->language, $value ) . " " . Lang::get( |
|
| 107 | + return Lang::getNumbers($this->language, $value)." ".Lang::get( |
|
| 108 | 108 | $this->language, |
| 109 | - $config[ $type ][ '*' ] |
|
| 110 | - ) . $time; |
|
| 109 | + $config[$type]['*'] |
|
| 110 | + ).$time; |
|
| 111 | 111 | |
| 112 | 112 | } |
| 113 | 113 | |
@@ -119,12 +119,12 @@ discard block |
||
| 119 | 119 | * @param integer $date date index in ago config file |
| 120 | 120 | * @param string $type duration type on ago config file |
| 121 | 121 | */ |
| 122 | - public function priority( $date, $type ) |
|
| 122 | + public function priority($date, $type) |
|
| 123 | 123 | { |
| 124 | 124 | |
| 125 | - if( $date != 0 ) { |
|
| 125 | + if ($date != 0) { |
|
| 126 | 126 | |
| 127 | - return $this->read( $date, $type ); |
|
| 127 | + return $this->read($date, $type); |
|
| 128 | 128 | |
| 129 | 129 | } else { |
| 130 | 130 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - public function lang( $value ) |
|
| 137 | + public function lang($value) |
|
| 138 | 138 | { |
| 139 | 139 | |
| 140 | 140 | $this->language = $value; |
@@ -160,11 +160,11 @@ discard block |
||
| 160 | 160 | 'second' => $this->result->second |
| 161 | 161 | ]; |
| 162 | 162 | |
| 163 | - foreach( $duration as $index => $value ) { |
|
| 163 | + foreach ($duration as $index => $value) { |
|
| 164 | 164 | |
| 165 | - if( $this->priority( $value, $index ) != false ) { |
|
| 165 | + if ($this->priority($value, $index) != false) { |
|
| 166 | 166 | |
| 167 | - return $this->priority( $value, $index ); |
|
| 167 | + return $this->priority($value, $index); |
|
| 168 | 168 | |
| 169 | 169 | } |
| 170 | 170 | |
@@ -36,11 +36,11 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | - * Which day of year is current day. |
|
| 40 | - * |
|
| 41 | - * @since Aug, 03 2015 |
|
| 42 | - * @return integer |
|
| 43 | - */ |
|
| 39 | + * Which day of year is current day. |
|
| 40 | + * |
|
| 41 | + * @since Aug, 03 2015 |
|
| 42 | + * @return integer |
|
| 43 | + */ |
|
| 44 | 44 | public function year() |
| 45 | 45 | { |
| 46 | 46 | |
@@ -52,11 +52,11 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | - * Which day of week is current day. |
|
| 56 | - * |
|
| 57 | - * @since Aug, 09 2015 |
|
| 58 | - * @return integer |
|
| 59 | - */ |
|
| 55 | + * Which day of week is current day. |
|
| 56 | + * |
|
| 57 | + * @since Aug, 09 2015 |
|
| 58 | + * @return integer |
|
| 59 | + */ |
|
| 60 | 60 | public function week() |
| 61 | 61 | { |
| 62 | 62 | |
@@ -66,17 +66,17 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Return last day of current month |
|
| 71 | - * |
|
| 72 | - * @since Oct, 18 2016 |
|
| 73 | - * @return integer |
|
| 74 | - */ |
|
| 75 | - public function lastDayMonth() { |
|
| 69 | + /** |
|
| 70 | + * Return last day of current month |
|
| 71 | + * |
|
| 72 | + * @since Oct, 18 2016 |
|
| 73 | + * @return integer |
|
| 74 | + */ |
|
| 75 | + public function lastDayMonth() { |
|
| 76 | 76 | |
| 77 | - $this->config = include __DIR__.'/CalendarSettings/' . ucfirst($this->calendar_type) . '.php'; |
|
| 77 | + $this->config = include __DIR__.'/CalendarSettings/' . ucfirst($this->calendar_type) . '.php'; |
|
| 78 | 78 | |
| 79 | - return $this->config[ 'month_days_number' ][ intval( $this->date_time->format( 'm' ) ) ]; |
|
| 79 | + return $this->config[ 'month_days_number' ][ intval( $this->date_time->format( 'm' ) ) ]; |
|
| 80 | 80 | |
| 81 | - } |
|
| 81 | + } |
|
| 82 | 82 | } |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | public function year() |
| 45 | 45 | { |
| 46 | 46 | |
| 47 | - $this->config = include __DIR__.'/CalendarSettings/' . ucfirst($this->calendar_type) . '.php'; |
|
| 47 | + $this->config = include __DIR__.'/CalendarSettings/'.ucfirst($this->calendar_type).'.php'; |
|
| 48 | 48 | |
| 49 | - return $this->config[ 'day_of_year' ]( $this->date_time ); |
|
| 49 | + return $this->config['day_of_year']($this->date_time); |
|
| 50 | 50 | |
| 51 | 51 | } |
| 52 | 52 | |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | public function week() |
| 61 | 61 | { |
| 62 | 62 | |
| 63 | - $this->config = include __DIR__.'/CalendarSettings/' . ucfirst($this->calendar_type) . '.php'; |
|
| 63 | + $this->config = include __DIR__.'/CalendarSettings/'.ucfirst($this->calendar_type).'.php'; |
|
| 64 | 64 | |
| 65 | - return $this->config[ 'day_of_week' ]( $this->date_time ); |
|
| 65 | + return $this->config['day_of_week']($this->date_time); |
|
| 66 | 66 | |
| 67 | 67 | } |
| 68 | 68 | |
@@ -74,9 +74,9 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | public function lastDayMonth() { |
| 76 | 76 | |
| 77 | - $this->config = include __DIR__.'/CalendarSettings/' . ucfirst($this->calendar_type) . '.php'; |
|
| 77 | + $this->config = include __DIR__.'/CalendarSettings/'.ucfirst($this->calendar_type).'.php'; |
|
| 78 | 78 | |
| 79 | - return $this->config[ 'month_days_number' ][ intval( $this->date_time->format( 'm' ) ) ]; |
|
| 79 | + return $this->config['month_days_number'][intval($this->date_time->format('m'))]; |
|
| 80 | 80 | |
| 81 | 81 | } |
| 82 | 82 | } |