Merge branch 'Fix-getting-freebusy-by-email' into 'master'

Fix getting freebusy info from email

See merge request davical-project/davical!67

debian/changelog

@@ -1,3 +1,10 @@
+davical (1.1.13-2) unstable; urgency=medium
+
+  * fix Debian autopkgtest / CI: prevent caching of phpunit results, like we
+    do already for "make test"
+
+ -- Florian Schlichting <fsfs@debian.org>  Wed, 27 May 2026 23:10:28 +0200
+
 davical (1.1.13-1) unstable; urgency=medium
 
   [ Andrew Ruthven ]

debian/tests/phpunit

@@ -4,5 +4,5 @@
 set -e
 
 # 2) phpunit tests
-phpunit --include-path "/usr/share/davical:/usr/share/awl" testing/phpunit
+phpunit --include-path "/usr/share/davical:/usr/share/awl" --do-not-cache-result testing/phpunit
 

inc/CalDAVRequest.php

@@ -352,8 +352,6 @@ class CalDAVRequest
       if ( ! isset($this->timeout) || $this->timeout == 0 ) $this->timeout = (isset($c->default_lock_timeout) ? $c->default_lock_timeout : 900);
     }
 
-    $this->principal = new Principal('path',$this->path);
-
     /**
     * RFC2518, 5.2: URL pointing to a collection SHOULD end in '/', and if it does not then
     * we SHOULD return a Content-location header with the correction...
@@ -466,7 +464,14 @@ EOSQL;
     /**
     * Extract the user whom we are accessing
     */
-    $this->principal = new DAVPrincipal( array( "path" => $this->path, "options" => $this->options ) );
+
+    if ( $this->options['allow_by_email'] && preg_match( '{^/(\S+@[a-z0-9][a-z0-9-]*[.][a-z0-9.-]+)/?$}i', $this->path, $matches ) ) {
+      $this->principal = new DAVPrincipal( array( "email" => $matches[1], "options" => $this->options ) );
+//      @dbg_error_log('caldav', 'DAVPrincipal by email: %s', print_r($this->principal, true) );
+    } else {
+      $this->principal = new DAVPrincipal( array( "path" => $this->path, "options" => $this->options ) );
+//      @dbg_error_log('caldav', 'Principal by path: %s', $this->path );
+    }
     $this->user_no  = $this->principal->user_no();
     $this->username = $this->principal->username();
     $this->by_email = $this->principal->byEmail();