Skip to content

Commit 396f8e8

Browse files
phil-davisphil-davis
authored
Merge pull request #1562 from ChristophWurst/refactor/class-constant
refactor: Change class strings to ::class constants
2 parents c84cc78 + e7aec4d commit 396f8e8

File tree

118 files changed

+316
-316
lines changed

Some content is hidden

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

118 files changed

+316
-316
lines changed

‎lib/CalDAV/Notifications/Plugin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function initialize(Server $server)
6868
$server->on('propFind', [$this, 'propFind']);
6969

7070
$server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
71-
$server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{'.self::NS_CALENDARSERVER.'}notification';
71+
$server->resourceTypeMapping[\Sabre\CalDAV\Notifications\ICollection::class] = '{'.self::NS_CALENDARSERVER.'}notification';
7272

7373
array_push($server->protectedProperties,
7474
'{'.self::NS_CALENDARSERVER.'}notification-URL',

‎lib/CalDAV/Plugin.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -200,18 +200,18 @@ public function initialize(DAV\Server $server)
200200
$server->xml->namespaceMap[self::NS_CALDAV] = 'cal';
201201
$server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
202202

203-
$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
204-
$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-query'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarQueryReport';
205-
$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-multiget'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarMultiGetReport';
206-
$server->xml->elementMap['{'.self::NS_CALDAV.'}free-busy-query'] = 'Sabre\\CalDAV\\Xml\\Request\\FreeBusyQueryReport';
207-
$server->xml->elementMap['{'.self::NS_CALDAV.'}mkcalendar'] = 'Sabre\\CalDAV\\Xml\\Request\\MkCalendar';
208-
$server->xml->elementMap['{'.self::NS_CALDAV.'}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp';
209-
$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
210-
211-
$server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
212-
213-
$server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
214-
$server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
203+
$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet::class;
204+
$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-query'] = \Sabre\CalDAV\Xml\Request\CalendarQueryReport::class;
205+
$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-multiget'] = \Sabre\CalDAV\Xml\Request\CalendarMultiGetReport::class;
206+
$server->xml->elementMap['{'.self::NS_CALDAV.'}free-busy-query'] = \Sabre\CalDAV\Xml\Request\FreeBusyQueryReport::class;
207+
$server->xml->elementMap['{'.self::NS_CALDAV.'}mkcalendar'] = \Sabre\CalDAV\Xml\Request\MkCalendar::class;
208+
$server->xml->elementMap['{'.self::NS_CALDAV.'}schedule-calendar-transp'] = \Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp::class;
209+
$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet::class;
210+
211+
$server->resourceTypeMapping[\Sabre\CalDAV\ICalendar::class] = '{urn:ietf:params:xml:ns:caldav}calendar';
212+
213+
$server->resourceTypeMapping[\Sabre\CalDAV\Principal\IProxyRead::class] = '{http://calendarserver.org/ns/}calendar-proxy-read';
214+
$server->resourceTypeMapping[\Sabre\CalDAV\Principal\IProxyWrite::class] = '{http://calendarserver.org/ns/}calendar-proxy-write';
215215

216216
array_push($server->protectedProperties,
217217
'{'.self::NS_CALDAV.'}supported-calendar-component-set',

‎lib/CalDAV/Schedule/Plugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ public function initialize(Server $server)
113113
* This information ensures that the {DAV:}resourcetype property has
114114
* the correct values.
115115
*/
116-
$server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IOutbox'] = $ns.'schedule-outbox';
117-
$server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IInbox'] = $ns.'schedule-inbox';
116+
$server->resourceTypeMapping[\Sabre\CalDAV\Schedule\IOutbox::class] = $ns.'schedule-outbox';
117+
$server->resourceTypeMapping[\Sabre\CalDAV\Schedule\IInbox::class] = $ns.'schedule-inbox';
118118

119119
/*
120120
* Properties we protect are made read-only by the server.

‎lib/CalDAV/SharingPlugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public function initialize(DAV\Server $server)
8383
'{'.Plugin::NS_CALENDARSERVER.'}shared-url'
8484
);
8585

86-
$this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}share'] = 'Sabre\\CalDAV\\Xml\\Request\\Share';
87-
$this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}invite-reply'] = 'Sabre\\CalDAV\\Xml\\Request\\InviteReply';
86+
$this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}share'] = \Sabre\CalDAV\Xml\Request\Share::class;
87+
$this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}invite-reply'] = \Sabre\CalDAV\Xml\Request\InviteReply::class;
8888

8989
$this->server->on('propFind', [$this, 'propFindEarly']);
9090
$this->server->on('propFind', [$this, 'propFindLate'], 150);

‎lib/CalDAV/Subscriptions/Plugin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ class Plugin extends ServerPlugin
3131
*/
3232
public function initialize(Server $server)
3333
{
34-
$server->resourceTypeMapping['Sabre\\CalDAV\\Subscriptions\\ISubscription'] =
34+
$server->resourceTypeMapping[\Sabre\CalDAV\Subscriptions\ISubscription::class] =
3535
'{http://calendarserver.org/ns/}subscribed';
3636

3737
$server->xml->elementMap['{http://calendarserver.org/ns/}source'] =
38-
'Sabre\\DAV\\Xml\\Property\\Href';
38+
\Sabre\DAV\Xml\Property\Href::class;
3939

4040
$server->on('propFind', [$this, 'propFind'], 150);
4141
}

‎lib/CalDAV/Xml/Request/CalendarMultiGetReport.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ class CalendarMultiGetReport implements XmlDeserializable
8686
public static function xmlDeserialize(Reader $reader)
8787
{
8888
$elems = $reader->parseInnerTree([
89-
'{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
90-
'{DAV:}prop' => 'Sabre\\Xml\\Element\\KeyValue',
89+
'{urn:ietf:params:xml:ns:caldav}calendar-data' => \Sabre\CalDAV\Xml\Filter\CalendarData::class,
90+
'{DAV:}prop' => \Sabre\Xml\Element\KeyValue::class,
9191
]);
9292

9393
$newProps = [

‎lib/CalDAV/Xml/Request/CalendarQueryReport.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ class CalendarQueryReport implements XmlDeserializable
8686
public static function xmlDeserialize(Reader $reader)
8787
{
8888
$elems = $reader->parseInnerTree([
89-
'{urn:ietf:params:xml:ns:caldav}comp-filter' => 'Sabre\\CalDAV\\Xml\\Filter\\CompFilter',
90-
'{urn:ietf:params:xml:ns:caldav}prop-filter' => 'Sabre\\CalDAV\\Xml\\Filter\\PropFilter',
91-
'{urn:ietf:params:xml:ns:caldav}param-filter' => 'Sabre\\CalDAV\\Xml\\Filter\\ParamFilter',
92-
'{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
93-
'{DAV:}prop' => 'Sabre\\Xml\\Element\\KeyValue',
89+
'{urn:ietf:params:xml:ns:caldav}comp-filter' => \Sabre\CalDAV\Xml\Filter\CompFilter::class,
90+
'{urn:ietf:params:xml:ns:caldav}prop-filter' => \Sabre\CalDAV\Xml\Filter\PropFilter::class,
91+
'{urn:ietf:params:xml:ns:caldav}param-filter' => \Sabre\CalDAV\Xml\Filter\ParamFilter::class,
92+
'{urn:ietf:params:xml:ns:caldav}calendar-data' => \Sabre\CalDAV\Xml\Filter\CalendarData::class,
93+
'{DAV:}prop' => \Sabre\Xml\Element\KeyValue::class,
9494
]);
9595

9696
$newProps = [

‎lib/CalDAV/Xml/Request/MkCalendar.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public static function xmlDeserialize(Reader $reader)
6262
$self = new self();
6363

6464
$elementMap = $reader->elementMap;
65-
$elementMap['{DAV:}prop'] = 'Sabre\DAV\Xml\Element\Prop';
66-
$elementMap['{DAV:}set'] = 'Sabre\Xml\Element\KeyValue';
65+
$elementMap['{DAV:}prop'] = \Sabre\DAV\Xml\Element\Prop::class;
66+
$elementMap['{DAV:}set'] = \Sabre\Xml\Element\KeyValue::class;
6767
$elems = $reader->parseInnerTree($elementMap);
6868

6969
foreach ($elems as $elem) {

‎lib/CalDAV/Xml/Request/Share.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public function __construct(array $sharees)
6262
public static function xmlDeserialize(Reader $reader)
6363
{
6464
$elems = $reader->parseGetElements([
65-
'{'.Plugin::NS_CALENDARSERVER.'}set' => 'Sabre\\Xml\\Element\\KeyValue',
66-
'{'.Plugin::NS_CALENDARSERVER.'}remove' => 'Sabre\\Xml\\Element\\KeyValue',
65+
'{'.Plugin::NS_CALENDARSERVER.'}set' => \Sabre\Xml\Element\KeyValue::class,
66+
'{'.Plugin::NS_CALENDARSERVER.'}remove' => \Sabre\Xml\Element\KeyValue::class,
6767
]);
6868

6969
$sharees = [];

‎lib/CardDAV/Plugin.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,20 @@ public function initialize(DAV\Server $server)
7373

7474
$server->xml->namespaceMap[self::NS_CARDDAV] = 'card';
7575

76-
$server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-query'] = 'Sabre\\CardDAV\\Xml\\Request\\AddressBookQueryReport';
77-
$server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-multiget'] = 'Sabre\\CardDAV\\Xml\\Request\\AddressBookMultiGetReport';
76+
$server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-query'] = \Sabre\CardDAV\Xml\Request\AddressBookQueryReport::class;
77+
$server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-multiget'] = \Sabre\CardDAV\Xml\Request\AddressBookMultiGetReport::class;
7878

7979
/* Mapping Interfaces to {DAV:}resourcetype values */
80-
$server->resourceTypeMapping['Sabre\\CardDAV\\IAddressBook'] = '{'.self::NS_CARDDAV.'}addressbook';
81-
$server->resourceTypeMapping['Sabre\\CardDAV\\IDirectory'] = '{'.self::NS_CARDDAV.'}directory';
80+
$server->resourceTypeMapping[\Sabre\CardDAV\IAddressBook::class] = '{'.self::NS_CARDDAV.'}addressbook';
81+
$server->resourceTypeMapping[\Sabre\CardDAV\IDirectory::class] = '{'.self::NS_CARDDAV.'}directory';
8282

8383
/* Adding properties that may never be changed */
8484
$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}supported-address-data';
8585
$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}max-resource-size';
8686
$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}addressbook-home-set';
8787
$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}supported-collation-set';
8888

89-
$server->xml->elementMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre\\DAV\\Xml\\Property\\Href';
89+
$server->xml->elementMap['{http://calendarserver.org/ns/}me-card'] = \Sabre\DAV\Xml\Property\Href::class;
9090

9191
$this->server = $server;
9292
}

0 commit comments

Comments
 (0)