Skip to content

Commit aef4d71

Browse files
PowerKiKiPowerKiKi
committed
Use self::assert*() instead of $this->assert*()
Because even if it doesn't make a difference in practice, it is technically more correct to call static methods statically. It also better advertise that those methods can be used from any context.
1 parent 0477e6f commit aef4d71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+527
-527
lines changed

‎tests/PhpSpreadsheetTests/Calculation/DateTimeTest.php

+45-45
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function setUp()
2525
public function testDATE($expectedResult, ...$args)
2626
{
2727
$result = DateTime::DATE(...$args);
28-
$this->assertEquals($expectedResult, $result, null, 1E-8);
28+
self::assertEquals($expectedResult, $result, null, 1E-8);
2929
}
3030

3131
public function providerDATE()
@@ -38,7 +38,7 @@ public function testDATEtoPHP()
3838
Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
3939
$result = DateTime::DATE(2012, 1, 31);
4040
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
41-
$this->assertEquals(1327968000, $result, null, 1E-8);
41+
self::assertEquals(1327968000, $result, null, 1E-8);
4242
}
4343

4444
public function testDATEtoPHPObject()
@@ -47,27 +47,27 @@ public function testDATEtoPHPObject()
4747
$result = DateTime::DATE(2012, 1, 31);
4848
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
4949
// Must return an object...
50-
$this->assertInternalType('object', $result);
50+
self::assertInternalType('object', $result);
5151
// ... of the correct type
52-
$this->assertTrue(is_a($result, 'DateTime'));
52+
self::assertTrue(is_a($result, 'DateTime'));
5353
// ... with the correct value
54-
$this->assertEquals($result->format('d-M-Y'), '31-Jan-2012');
54+
self::assertEquals($result->format('d-M-Y'), '31-Jan-2012');
5555
}
5656

5757
public function testDATEwith1904Calendar()
5858
{
5959
Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
6060
$result = DateTime::DATE(1918, 11, 11);
6161
Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
62-
$this->assertEquals($result, 5428);
62+
self::assertEquals($result, 5428);
6363
}
6464

6565
public function testDATEwith1904CalendarError()
6666
{
6767
Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
6868
$result = DateTime::DATE(1901, 1, 31);
6969
Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
70-
$this->assertEquals($result, '#NUM!');
70+
self::assertEquals($result, '#NUM!');
7171
}
7272

7373
/**
@@ -78,7 +78,7 @@ public function testDATEwith1904CalendarError()
7878
public function testDATEVALUE($expectedResult, ...$args)
7979
{
8080
$result = DateTime::DATEVALUE(...$args);
81-
$this->assertEquals($expectedResult, $result, null, 1E-8);
81+
self::assertEquals($expectedResult, $result, null, 1E-8);
8282
}
8383

8484
public function providerDATEVALUE()
@@ -91,7 +91,7 @@ public function testDATEVALUEtoPHP()
9191
Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
9292
$result = DateTime::DATEVALUE('2012-1-31');
9393
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
94-
$this->assertEquals(1327968000, $result, null, 1E-8);
94+
self::assertEquals(1327968000, $result, null, 1E-8);
9595
}
9696

9797
public function testDATEVALUEtoPHPObject()
@@ -100,11 +100,11 @@ public function testDATEVALUEtoPHPObject()
100100
$result = DateTime::DATEVALUE('2012-1-31');
101101
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
102102
// Must return an object...
103-
$this->assertInternalType('object', $result);
103+
self::assertInternalType('object', $result);
104104
// ... of the correct type
105-
$this->assertTrue(is_a($result, 'DateTime'));
105+
self::assertTrue(is_a($result, 'DateTime'));
106106
// ... with the correct value
107-
$this->assertEquals($result->format('d-M-Y'), '31-Jan-2012');
107+
self::assertEquals($result->format('d-M-Y'), '31-Jan-2012');
108108
}
109109

110110
/**
@@ -115,7 +115,7 @@ public function testDATEVALUEtoPHPObject()
115115
public function testYEAR($expectedResult, ...$args)
116116
{
117117
$result = DateTime::YEAR(...$args);
118-
$this->assertEquals($expectedResult, $result, null, 1E-8);
118+
self::assertEquals($expectedResult, $result, null, 1E-8);
119119
}
120120

121121
public function providerYEAR()
@@ -131,7 +131,7 @@ public function providerYEAR()
131131
public function testMONTH($expectedResult, ...$args)
132132
{
133133
$result = DateTime::MONTHOFYEAR(...$args);
134-
$this->assertEquals($expectedResult, $result, null, 1E-8);
134+
self::assertEquals($expectedResult, $result, null, 1E-8);
135135
}
136136

137137
public function providerMONTH()
@@ -147,7 +147,7 @@ public function providerMONTH()
147147
public function testWEEKNUM($expectedResult, ...$args)
148148
{
149149
$result = DateTime::WEEKNUM(...$args);
150-
$this->assertEquals($expectedResult, $result, null, 1E-8);
150+
self::assertEquals($expectedResult, $result, null, 1E-8);
151151
}
152152

153153
public function providerWEEKNUM()
@@ -163,7 +163,7 @@ public function providerWEEKNUM()
163163
public function testWEEKDAY($expectedResult, ...$args)
164164
{
165165
$result = DateTime::WEEKDAY(...$args);
166-
$this->assertEquals($expectedResult, $result, null, 1E-8);
166+
self::assertEquals($expectedResult, $result, null, 1E-8);
167167
}
168168

169169
public function providerWEEKDAY()
@@ -179,7 +179,7 @@ public function providerWEEKDAY()
179179
public function testDAY($expectedResult, ...$args)
180180
{
181181
$result = DateTime::DAYOFMONTH(...$args);
182-
$this->assertEquals($expectedResult, $result, null, 1E-8);
182+
self::assertEquals($expectedResult, $result, null, 1E-8);
183183
}
184184

185185
public function providerDAY()
@@ -195,7 +195,7 @@ public function providerDAY()
195195
public function testTIME($expectedResult, ...$args)
196196
{
197197
$result = DateTime::TIME(...$args);
198-
$this->assertEquals($expectedResult, $result, null, 1E-8);
198+
self::assertEquals($expectedResult, $result, null, 1E-8);
199199
}
200200

201201
public function providerTIME()
@@ -208,7 +208,7 @@ public function testTIMEtoPHP()
208208
Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
209209
$result = DateTime::TIME(7, 30, 20);
210210
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
211-
$this->assertEquals(27020, $result, null, 1E-8);
211+
self::assertEquals(27020, $result, null, 1E-8);
212212
}
213213

214214
public function testTIMEtoPHPObject()
@@ -217,11 +217,11 @@ public function testTIMEtoPHPObject()
217217
$result = DateTime::TIME(7, 30, 20);
218218
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
219219
// Must return an object...
220-
$this->assertInternalType('object', $result);
220+
self::assertInternalType('object', $result);
221221
// ... of the correct type
222-
$this->assertTrue(is_a($result, 'DateTime'));
222+
self::assertTrue(is_a($result, 'DateTime'));
223223
// ... with the correct value
224-
$this->assertEquals($result->format('H:i:s'), '07:30:20');
224+
self::assertEquals($result->format('H:i:s'), '07:30:20');
225225
}
226226

227227
/**
@@ -232,7 +232,7 @@ public function testTIMEtoPHPObject()
232232
public function testTIMEVALUE($expectedResult, ...$args)
233233
{
234234
$result = DateTime::TIMEVALUE(...$args);
235-
$this->assertEquals($expectedResult, $result, null, 1E-8);
235+
self::assertEquals($expectedResult, $result, null, 1E-8);
236236
}
237237

238238
public function providerTIMEVALUE()
@@ -245,7 +245,7 @@ public function testTIMEVALUEtoPHP()
245245
Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
246246
$result = DateTime::TIMEVALUE('7:30:20');
247247
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
248-
$this->assertEquals(23420, $result, null, 1E-8);
248+
self::assertEquals(23420, $result, null, 1E-8);
249249
}
250250

251251
public function testTIMEVALUEtoPHPObject()
@@ -254,11 +254,11 @@ public function testTIMEVALUEtoPHPObject()
254254
$result = DateTime::TIMEVALUE('7:30:20');
255255
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
256256
// Must return an object...
257-
$this->assertInternalType('object', $result);
257+
self::assertInternalType('object', $result);
258258
// ... of the correct type
259-
$this->assertTrue(is_a($result, 'DateTime'));
259+
self::assertTrue(is_a($result, 'DateTime'));
260260
// ... with the correct value
261-
$this->assertEquals($result->format('H:i:s'), '07:30:20');
261+
self::assertEquals($result->format('H:i:s'), '07:30:20');
262262
}
263263

264264
/**
@@ -269,7 +269,7 @@ public function testTIMEVALUEtoPHPObject()
269269
public function testHOUR($expectedResult, ...$args)
270270
{
271271
$result = DateTime::HOUROFDAY(...$args);
272-
$this->assertEquals($expectedResult, $result, null, 1E-8);
272+
self::assertEquals($expectedResult, $result, null, 1E-8);
273273
}
274274

275275
public function providerHOUR()
@@ -285,7 +285,7 @@ public function providerHOUR()
285285
public function testMINUTE($expectedResult, ...$args)
286286
{
287287
$result = DateTime::MINUTE(...$args);
288-
$this->assertEquals($expectedResult, $result, null, 1E-8);
288+
self::assertEquals($expectedResult, $result, null, 1E-8);
289289
}
290290

291291
public function providerMINUTE()
@@ -301,7 +301,7 @@ public function providerMINUTE()
301301
public function testSECOND($expectedResult, ...$args)
302302
{
303303
$result = DateTime::SECOND(...$args);
304-
$this->assertEquals($expectedResult, $result, null, 1E-8);
304+
self::assertEquals($expectedResult, $result, null, 1E-8);
305305
}
306306

307307
public function providerSECOND()
@@ -317,7 +317,7 @@ public function providerSECOND()
317317
public function testNETWORKDAYS($expectedResult, ...$args)
318318
{
319319
$result = DateTime::NETWORKDAYS(...$args);
320-
$this->assertEquals($expectedResult, $result, null, 1E-8);
320+
self::assertEquals($expectedResult, $result, null, 1E-8);
321321
}
322322

323323
public function providerNETWORKDAYS()
@@ -333,7 +333,7 @@ public function providerNETWORKDAYS()
333333
public function testWORKDAY($expectedResult, ...$args)
334334
{
335335
$result = DateTime::WORKDAY(...$args);
336-
$this->assertEquals($expectedResult, $result, null, 1E-8);
336+
self::assertEquals($expectedResult, $result, null, 1E-8);
337337
}
338338

339339
public function providerWORKDAY()
@@ -349,7 +349,7 @@ public function providerWORKDAY()
349349
public function testEDATE($expectedResult, ...$args)
350350
{
351351
$result = DateTime::EDATE(...$args);
352-
$this->assertEquals($expectedResult, $result, null, 1E-8);
352+
self::assertEquals($expectedResult, $result, null, 1E-8);
353353
}
354354

355355
public function providerEDATE()
@@ -362,7 +362,7 @@ public function testEDATEtoPHP()
362362
Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
363363
$result = DateTime::EDATE('2012-1-26', -1);
364364
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
365-
$this->assertEquals(1324857600, $result, null, 1E-8);
365+
self::assertEquals(1324857600, $result, null, 1E-8);
366366
}
367367

368368
public function testEDATEtoPHPObject()
@@ -371,11 +371,11 @@ public function testEDATEtoPHPObject()
371371
$result = DateTime::EDATE('2012-1-26', -1);
372372
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
373373
// Must return an object...
374-
$this->assertInternalType('object', $result);
374+
self::assertInternalType('object', $result);
375375
// ... of the correct type
376-
$this->assertTrue(is_a($result, 'DateTime'));
376+
self::assertTrue(is_a($result, 'DateTime'));
377377
// ... with the correct value
378-
$this->assertEquals($result->format('d-M-Y'), '26-Dec-2011');
378+
self::assertEquals($result->format('d-M-Y'), '26-Dec-2011');
379379
}
380380

381381
/**
@@ -386,7 +386,7 @@ public function testEDATEtoPHPObject()
386386
public function testEOMONTH($expectedResult, ...$args)
387387
{
388388
$result = DateTime::EOMONTH(...$args);
389-
$this->assertEquals($expectedResult, $result, null, 1E-8);
389+
self::assertEquals($expectedResult, $result, null, 1E-8);
390390
}
391391

392392
public function providerEOMONTH()
@@ -399,7 +399,7 @@ public function testEOMONTHtoPHP()
399399
Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
400400
$result = DateTime::EOMONTH('2012-1-26', -1);
401401
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
402-
$this->assertEquals(1325289600, $result, null, 1E-8);
402+
self::assertEquals(1325289600, $result, null, 1E-8);
403403
}
404404

405405
public function testEOMONTHtoPHPObject()
@@ -408,11 +408,11 @@ public function testEOMONTHtoPHPObject()
408408
$result = DateTime::EOMONTH('2012-1-26', -1);
409409
Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
410410
// Must return an object...
411-
$this->assertInternalType('object', $result);
411+
self::assertInternalType('object', $result);
412412
// ... of the correct type
413-
$this->assertTrue(is_a($result, 'DateTime'));
413+
self::assertTrue(is_a($result, 'DateTime'));
414414
// ... with the correct value
415-
$this->assertEquals($result->format('d-M-Y'), '31-Dec-2011');
415+
self::assertEquals($result->format('d-M-Y'), '31-Dec-2011');
416416
}
417417

418418
/**
@@ -423,7 +423,7 @@ public function testEOMONTHtoPHPObject()
423423
public function testDATEDIF($expectedResult, ...$args)
424424
{
425425
$result = DateTime::DATEDIF(...$args);
426-
$this->assertEquals($expectedResult, $result, null, 1E-8);
426+
self::assertEquals($expectedResult, $result, null, 1E-8);
427427
}
428428

429429
public function providerDATEDIF()
@@ -439,7 +439,7 @@ public function providerDATEDIF()
439439
public function testDAYS360($expectedResult, ...$args)
440440
{
441441
$result = DateTime::DAYS360(...$args);
442-
$this->assertEquals($expectedResult, $result, null, 1E-8);
442+
self::assertEquals($expectedResult, $result, null, 1E-8);
443443
}
444444

445445
public function providerDAYS360()
@@ -455,7 +455,7 @@ public function providerDAYS360()
455455
public function testYEARFRAC($expectedResult, ...$args)
456456
{
457457
$result = DateTime::YEARFRAC(...$args);
458-
$this->assertEquals($expectedResult, $result, null, 1E-8);
458+
self::assertEquals($expectedResult, $result, null, 1E-8);
459459
}
460460

461461
public function providerYEARFRAC()

0 commit comments

Comments
 (0)