Skip to content

Commit c69411c

Browse files
phpfuiphpfui
committed
Class ordering from PHPCSFixer
1 parent c4f2c36 commit c69411c

File tree

6 files changed

+129
-129
lines changed

6 files changed

+129
-129
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"php": ">=7.4 <8.3"
3535
},
3636
"require-dev": {
37-
"phpunit/phpunit": "^8.4 | ^9.0",
37+
"phpunit/phpunit": "<11.0",
3838
"friendsofphp/php-cs-fixer": "^3.3",
3939
"phpstan/phpstan": "^1.8",
4040
"phpfui/phpunit-syntax-coverage": "^1.0"

‎src/ICalendarOrg/ZCRecurringDate.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ class ZCRecurringDate
8484
*/
8585
public ?string $freq = null;
8686

87-
/**
88-
* start of week number (i.e. 0 for Sunday, 5 for Friday)
89-
*
90-
* @var ?integer
91-
*/
92-
public ?int $weekstart = null;
93-
9487
/**
9588
* inteval of repeating event (i.e. every 2 weeks, every 6 months)
9689
*
@@ -131,6 +124,13 @@ class ZCRecurringDate
131124
*/
132125
public ?int $until = null;
133126

127+
/**
128+
* start of week number (i.e. 0 for Sunday, 5 for Friday)
129+
*
130+
* @var ?integer
131+
*/
132+
public ?int $weekstart = null;
133+
134134
/**
135135
* Max year supported
136136
*

‎src/ICalendarOrg/ZDateHelper.php‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,25 @@ public static function DayInMonth(int $month, int $year) : int
6767
return (\checkdate($month, 29, $year)) ? 29 : 28;
6868
}
6969

70+
/**
71+
* Return now as DateTime
72+
*
73+
* @param string $tzid PHP recognized timezone (default is UTC)
74+
*/
75+
public static function DTNow(string $tzid) : \DateTime
76+
{
77+
try
78+
{
79+
$dtz = new \DateTimeZone($tzid);
80+
}
81+
catch (\Exception $e)
82+
{
83+
$dtz = null;
84+
}
85+
86+
return new \DateTime('now', $dtz);
87+
}
88+
7089
/**
7190
* Format iCal date-time string to Unix timestamp
7291
*
@@ -114,6 +133,73 @@ public static function fromiCaltoUnixDateTime(string $datetime) : int
114133
return \gmmktime($hour, $minute, $second, $month, $day, $year);
115134
}
116135

136+
/**
137+
* fromSqlDateTime()
138+
*
139+
* Take SQL timestamp and format to iCal date/time string
140+
*
141+
* @param string $datetime SQL timestamp, leave blank for current date/time
142+
*
143+
* @return string formatted iCal date/time string
144+
*/
145+
public static function fromSqlDateTime(?string $datetime = null) : string
146+
{
147+
\date_default_timezone_set('UTC');
148+
149+
if (null == $datetime)
150+
{
151+
$datetime = \time();
152+
}
153+
else
154+
{
155+
$datetime = \strtotime($datetime);
156+
}
157+
158+
return \date('Ymd\THis', $datetime);
159+
}
160+
161+
/**
162+
* fromUnixDate()
163+
*
164+
* Take Unix timestamp and format to iCal date string
165+
*
166+
* @param int $datetime Unix timestamp, leave blank for current date/time
167+
*
168+
* @return string formatted iCal date string
169+
*/
170+
public static function fromUnixDate(?int $datetime = null) : string
171+
{
172+
\date_default_timezone_set('UTC');
173+
174+
if (null == $datetime)
175+
{
176+
$datetime = \time();
177+
}
178+
179+
return \date('Ymd', $datetime);
180+
}
181+
182+
/**
183+
* fromUnixDateTime()
184+
*
185+
* Take Unix timestamp and format to iCal date/time string
186+
*
187+
* @param int $datetime Unix timestamp, leave blank for current date/time
188+
*
189+
* @return string formatted iCal date/time string
190+
*/
191+
public static function fromUnixDateTime(?int $datetime = null) : string
192+
{
193+
\date_default_timezone_set('UTC');
194+
195+
if (null == $datetime)
196+
{
197+
$datetime = \time();
198+
}
199+
200+
return \date('Ymd\THis', $datetime);
201+
}
202+
117203
/**
118204
* Format Unix timestamp to iCal date-time string
119205
*
@@ -333,25 +419,6 @@ public static function inDay(int $daystart, int $begin, int $end) : bool
333419
return $inday;
334420
}
335421

336-
/**
337-
* Return now as DateTime
338-
*
339-
* @param string $tzid PHP recognized timezone (default is UTC)
340-
*/
341-
public static function DTNow(string $tzid) : \DateTime
342-
{
343-
try
344-
{
345-
$dtz = new \DateTimeZone($tzid);
346-
}
347-
catch (\Exception $e)
348-
{
349-
$dtz = null;
350-
}
351-
352-
return new \DateTime('now', $dtz);
353-
}
354-
355422
/**
356423
* Is given date after today?
357424
*
@@ -656,71 +723,4 @@ public static function toUTCDateTime(string $sqldate, string $tzid = 'UTC') : st
656723

657724
return $date->format('Y-m-d H:i:s');
658725
}
659-
660-
/**
661-
* fromUnixDate()
662-
*
663-
* Take Unix timestamp and format to iCal date string
664-
*
665-
* @param int $datetime Unix timestamp, leave blank for current date/time
666-
*
667-
* @return string formatted iCal date string
668-
*/
669-
public static function fromUnixDate(?int $datetime = null) : string
670-
{
671-
\date_default_timezone_set('UTC');
672-
673-
if (null == $datetime)
674-
{
675-
$datetime = \time();
676-
}
677-
678-
return \date('Ymd', $datetime);
679-
}
680-
681-
/**
682-
* fromUnixDateTime()
683-
*
684-
* Take Unix timestamp and format to iCal date/time string
685-
*
686-
* @param int $datetime Unix timestamp, leave blank for current date/time
687-
*
688-
* @return string formatted iCal date/time string
689-
*/
690-
public static function fromUnixDateTime(?int $datetime = null) : string
691-
{
692-
\date_default_timezone_set('UTC');
693-
694-
if (null == $datetime)
695-
{
696-
$datetime = \time();
697-
}
698-
699-
return \date('Ymd\THis', $datetime);
700-
}
701-
702-
/**
703-
* fromSqlDateTime()
704-
*
705-
* Take SQL timestamp and format to iCal date/time string
706-
*
707-
* @param string $datetime SQL timestamp, leave blank for current date/time
708-
*
709-
* @return string formatted iCal date/time string
710-
*/
711-
public static function fromSqlDateTime(?string $datetime = null) : string
712-
{
713-
\date_default_timezone_set('UTC');
714-
715-
if (null == $datetime)
716-
{
717-
$datetime = \time();
718-
}
719-
else
720-
{
721-
$datetime = \strtotime($datetime);
722-
}
723-
724-
return \date('Ymd\THis', $datetime);
725-
}
726726
}

‎tests/DateTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,6 @@ public function testGetDateFromDay() : void
152152
$this->assertEquals($stamp, ZDateHelper::getDateFromDay($stamp, 4, 4));
153153
}
154154

155-
public function testIsToday() : void
156-
{
157-
$this->assertEquals(true, ZDateHelper::isToday(\time()));
158-
$this->assertEquals(false, ZDateHelper::isToday(\strtotime('2019-10-30')));
159-
$this->assertEquals(false, ZDateHelper::isToday(\strtotime('2222-10-30')));
160-
}
161-
162155
public function testInDay() : void
163156
{
164157
$stamp = \strtotime('2222-10-30');
@@ -196,6 +189,13 @@ public function testIsPast() : void
196189
$this->assertEquals(false, ZDateHelper::isPast(\strtotime('2222-10-30')));
197190
}
198191

192+
public function testIsToday() : void
193+
{
194+
$this->assertEquals(true, ZDateHelper::isToday(\time()));
195+
$this->assertEquals(false, ZDateHelper::isToday(\strtotime('2019-10-30')));
196+
$this->assertEquals(false, ZDateHelper::isToday(\strtotime('2222-10-30')));
197+
}
198+
199199
public function testIsTomorrow() : void
200200
{
201201
$this->assertEquals(false, ZDateHelper::isTomorrow(\time()));

‎tests/FileTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,6 @@
1111
*/
1212
class FileTest extends \PHPUnit\Framework\TestCase
1313
{
14-
/**
15-
* @dataProvider providerICSFiles
16-
*/
17-
public function testICSFiles(string $contents, string $file) : void
18-
{
19-
$this->assertNotEmpty($contents);
20-
$calendar = new \ICalendarOrg\ZCiCal($contents);
21-
$generated = $calendar->export();
22-
23-
foreach (\explode("\n", $generated) as $line)
24-
{
25-
$this->assertLessThan(72, \strlen($line), "Line ->{$line}<- in file {$file} is too long (>72 chars)");
26-
}
27-
28-
$resultsFile = __DIR__ . '/results/' . \basename($file);
29-
\file_put_contents($resultsFile, $generated);
30-
}
31-
3214
/**
3315
* Expressions data provider
3416
*
@@ -53,4 +35,22 @@ public static function providerICSFiles() : array
5335

5436
return $contents;
5537
}
38+
39+
/**
40+
* @dataProvider providerICSFiles
41+
*/
42+
public function testICSFiles(string $contents, string $file) : void
43+
{
44+
$this->assertNotEmpty($contents);
45+
$calendar = new \ICalendarOrg\ZCiCal($contents);
46+
$generated = $calendar->export();
47+
48+
foreach (\explode("\n", $generated) as $line)
49+
{
50+
$this->assertLessThan(72, \strlen($line), "Line ->{$line}<- in file {$file} is too long (>72 chars)");
51+
}
52+
53+
$resultsFile = __DIR__ . '/results/' . \basename($file);
54+
\file_put_contents($resultsFile, $generated);
55+
}
5656
}

‎tests/ZCiCalDataNodeTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@
1111
*/
1212
class ZCiCalDataNodeTest extends \PHPUnit\Framework\TestCase
1313
{
14-
/**
15-
* @dataProvider providerZCiCalDataNode
16-
*/
17-
public function testZCiCalDataNode(string $line) : void
18-
{
19-
$dataNode = new \ICalendarOrg\ZCiCalDataNode($line);
20-
$generated = "{$dataNode}";
21-
$this->assertEquals($line . "\r\n", $generated, $line . ' has an error');
22-
}
23-
2414
/**
2515
* Expressions data provider
2616
*
@@ -103,4 +93,14 @@ public static function providerZCiCalDataNode() : array
10393
['VERSION:2.0'],
10494
];
10595
}
96+
97+
/**
98+
* @dataProvider providerZCiCalDataNode
99+
*/
100+
public function testZCiCalDataNode(string $line) : void
101+
{
102+
$dataNode = new \ICalendarOrg\ZCiCalDataNode($line);
103+
$generated = "{$dataNode}";
104+
$this->assertEquals($line . "\r\n", $generated, $line . ' has an error');
105+
}
106106
}

0 commit comments

Comments
 (0)