Merge branch '7.2RC'7.2

8 files changed, 73 insertions, 8 deletions

diff --git a/vendor/sabre/event/.github/workflows/ci.yml b/vendor/sabre/event/.github/workflows/ci.yml
new file mode 100644
index 000000000..3473cd2de
--- /dev/null
+++ b/vendor/sabre/event/.github/workflows/ci.yml
@@ -0,0 +1,63 @@
+name: continuous-integration
+on:
+  push:
+    branches:
+      - master
+      - release/*
+  pull_request:
+jobs:
+  unit-testing:
+    name: PHPUnit (PHP ${{ matrix.php-versions }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        coverage: ['pcov']
+        code-analysis: ['no']
+        include:
+          - php-versions: '7.1'
+            coverage: 'none'
+            code-analysis: 'yes'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, dom, fileinfo, mysql, redis, opcache
+          coverage: ${{ matrix.coverage }}
+          tools: composer
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Code Analysis (PHP CS-Fixer)
+        if: matrix.code-analysis == 'yes'
+        run: php vendor/bin/php-cs-fixer fix --dry-run --diff
+
+      - name: Code Analysis (PHPStan)
+        if: matrix.code-analysis == 'yes'
+        run: composer phpstan
+
+      - name: Test with phpunit
+        run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
+
+      - name: Code Coverage
+        uses: codecov/codecov-action@v2
+        if: matrix.coverage != 'none'
diff --git a/vendor/sabre/event/composer.json b/vendor/sabre/event/composer.json
index 181afe190..42fb4aa22 100644
--- a/vendor/sabre/event/composer.json
+++ b/vendor/sabre/event/composer.json
@@ -46,7 +46,7 @@
         }
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.16.1",
+        "friendsofphp/php-cs-fixer": "~2.17.1",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
     },
diff --git a/vendor/sabre/event/lib/EventEmitter.php b/vendor/sabre/event/lib/EventEmitter.php
index 18971e3ee..865c99b53 100644
--- a/vendor/sabre/event/lib/EventEmitter.php
+++ b/vendor/sabre/event/lib/EventEmitter.php
@@ -7,7 +7,7 @@ namespace Sabre\Event;
 /**
  * This is the old name for the Emitter class.
  *
- * Instead of of using EventEmitter, please use Emitter. They are identical
+ * Instead of using EventEmitter, please use Emitter. They are identical
  * otherwise.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
diff --git a/vendor/sabre/event/lib/Loop/Loop.php b/vendor/sabre/event/lib/Loop/Loop.php
index ec09be921..b85a7a440 100644
--- a/vendor/sabre/event/lib/Loop/Loop.php
+++ b/vendor/sabre/event/lib/Loop/Loop.php
@@ -273,7 +273,9 @@ class Loop
             $read = $this->readStreams;
             $write = $this->writeStreams;
             $except = null;
-            if (stream_select($read, $write, $except, (null === $timeout) ? null : 0, $timeout ? (int) ($timeout * 1000000) : 0)) {
+            // stream_select changes behavior in 8.1 to forbid passing non-null microseconds when the seconds are null.
+            // Older versions of php don't allow passing null to microseconds.
+            if (null !== $timeout ? stream_select($read, $write, $except, 0, (int) ($timeout * 1000000)) : stream_select($read, $write, $except, null)) {
                 // See PHP Bug https://bugs.php.net/bug.php?id=62452
                 // Fixed in PHP7
                 foreach ($read as $readStream) {
diff --git a/vendor/sabre/event/lib/Promise.php b/vendor/sabre/event/lib/Promise.php
index 1228561af..42969a55f 100644
--- a/vendor/sabre/event/lib/Promise.php
+++ b/vendor/sabre/event/lib/Promise.php
@@ -144,7 +144,7 @@ class Promise
     }
 
     /**
-     * Marks this promise as rejected, and set it's rejection reason.
+     * Marks this promise as rejected, and set its rejection reason.
      */
     public function reject(Throwable $reason)
     {
diff --git a/vendor/sabre/event/lib/Promise/functions.php b/vendor/sabre/event/lib/Promise/functions.php
index 986fe2b00..fbed63471 100644
--- a/vendor/sabre/event/lib/Promise/functions.php
+++ b/vendor/sabre/event/lib/Promise/functions.php
@@ -18,7 +18,7 @@ use Throwable;
 
 /**
  * This function takes an array of Promises, and returns a Promise that
- * resolves when all of the given arguments have resolved.
+ * resolves when all the given arguments have resolved.
  *
  * The returned Promise will resolve with a value that's an array of all the
  * values the given promises have been resolved with.
diff --git a/vendor/sabre/event/lib/Version.php b/vendor/sabre/event/lib/Version.php
index 457aea9b2..fe8f5c3bf 100644
--- a/vendor/sabre/event/lib/Version.php
+++ b/vendor/sabre/event/lib/Version.php
@@ -16,5 +16,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '5.1.2';
+    const VERSION = '5.1.4';
 }
diff --git a/vendor/sabre/event/lib/WildcardEmitter.php b/vendor/sabre/event/lib/WildcardEmitter.php
index 1b7c248b2..997709e8a 100644
--- a/vendor/sabre/event/lib/WildcardEmitter.php
+++ b/vendor/sabre/event/lib/WildcardEmitter.php
@@ -22,9 +22,9 @@ namespace Sabre\Event;
  * - Using ":" as a separator is optional, but it's highly recommended to use
  *   some kind of separator.
  *
- * The WilcardEmitter is a bit slower than the regular Emitter. If you code
+ * The WildcardEmitter is a bit slower than the regular Emitter. If your code
  * must be very high performance, it might be better to try to use the other
- * emitter. For must usage the difference is negligible though.
+ * emitter. For most usage the difference is negligible though.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)