Skip to content

Commit 914a138

Browse files
DgameDgame
committed
PSR update
1 parent 8425b7c commit 914a138

14 files changed

+199
-196
lines changed

Diff for: ‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"src/"
2929
],
3030
"files": [
31-
"src/Unit/TimeUnit.php"
31+
"src/Unit/functions.php"
3232
],
3333
"psr-4": {
3434
"Dgame\\Time\\": "src/"

Diff for: ‎src/DateUnit.php

+21-21
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,33 @@
1818
final class DateUnit
1919
{
2020
/**
21-
* @var Years|null
21+
* @var Years
2222
*/
23-
private $years = null;
23+
private $years;
2424
/**
25-
* @var Months|null
25+
* @var Months
2626
*/
27-
private $months = null;
27+
private $months;
2828
/**
29-
* @var Weeks|null
29+
* @var Weeks
3030
*/
31-
private $weeks = null;
31+
private $weeks;
3232
/**
33-
* @var Days|null
33+
* @var Days
3434
*/
35-
private $days = null;
35+
private $days;
3636
/**
37-
* @var Hours|null
37+
* @var Hours
3838
*/
39-
private $hours = null;
39+
private $hours;
4040
/**
41-
* @var Minutes|null
41+
* @var Minutes
4242
*/
43-
private $minutes = null;
43+
private $minutes;
4444
/**
45-
* @var Seconds|null
45+
* @var Seconds
4646
*/
47-
private $seconds = null;
47+
private $seconds;
4848

4949
/**
5050
* Date constructor.
@@ -108,55 +108,55 @@ public function __construct(TimeUnit $unit)
108108
/**
109109
* @return Years
110110
*/
111-
public function getYears() : Years
111+
public function getYears(): Years
112112
{
113113
return $this->years;
114114
}
115115

116116
/**
117117
* @return Months
118118
*/
119-
public function getMonths() : Months
119+
public function getMonths(): Months
120120
{
121121
return $this->months;
122122
}
123123

124124
/**
125125
* @return Weeks
126126
*/
127-
public function getWeeks() : Weeks
127+
public function getWeeks(): Weeks
128128
{
129129
return $this->weeks;
130130
}
131131

132132
/**
133133
* @return Days
134134
*/
135-
public function getDays() : Days
135+
public function getDays(): Days
136136
{
137137
return $this->days;
138138
}
139139

140140
/**
141141
* @return Hours
142142
*/
143-
public function getHours() : Hours
143+
public function getHours(): Hours
144144
{
145145
return $this->hours;
146146
}
147147

148148
/**
149149
* @return Minutes
150150
*/
151-
public function getMinutes() : Minutes
151+
public function getMinutes(): Minutes
152152
{
153153
return $this->minutes;
154154
}
155155

156156
/**
157157
* @return Seconds
158158
*/
159-
public function getSeconds() : Seconds
159+
public function getSeconds(): Seconds
160160
{
161161
return $this->seconds;
162162
}

Diff for: ‎src/Month.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class Month implements TimeConvert
3030
/**
3131
* @return Month
3232
*/
33-
public static function Current() : Month
33+
public static function Current(): Month
3434
{
3535
return new self(date('n'), date('Y'));
3636
}
@@ -42,9 +42,9 @@ public static function Current() : Month
4242
* @return Month
4343
* @throws InvalidMonthException
4444
*/
45-
public static function Of($month, int $year = null) : Month
45+
public static function Of($month, int $year = null): Month
4646
{
47-
$year = $year === null ? date('Y') : $year;
47+
$year = $year === null ? date('Y'): $year;
4848
if (is_string($month)) {
4949
$month = date_parse($month)['month'];
5050
}
@@ -71,55 +71,55 @@ private function __construct(int $month, int $year)
7171
/**
7272
* @return Seconds
7373
*/
74-
public function inSeconds() : Seconds
74+
public function inSeconds(): Seconds
7575
{
7676
return $this->inMinutes()->inSeconds();
7777
}
7878

7979
/**
8080
* @return Minutes
8181
*/
82-
public function inMinutes() : Minutes
82+
public function inMinutes(): Minutes
8383
{
8484
return $this->inHours()->inMinutes();
8585
}
8686

8787
/**
8888
* @return Hours
8989
*/
90-
public function inHours() : Hours
90+
public function inHours(): Hours
9191
{
9292
return $this->inDays()->inHours();
9393
}
9494

9595
/**
9696
* @return Days
9797
*/
98-
public function inDays() : Days
98+
public function inDays(): Days
9999
{
100100
return new Days(cal_days_in_month(CAL_GREGORIAN, $this->month, $this->year));
101101
}
102102

103103
/**
104104
* @return Weeks
105105
*/
106-
public function inWeeks() : Weeks
106+
public function inWeeks(): Weeks
107107
{
108108
return $this->inDays()->inWeeks();
109109
}
110110

111111
/**
112112
* @return Months
113113
*/
114-
public function inMonths() : Months
114+
public function inMonths(): Months
115115
{
116116
return $this->inWeeks()->inMonths();
117117
}
118118

119119
/**
120120
* @return Years
121121
*/
122-
public function inYears() : Years
122+
public function inYears(): Years
123123
{
124124
return $this->inWeeks()->inYears();
125125
}

Diff for: ‎src/Unit/Days.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,55 @@ final class Days extends TimeUnit
1818
/**
1919
* @return Seconds
2020
*/
21-
public function inSeconds() : Seconds
21+
public function inSeconds(): Seconds
2222
{
2323
return new Seconds($this->getAmount() * self::SECONDS);
2424
}
2525

2626
/**
2727
* @return Minutes
2828
*/
29-
public function inMinutes() : Minutes
29+
public function inMinutes(): Minutes
3030
{
3131
return new Minutes($this->getAmount() * self::MINUTES);
3232
}
3333

3434
/**
3535
* @return Hours
3636
*/
37-
public function inHours() : Hours
37+
public function inHours(): Hours
3838
{
3939
return new Hours($this->getAmount() * self::HOURS);
4040
}
4141

4242
/**
4343
* @return Days
4444
*/
45-
public function inDays() : Days
45+
public function inDays(): Days
4646
{
4747
return $this;
4848
}
4949

5050
/**
5151
* @return Weeks
5252
*/
53-
public function inWeeks() : Weeks
53+
public function inWeeks(): Weeks
5454
{
5555
return new Weeks($this->getAmount() / self::WEEK);
5656
}
5757

5858
/**
5959
* @return Months
6060
*/
61-
public function inMonths() : Months
61+
public function inMonths(): Months
6262
{
6363
return new Months($this->getAmount() / self::MONTH);
6464
}
6565

6666
/**
6767
* @return Years
6868
*/
69-
public function inYears() : Years
69+
public function inYears(): Years
7070
{
7171
return new Years($this->getAmount() / self::YEAR);
7272
}
@@ -76,7 +76,7 @@ public function inYears() : Years
7676
*
7777
* @return TimeUnit
7878
*/
79-
public function add(TimeUnit $unit) : TimeUnit
79+
public function add(TimeUnit $unit): TimeUnit
8080
{
8181
return new self($this->getAmount() + $unit->inDays()->getAmount());
8282
}
@@ -86,7 +86,7 @@ public function add(TimeUnit $unit) : TimeUnit
8686
*
8787
* @return TimeUnit
8888
*/
89-
public function subtract(TimeUnit $unit) : TimeUnit
89+
public function subtract(TimeUnit $unit): TimeUnit
9090
{
9191
return new self($this->getAmount() - $unit->inDays()->getAmount());
9292
}
@@ -96,7 +96,7 @@ public function subtract(TimeUnit $unit) : TimeUnit
9696
*
9797
* @return bool
9898
*/
99-
public function equals(TimeUnit $unit) : bool
99+
public function equals(TimeUnit $unit): bool
100100
{
101101
return $this->equalsAmount($unit->inDays()->getAmount());
102102
}

Diff for: ‎src/Unit/Hours.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,55 @@ final class Hours extends TimeUnit
1818
/**
1919
* @return Seconds
2020
*/
21-
public function inSeconds() : Seconds
21+
public function inSeconds(): Seconds
2222
{
2323
return new Seconds($this->getAmount() * self::SECONDS);
2424
}
2525

2626
/**
2727
* @return Minutes
2828
*/
29-
public function inMinutes() : Minutes
29+
public function inMinutes(): Minutes
3030
{
3131
return new Minutes($this->getAmount() * self::MINUTES);
3232
}
3333

3434
/**
3535
* @return Hours
3636
*/
37-
public function inHours() : Hours
37+
public function inHours(): Hours
3838
{
3939
return $this;
4040
}
4141

4242
/**
4343
* @return Days
4444
*/
45-
public function inDays() : Days
45+
public function inDays(): Days
4646
{
4747
return new Days($this->getAmount() / self::DAY);
4848
}
4949

5050
/**
5151
* @return Weeks
5252
*/
53-
public function inWeeks() : Weeks
53+
public function inWeeks(): Weeks
5454
{
5555
return new Weeks($this->getAmount() / self::WEEK);
5656
}
5757

5858
/**
5959
* @return Months
6060
*/
61-
public function inMonths() : Months
61+
public function inMonths(): Months
6262
{
6363
return new Months($this->getAmount() / self::MONTH);
6464
}
6565

6666
/**
6767
* @return Years
6868
*/
69-
public function inYears() : Years
69+
public function inYears(): Years
7070
{
7171
return new Years($this->getAmount() / self::YEAR);
7272
}
@@ -76,7 +76,7 @@ public function inYears() : Years
7676
*
7777
* @return TimeUnit
7878
*/
79-
public function add(TimeUnit $unit) : TimeUnit
79+
public function add(TimeUnit $unit): TimeUnit
8080
{
8181
return new self($this->getAmount() + $unit->inHours()->getAmount());
8282
}
@@ -86,7 +86,7 @@ public function add(TimeUnit $unit) : TimeUnit
8686
*
8787
* @return TimeUnit
8888
*/
89-
public function subtract(TimeUnit $unit) : TimeUnit
89+
public function subtract(TimeUnit $unit): TimeUnit
9090
{
9191
return new self($this->getAmount() - $unit->inHours()->getAmount());
9292
}
@@ -96,7 +96,7 @@ public function subtract(TimeUnit $unit) : TimeUnit
9696
*
9797
* @return bool
9898
*/
99-
public function equals(TimeUnit $unit) : bool
99+
public function equals(TimeUnit $unit): bool
100100
{
101101
return $this->equalsAmount($unit->inHours()->getAmount());
102102
}

0 commit comments

Comments
 (0)