PHPStan level 1

composer.json

@@ -37,7 +37,8 @@
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
         "evert/phpdoc-md" : "~0.1.0",
-        "monolog/monolog": "^1.18"
+        "monolog/monolog": "^1.18",
+        "phpstan/phpstan-phpunit": "^0.12.6"
     },
     "suggest" : {
         "ext-curl" : "*",
@@ -46,21 +47,12 @@
     },
     "autoload": {
         "psr-4" : {
-            "Sabre\\DAV\\"     : "lib/DAV/",
-            "Sabre\\DAVACL\\"  : "lib/DAVACL/",
-            "Sabre\\CalDAV\\"  : "lib/CalDAV/",
-            "Sabre\\CardDAV\\" : "lib/CardDAV/"
+            "Sabre\\" : "lib/"
         }
     },
     "autoload-dev" : {
         "psr-4" : {
-            "Sabre\\" : "tests/Sabre/",
-            "Sabre\\CalDAV\\" : "tests/Sabre/CalDAV",
-            "Sabre\\CardDAV\\" : "tests/Sabre/CardDAV",
-            "Sabre\\DAV\\" : "tests/Sabre/DAV",
-            "Sabre\\DAV\\Property\\" : "tests/Sabre/DAV/Xml/Property",
-            "Sabre\\DAVACL\\" : "tests/Sabre/DAVACL",
-            "Sabre\\HTTP\\" : "tests/Sabre/HTTP"
+            "Sabre\\" : "tests/Sabre/"
         }
     },
     "support" : {

lib/CalDAV/Schedule/Plugin.php

@@ -493,8 +493,7 @@ public function scheduleLocalDelivery(ITip\Message $iTipMessage)
             // There was an existing object, we need to update probably.
             $objectPath = $homePath.'/'.$result;
             $objectNode = $this->server->tree->getNodeForPath($objectPath);
-            $oldICalendarData = $objectNode->get();
-            $currentObject = Reader::read($oldICalendarData);
+            $currentObject = Reader::read($objectNode->get());
         } else {
             $isNewNode = true;
         }
@@ -528,7 +527,7 @@ public function scheduleLocalDelivery(ITip\Message $iTipMessage)
             // another itipMessage.
             if ('REPLY' === $iTipMessage->method) {
                 $this->processICalendarChange(
-                    $oldICalendarData,
+                    $objectNode->get(),
                     $newObject,
                     [$iTipMessage->recipient],
                     [$iTipMessage->sender]

lib/DAV/FSExt/File.php

@@ -75,6 +75,8 @@ public function patch($data, $rangeType, $offset = null)
                 $f = fopen($this->path, 'c');
                 fseek($f, $offset, SEEK_END);
                 break;
+            default:
+                throw new \UnexpectedValueException('Unkown rangeType used: '.$rangeType);
         }
         if (is_string($data)) {
             fwrite($f, $data);

lib/DAV/Tree.php

@@ -313,6 +313,8 @@ protected function copyNode(INode $source, ICollection $destinationParent, $dest
             foreach ($source->getChildren() as $child) {
                 $this->copyNode($child, $destination);
             }
+        } else {
+            throw new \UnexpectedValueException('Source must be either IFile or ICollection.');
         }
         if ($source instanceof IProperties && $destination instanceof IProperties) {
             $props = $source->getProperties([]);

phpstan.neon

@@ -1,2 +1,9 @@
 parameters:
-  level: 0
+  level: 1
+  ignoreErrors:
+    -
+      message: '#Constant (SABRE_TEMPDIR|SABRE_MYSQLDSN|SABRE_MYSQLPASS|SABRE_MYSQLUSER|SABRE_PGSQLDSN|SABRE_HASSQLITE) not found\.#'
+      path: tests/*
+includes:
+  - vendor/phpstan/phpstan-phpunit/extension.neon
+  - vendor/phpstan/phpstan-phpunit/rules.neon

tests/Sabre/CalDAV/Backend/AbstractPDOTest.php

@@ -875,7 +875,7 @@ public function testGetChangesBadId()
     public function testCreateSubscriptions()
     {
         $props = [
-            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
             '{DAV:}displayname' => 'cal',
             '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
             '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -916,7 +916,7 @@ public function testCreateSubscriptionFail()
     public function testUpdateSubscriptions()
     {
         $props = [
-            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
             '{DAV:}displayname' => 'cal',
             '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
             '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -930,7 +930,7 @@ public function testUpdateSubscriptions()
 
         $newProps = [
             '{DAV:}displayname' => 'new displayname',
-            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
+            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'),
         ];
 
         $propPatch = new DAV\PropPatch($newProps);
@@ -958,7 +958,7 @@ public function testUpdateSubscriptions()
     public function testUpdateSubscriptionsFail()
     {
         $props = [
-            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
             '{DAV:}displayname' => 'cal',
             '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
             '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -972,7 +972,7 @@ public function testUpdateSubscriptionsFail()
 
         $propPatch = new DAV\PropPatch([
             '{DAV:}displayname' => 'new displayname',
-            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
+            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'),
             '{DAV:}unknown' => 'foo',
         ]);
 
@@ -989,7 +989,7 @@ public function testUpdateSubscriptionsFail()
     public function testDeleteSubscriptions()
     {
         $props = [
-            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'),
             '{DAV:}displayname' => 'cal',
             '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
             '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
@@ -1003,7 +1003,7 @@ public function testDeleteSubscriptions()
 
         $newProps = [
             '{DAV:}displayname' => 'new displayname',
-            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
+            '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'),
         ];
 
         $backend->deleteSubscription(1);

tests/Sabre/CalDAV/Schedule/SchedulingObjectTest.php

@@ -75,7 +75,6 @@ public function testInvalidArg1()
         $this->expectException('InvalidArgumentException');
         $obj = new SchedulingObject(
             new Backend\MockScheduling([], []),
-            [],
             []
         );
     }
@@ -85,8 +84,7 @@ public function testInvalidArg2()
         $this->expectException('InvalidArgumentException');
         $obj = new SchedulingObject(
             new Backend\MockScheduling([], []),
-            [],
-            ['calendarid' => '1']
+            []
         );
     }
 

tests/Sabre/CalDAV/Subscriptions/SubscriptionTest.php

@@ -16,7 +16,7 @@ public function getSub($override = [])
         $caldavBackend = new \Sabre\CalDAV\Backend\MockSubscriptionSupport([], []);
 
         $info = [
-            '{http://calendarserver.org/ns/}source' => new Href('http://example.org/src', false),
+            '{http://calendarserver.org/ns/}source' => new Href('http://example.org/src'),
             'lastmodified' => date('2013-04-06 11:40:00'), // tomorrow is my birthday!
             '{DAV:}displayname' => 'displayname',
         ];
@@ -43,7 +43,7 @@ public function testValues()
         $this->assertEquals(
             [
                 '{DAV:}displayname' => 'displayname',
-                '{http://calendarserver.org/ns/}source' => new Href('http://example.org/src', false),
+                '{http://calendarserver.org/ns/}source' => new Href('http://example.org/src'),
             ],
             $sub->getProperties(['{DAV:}displayname', '{http://calendarserver.org/ns/}source'])
         );

tests/Sabre/DAV/DbTestHelperTrait.php

@@ -57,6 +57,8 @@ public function getDb()
                         $this->markTestSkipped('We require at least Postgres 9.5. This server is running '.$version);
                     }
                     break;
+                default:
+                    throw new \UnexpectedValueException('Unknown driver: '.$this->driver);
             }
             $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
         } catch (PDOException $e) {

tests/Sabre/DAV/SyncTokenPropertyTest.php

@@ -96,7 +96,7 @@ public function data()
             ],
             [
                 '{DAV:}sync-token',
-                new Xml\Property\Href(Sync\Plugin::SYNCTOKEN_PREFIX.'hello', false),
+                new Xml\Property\Href(Sync\Plugin::SYNCTOKEN_PREFIX.'hello'),
             ],
         ];
     }

tests/Sabre/DAV/Xml/Element/PropTest.php

@@ -65,7 +65,7 @@ public function testDeserializeCustom()
 XML;
 
         $expected = [
-            '{DAV:}foo' => new Href('/hello', false),
+            '{DAV:}foo' => new Href('/hello'),
         ];
 
         $elementMap = [

tests/Sabre/DAV/Xml/Element/ResponseTest.php

@@ -135,7 +135,7 @@ public function testSerializeComplexProperty()
     {
         $innerProps = [
             200 => [
-                '{DAV:}link' => new DAV\Xml\Property\Href('http://sabredav.org/', false),
+                '{DAV:}link' => new DAV\Xml\Property\Href('http://sabredav.org/'),
             ],
         ];
 

tests/Sabre/DAV/Xml/Property/HrefTest.php

@@ -70,7 +70,7 @@ public function testUnserializeEmpty()
      */
     public function testSerializeEntity()
     {
-        $href = new Href('http://example.org/?a&b', false);
+        $href = new Href('http://example.org/?a&b');
         $this->assertEquals('http://example.org/?a&b', $href->getHref());
 
         $xml = $this->write(['{DAV:}anything' => $href]);

tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sabre\DAV\Property;
+namespace Sabre\DAV\Xml\Property;
 
 use Sabre\DAV;
 use Sabre\HTTP;

tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php

@@ -61,7 +61,7 @@ public function testSetGroupMembers()
         $server->addPlugin($plugin);
 
         $result = $server->updateProperties('foo', [
-            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz'], true),
+            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz']),
         ]);
 
         $expected = [
@@ -99,7 +99,7 @@ public function testSetBadNode()
         $server->addPlugin($plugin);
 
         $result = $server->updateProperties('foo', [
-            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz'], false),
+            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz']),
         ]);
 
         $expected = [

tests/Sabre/DAVACL/PrincipalBackend/Mock.php

@@ -137,7 +137,7 @@ public function updatePrincipal($path, \Sabre\DAV\PropPatch $propPatch)
                 break;
             }
         }
-        if (!$principal) {
+        if (!isset($principal) || !isset($principalIndex)) {
             return;
         }