Skip to content

Commit 0939a25

Browse files
phil-davisphil-davis
committed
Increase phpstan to level 1
1 parent 38efc9e commit 0939a25

File tree

16 files changed

+62
-23
lines changed

16 files changed

+62
-23
lines changed

‎lib/CalDAV/Schedule/Plugin.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ public function scheduleLocalDelivery(ITip\Message $iTipMessage)
486486

487487
$currentObject = null;
488488
$objectNode = null;
489+
$oldICalendarData = null;
489490
$isNewNode = false;
490491

491492
$result = $home->getCalendarObjectByUID($uid);

‎lib/DAV/FSExt/File.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function put($data)
4141
*
4242
* The second argument is the type of update we're doing.
4343
* This is either:
44-
* * 1. append
44+
* * 1. append (default)
4545
* * 2. update based on a start byte
4646
* * 3. update based on an end byte
4747
*;
@@ -75,6 +75,9 @@ public function patch($data, $rangeType, $offset = null)
7575
$f = fopen($this->path, 'c');
7676
fseek($f, $offset, SEEK_END);
7777
break;
78+
default:
79+
$f = fopen($this->path, 'a');
80+
break;
7881
}
7982
if (is_string($data)) {
8083
fwrite($f, $data);

‎lib/DAV/Tree.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ protected function copyNode(INode $source, ICollection $destinationParent, $dest
292292
$destinationName = $source->getName();
293293
}
294294

295+
$destination = null;
296+
295297
if ($source instanceof IFile) {
296298
$data = $source->get();
297299

‎lib/DAV/Xml/Property/Href.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ class Href implements Element, HtmlOutput
3939
*
4040
* You must either pass a string for a single href, or an array of hrefs.
4141
*
42-
* If auto-prefix is set to false, the hrefs will be treated as absolute
43-
* and not relative to the servers base uri.
44-
*
4542
* @param string|string[] $hrefs
4643
*/
4744
public function __construct($hrefs)

‎phpstan.neon‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
parameters:
2-
level: 0
2+
level: 1
3+
bootstrapFiles:
4+
- tests/bootstrap.php

‎tests/Sabre/CalDAV/Backend/AbstractPDOTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ public function testGetChangesBadId()
963963
public function testCreateSubscriptions()
964964
{
965965
$props = [
966-
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
966+
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
967967
'{DAV:}displayname' => 'cal',
968968
'{http://apple.com/ns/ical/}refreshrate' => 'P1W',
969969
'{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -1004,7 +1004,7 @@ public function testCreateSubscriptionFail()
10041004
public function testUpdateSubscriptions()
10051005
{
10061006
$props = [
1007-
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
1007+
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
10081008
'{DAV:}displayname' => 'cal',
10091009
'{http://apple.com/ns/ical/}refreshrate' => 'P1W',
10101010
'{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -1018,7 +1018,7 @@ public function testUpdateSubscriptions()
10181018

10191019
$newProps = [
10201020
'{DAV:}displayname' => 'new displayname',
1021-
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
1021+
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'),
10221022
];
10231023

10241024
$propPatch = new DAV\PropPatch($newProps);
@@ -1046,7 +1046,7 @@ public function testUpdateSubscriptions()
10461046
public function testUpdateSubscriptionsFail()
10471047
{
10481048
$props = [
1049-
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
1049+
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
10501050
'{DAV:}displayname' => 'cal',
10511051
'{http://apple.com/ns/ical/}refreshrate' => 'P1W',
10521052
'{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -1060,7 +1060,7 @@ public function testUpdateSubscriptionsFail()
10601060

10611061
$propPatch = new DAV\PropPatch([
10621062
'{DAV:}displayname' => 'new displayname',
1063-
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
1063+
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'),
10641064
'{DAV:}unknown' => 'foo',
10651065
]);
10661066

@@ -1077,7 +1077,7 @@ public function testUpdateSubscriptionsFail()
10771077
public function testDeleteSubscriptions()
10781078
{
10791079
$props = [
1080-
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
1080+
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
10811081
'{DAV:}displayname' => 'cal',
10821082
'{http://apple.com/ns/ical/}refreshrate' => 'P1W',
10831083
'{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -1091,7 +1091,7 @@ public function testDeleteSubscriptions()
10911091

10921092
$newProps = [
10931093
'{DAV:}displayname' => 'new displayname',
1094-
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
1094+
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'),
10951095
];
10961096

10971097
$backend->deleteSubscription(1);

‎tests/Sabre/CalDAV/Schedule/SchedulingObjectTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public function testInvalidArg1()
7575
$this->expectException('InvalidArgumentException');
7676
$obj = new SchedulingObject(
7777
new Backend\MockScheduling([], []),
78-
[],
7978
[]
8079
);
8180
}
@@ -85,7 +84,6 @@ public function testInvalidArg2()
8584
$this->expectException('InvalidArgumentException');
8685
$obj = new SchedulingObject(
8786
new Backend\MockScheduling([], []),
88-
[],
8987
['calendarid' => '1']
9088
);
9189
}

‎tests/Sabre/CalDAV/Subscriptions/SubscriptionTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function getSub($override = [])
1616
$caldavBackend = new \Sabre\CalDAV\Backend\MockSubscriptionSupport([], []);
1717

1818
$info = [
19-
'{http://calendarserver.org/ns/}source' => new Href('http://example.org/src', false),
19+
'{http://calendarserver.org/ns/}source' => new Href('http://example.org/src'),
2020
'lastmodified' => date('2013-04-06 11:40:00'), // tomorrow is my birthday!
2121
'{DAV:}displayname' => 'displayname',
2222
];
@@ -43,7 +43,7 @@ public function testValues()
4343
$this->assertEquals(
4444
[
4545
'{DAV:}displayname' => 'displayname',
46-
'{http://calendarserver.org/ns/}source' => new Href('http://example.org/src', false),
46+
'{http://calendarserver.org/ns/}source' => new Href('http://example.org/src'),
4747
],
4848
$sub->getProperties(['{DAV:}displayname', '{http://calendarserver.org/ns/}source'])
4949
);

‎tests/Sabre/DAV/DbTestHelperTrait.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public function getDb()
3030
throw new \Exception('You must set the $driver public property');
3131
}
3232

33+
$pdo = null;
34+
3335
if (array_key_exists($this->driver, DbCache::$cache)) {
3436
$pdo = DbCache::$cache[$this->driver];
3537
if (null === $pdo) {
@@ -58,6 +60,11 @@ public function getDb()
5860
}
5961
break;
6062
}
63+
64+
if (null === $pdo) {
65+
$this->markTestSkipped($this->driver.' was not recognised');
66+
}
67+
6168
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
6269
} catch (PDOException $e) {
6370
$this->markTestSkipped($this->driver.' was not enabled or not correctly configured. Error message: '.$e->getMessage());

‎tests/Sabre/DAV/FSExt/FileTest.php‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,16 @@ public function testPut()
3434
);
3535
}
3636

37-
public function testRange()
37+
public function testRangeAppend()
38+
{
39+
$file = new File(SABRE_TEMPDIR.'/file.txt');
40+
$file->put('0000000');
41+
$file->patch('111', 1);
42+
43+
$this->assertEquals('0000000111', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
44+
}
45+
46+
public function testRangeOffset()
3847
{
3948
$file = new File(SABRE_TEMPDIR.'/file.txt');
4049
$file->put('0000000');
@@ -43,6 +52,24 @@ public function testRange()
4352
$this->assertEquals('0001110', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
4453
}
4554

55+
public function testRangeOffsetEnd()
56+
{
57+
$file = new File(SABRE_TEMPDIR.'/file.txt');
58+
$file->put('0000000');
59+
$file->patch('11', 3, -4);
60+
61+
$this->assertEquals('0001100', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
62+
}
63+
64+
public function testRangeOffsetDefault()
65+
{
66+
$file = new File(SABRE_TEMPDIR.'/file.txt');
67+
$file->put('0000000');
68+
$file->patch('11', 0);
69+
70+
$this->assertEquals('000000011', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
71+
}
72+
4673
public function testRangeStream()
4774
{
4875
$stream = fopen('php://memory', 'r+');

0 commit comments

Comments
 (0)