Merge branch 'master' into support_multiget_addressdata_filter

.travis.yml

@@ -16,16 +16,26 @@ env:
     - SABRE_MYSQLUSER="root"
     - SABRE_MYSQLPASS=""
     - SABRE_MYSQLDSN="mysql:host=127.0.0.1;dbname=sabredav_test"
+    - RUN_PHPCSFIXER="TRUE"
+    - RUN_PHPUNIT="TRUE"
     - RUN_PHPSTAN="FALSE"
   matrix:
     - PREFER_LOWEST="" TEST_DEPS="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml"
     - PREFER_LOWEST="--prefer-lowest" TEST_DEPS="tests/Sabre/" REPORT_COVERAGE="FALSE" WITH_COVERAGE=""
 
 matrix:
   include:
+    - name: 'PHP8'
+      dist: bionic
+      php: nightly
+      env:
+        - RUN_PHPCSFIXER="FALSE"
+        - REPORT_COVERAGE="FALSE"
     - name: 'PHPStan'
       php: 7.4
       env:
+        - RUN_PHPCSFIXER="FALSE"
+        - RUN_PHPUNIT="FALSE"
         - RUN_PHPSTAN="TRUE"
         - REPORT_COVERAGE="FALSE"
     - name: 'Test with streaming propfind'
@@ -43,15 +53,16 @@ before_script:
   - mysql -u root -h 127.0.0.1 -e 'create database sabredav_test'
   - psql -c "create database sabredav_test" -U postgres
   - psql -c "create user sabredav with PASSWORD 'sabredav';GRANT ALL PRIVILEGES ON DATABASE sabredav_test TO sabredav" -U postgres
+  - if [ $RUN_PHPCSFIXER == "FALSE" ]; then composer remove --no-update --dev friendsofphp/php-cs-fixer; fi
   - composer update $PREFER_LOWEST
 
 addons:
   postgresql: "9.5"
 
 script:
-  - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi
-  - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE $TEST_DEPS; fi
-  - if [ $RUN_PHPSTAN == "FALSE"  ]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi
+  - if [ $RUN_PHPCSFIXER == "TRUE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi
+  - if [ $RUN_PHPUNIT == "TRUE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE $TEST_DEPS; fi
+  - if [ $RUN_PHPUNIT == "TRUE"  ]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi
   - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi
 
 after_success:

CHANGELOG.md

@@ -1,6 +1,14 @@
 ChangeLog
 =========
 
+4.1.3 (2020-11-09)
+-------------------------
+* #1306: Return 409 when trying to PUT a file into a non-existent collection
+
+4.1.2 (2020-10-04)
+-------------------------
+* #1296: Add experimental support for PHP 8.0
+
 4.1.1 (2020-07-13)
 -------------------------
 * Fix PHPdoc of Tree:move method
@@ -246,7 +254,7 @@ ChangeLog
   [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].
 
 
-3.1.5 (????-??-??)
+3.1.5 (2018-10-19)
 ------------------
 
 * Fixed: Creating a new calendar on some MySQL configurations caused an error.

composer.json

@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^7.1.0",
+        "php": "^7.1.0 || ^8.0",
         "sabre/vobject": "^4.2.1",
         "sabre/event" : "^5.0",
         "sabre/xml"  : "^2.0.1",
@@ -33,7 +33,7 @@
         "ext-json": "*"
     },
     "require-dev" : {
-        "friendsofphp/php-cs-fixer": "^2.16.3",
+        "friendsofphp/php-cs-fixer": "^2.16.7",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
         "evert/phpdoc-md" : "~0.1.0",

lib/CalDAV/Schedule/Plugin.php

@@ -609,7 +609,7 @@ public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilege
      * @param bool             $modified  a marker to indicate that the original object
      *                                    modified by this process
      */
-    protected function processICalendarChange($oldObject = null, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false)
+    protected function processICalendarChange($oldObject, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false)
     {
         $broker = new ITip\Broker();
         $messages = $broker->parseEvent($newObject, $addresses, $oldObject);

lib/DAV/Server.php

@@ -1075,7 +1075,12 @@ public function createFile($uri, $data, &$etag = null)
             return false;
         }
 
-        $parent = $this->tree->getNodeForPath($dir);
+        try {
+            $parent = $this->tree->getNodeForPath($dir);
+        } catch (Exception\NotFound $e) {
+            throw new Exception\Conflict('Files cannot be created in non-existent collections');
+        }
+
         if (!$parent instanceof ICollection) {
             throw new Exception\Conflict('Files can only be created as children of collections');
         }

lib/DAV/Version.php

@@ -16,5 +16,5 @@ class Version
     /**
      * Full version number.
      */
-    public const VERSION = '4.1.1';
+    public const VERSION = '4.1.3';
 }

tests/Sabre/DAV/HttpPutTest.php

@@ -241,7 +241,7 @@ public function testPutExistingIfNoneMatchStar()
      *
      * @depends testPut
      */
-    public function testPutNoParent()
+    public function testPutParentIsNotCollection()
     {
         $request = new HTTP\Request(
             'PUT',
@@ -254,6 +254,24 @@ public function testPutNoParent()
         $this->assertEquals(409, $response->getStatus());
     }
 
+    /**
+     * PUT thats created in a non-existent collection should be rejected.
+     *
+     * @depends testPut
+     */
+    public function testPutParentCollectionDoesNotExist()
+    {
+        $request = new HTTP\Request(
+            'PUT',
+            '/non-existent-collection/file2',
+            [],
+            'hello'
+        );
+
+        $response = $this->request($request);
+        $this->assertEquals(409, $response->getStatus());
+    }
+
     /**
      * Finder may sometimes make a request, which gets its content-body
      * stripped. We can't always prevent this from happening, but in some cases