php-cs-fixer major version 3

.gitignore

@@ -21,9 +21,6 @@ bin/vobject
 bin/generate_vcards
 bin/phpdocmd
 
-# Assuming every .php file in the root is for testing
-/*.php
-
 # Other testing stuff
 /tmpdata
 /data
@@ -37,4 +34,4 @@ build.properties
 docs/api
 docs/wikidocs
 
-.php_cs.cache
+.php-cs-fixer.cache

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,6 +1,6 @@
 <?php
 
-$config = PhpCsFixer\Config::create();
+$config = new PhpCsFixer\Config();
 $config->getFinder()
     ->exclude('vendor')
     ->in(__DIR__);

bin/migrateto20.php

@@ -34,7 +34,7 @@
 
 HELLO;
 
-    exit();
+    exit;
 }
 
 // There's a bunch of places where the autoloader could be, so we'll try all of

bin/migrateto21.php

@@ -35,7 +35,7 @@
 
 HELLO;
 
-    exit();
+    exit;
 }
 
 // There's a bunch of places where the autoloader could be, so we'll try all of

bin/migrateto30.php

@@ -34,7 +34,7 @@
 
 HELLO;
 
-    exit();
+    exit;
 }
 
 // There's a bunch of places where the autoloader could be, so we'll try all of

bin/migrateto32.php

@@ -35,7 +35,7 @@
 
 HELLO;
 
-    exit();
+    exit;
 }
 
 // There's a bunch of places where the autoloader could be, so we'll try all of
@@ -110,7 +110,7 @@
     UNIQUE(calendarid, share_href)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 SQL
-        );
+            );
             $pdo->exec('
 INSERT INTO calendarinstances
     (
@@ -159,7 +159,7 @@
     UNIQUE (calendarid, share_href)
 );
 SQL
-        );
+            );
             $pdo->exec('
 INSERT INTO calendarinstances
     (
@@ -233,7 +233,7 @@
     components VARBINARY(21)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SQL
-);
+            );
             break;
         case 'sqlite':
             $pdo->exec(<<<SQL
@@ -243,7 +243,7 @@
     components text NOT NULL
 );
 SQL
-        );
+            );
             break;
     }
 

composer.json

@@ -32,7 +32,7 @@
     },
     "require-dev" : {
         "ext-sqlite3": "*",
-        "friendsofphp/php-cs-fixer": "^2.19 || ^3.0",
+        "friendsofphp/php-cs-fixer": "^3.40",
         "monolog/monolog": "^2.9",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",

examples/addressbookserver.php

@@ -26,7 +26,7 @@
 $authBackend = new Sabre\DAV\Auth\Backend\PDO($pdo);
 $principalBackend = new Sabre\DAVACL\PrincipalBackend\PDO($pdo);
 $carddavBackend = new Sabre\CardDAV\Backend\PDO($pdo);
-//$caldavBackend    = new Sabre\CalDAV\Backend\PDO($pdo);
+// $caldavBackend    = new Sabre\CalDAV\Backend\PDO($pdo);
 
 // Setting up the directory tree //
 $nodes = [
@@ -42,7 +42,7 @@
 // Plugins
 $server->addPlugin(new Sabre\DAV\Auth\Plugin($authBackend));
 $server->addPlugin(new Sabre\DAV\Browser\Plugin());
-//$server->addPlugin(new Sabre\CalDAV\Plugin());
+// $server->addPlugin(new Sabre\CalDAV\Plugin());
 $server->addPlugin(new Sabre\CardDAV\Plugin());
 $server->addPlugin(new Sabre\DAVACL\Plugin());
 $server->addPlugin(new Sabre\DAV\Sync\Plugin());

examples/groupwareserver.php

@@ -78,7 +78,7 @@
 
 // Logging
 $server->setLogger($logger);
-//$server->debugExceptions = true; //enable this to include the stacktrace in exception responses
+// $server->debugExceptions = true; //enable this to include the stacktrace in exception responses
 
 // Plugins
 $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));

lib/CalDAV/Backend/AbstractBackend.php

@@ -29,8 +29,6 @@ abstract class AbstractBackend implements BackendInterface
      * promise I can handle updating this property".
      *
      * Read the PropPatch documentation for more info and examples.
-     *
-     * @param mixed $calendarId
      */
     public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
     {
@@ -44,8 +42,6 @@ public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
      *
      * If the backend supports this, it may allow for some speed-ups.
      *
-     * @param mixed $calendarId
-     *
      * @return array
      */
     public function getMultipleCalendarObjects($calendarId, array $uris)
@@ -100,8 +96,6 @@ public function getMultipleCalendarObjects($calendarId, array $uris)
      * as possible, so it gives you a good idea on what type of stuff you need
      * to think of.
      *
-     * @param mixed $calendarId
-     *
      * @return array
      */
     public function calendarQuery($calendarId, array $filters)

lib/CalDAV/Backend/BackendInterface.php

@@ -51,8 +51,6 @@ public function getCalendarsForUser($principalUri);
      *
      * @param string $principalUri
      * @param string $calendarUri
-     *
-     * @return mixed
      */
     public function createCalendar($principalUri, $calendarUri, array $properties);
 
@@ -67,15 +65,11 @@ public function createCalendar($principalUri, $calendarUri, array $properties);
      * promise I can handle updating this property".
      *
      * Read the PropPatch documentation for more info and examples.
-     *
-     * @param mixed $calendarId
      */
     public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch);
 
     /**
      * Delete a calendar and all its objects.
-     *
-     * @param mixed $calendarId
      */
     public function deleteCalendar($calendarId);
 
@@ -107,8 +101,6 @@ public function deleteCalendar($calendarId);
      * used/fetched to determine these numbers. If both are specified the
      * amount of times this is needed is reduced by a great degree.
      *
-     * @param mixed $calendarId
-     *
      * @return array
      */
     public function getCalendarObjects($calendarId);
@@ -125,7 +117,6 @@ public function getCalendarObjects($calendarId);
      *
      * This method must return null if the object did not exist.
      *
-     * @param mixed  $calendarId
      * @param string $objectUri
      *
      * @return array|null
@@ -140,8 +131,6 @@ public function getCalendarObject($calendarId, $objectUri);
      *
      * If the backend supports this, it may allow for some speed-ups.
      *
-     * @param mixed $calendarId
-     *
      * @return array
      */
     public function getMultipleCalendarObjects($calendarId, array $uris);
@@ -159,7 +148,6 @@ public function getMultipleCalendarObjects($calendarId, array $uris);
      * calendar-data. If the result of a subsequent GET to this object is not
      * the exact same as this request body, you should omit the ETag.
      *
-     * @param mixed  $calendarId
      * @param string $objectUri
      * @param string $calendarData
      *
@@ -180,7 +168,6 @@ public function createCalendarObject($calendarId, $objectUri, $calendarData);
      * calendar-data. If the result of a subsequent GET to this object is not
      * the exact same as this request body, you should omit the ETag.
      *
-     * @param mixed  $calendarId
      * @param string $objectUri
      * @param string $calendarData
      *
@@ -193,7 +180,6 @@ public function updateCalendarObject($calendarId, $objectUri, $calendarData);
      *
      * The object uri is only the basename, or filename and not a full path.
      *
-     * @param mixed  $calendarId
      * @param string $objectUri
      */
     public function deleteCalendarObject($calendarId, $objectUri);
@@ -243,8 +229,6 @@ public function deleteCalendarObject($calendarId, $objectUri);
      * as possible, so it gives you a good idea on what type of stuff you need
      * to think of.
      *
-     * @param mixed $calendarId
-     *
      * @return array
      */
     public function calendarQuery($calendarId, array $filters);