Merge branch '4.6RC'4.6

1 files changed, 7 insertions, 6 deletions

diff --git a/vendor/sabre/event/lib/EventEmitter.php b/vendor/sabre/event/lib/EventEmitter.php
index 1bb1c3cf9..cae6ac2a6 100644
--- a/vendor/sabre/event/lib/EventEmitter.php
+++ b/vendor/sabre/event/lib/EventEmitter.php
@@ -1,18 +1,19 @@
-<?php
+<?php declare (strict_types=1);
 
 namespace Sabre\Event;
 
 /**
- * EventEmitter object.
+ * This is the old name for the Emitter class.
  *
- * Instantiate this class, or subclass it for easily creating event emitters.
+ * Instead of of using EventEmitter, please use Emitter. They are identical
+ * otherwise.
  *
- * @copyright Copyright (C) 2013-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class EventEmitter implements EventEmitterInterface {
+class EventEmitter implements EmitterInterface {
 
-    use EventEmitterTrait;
+    use EmitterTrait;
 
 }