Skip to content

Commit 4c7ca99

Browse files
committed
php-cs-fixer major version 3
1 parent bf36cd2 commit 4c7ca99

File tree

174 files changed

+497
-754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+497
-754
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ bin/vobject
2121
bin/generate_vcards
2222
bin/phpdocmd
2323

24-
# Assuming every .php file in the root is for testing
25-
/*.php
26-
2724
# Other testing stuff
2825
/tmpdata
2926
/data
@@ -37,4 +34,4 @@ build.properties
3734
docs/api
3835
docs/wikidocs
3936

40-
.php_cs.cache
37+
.php-cs-fixer.cache

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$config = PhpCsFixer\Config::create();
3+
$config = new PhpCsFixer\Config();
44
$config->getFinder()
55
->exclude('vendor')
66
->in(__DIR__);

bin/migrateto20.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
3535
HELLO;
3636

37-
exit();
37+
exit;
3838
}
3939

4040
// There's a bunch of places where the autoloader could be, so we'll try all of

bin/migrateto21.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
3636
HELLO;
3737

38-
exit();
38+
exit;
3939
}
4040

4141
// There's a bunch of places where the autoloader could be, so we'll try all of

bin/migrateto30.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
3535
HELLO;
3636

37-
exit();
37+
exit;
3838
}
3939

4040
// There's a bunch of places where the autoloader could be, so we'll try all of

bin/migrateto32.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
3636
HELLO;
3737

38-
exit();
38+
exit;
3939
}
4040

4141
// There's a bunch of places where the autoloader could be, so we'll try all of
@@ -110,7 +110,7 @@
110110
UNIQUE(calendarid, share_href)
111111
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
112112
SQL
113-
);
113+
);
114114
$pdo->exec('
115115
INSERT INTO calendarinstances
116116
(
@@ -159,7 +159,7 @@
159159
UNIQUE (calendarid, share_href)
160160
);
161161
SQL
162-
);
162+
);
163163
$pdo->exec('
164164
INSERT INTO calendarinstances
165165
(
@@ -233,7 +233,7 @@
233233
components VARBINARY(21)
234234
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
235235
SQL
236-
);
236+
);
237237
break;
238238
case 'sqlite':
239239
$pdo->exec(<<<SQL
@@ -243,7 +243,7 @@
243243
components text NOT NULL
244244
);
245245
SQL
246-
);
246+
);
247247
break;
248248
}
249249

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"require-dev" : {
3434
"ext-sqlite3": "*",
35-
"friendsofphp/php-cs-fixer": "^2.19 || ^3.0",
35+
"friendsofphp/php-cs-fixer": "^3.40",
3636
"monolog/monolog": "^1.27 || ^2.0",
3737
"phpstan/phpstan": "^0.12 || ^1.0",
3838
"phpstan/phpstan-phpunit": "^1.0",

examples/addressbookserver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
$authBackend = new Sabre\DAV\Auth\Backend\PDO($pdo);
2727
$principalBackend = new Sabre\DAVACL\PrincipalBackend\PDO($pdo);
2828
$carddavBackend = new Sabre\CardDAV\Backend\PDO($pdo);
29-
//$caldavBackend = new Sabre\CalDAV\Backend\PDO($pdo);
29+
// $caldavBackend = new Sabre\CalDAV\Backend\PDO($pdo);
3030

3131
// Setting up the directory tree //
3232
$nodes = [
@@ -42,7 +42,7 @@
4242
// Plugins
4343
$server->addPlugin(new Sabre\DAV\Auth\Plugin($authBackend));
4444
$server->addPlugin(new Sabre\DAV\Browser\Plugin());
45-
//$server->addPlugin(new Sabre\CalDAV\Plugin());
45+
// $server->addPlugin(new Sabre\CalDAV\Plugin());
4646
$server->addPlugin(new Sabre\CardDAV\Plugin());
4747
$server->addPlugin(new Sabre\DAVACL\Plugin());
4848
$server->addPlugin(new Sabre\DAV\Sync\Plugin());

examples/groupwareserver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
// Logging
8080
$server->setLogger($logger);
81-
//$server->debugExceptions = true; //enable this to include the stacktrace in exception responses
81+
// $server->debugExceptions = true; //enable this to include the stacktrace in exception responses
8282

8383
// Plugins
8484
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));

lib/CalDAV/Backend/AbstractBackend.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ abstract class AbstractBackend implements BackendInterface
2929
* promise I can handle updating this property".
3030
*
3131
* Read the PropPatch documentation for more info and examples.
32-
*
33-
* @param mixed $calendarId
3432
*/
3533
public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
3634
{
@@ -44,8 +42,6 @@ public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
4442
*
4543
* If the backend supports this, it may allow for some speed-ups.
4644
*
47-
* @param mixed $calendarId
48-
*
4945
* @return array
5046
*/
5147
public function getMultipleCalendarObjects($calendarId, array $uris)
@@ -100,8 +96,6 @@ public function getMultipleCalendarObjects($calendarId, array $uris)
10096
* as possible, so it gives you a good idea on what type of stuff you need
10197
* to think of.
10298
*
103-
* @param mixed $calendarId
104-
*
10599
* @return array
106100
*/
107101
public function calendarQuery($calendarId, array $filters)

0 commit comments

Comments
 (0)