Merge pull request #1615 from alecpl/dev/phpstan

Remove useless ResponseMock, fix obvious code issues

Author: phil-davis

lib/CardDAV/Backend/PDO.php

@@ -22,7 +22,7 @@ class PDO extends AbstractBackend implements SyncSupport
     /**
      * PDO connection.
      *
-     * @var PDO
+     * @var \PDO
      */
     protected $pdo;
 

lib/DAV/Auth/Backend/AbstractBearer.php

@@ -89,7 +89,7 @@ public function check(RequestInterface $request, ResponseInterface $response)
             $response
         );
 
-        $bearerToken = $auth->getToken($request);
+        $bearerToken = $auth->getToken();
         if (!$bearerToken) {
             return [false, "No 'Authorization: Bearer' header found. Either the client didn't send one, or the server is mis-configured"];
         }

lib/DAV/Auth/Backend/PDO.php

@@ -16,7 +16,7 @@ class PDO extends AbstractDigest
     /**
      * Reference to PDO connection.
      *
-     * @var PDO
+     * @var \PDO
      */
     protected $pdo;
 

lib/DAV/Auth/Backend/PDOBasicAuth.php

@@ -13,7 +13,7 @@ class PDOBasicAuth extends AbstractBasic
     /**
      * Reference to PDO connection.
      *
-     * @var PDO
+     * @var \PDO
      */
     protected $pdo;
 

lib/DAV/Auth/Plugin.php

@@ -36,7 +36,7 @@ class Plugin extends ServerPlugin
      * This is useful if you want to allow both authenticated and
      * unauthenticated access to your server.
      *
-     * @param bool
+     * @var bool
      */
     public $autoRequireLogin = true;
 

lib/DAV/Client.php

@@ -412,7 +412,7 @@ public function options()
      * @param string               $url
      * @param string|resource|null $body
      *
-     * @throws clientException, in case a curl error occurred
+     * @throws HTTP\ClientException, in case a curl error occurred
      *
      * @return array
      */

lib/DAV/Locks/Backend/PDO.php

@@ -28,7 +28,7 @@ class PDO extends AbstractBackend
     /**
      * The PDO connection object.
      *
-     * @var pdo
+     * @var \PDO
      */
     protected $pdo;
 

lib/DAVACL/Plugin.php

@@ -236,7 +236,7 @@ public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT,
      */
     public function getCurrentUserPrincipal()
     {
-        /** @var $authPlugin \Sabre\DAV\Auth\Plugin */
+        /** @var DAV\Auth\Plugin $authPlugin */
         $authPlugin = $this->server->getPlugin('auth');
         if (!$authPlugin) {
             return null;

lib/DAVACL/PrincipalBackend/PDO.php

@@ -37,7 +37,7 @@ class PDO extends AbstractBackend implements CreatePrincipalSupport
     /**
      * pdo.
      *
-     * @var PDO
+     * @var \PDO
      */
     protected $pdo;
 

tests/Sabre/AbstractDAVServerTestCase.php

@@ -204,7 +204,7 @@ public function request($request, $expectedStatus = null)
         if (is_array($request)) {
             $request = HTTP\Sapi::createFromServerArray($request);
         }
-        $response = new HTTP\ResponseMock();
+        $response = new HTTP\Response();
 
         $this->server->httpRequest = $request;
         $this->server->httpResponse = $response;