Merge pull request #1329 from phil-davis/phpstan-level-1

phil-davis · web-flow · commit 82ea0e95afe8 · 2021-02-12T02:51:11.000+03:00
phpstan level 1 and other fixes
diff --git a/lib/CalDAV/Schedule/Plugin.php b/lib/CalDAV/Schedule/Plugin.php
@@ -486,6 +486,7 @@ public function scheduleLocalDelivery(ITip\Message $iTipMessage)
 
         $currentObject = null;
         $objectNode = null;
+        $oldICalendarData = null;
         $isNewNode = false;
 
         $result = $home->getCalendarObjectByUID($uid);
diff --git a/lib/DAV/Browser/Plugin.php b/lib/DAV/Browser/Plugin.php
@@ -157,6 +157,9 @@ public function httpGet(RequestInterface $request, ResponseInterface $response)
     public function httpPOST(RequestInterface $request, ResponseInterface $response)
     {
         $contentType = $request->getHeader('Content-Type');
+        if (!\is_string($contentType)) {
+            return;
+        }
         list($contentType) = explode(';', $contentType);
         if ('application/x-www-form-urlencoded' !== $contentType &&
             'multipart/form-data' !== $contentType) {
diff --git a/lib/DAV/FSExt/File.php b/lib/DAV/FSExt/File.php
@@ -41,7 +41,7 @@ public function put($data)
      *
      * The second argument is the type of update we're doing.
      * This is either:
-     * * 1. append
+     * * 1. append (default)
      * * 2. update based on a start byte
      * * 3. update based on an end byte
      *;
@@ -75,6 +75,9 @@ public function patch($data, $rangeType, $offset = null)
                 $f = fopen($this->path, 'c');
                 fseek($f, $offset, SEEK_END);
                 break;
+            default:
+                $f = fopen($this->path, 'a');
+                break;
         }
         if (is_string($data)) {
             fwrite($f, $data);
diff --git a/lib/DAV/Tree.php b/lib/DAV/Tree.php
@@ -292,6 +292,8 @@ protected function copyNode(INode $source, ICollection $destinationParent, $dest
             $destinationName = $source->getName();
         }
 
+        $destination = null;
+
         if ($source instanceof IFile) {
             $data = $source->get();
 
diff --git a/lib/DAV/Xml/Property/Href.php b/lib/DAV/Xml/Property/Href.php
@@ -39,9 +39,6 @@ class Href implements Element, HtmlOutput
      *
      * You must either pass a string for a single href, or an array of hrefs.
      *
-     * If auto-prefix is set to false, the hrefs will be treated as absolute
-     * and not relative to the servers base uri.
-     *
      * @param string|string[] $hrefs
      */
     public function __construct($hrefs)
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,2 +1,4 @@
 parameters:
-  level: 0
+  level: 1
+  bootstrapFiles:
+    - tests/bootstrap.php
diff --git a/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
@@ -963,7 +963,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',
@@ -1004,7 +1004,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',
@@ -1018,7 +1018,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);
@@ -1046,7 +1046,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',
@@ -1060,7 +1060,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',
         ]);
 
@@ -1077,7 +1077,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',
@@ -1091,7 +1091,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);
diff --git a/tests/Sabre/CalDAV/Schedule/SchedulingObjectTest.php b/tests/Sabre/CalDAV/Schedule/SchedulingObjectTest.php
@@ -75,7 +75,6 @@ public function testInvalidArg1()
         $this->expectException('InvalidArgumentException');
         $obj = new SchedulingObject(
             new Backend\MockScheduling([], []),
-            [],
             []
         );
     }
@@ -85,7 +84,6 @@ public function testInvalidArg2()
         $this->expectException('InvalidArgumentException');
         $obj = new SchedulingObject(
             new Backend\MockScheduling([], []),
-            [],
             ['calendarid' => '1']
         );
     }
diff --git a/tests/Sabre/CalDAV/Subscriptions/SubscriptionTest.php b/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'])
         );
diff --git a/tests/Sabre/DAV/Browser/PluginTest.php b/tests/Sabre/DAV/Browser/PluginTest.php
@@ -104,6 +104,15 @@ public function testPostOtherContentType()
         $this->assertEquals(501, $this->response->status);
     }
 
+    public function testPostNoContentType()
+    {
+        $request = new HTTP\Request('POST', '/', []);
+        $this->server->httpRequest = $request;
+        $this->server->exec();
+
+        $this->assertEquals(501, $this->response->status);
+    }
+
     public function testPostNoSabreAction()
     {
         $request = new HTTP\Request('POST', '/', ['Content-Type' => 'application/x-www-form-urlencoded']);
diff --git a/tests/Sabre/DAV/DbTestHelperTrait.php b/tests/Sabre/DAV/DbTestHelperTrait.php
@@ -30,6 +30,8 @@ public function getDb()
             throw new \Exception('You must set the $driver public property');
         }
 
+        $pdo = null;
+
         if (array_key_exists($this->driver, DbCache::$cache)) {
             $pdo = DbCache::$cache[$this->driver];
             if (null === $pdo) {
@@ -58,6 +60,11 @@ public function getDb()
                     }
                     break;
             }
+
+            if (null === $pdo) {
+                $this->markTestSkipped($this->driver.' was not recognised');
+            }
+
             $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
         } catch (PDOException $e) {
             $this->markTestSkipped($this->driver.' was not enabled or not correctly configured. Error message: '.$e->getMessage());
diff --git a/tests/Sabre/DAV/FSExt/FileTest.php b/tests/Sabre/DAV/FSExt/FileTest.php
@@ -34,7 +34,16 @@ public function testPut()
         );
     }
 
-    public function testRange()
+    public function testRangeAppend()
+    {
+        $file = new File(SABRE_TEMPDIR.'/file.txt');
+        $file->put('0000000');
+        $file->patch('111', 1);
+
+        $this->assertEquals('0000000111', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
+    }
+
+    public function testRangeOffset()
     {
         $file = new File(SABRE_TEMPDIR.'/file.txt');
         $file->put('0000000');
@@ -43,6 +52,24 @@ public function testRange()
         $this->assertEquals('0001110', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
     }
 
+    public function testRangeOffsetEnd()
+    {
+        $file = new File(SABRE_TEMPDIR.'/file.txt');
+        $file->put('0000000');
+        $file->patch('11', 3, -4);
+
+        $this->assertEquals('0001100', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
+    }
+
+    public function testRangeOffsetDefault()
+    {
+        $file = new File(SABRE_TEMPDIR.'/file.txt');
+        $file->put('0000000');
+        $file->patch('11', 0);
+
+        $this->assertEquals('000000011', file_get_contents(SABRE_TEMPDIR.'/file.txt'));
+    }
+
     public function testRangeStream()
     {
         $stream = fopen('php://memory', 'r+');
diff --git a/tests/Sabre/DAV/SyncTokenPropertyTest.php b/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'),
             ],
         ];
     }
diff --git a/tests/Sabre/DAV/Xml/Element/PropTest.php b/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 = [
diff --git a/tests/Sabre/DAV/Xml/Element/ResponseTest.php b/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/'),
             ],
         ];
 
diff --git a/tests/Sabre/DAV/Xml/Property/HrefTest.php b/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]);
diff --git a/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php b/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 = [
diff --git a/tests/Sabre/DAVACL/PrincipalBackend/Mock.php b/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
@@ -131,6 +131,8 @@ public function setGroupMemberSet($path, array $members)
     public function updatePrincipal($path, \Sabre\DAV\PropPatch $propPatch)
     {
         $value = null;
+        $principal = false;
+        $principalIndex = null;
         foreach ($this->principals as $principalIndex => $value) {
             if ($value['uri'] === $path) {
                 $principal = $value;
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -16,9 +16,6 @@
       <testsuite name="sabre-http">
           <directory>../vendor/sabre/http/tests/HTTP</directory>
       </testsuite>
-      <testsuite name="sabre-vobject">
-          <directory>../vendor/sabre/vobject/tests/VObject</directory>
-      </testsuite>
 
       <testsuite name="sabre-dav">
           <directory>Sabre/DAV</directory>

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,8 @@ protected function copyNode(INode $source, ICollection $destinationParent, $dest`
`292`	`292`	`$destinationName = $source->getName();`
`293`	`293`	`}`
`294`	`294`
	`295`	`+ $destination = null;`
	`296`	`+`
`295`	`297`	`if ($source instanceof IFile) {`
`296`	`298`	`$data = $source->get();`
`297`	`299`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,6 @@ class Href implements Element, HtmlOutput`
`39`	`39`	`*`
`40`	`40`	`* You must either pass a string for a single href, or an array of hrefs.`
`41`	`41`	`*`
`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`		`- *`
`45`	`42`	`* @param string\|string[] $hrefs`
`46`	`43`	`*/`
`47`	`44`	`public function __construct($hrefs)`