Forráskód Böngészése

update more frameworks

CauseFX 5 éve
szülő
commit
52153456a8
100 módosított fájl, 3186 hozzáadás és 1510 törlés
  1. 1 1
      api/composer.json
  2. 183 87
      api/composer.lock
  3. 34 34
      api/vendor/composer/InstalledVersions.php
  4. 182 93
      api/vendor/composer/installed.json
  5. 34 34
      api/vendor/composer/installed.php
  6. 41 0
      api/vendor/composer/semver/CHANGELOG.md
  7. 1 1
      api/vendor/composer/semver/README.md
  8. 2 3
      api/vendor/composer/semver/composer.json
  9. 1 1
      api/vendor/composer/semver/src/Constraint/AbstractConstraint.php
  10. 6 10
      api/vendor/composer/semver/src/Constraint/Constraint.php
  11. 2 2
      api/vendor/composer/semver/src/Constraint/EmptyConstraint.php
  12. 4 4
      api/vendor/composer/semver/src/Constraint/MultiConstraint.php
  13. 4 4
      api/vendor/composer/semver/src/Semver.php
  14. 84 54
      api/vendor/composer/semver/src/VersionParser.php
  15. 33 1
      api/vendor/guzzlehttp/guzzle/CHANGELOG.md
  16. 7 6
      api/vendor/guzzlehttp/guzzle/composer.json
  17. 0 87
      api/vendor/guzzlehttp/guzzle/psalm.baseline.xml
  18. 0 16
      api/vendor/guzzlehttp/guzzle/psalm.xml
  19. 28 0
      api/vendor/guzzlehttp/guzzle/src/BodySummarizer.php
  20. 13 0
      api/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php
  21. 15 14
      api/vendor/guzzlehttp/guzzle/src/Client.php
  22. 1 4
      api/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
  23. 13 11
      api/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
  24. 59 67
      api/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
  25. 8 13
      api/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
  26. 16 23
      api/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
  27. 42 0
      api/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php
  28. 8 13
      api/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
  29. 6 14
      api/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
  30. 89 83
      api/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
  31. 4 7
      api/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
  32. 1 5
      api/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php
  33. 13 12
      api/vendor/guzzlehttp/guzzle/src/Middleware.php
  34. 7 15
      api/vendor/guzzlehttp/guzzle/src/Pool.php
  35. 4 7
      api/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
  36. 12 32
      api/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
  37. 4 6
      api/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
  38. 1 3
      api/vendor/guzzlehttp/guzzle/src/TransferStats.php
  39. 6 18
      api/vendor/guzzlehttp/guzzle/src/Utils.php
  40. 9 0
      api/vendor/guzzlehttp/guzzle/vendor-bin/php-cs-fixer/composer.json
  41. 10 0
      api/vendor/guzzlehttp/guzzle/vendor-bin/phpstan/composer.json
  42. 9 0
      api/vendor/guzzlehttp/guzzle/vendor-bin/psalm/composer.json
  43. 19 0
      api/vendor/guzzlehttp/promises/CHANGELOG.md
  44. 35 7
      api/vendor/guzzlehttp/promises/README.md
  45. 9 4
      api/vendor/guzzlehttp/promises/composer.json
  46. 1 0
      api/vendor/guzzlehttp/promises/src/AggregateException.php
  47. 1 0
      api/vendor/guzzlehttp/promises/src/CancellationException.php
  48. 23 5
      api/vendor/guzzlehttp/promises/src/Coroutine.php
  49. 84 0
      api/vendor/guzzlehttp/promises/src/Create.php
  50. 90 0
      api/vendor/guzzlehttp/promises/src/Each.php
  51. 48 23
      api/vendor/guzzlehttp/promises/src/EachPromise.php
  52. 6 4
      api/vendor/guzzlehttp/promises/src/FulfilledPromise.php
  53. 46 0
      api/vendor/guzzlehttp/promises/src/Is.php
  54. 33 35
      api/vendor/guzzlehttp/promises/src/Promise.php
  55. 4 0
      api/vendor/guzzlehttp/promises/src/PromiseInterface.php
  56. 1 0
      api/vendor/guzzlehttp/promises/src/PromisorInterface.php
  57. 9 5
      api/vendor/guzzlehttp/promises/src/RejectedPromise.php
  58. 2 1
      api/vendor/guzzlehttp/promises/src/RejectionException.php
  59. 3 2
      api/vendor/guzzlehttp/promises/src/TaskQueue.php
  60. 1 2
      api/vendor/guzzlehttp/promises/src/TaskQueueInterface.php
  61. 274 0
      api/vendor/guzzlehttp/promises/src/Utils.php
  62. 80 174
      api/vendor/guzzlehttp/promises/src/functions.php
  63. 1 1
      api/vendor/paragonie/random_compat/composer.json
  64. 67 60
      api/vendor/phpmailer/phpmailer/README.md
  65. 3 1
      api/vendor/phpmailer/phpmailer/SECURITY.md
  66. 1 1
      api/vendor/phpmailer/phpmailer/VERSION
  67. 6 2
      api/vendor/phpmailer/phpmailer/composer.json
  68. 12 12
      api/vendor/phpmailer/phpmailer/get_oauth_token.php
  69. 2 0
      api/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
  70. 2 0
      api/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
  71. 28 0
      api/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php
  72. 2 2
      api/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
  73. 35 0
      api/vendor/phpmailer/phpmailer/phpunit.xml.dist
  74. 1 1
      api/vendor/phpmailer/phpmailer/src/OAuth.php
  75. 208 142
      api/vendor/phpmailer/phpmailer/src/PHPMailer.php
  76. 22 22
      api/vendor/phpmailer/phpmailer/src/POP3.php
  77. 70 46
      api/vendor/phpmailer/phpmailer/src/SMTP.php
  78. 11 3
      api/vendor/psr/container/README.md
  79. 2 7
      api/vendor/psr/container/composer.json
  80. 0 3
      api/vendor/psr/container/src/ContainerExceptionInterface.php
  81. 4 5
      api/vendor/psr/container/src/ContainerInterface.php
  82. 0 3
      api/vendor/psr/container/src/NotFoundExceptionInterface.php
  83. 0 1
      api/vendor/psr/log/.gitignore
  84. 16 16
      api/vendor/psr/log/Psr/Log/AbstractLogger.php
  85. 1 1
      api/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
  86. 21 19
      api/vendor/psr/log/Psr/Log/LoggerInterface.php
  87. 2 0
      api/vendor/psr/log/Psr/Log/LoggerTrait.php
  88. 2 0
      api/vendor/psr/log/Psr/Log/NullLogger.php
  89. 18 0
      api/vendor/psr/log/Psr/Log/Test/DummyTest.php
  90. 2 8
      api/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
  91. 6 0
      api/vendor/psr/log/README.md
  92. 2 2
      api/vendor/psr/log/composer.json
  93. 4 0
      api/vendor/symfony/polyfill-ctype/bootstrap.php
  94. 46 0
      api/vendor/symfony/polyfill-ctype/bootstrap80.php
  95. 2 2
      api/vendor/symfony/polyfill-ctype/composer.json
  96. 82 60
      api/vendor/symfony/polyfill-mbstring/Mbstring.php
  97. 1 1
      api/vendor/symfony/polyfill-mbstring/README.md
  98. 302 1
      api/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
  99. 311 1
      api/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
  100. 125 40
      api/vendor/symfony/polyfill-mbstring/bootstrap.php

+ 1 - 1
api/composer.json

@@ -3,7 +3,7 @@
     "dibi/dibi": "^3.2",
     "dibi/dibi": "^3.2",
     "lcobucci/jwt": "^3.2",
     "lcobucci/jwt": "^3.2",
     "composer/semver": "^1.4",
     "composer/semver": "^1.4",
-    "phpmailer/phpmailer": "^6.0",
+    "phpmailer/phpmailer": "^6.2",
     "rmccue/requests": "^1.7",
     "rmccue/requests": "^1.7",
     "kryptonit3/sonarr": "1.0.6.1",
     "kryptonit3/sonarr": "1.0.6.1",
     "kryptonit3/couchpotato": "^1.0",
     "kryptonit3/couchpotato": "^1.0",

+ 183 - 87
api/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
         "This file is @generated automatically"
     ],
     ],
-    "content-hash": "6c33c6a831d0034c65fe02a8df137f7c",
+    "content-hash": "ee20c3224ed607ae3df1433bd9253824",
     "packages": [
     "packages": [
         {
         {
             "name": "adldap2/adldap2",
             "name": "adldap2/adldap2",
@@ -128,24 +128,23 @@
         },
         },
         {
         {
             "name": "composer/semver",
             "name": "composer/semver",
-            "version": "1.4.2",
+            "version": "1.7.2",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+                "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "url": "https://api.github.com/repos/composer/semver/zipball/647490bbcaf7fc4891c58f47b825eb99d19c377a",
+                "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": "^5.3.2 || ^7.0"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             },
             "require-dev": {
             "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5",
-                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+                "phpunit/phpunit": "^4.5 || ^5.0.5"
             },
             },
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
@@ -186,7 +185,26 @@
                 "validation",
                 "validation",
                 "versioning"
                 "versioning"
             ],
             ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/1.7.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-12-03T15:47:16+00:00"
         },
         },
         {
         {
             "name": "dibi/dibi",
             "name": "dibi/dibi",
@@ -440,32 +458,33 @@
         },
         },
         {
         {
             "name": "guzzlehttp/guzzle",
             "name": "guzzlehttp/guzzle",
-            "version": "7.1.1",
+            "version": "7.3.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "7427d6f99df41cc01f33cd59832f721c150ffdf3"
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7427d6f99df41cc01f33cd59832f721c150ffdf3",
-                "reference": "7427d6f99df41cc01f33cd59832f721c150ffdf3",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628",
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
                 "ext-json": "*",
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
-                "php": "^7.2.5",
+                "guzzlehttp/promises": "^1.4",
+                "guzzlehttp/psr7": "^1.7 || ^2.0",
+                "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0"
                 "psr/http-client": "^1.0"
             },
             },
             "provide": {
             "provide": {
                 "psr/http-client-implementation": "1.0"
                 "psr/http-client-implementation": "1.0"
             },
             },
             "require-dev": {
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
                 "ext-curl": "*",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-phpunit8",
-                "phpunit/phpunit": "^8.5.5",
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
                 "psr/log": "^1.1"
                 "psr/log": "^1.1"
             },
             },
             "suggest": {
             "suggest": {
@@ -476,7 +495,7 @@
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "7.1-dev"
+                    "dev-master": "7.3-dev"
                 }
                 }
             },
             },
             "autoload": {
             "autoload": {
@@ -518,7 +537,7 @@
             ],
             ],
             "support": {
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.1.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.3.0"
             },
             },
             "funding": [
             "funding": [
                 {
                 {
@@ -538,27 +557,27 @@
                     "type": "github"
                     "type": "github"
                 }
                 }
             ],
             ],
-            "time": "2020-09-30T08:51:17+00:00"
+            "time": "2021-03-23T11:33:13+00:00"
         },
         },
         {
         {
             "name": "guzzlehttp/promises",
             "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
+            "version": "1.4.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.5.0"
+                "php": ">=5.5"
             },
             },
             "require-dev": {
             "require-dev": {
-                "phpunit/phpunit": "^4.0"
+                "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             },
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
@@ -589,7 +608,11 @@
             "keywords": [
             "keywords": [
                 "promise"
                 "promise"
             ],
             ],
-            "time": "2016-12-20T10:07:11+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/1.4.1"
+            },
+            "time": "2021-03-07T09:25:29+00:00"
         },
         },
         {
         {
             "name": "guzzlehttp/psr7",
             "name": "guzzlehttp/psr7",
@@ -725,7 +748,7 @@
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0"
+                "guzzlehttp/guzzle": "^7.0"
             },
             },
             "type": "library",
             "type": "library",
             "autoload": {
             "autoload": {
@@ -761,7 +784,7 @@
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0"
+                "guzzlehttp/guzzle": "^7.0"
             },
             },
             "type": "library",
             "type": "library",
             "autoload": {
             "autoload": {
@@ -797,7 +820,7 @@
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0"
+                "guzzlehttp/guzzle": "^7.0"
             },
             },
             "type": "library",
             "type": "library",
             "autoload": {
             "autoload": {
@@ -888,7 +911,7 @@
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0",
+                "guzzlehttp/guzzle": "^7.0",
                 "paragonie/random_compat": "^1 || ^2 || ^9.99",
                 "paragonie/random_compat": "^1 || ^2 || ^9.99",
                 "php": "^5.6 || ^7.0 || ^8.0"
                 "php": "^5.6 || ^7.0 || ^8.0"
             },
             },
@@ -1231,20 +1254,20 @@
         },
         },
         {
         {
             "name": "paragonie/random_compat",
             "name": "paragonie/random_compat",
-            "version": "v9.99.99",
+            "version": "v9.99.100",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": "^7"
+                "php": ">= 7"
             },
             },
             "require-dev": {
             "require-dev": {
                 "phpunit/phpunit": "4.*|5.*",
                 "phpunit/phpunit": "4.*|5.*",
@@ -1272,7 +1295,12 @@
                 "pseudorandom",
                 "pseudorandom",
                 "random"
                 "random"
             ],
             ],
-            "time": "2018-07-02T15:55:56+00:00"
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/random_compat/issues",
+                "source": "https://github.com/paragonie/random_compat"
+            },
+            "time": "2020-10-15T08:29:30+00:00"
         },
         },
         {
         {
             "name": "paragonie/sodium_compat",
             "name": "paragonie/sodium_compat",
@@ -1477,16 +1505,16 @@
         },
         },
         {
         {
             "name": "phpmailer/phpmailer",
             "name": "phpmailer/phpmailer",
-            "version": "v6.2.0",
+            "version": "v6.4.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "e38888a75c070304ca5514197d4847a59a5c853f"
+                "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f",
-                "reference": "e38888a75c070304ca5514197d4847a59a5c853f",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9256f12d8fb0cd0500f93b19e18c356906cbed3d",
+                "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -1504,7 +1532,7 @@
                 "yoast/phpunit-polyfills": "^0.2.0"
                 "yoast/phpunit-polyfills": "^0.2.0"
             },
             },
             "suggest": {
             "suggest": {
-                "ext-mbstring": "Needed to send email in multibyte encoding charset",
+                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "psr/log": "For optional PSR-3 debug logging",
                 "psr/log": "For optional PSR-3 debug logging",
@@ -1541,7 +1569,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.2.0"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.4.1"
             },
             },
             "funding": [
             "funding": [
                 {
                 {
@@ -1549,7 +1577,7 @@
                     "type": "github"
                     "type": "github"
                 }
                 }
             ],
             ],
-            "time": "2020-11-25T15:24:57+00:00"
+            "time": "2021-04-29T12:25:04+00:00"
         },
         },
         {
         {
             "name": "pragmarx/google2fa",
             "name": "pragmarx/google2fa",
@@ -1614,27 +1642,22 @@
         },
         },
         {
         {
             "name": "psr/container",
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             },
             "type": "library",
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
             "autoload": {
                 "psr-4": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
                     "Psr\\Container\\": "src/"
@@ -1647,7 +1670,7 @@
             "authors": [
             "authors": [
                 {
                 {
                     "name": "PHP-FIG",
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
                 }
             ],
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -1659,7 +1682,11 @@
                 "container-interop",
                 "container-interop",
                 "psr"
                 "psr"
             ],
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         },
         {
         {
             "name": "psr/http-client",
             "name": "psr/http-client",
@@ -1813,6 +1840,9 @@
                 "request",
                 "request",
                 "response"
                 "response"
             ],
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
             "time": "2016-08-06T14:39:51+00:00"
         },
         },
         {
         {
@@ -1923,16 +1953,16 @@
         },
         },
         {
         {
             "name": "psr/log",
             "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.4",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -1941,7 +1971,7 @@
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
                 }
             },
             },
             "autoload": {
             "autoload": {
@@ -1956,7 +1986,7 @@
             "authors": [
             "authors": [
                 {
                 {
                     "name": "PHP-FIG",
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
                 }
             ],
             ],
             "description": "Common interface for logging libraries",
             "description": "Common interface for logging libraries",
@@ -1966,7 +1996,10 @@
                 "psr",
                 "psr",
                 "psr-3"
                 "psr-3"
             ],
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
+            "time": "2021-05-03T11:20:27+00:00"
         },
         },
         {
         {
             "name": "psr/simple-cache",
             "name": "psr/simple-cache",
@@ -2112,6 +2145,10 @@
                 }
                 }
             ],
             ],
             "description": "A polyfill for getallheaders.",
             "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
             "time": "2019-03-08T08:55:37+00:00"
             "time": "2019-03-08T08:55:37+00:00"
         },
         },
         {
         {
@@ -2470,20 +2507,20 @@
         },
         },
         {
         {
             "name": "symfony/polyfill-ctype",
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.0",
+            "version": "v1.22.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             },
             "suggest": {
             "suggest": {
                 "ext-ctype": "For best performance"
                 "ext-ctype": "For best performance"
@@ -2491,7 +2528,7 @@
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 },
                 "thanks": {
                 "thanks": {
                     "name": "symfony/polyfill",
                     "name": "symfony/polyfill",
@@ -2528,24 +2565,41 @@
                 "polyfill",
                 "polyfill",
                 "portable"
                 "portable"
             ],
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         },
         {
         {
             "name": "symfony/polyfill-mbstring",
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.14.0",
+            "version": "v1.22.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2"
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2",
-                "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             },
             "suggest": {
             "suggest": {
                 "ext-mbstring": "For best performance"
                 "ext-mbstring": "For best performance"
@@ -2553,7 +2607,11 @@
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.14-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
                 }
             },
             },
             "autoload": {
             "autoload": {
@@ -2587,7 +2645,24 @@
                 "portable",
                 "portable",
                 "shim"
                 "shim"
             ],
             ],
-            "time": "2020-01-13T11:15:53+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-22T09:19:47+00:00"
         },
         },
         {
         {
             "name": "symfony/polyfill-php56",
             "name": "symfony/polyfill-php56",
@@ -2647,25 +2722,29 @@
         },
         },
         {
         {
             "name": "symfony/polyfill-php72",
             "name": "symfony/polyfill-php72",
-            "version": "v1.10.0",
+            "version": "v1.22.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
+                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
+                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             },
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
                 }
             },
             },
             "autoload": {
             "autoload": {
@@ -2698,11 +2777,28 @@
                 "portable",
                 "portable",
                 "shim"
                 "shim"
             ],
             ],
-            "time": "2018-09-21T13:07:52+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         },
         {
         {
             "name": "symfony/polyfill-php80",
             "name": "symfony/polyfill-php80",
-            "version": "v1.22.0",
+            "version": "v1.22.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -2765,7 +2861,7 @@
                 "shim"
                 "shim"
             ],
             ],
             "support": {
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
             },
             },
             "funding": [
             "funding": [
                 {
                 {

+ 34 - 34
api/vendor/composer/InstalledVersions.php

@@ -29,7 +29,7 @@ private static $installed = array (
     'aliases' => 
     'aliases' => 
     array (
     array (
     ),
     ),
-    'reference' => 'd85afc49ef7049063cc939f169cfada102f84818',
+    'reference' => 'c369707471ade0c58c1013f42a2bb039a4f14f9e',
     'name' => '__root__',
     'name' => '__root__',
   ),
   ),
   'versions' => 
   'versions' => 
@@ -41,7 +41,7 @@ private static $installed = array (
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'd85afc49ef7049063cc939f169cfada102f84818',
+      'reference' => 'c369707471ade0c58c1013f42a2bb039a4f14f9e',
     ),
     ),
     'adldap2/adldap2' => 
     'adldap2/adldap2' => 
     array (
     array (
@@ -63,12 +63,12 @@ private static $installed = array (
     ),
     ),
     'composer/semver' => 
     'composer/semver' => 
     array (
     array (
-      'pretty_version' => '1.4.2',
-      'version' => '1.4.2.0',
+      'pretty_version' => '1.7.2',
+      'version' => '1.7.2.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'c7cb9a2095a074d131b65a8a0cd294479d785573',
+      'reference' => '647490bbcaf7fc4891c58f47b825eb99d19c377a',
     ),
     ),
     'dg/dibi' => 
     'dg/dibi' => 
     array (
     array (
@@ -115,21 +115,21 @@ private static $installed = array (
     ),
     ),
     'guzzlehttp/guzzle' => 
     'guzzlehttp/guzzle' => 
     array (
     array (
-      'pretty_version' => '7.1.1',
-      'version' => '7.1.1.0',
+      'pretty_version' => '7.3.0',
+      'version' => '7.3.0.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '7427d6f99df41cc01f33cd59832f721c150ffdf3',
+      'reference' => '7008573787b430c1c1f650e3722d9bba59967628',
     ),
     ),
     'guzzlehttp/promises' => 
     'guzzlehttp/promises' => 
     array (
     array (
-      'pretty_version' => 'v1.3.1',
-      'version' => '1.3.1.0',
+      'pretty_version' => '1.4.1',
+      'version' => '1.4.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'a59da6cf61d80060647ff4d3eb2c03a2bc694646',
+      'reference' => '8e7d04f1f6450fef59366c399cfad4b9383aa30d',
     ),
     ),
     'guzzlehttp/psr7' => 
     'guzzlehttp/psr7' => 
     array (
     array (
@@ -241,12 +241,12 @@ private static $installed = array (
     ),
     ),
     'paragonie/random_compat' => 
     'paragonie/random_compat' => 
     array (
     array (
-      'pretty_version' => 'v9.99.99',
-      'version' => '9.99.99.0',
+      'pretty_version' => 'v9.99.100',
+      'version' => '9.99.100.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95',
+      'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
     ),
     ),
     'paragonie/sodium_compat' => 
     'paragonie/sodium_compat' => 
     array (
     array (
@@ -277,12 +277,12 @@ private static $installed = array (
     ),
     ),
     'phpmailer/phpmailer' => 
     'phpmailer/phpmailer' => 
     array (
     array (
-      'pretty_version' => 'v6.2.0',
-      'version' => '6.2.0.0',
+      'pretty_version' => 'v6.4.1',
+      'version' => '6.4.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'e38888a75c070304ca5514197d4847a59a5c853f',
+      'reference' => '9256f12d8fb0cd0500f93b19e18c356906cbed3d',
     ),
     ),
     'pragmarx/google2fa' => 
     'pragmarx/google2fa' => 
     array (
     array (
@@ -295,12 +295,12 @@ private static $installed = array (
     ),
     ),
     'psr/container' => 
     'psr/container' => 
     array (
     array (
-      'pretty_version' => '1.0.0',
-      'version' => '1.0.0.0',
+      'pretty_version' => '1.1.1',
+      'version' => '1.1.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f',
+      'reference' => '8622567409010282b7aeebe4bb841fe98b58dcaf',
     ),
     ),
     'psr/http-client' => 
     'psr/http-client' => 
     array (
     array (
@@ -370,12 +370,12 @@ private static $installed = array (
     ),
     ),
     'psr/log' => 
     'psr/log' => 
     array (
     array (
-      'pretty_version' => '1.1.0',
-      'version' => '1.1.0.0',
+      'pretty_version' => '1.1.4',
+      'version' => '1.1.4.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd',
+      'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
     ),
     ),
     'psr/simple-cache' => 
     'psr/simple-cache' => 
     array (
     array (
@@ -451,21 +451,21 @@ private static $installed = array (
     ),
     ),
     'symfony/polyfill-ctype' => 
     'symfony/polyfill-ctype' => 
     array (
     array (
-      'pretty_version' => 'v1.18.0',
-      'version' => '1.18.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '1c302646f6efc070cd46856e600e5e0684d6b454',
+      'reference' => 'c6c942b1ac76c82448322025e084cadc56048b4e',
     ),
     ),
     'symfony/polyfill-mbstring' => 
     'symfony/polyfill-mbstring' => 
     array (
     array (
-      'pretty_version' => 'v1.14.0',
-      'version' => '1.14.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '34094cfa9abe1f0f14f48f490772db7a775559f2',
+      'reference' => '5232de97ee3b75b0360528dae24e73db49566ab1',
     ),
     ),
     'symfony/polyfill-php56' => 
     'symfony/polyfill-php56' => 
     array (
     array (
@@ -478,17 +478,17 @@ private static $installed = array (
     ),
     ),
     'symfony/polyfill-php72' => 
     'symfony/polyfill-php72' => 
     array (
     array (
-      'pretty_version' => 'v1.10.0',
-      'version' => '1.10.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '9050816e2ca34a8e916c3a0ae8b9c2fccf68b631',
+      'reference' => 'cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9',
     ),
     ),
     'symfony/polyfill-php80' => 
     'symfony/polyfill-php80' => 
     array (
     array (
-      'pretty_version' => 'v1.22.0',
-      'version' => '1.22.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),

+ 182 - 93
api/vendor/composer/installed.json

@@ -128,27 +128,26 @@
         },
         },
         {
         {
             "name": "composer/semver",
             "name": "composer/semver",
-            "version": "1.4.2",
-            "version_normalized": "1.4.2.0",
+            "version": "1.7.2",
+            "version_normalized": "1.7.2.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+                "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "url": "https://api.github.com/repos/composer/semver/zipball/647490bbcaf7fc4891c58f47b825eb99d19c377a",
+                "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": "^5.3.2 || ^7.0"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             },
             "require-dev": {
             "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5",
-                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+                "phpunit/phpunit": "^4.5 || ^5.0.5"
             },
             },
-            "time": "2016-08-30T16:08:34+00:00",
+            "time": "2020-12-03T15:47:16+00:00",
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
@@ -189,6 +188,25 @@
                 "validation",
                 "validation",
                 "versioning"
                 "versioning"
             ],
             ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/1.7.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "install-path": "./semver"
             "install-path": "./semver"
         },
         },
         {
         {
@@ -455,33 +473,34 @@
         },
         },
         {
         {
             "name": "guzzlehttp/guzzle",
             "name": "guzzlehttp/guzzle",
-            "version": "7.1.1",
-            "version_normalized": "7.1.1.0",
+            "version": "7.3.0",
+            "version_normalized": "7.3.0.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "7427d6f99df41cc01f33cd59832f721c150ffdf3"
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7427d6f99df41cc01f33cd59832f721c150ffdf3",
-                "reference": "7427d6f99df41cc01f33cd59832f721c150ffdf3",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628",
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
                 "ext-json": "*",
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
-                "php": "^7.2.5",
+                "guzzlehttp/promises": "^1.4",
+                "guzzlehttp/psr7": "^1.7 || ^2.0",
+                "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0"
                 "psr/http-client": "^1.0"
             },
             },
             "provide": {
             "provide": {
                 "psr/http-client-implementation": "1.0"
                 "psr/http-client-implementation": "1.0"
             },
             },
             "require-dev": {
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
                 "ext-curl": "*",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-phpunit8",
-                "phpunit/phpunit": "^8.5.5",
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
                 "psr/log": "^1.1"
                 "psr/log": "^1.1"
             },
             },
             "suggest": {
             "suggest": {
@@ -489,11 +508,11 @@
                 "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
                 "psr/log": "Required for using the Log middleware"
             },
             },
-            "time": "2020-09-30T08:51:17+00:00",
+            "time": "2021-03-23T11:33:13+00:00",
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "7.1-dev"
+                    "dev-master": "7.3-dev"
                 }
                 }
             },
             },
             "installation-source": "dist",
             "installation-source": "dist",
@@ -536,7 +555,7 @@
             ],
             ],
             "support": {
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.1.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.3.0"
             },
             },
             "funding": [
             "funding": [
                 {
                 {
@@ -560,26 +579,26 @@
         },
         },
         {
         {
             "name": "guzzlehttp/promises",
             "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
-            "version_normalized": "1.3.1.0",
+            "version": "1.4.1",
+            "version_normalized": "1.4.1.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.5.0"
+                "php": ">=5.5"
             },
             },
             "require-dev": {
             "require-dev": {
-                "phpunit/phpunit": "^4.0"
+                "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             },
-            "time": "2016-12-20T10:07:11+00:00",
+            "time": "2021-03-07T09:25:29+00:00",
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
@@ -610,6 +629,10 @@
             "keywords": [
             "keywords": [
                 "promise"
                 "promise"
             ],
             ],
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/1.4.1"
+            },
             "install-path": "../guzzlehttp/promises"
             "install-path": "../guzzlehttp/promises"
         },
         },
         {
         {
@@ -1288,21 +1311,21 @@
         },
         },
         {
         {
             "name": "paragonie/random_compat",
             "name": "paragonie/random_compat",
-            "version": "v9.99.99",
-            "version_normalized": "9.99.99.0",
+            "version": "v9.99.100",
+            "version_normalized": "9.99.100.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": "^7"
+                "php": ">= 7"
             },
             },
             "require-dev": {
             "require-dev": {
                 "phpunit/phpunit": "4.*|5.*",
                 "phpunit/phpunit": "4.*|5.*",
@@ -1311,7 +1334,7 @@
             "suggest": {
             "suggest": {
                 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
                 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
             },
             },
-            "time": "2018-07-02T15:55:56+00:00",
+            "time": "2020-10-15T08:29:30+00:00",
             "type": "library",
             "type": "library",
             "installation-source": "dist",
             "installation-source": "dist",
             "notification-url": "https://packagist.org/downloads/",
             "notification-url": "https://packagist.org/downloads/",
@@ -1332,6 +1355,11 @@
                 "pseudorandom",
                 "pseudorandom",
                 "random"
                 "random"
             ],
             ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/random_compat/issues",
+                "source": "https://github.com/paragonie/random_compat"
+            },
             "install-path": "../paragonie/random_compat"
             "install-path": "../paragonie/random_compat"
         },
         },
         {
         {
@@ -1546,17 +1574,17 @@
         },
         },
         {
         {
             "name": "phpmailer/phpmailer",
             "name": "phpmailer/phpmailer",
-            "version": "v6.2.0",
-            "version_normalized": "6.2.0.0",
+            "version": "v6.4.1",
+            "version_normalized": "6.4.1.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "e38888a75c070304ca5514197d4847a59a5c853f"
+                "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f",
-                "reference": "e38888a75c070304ca5514197d4847a59a5c853f",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9256f12d8fb0cd0500f93b19e18c356906cbed3d",
+                "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -1574,14 +1602,14 @@
                 "yoast/phpunit-polyfills": "^0.2.0"
                 "yoast/phpunit-polyfills": "^0.2.0"
             },
             },
             "suggest": {
             "suggest": {
-                "ext-mbstring": "Needed to send email in multibyte encoding charset",
+                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "psr/log": "For optional PSR-3 debug logging",
                 "psr/log": "For optional PSR-3 debug logging",
                 "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
                 "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
                 "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
                 "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
             },
             },
-            "time": "2020-11-25T15:24:57+00:00",
+            "time": "2021-04-29T12:25:04+00:00",
             "type": "library",
             "type": "library",
             "installation-source": "dist",
             "installation-source": "dist",
             "autoload": {
             "autoload": {
@@ -1613,7 +1641,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.2.0"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.4.1"
             },
             },
             "funding": [
             "funding": [
                 {
                 {
@@ -1689,29 +1717,24 @@
         },
         },
         {
         {
             "name": "psr/container",
             "name": "psr/container",
-            "version": "1.0.0",
-            "version_normalized": "1.0.0.0",
+            "version": "1.1.1",
+            "version_normalized": "1.1.1.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             },
-            "time": "2017-02-14T16:28:37+00:00",
+            "time": "2021-03-05T17:36:06+00:00",
             "type": "library",
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "installation-source": "dist",
             "installation-source": "dist",
             "autoload": {
             "autoload": {
                 "psr-4": {
                 "psr-4": {
@@ -1725,7 +1748,7 @@
             "authors": [
             "authors": [
                 {
                 {
                     "name": "PHP-FIG",
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
                 }
             ],
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -1737,6 +1760,10 @@
                 "container-interop",
                 "container-interop",
                 "psr"
                 "psr"
             ],
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
             "install-path": "../psr/container"
             "install-path": "../psr/container"
         },
         },
         {
         {
@@ -2016,27 +2043,27 @@
         },
         },
         {
         {
             "name": "psr/log",
             "name": "psr/log",
-            "version": "1.1.0",
-            "version_normalized": "1.1.0.0",
+            "version": "1.1.4",
+            "version_normalized": "1.1.4.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
                 "php": ">=5.3.0"
                 "php": ">=5.3.0"
             },
             },
-            "time": "2018-11-20T15:27:04+00:00",
+            "time": "2021-05-03T11:20:27+00:00",
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
                 }
             },
             },
             "installation-source": "dist",
             "installation-source": "dist",
@@ -2052,7 +2079,7 @@
             "authors": [
             "authors": [
                 {
                 {
                     "name": "PHP-FIG",
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
                 }
             ],
             ],
             "description": "Common interface for logging libraries",
             "description": "Common interface for logging libraries",
@@ -2062,6 +2089,9 @@
                 "psr",
                 "psr",
                 "psr-3"
                 "psr-3"
             ],
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "install-path": "../psr/log"
             "install-path": "../psr/log"
         },
         },
         {
         {
@@ -2590,30 +2620,30 @@
         },
         },
         {
         {
             "name": "symfony/polyfill-ctype",
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.0",
-            "version_normalized": "1.18.0.0",
+            "version": "v1.22.1",
+            "version_normalized": "1.22.1.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             },
             "suggest": {
             "suggest": {
                 "ext-ctype": "For best performance"
                 "ext-ctype": "For best performance"
             },
             },
-            "time": "2020-07-14T12:35:20+00:00",
+            "time": "2021-01-07T16:49:33+00:00",
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 },
                 "thanks": {
                 "thanks": {
                     "name": "symfony/polyfill",
                     "name": "symfony/polyfill",
@@ -2651,34 +2681,55 @@
                 "polyfill",
                 "polyfill",
                 "portable"
                 "portable"
             ],
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "install-path": "../symfony/polyfill-ctype"
             "install-path": "../symfony/polyfill-ctype"
         },
         },
         {
         {
             "name": "symfony/polyfill-mbstring",
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.14.0",
-            "version_normalized": "1.14.0.0",
+            "version": "v1.22.1",
+            "version_normalized": "1.22.1.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2"
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2",
-                "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             },
             "suggest": {
             "suggest": {
                 "ext-mbstring": "For best performance"
                 "ext-mbstring": "For best performance"
             },
             },
-            "time": "2020-01-13T11:15:53+00:00",
+            "time": "2021-01-22T09:19:47+00:00",
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.14-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
                 }
             },
             },
             "installation-source": "dist",
             "installation-source": "dist",
@@ -2713,6 +2764,23 @@
                 "portable",
                 "portable",
                 "shim"
                 "shim"
             ],
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "install-path": "../symfony/polyfill-mbstring"
             "install-path": "../symfony/polyfill-mbstring"
         },
         },
         {
         {
@@ -2776,27 +2844,31 @@
         },
         },
         {
         {
             "name": "symfony/polyfill-php72",
             "name": "symfony/polyfill-php72",
-            "version": "v1.10.0",
-            "version_normalized": "1.10.0.0",
+            "version": "v1.22.1",
+            "version_normalized": "1.22.1.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
+                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
+                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             },
-            "time": "2018-09-21T13:07:52+00:00",
+            "time": "2021-01-07T16:49:33+00:00",
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-main": "1.22-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
                 }
             },
             },
             "installation-source": "dist",
             "installation-source": "dist",
@@ -2830,12 +2902,29 @@
                 "portable",
                 "portable",
                 "shim"
                 "shim"
             ],
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "install-path": "../symfony/polyfill-php72"
             "install-path": "../symfony/polyfill-php72"
         },
         },
         {
         {
             "name": "symfony/polyfill-php80",
             "name": "symfony/polyfill-php80",
-            "version": "v1.22.0",
-            "version_normalized": "1.22.0.0",
+            "version": "v1.22.1",
+            "version_normalized": "1.22.1.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -2900,7 +2989,7 @@
                 "shim"
                 "shim"
             ],
             ],
             "support": {
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
             },
             },
             "funding": [
             "funding": [
                 {
                 {

+ 34 - 34
api/vendor/composer/installed.php

@@ -6,7 +6,7 @@
     'aliases' => 
     'aliases' => 
     array (
     array (
     ),
     ),
-    'reference' => 'd85afc49ef7049063cc939f169cfada102f84818',
+    'reference' => 'c369707471ade0c58c1013f42a2bb039a4f14f9e',
     'name' => '__root__',
     'name' => '__root__',
   ),
   ),
   'versions' => 
   'versions' => 
@@ -18,7 +18,7 @@
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'd85afc49ef7049063cc939f169cfada102f84818',
+      'reference' => 'c369707471ade0c58c1013f42a2bb039a4f14f9e',
     ),
     ),
     'adldap2/adldap2' => 
     'adldap2/adldap2' => 
     array (
     array (
@@ -40,12 +40,12 @@
     ),
     ),
     'composer/semver' => 
     'composer/semver' => 
     array (
     array (
-      'pretty_version' => '1.4.2',
-      'version' => '1.4.2.0',
+      'pretty_version' => '1.7.2',
+      'version' => '1.7.2.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'c7cb9a2095a074d131b65a8a0cd294479d785573',
+      'reference' => '647490bbcaf7fc4891c58f47b825eb99d19c377a',
     ),
     ),
     'dg/dibi' => 
     'dg/dibi' => 
     array (
     array (
@@ -92,21 +92,21 @@
     ),
     ),
     'guzzlehttp/guzzle' => 
     'guzzlehttp/guzzle' => 
     array (
     array (
-      'pretty_version' => '7.1.1',
-      'version' => '7.1.1.0',
+      'pretty_version' => '7.3.0',
+      'version' => '7.3.0.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '7427d6f99df41cc01f33cd59832f721c150ffdf3',
+      'reference' => '7008573787b430c1c1f650e3722d9bba59967628',
     ),
     ),
     'guzzlehttp/promises' => 
     'guzzlehttp/promises' => 
     array (
     array (
-      'pretty_version' => 'v1.3.1',
-      'version' => '1.3.1.0',
+      'pretty_version' => '1.4.1',
+      'version' => '1.4.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'a59da6cf61d80060647ff4d3eb2c03a2bc694646',
+      'reference' => '8e7d04f1f6450fef59366c399cfad4b9383aa30d',
     ),
     ),
     'guzzlehttp/psr7' => 
     'guzzlehttp/psr7' => 
     array (
     array (
@@ -218,12 +218,12 @@
     ),
     ),
     'paragonie/random_compat' => 
     'paragonie/random_compat' => 
     array (
     array (
-      'pretty_version' => 'v9.99.99',
-      'version' => '9.99.99.0',
+      'pretty_version' => 'v9.99.100',
+      'version' => '9.99.100.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95',
+      'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
     ),
     ),
     'paragonie/sodium_compat' => 
     'paragonie/sodium_compat' => 
     array (
     array (
@@ -254,12 +254,12 @@
     ),
     ),
     'phpmailer/phpmailer' => 
     'phpmailer/phpmailer' => 
     array (
     array (
-      'pretty_version' => 'v6.2.0',
-      'version' => '6.2.0.0',
+      'pretty_version' => 'v6.4.1',
+      'version' => '6.4.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'e38888a75c070304ca5514197d4847a59a5c853f',
+      'reference' => '9256f12d8fb0cd0500f93b19e18c356906cbed3d',
     ),
     ),
     'pragmarx/google2fa' => 
     'pragmarx/google2fa' => 
     array (
     array (
@@ -272,12 +272,12 @@
     ),
     ),
     'psr/container' => 
     'psr/container' => 
     array (
     array (
-      'pretty_version' => '1.0.0',
-      'version' => '1.0.0.0',
+      'pretty_version' => '1.1.1',
+      'version' => '1.1.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f',
+      'reference' => '8622567409010282b7aeebe4bb841fe98b58dcaf',
     ),
     ),
     'psr/http-client' => 
     'psr/http-client' => 
     array (
     array (
@@ -347,12 +347,12 @@
     ),
     ),
     'psr/log' => 
     'psr/log' => 
     array (
     array (
-      'pretty_version' => '1.1.0',
-      'version' => '1.1.0.0',
+      'pretty_version' => '1.1.4',
+      'version' => '1.1.4.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd',
+      'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
     ),
     ),
     'psr/simple-cache' => 
     'psr/simple-cache' => 
     array (
     array (
@@ -428,21 +428,21 @@
     ),
     ),
     'symfony/polyfill-ctype' => 
     'symfony/polyfill-ctype' => 
     array (
     array (
-      'pretty_version' => 'v1.18.0',
-      'version' => '1.18.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '1c302646f6efc070cd46856e600e5e0684d6b454',
+      'reference' => 'c6c942b1ac76c82448322025e084cadc56048b4e',
     ),
     ),
     'symfony/polyfill-mbstring' => 
     'symfony/polyfill-mbstring' => 
     array (
     array (
-      'pretty_version' => 'v1.14.0',
-      'version' => '1.14.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '34094cfa9abe1f0f14f48f490772db7a775559f2',
+      'reference' => '5232de97ee3b75b0360528dae24e73db49566ab1',
     ),
     ),
     'symfony/polyfill-php56' => 
     'symfony/polyfill-php56' => 
     array (
     array (
@@ -455,17 +455,17 @@
     ),
     ),
     'symfony/polyfill-php72' => 
     'symfony/polyfill-php72' => 
     array (
     array (
-      'pretty_version' => 'v1.10.0',
-      'version' => '1.10.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),
-      'reference' => '9050816e2ca34a8e916c3a0ae8b9c2fccf68b631',
+      'reference' => 'cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9',
     ),
     ),
     'symfony/polyfill-php80' => 
     'symfony/polyfill-php80' => 
     array (
     array (
-      'pretty_version' => 'v1.22.0',
-      'version' => '1.22.0.0',
+      'pretty_version' => 'v1.22.1',
+      'version' => '1.22.1.0',
       'aliases' => 
       'aliases' => 
       array (
       array (
       ),
       ),

+ 41 - 0
api/vendor/composer/semver/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+### [1.7.2] 2020-12-03
+
+  * Fixed: Allow installing on php 8
+
+### [1.7.1] 2020-09-27
+
+  * Fixed: accidental validation of broken constraints combining ^/~ and wildcards, and -dev suffix allowing weird cases
+  * Fixed: normalization of beta0 and such which was dropping the 0
+
+### [1.7.0] 2020-09-09
+
+  * Added: support for `x || @dev`, not very useful but seen in the wild and failed to validate with 1.5.2/1.6.0
+  * Added: support for `foobar-dev` being equal to `dev-foobar`, dev-foobar is the official way to write it but we need to support the other for BC and convenience
+
+### [1.6.0] 2020-09-08
+
+  * Added: support for constraints like `^2.x-dev` and `~2.x-dev`, not very useful but seen in the wild and failed to validate with 1.5.2
+  * Fixed: invalid aliases will no longer throw, unless explicitly validated by Composer in the root package
+
+### [1.5.2] 2020-09-08
+
+  * Fixed: handling of some invalid -dev versions which were seen as valid
+  * Fixed: some doctypes
+
+### [1.5.1] 2020-01-13
+
+  * Fixed: Parsing of aliased version was not validating the alias to be a valid version
+
+### [1.5.0] 2019-03-19
+
+  * Added: some support for date versions (e.g. 201903) in `~` operator
+  * Fixed: support for stabilities in `~` operator was inconsistent
+
 ### [1.4.2] 2016-08-30
 ### [1.4.2] 2016-08-30
 
 
   * Fixed: collapsing of complex constraints lead to buggy constraints
   * Fixed: collapsing of complex constraints lead to buggy constraints
@@ -57,6 +90,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - Namespace: `Composer\Test\Package\LinkConstraint` -> `Composer\Test\Semver\Constraint`
     - Namespace: `Composer\Test\Package\LinkConstraint` -> `Composer\Test\Semver\Constraint`
   * Changed: code style using php-cs-fixer.
   * Changed: code style using php-cs-fixer.
 
 
+[1.7.2]: https://github.com/composer/semver/compare/1.7.1...1.7.2
+[1.7.1]: https://github.com/composer/semver/compare/1.7.0...1.7.1
+[1.7.0]: https://github.com/composer/semver/compare/1.6.0...1.7.0
+[1.6.0]: https://github.com/composer/semver/compare/1.5.2...1.6.0
+[1.5.2]: https://github.com/composer/semver/compare/1.5.1...1.5.2
+[1.5.1]: https://github.com/composer/semver/compare/1.5.0...1.5.1
+[1.5.0]: https://github.com/composer/semver/compare/1.4.2...1.5.0
+[1.4.2]: https://github.com/composer/semver/compare/1.4.1...1.4.2
 [1.4.1]: https://github.com/composer/semver/compare/1.4.0...1.4.1
 [1.4.1]: https://github.com/composer/semver/compare/1.4.0...1.4.1
 [1.4.0]: https://github.com/composer/semver/compare/1.3.0...1.4.0
 [1.4.0]: https://github.com/composer/semver/compare/1.3.0...1.4.0
 [1.3.0]: https://github.com/composer/semver/compare/1.2.0...1.3.0
 [1.3.0]: https://github.com/composer/semver/compare/1.2.0...1.3.0

+ 1 - 1
api/vendor/composer/semver/README.md

@@ -46,7 +46,7 @@ The `Composer\Semver\Comparator` class provides the following methods for compar
 * equalTo($v1, $v2)
 * equalTo($v1, $v2)
 * notEqualTo($v1, $v2)
 * notEqualTo($v1, $v2)
 
 
-Each function takes two version strings as arguments. For example:
+Each function takes two version strings as arguments and returns a boolean. For example:
 
 
 ```php
 ```php
 use Composer\Semver\Comparator;
 use Composer\Semver\Comparator;

+ 2 - 3
api/vendor/composer/semver/composer.json

@@ -31,11 +31,10 @@
         "issues": "https://github.com/composer/semver/issues"
         "issues": "https://github.com/composer/semver/issues"
     },
     },
     "require": {
     "require": {
-        "php": "^5.3.2 || ^7.0"
+        "php": "^5.3.2 || ^7.0 || ^8.0"
     },
     },
     "require-dev": {
     "require-dev": {
-        "phpunit/phpunit": "^4.5 || ^5.0.5",
-        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+        "phpunit/phpunit": "^4.5 || ^5.0.5"
     },
     },
     "autoload": {
     "autoload": {
         "psr-4": {
         "psr-4": {

+ 1 - 1
api/vendor/composer/semver/src/Constraint/AbstractConstraint.php

@@ -11,7 +11,7 @@
 
 
 namespace Composer\Semver\Constraint;
 namespace Composer\Semver\Constraint;
 
 
-trigger_error('The ' . __CLASS__ . ' abstract class is deprecated, there is no replacement for it, it will be removed in the next major version.', E_USER_DEPRECATED);
+trigger_error('The ' . __NAMESPACE__ . '\AbstractConstraint abstract class is deprecated, there is no replacement for it, it will be removed in the next major version.', E_USER_DEPRECATED);
 
 
 /**
 /**
  * Base constraint class.
  * Base constraint class.

+ 6 - 10
api/vendor/composer/semver/src/Constraint/Constraint.php

@@ -54,7 +54,7 @@ class Constraint implements ConstraintInterface
         self::OP_NE => '!=',
         self::OP_NE => '!=',
     );
     );
 
 
-    /** @var string */
+    /** @var int */
     protected $operator;
     protected $operator;
 
 
     /** @var string */
     /** @var string */
@@ -134,7 +134,7 @@ class Constraint implements ConstraintInterface
      * @param string $a
      * @param string $a
      * @param string $b
      * @param string $b
      * @param string $operator
      * @param string $operator
-     * @param bool $compareBranches
+     * @param bool   $compareBranches
      *
      *
      * @throws \InvalidArgumentException if invalid operator is given.
      * @throws \InvalidArgumentException if invalid operator is given.
      *
      *
@@ -167,7 +167,7 @@ class Constraint implements ConstraintInterface
 
 
     /**
     /**
      * @param Constraint $provider
      * @param Constraint $provider
-     * @param bool $compareBranches
+     * @param bool       $compareBranches
      *
      *
      * @return bool
      * @return bool
      */
      */
@@ -184,7 +184,7 @@ class Constraint implements ConstraintInterface
         // '!=' operator is match when other operator is not '==' operator or version is not match
         // '!=' operator is match when other operator is not '==' operator or version is not match
         // these kinds of comparisons always have a solution
         // these kinds of comparisons always have a solution
         if ($isNonEqualOp || $isProviderNonEqualOp) {
         if ($isNonEqualOp || $isProviderNonEqualOp) {
-            return !$isEqualOp && !$isProviderEqualOp
+            return (!$isEqualOp && !$isProviderEqualOp)
                 || $this->versionCompare($provider->version, $this->version, '!=', $compareBranches);
                 || $this->versionCompare($provider->version, $this->version, '!=', $compareBranches);
         }
         }
 
 
@@ -197,13 +197,9 @@ class Constraint implements ConstraintInterface
         if ($this->versionCompare($provider->version, $this->version, self::$transOpInt[$this->operator], $compareBranches)) {
         if ($this->versionCompare($provider->version, $this->version, self::$transOpInt[$this->operator], $compareBranches)) {
             // special case, e.g. require >= 1.0 and provide < 1.0
             // special case, e.g. require >= 1.0 and provide < 1.0
             // 1.0 >= 1.0 but 1.0 is outside of the provided interval
             // 1.0 >= 1.0 but 1.0 is outside of the provided interval
-            if ($provider->version === $this->version
+            return !($provider->version === $this->version
                 && self::$transOpInt[$provider->operator] === $providerNoEqualOp
                 && self::$transOpInt[$provider->operator] === $providerNoEqualOp
-                && self::$transOpInt[$this->operator] !== $noEqualOp) {
-                return false;
-            }
-
-            return true;
+                && self::$transOpInt[$this->operator] !== $noEqualOp);
         }
         }
 
 
         return false;
         return false;

+ 2 - 2
api/vendor/composer/semver/src/Constraint/EmptyConstraint.php

@@ -30,7 +30,7 @@ class EmptyConstraint implements ConstraintInterface
     }
     }
 
 
     /**
     /**
-     * @param $prettyString
+     * @param string $prettyString
      */
      */
     public function setPrettyString($prettyString)
     public function setPrettyString($prettyString)
     {
     {
@@ -46,7 +46,7 @@ class EmptyConstraint implements ConstraintInterface
             return $this->prettyString;
             return $this->prettyString;
         }
         }
 
 
-        return $this->__toString();
+        return (string) $this;
     }
     }
 
 
     /**
     /**

+ 4 - 4
api/vendor/composer/semver/src/Constraint/MultiConstraint.php

@@ -19,7 +19,7 @@ class MultiConstraint implements ConstraintInterface
     /** @var ConstraintInterface[] */
     /** @var ConstraintInterface[] */
     protected $constraints;
     protected $constraints;
 
 
-    /** @var string */
+    /** @var string|null */
     protected $prettyString;
     protected $prettyString;
 
 
     /** @var bool */
     /** @var bool */
@@ -27,7 +27,7 @@ class MultiConstraint implements ConstraintInterface
 
 
     /**
     /**
      * @param ConstraintInterface[] $constraints A set of constraints
      * @param ConstraintInterface[] $constraints A set of constraints
-     * @param bool $conjunctive Whether the constraints should be treated as conjunctive or disjunctive
+     * @param bool                  $conjunctive Whether the constraints should be treated as conjunctive or disjunctive
      */
      */
     public function __construct(array $constraints, $conjunctive = true)
     public function __construct(array $constraints, $conjunctive = true)
     {
     {
@@ -86,7 +86,7 @@ class MultiConstraint implements ConstraintInterface
     }
     }
 
 
     /**
     /**
-     * @param string $prettyString
+     * @param string|null $prettyString
      */
      */
     public function setPrettyString($prettyString)
     public function setPrettyString($prettyString)
     {
     {
@@ -102,7 +102,7 @@ class MultiConstraint implements ConstraintInterface
             return $this->prettyString;
             return $this->prettyString;
         }
         }
 
 
-        return $this->__toString();
+        return (string) $this;
     }
     }
 
 
     /**
     /**

+ 4 - 4
api/vendor/composer/semver/src/Semver.php

@@ -37,15 +37,15 @@ class Semver
 
 
         $versionParser = self::$versionParser;
         $versionParser = self::$versionParser;
         $provider = new Constraint('==', $versionParser->normalize($version));
         $provider = new Constraint('==', $versionParser->normalize($version));
-        $constraints = $versionParser->parseConstraints($constraints);
+        $parsedConstraints = $versionParser->parseConstraints($constraints);
 
 
-        return $constraints->matches($provider);
+        return $parsedConstraints->matches($provider);
     }
     }
 
 
     /**
     /**
      * Return all versions that satisfy given constraints.
      * Return all versions that satisfy given constraints.
      *
      *
-     * @param array $versions
+     * @param array  $versions
      * @param string $constraints
      * @param string $constraints
      *
      *
      * @return array
      * @return array
@@ -85,7 +85,7 @@ class Semver
 
 
     /**
     /**
      * @param array $versions
      * @param array $versions
-     * @param int $direction
+     * @param int   $direction
      *
      *
      * @return array
      * @return array
      */
      */

+ 84 - 54
api/vendor/composer/semver/src/VersionParser.php

@@ -38,8 +38,8 @@ class VersionParser
      */
      */
     private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)((?:[.-]?\d+)*+)?)?([.-]?dev)?';
     private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)((?:[.-]?\d+)*+)?)?([.-]?dev)?';
 
 
-    /** @var array */
-    private static $stabilities = array('stable', 'RC', 'beta', 'alpha', 'dev');
+    /** @var string */
+    private static $stabilitiesRegex = 'stable|RC|beta|alpha|dev';
 
 
     /**
     /**
      * Returns the stability of a version.
      * Returns the stability of a version.
@@ -52,11 +52,12 @@ class VersionParser
     {
     {
         $version = preg_replace('{#.+$}i', '', $version);
         $version = preg_replace('{#.+$}i', '', $version);
 
 
-        if ('dev-' === substr($version, 0, 4) || '-dev' === substr($version, -4)) {
+        if (strpos($version, 'dev-') === 0 || '-dev' === substr($version, -4)) {
             return 'dev';
             return 'dev';
         }
         }
 
 
         preg_match('{' . self::$modifierRegex . '(?:\+.*)?$}i', strtolower($version), $match);
         preg_match('{' . self::$modifierRegex . '(?:\+.*)?$}i', strtolower($version), $match);
+
         if (!empty($match[3])) {
         if (!empty($match[3])) {
             return 'dev';
             return 'dev';
         }
         }
@@ -101,6 +102,7 @@ class VersionParser
     public function normalize($version, $fullVersion = null)
     public function normalize($version, $fullVersion = null)
     {
     {
         $version = trim($version);
         $version = trim($version);
+        $origVersion = $version;
         if (null === $fullVersion) {
         if (null === $fullVersion) {
             $fullVersion = $version;
             $fullVersion = $version;
         }
         }
@@ -110,13 +112,18 @@ class VersionParser
             $version = $match[1];
             $version = $match[1];
         }
         }
 
 
+        // strip off stability flag
+        if (preg_match('{@(?:' . self::$stabilitiesRegex . ')$}i', $version, $match)) {
+            $version = substr($version, 0, strlen($version) - strlen($match[0]));
+        }
+
         // match master-like branches
         // match master-like branches
         if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
         if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
             return '9999999-dev';
             return '9999999-dev';
         }
         }
 
 
         // if requirement is branch-like, use full name
         // if requirement is branch-like, use full name
-        if ('dev-' === strtolower(substr($version, 0, 4))) {
+        if (stripos($version, 'dev-') === 0) {
             return 'dev-' . substr($version, 4);
             return 'dev-' . substr($version, 4);
         }
         }
 
 
@@ -144,7 +151,7 @@ class VersionParser
                 if ('stable' === $matches[$index]) {
                 if ('stable' === $matches[$index]) {
                     return $version;
                     return $version;
                 }
                 }
-                $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? ltrim($matches[$index + 1], '.-') : '');
+                $version .= '-' . $this->expandStability($matches[$index]) . (isset($matches[$index + 1]) && '' !== $matches[$index + 1] ? ltrim($matches[$index + 1], '.-') : '');
             }
             }
 
 
             if (!empty($matches[$index + 2])) {
             if (!empty($matches[$index + 2])) {
@@ -157,19 +164,25 @@ class VersionParser
         // match dev branches
         // match dev branches
         if (preg_match('{(.*?)[.-]?dev$}i', $version, $match)) {
         if (preg_match('{(.*?)[.-]?dev$}i', $version, $match)) {
             try {
             try {
-                return $this->normalizeBranch($match[1]);
+                $normalized = $this->normalizeBranch($match[1]);
+                // a branch ending with -dev is only valid if it is numeric
+                // if it gets prefixed with dev- it means the branch name should
+                // have had a dev- prefix already when passed to normalize
+                if (strpos($normalized, 'dev-') === false) {
+                    return $normalized;
+                }
             } catch (\Exception $e) {
             } catch (\Exception $e) {
             }
             }
         }
         }
 
 
         $extraMessage = '';
         $extraMessage = '';
-        if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
+        if (preg_match('{ +as +' . preg_quote($version) . '(?:@(?:'.self::$stabilitiesRegex.'))?$}', $fullVersion)) {
             $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
             $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
-        } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
+        } elseif (preg_match('{^' . preg_quote($version) . '(?:@(?:'.self::$stabilitiesRegex.'))? +as +}', $fullVersion)) {
             $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
             $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
         }
         }
 
 
-        throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
+        throw new \UnexpectedValueException('Invalid version string "' . $origVersion . '"' . $extraMessage);
     }
     }
 
 
     /**
     /**
@@ -226,16 +239,9 @@ class VersionParser
     {
     {
         $prettyConstraint = $constraints;
         $prettyConstraint = $constraints;
 
 
-        if (preg_match('{^([^,\s]*?)@(' . implode('|', self::$stabilities) . ')$}i', $constraints, $match)) {
-            $constraints = empty($match[1]) ? '*' : $match[1];
-        }
-
-        if (preg_match('{^(dev-[^,\s@]+?|[^,\s@]+?\.x-dev)#.+$}i', $constraints, $match)) {
-            $constraints = $match[1];
-        }
-
         $orConstraints = preg_split('{\s*\|\|?\s*}', trim($constraints));
         $orConstraints = preg_split('{\s*\|\|?\s*}', trim($constraints));
         $orGroups = array();
         $orGroups = array();
+
         foreach ($orConstraints as $constraints) {
         foreach ($orConstraints as $constraints) {
             $andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $constraints);
             $andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $constraints);
             if (count($andConstraints) > 1) {
             if (count($andConstraints) > 1) {
@@ -268,9 +274,9 @@ class VersionParser
             && 2 === count($orGroups[0]->getConstraints())
             && 2 === count($orGroups[0]->getConstraints())
             && 2 === count($orGroups[1]->getConstraints())
             && 2 === count($orGroups[1]->getConstraints())
             && ($a = (string) $orGroups[0])
             && ($a = (string) $orGroups[0])
-            && substr($a, 0, 3) === '[>=' && (false !== ($posA = strpos($a, '<', 4)))
+            && strpos($a, '[>=') === 0 && (false !== ($posA = strpos($a, '<', 4)))
             && ($b = (string) $orGroups[1])
             && ($b = (string) $orGroups[1])
-            && substr($b, 0, 3) === '[>=' && (false !== ($posB = strpos($b, '<', 4)))
+            && strpos($b, '[>=') === 0 && (false !== ($posB = strpos($b, '<', 4)))
             && substr($a, $posA + 2, -1) === substr($b, 4, $posB - 5)
             && substr($a, $posA + 2, -1) === substr($b, 4, $posB - 5)
         ) {
         ) {
             $constraint = new MultiConstraint(array(
             $constraint = new MultiConstraint(array(
@@ -295,18 +301,29 @@ class VersionParser
      */
      */
     private function parseConstraint($constraint)
     private function parseConstraint($constraint)
     {
     {
-        if (preg_match('{^([^,\s]+?)@(' . implode('|', self::$stabilities) . ')$}i', $constraint, $match)) {
+        // strip off aliasing
+        if (preg_match('{^([^,\s]++) ++as ++([^,\s]++)$}', $constraint, $match)) {
             $constraint = $match[1];
             $constraint = $match[1];
+        }
+
+        // strip @stability flags, and keep it for later use
+        if (preg_match('{^([^,\s]*?)@(' . self::$stabilitiesRegex . ')$}i', $constraint, $match)) {
+            $constraint = '' !== $match[1] ? $match[1] : '*';
             if ($match[2] !== 'stable') {
             if ($match[2] !== 'stable') {
                 $stabilityModifier = $match[2];
                 $stabilityModifier = $match[2];
             }
             }
         }
         }
 
 
+        // get rid of #refs as those are used by composer only
+        if (preg_match('{^(dev-[^,\s@]+?|[^,\s@]+?\.x-dev)#.+$}i', $constraint, $match)) {
+            $constraint = $match[1];
+        }
+
         if (preg_match('{^v?[xX*](\.[xX*])*$}i', $constraint)) {
         if (preg_match('{^v?[xX*](\.[xX*])*$}i', $constraint)) {
             return array(new EmptyConstraint());
             return array(new EmptyConstraint());
         }
         }
 
 
-        $versionRegex = 'v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.(\d++))?' . self::$modifierRegex . '(?:\+[^\s]+)?';
+        $versionRegex = 'v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.(\d++))?(?:' . self::$modifierRegex . '|\.([xX*][.-]?dev))(?:\+[^\s]+)?';
 
 
         // Tilde Range
         // Tilde Range
         //
         //
@@ -314,7 +331,7 @@ class VersionParser
         // version, to ensure that unstable instances of the current version are allowed. However, if a stability
         // version, to ensure that unstable instances of the current version are allowed. However, if a stability
         // suffix is added to the constraint, then a >= match on the current version is used instead.
         // suffix is added to the constraint, then a >= match on the current version is used instead.
         if (preg_match('{^~>?' . $versionRegex . '$}i', $constraint, $matches)) {
         if (preg_match('{^~>?' . $versionRegex . '$}i', $constraint, $matches)) {
-            if (substr($constraint, 0, 2) === '~>') {
+            if (strpos($constraint, '~>') === 0) {
                 throw new \UnexpectedValueException(
                 throw new \UnexpectedValueException(
                     'Could not parse version constraint ' . $constraint . ': ' .
                     'Could not parse version constraint ' . $constraint . ': ' .
                     'Invalid operator "~>", you probably meant to use the "~" operator'
                     'Invalid operator "~>", you probably meant to use the "~" operator'
@@ -322,31 +339,28 @@ class VersionParser
             }
             }
 
 
             // Work out which position in the version we are operating at
             // Work out which position in the version we are operating at
-            if (isset($matches[4]) && '' !== $matches[4]) {
+            if (isset($matches[4]) && '' !== $matches[4] && null !== $matches[4]) {
                 $position = 4;
                 $position = 4;
-            } elseif (isset($matches[3]) && '' !== $matches[3]) {
+            } elseif (isset($matches[3]) && '' !== $matches[3] && null !== $matches[3]) {
                 $position = 3;
                 $position = 3;
-            } elseif (isset($matches[2]) && '' !== $matches[2]) {
+            } elseif (isset($matches[2]) && '' !== $matches[2] && null !== $matches[2]) {
                 $position = 2;
                 $position = 2;
             } else {
             } else {
                 $position = 1;
                 $position = 1;
             }
             }
 
 
-            // Calculate the stability suffix
-            $stabilitySuffix = '';
-            if (!empty($matches[5])) {
-                $stabilitySuffix .= '-' . $this->expandStability($matches[5]) . (!empty($matches[6]) ? $matches[6] : '');
+            // when matching 2.x-dev or 3.0.x-dev we have to shift the second or third number, despite no second/third number matching above
+            if (!empty($matches[8])) {
+                $position++;
             }
             }
 
 
-            if (!empty($matches[7])) {
+            // Calculate the stability suffix
+            $stabilitySuffix = '';
+            if (empty($matches[5]) && empty($matches[7]) && empty($matches[8])) {
                 $stabilitySuffix .= '-dev';
                 $stabilitySuffix .= '-dev';
             }
             }
 
 
-            if (!$stabilitySuffix) {
-                $stabilitySuffix = '-dev';
-            }
-
-            $lowVersion = $this->manipulateVersionString($matches, $position, 0) . $stabilitySuffix;
+            $lowVersion = $this->normalize(substr($constraint . $stabilitySuffix, 1));
             $lowerBound = new Constraint('>=', $lowVersion);
             $lowerBound = new Constraint('>=', $lowVersion);
 
 
             // For upper bound, we increment the position of one more significance,
             // For upper bound, we increment the position of one more significance,
@@ -368,9 +382,9 @@ class VersionParser
         // versions 0.X >=0.1.0, and no updates for versions 0.0.X
         // versions 0.X >=0.1.0, and no updates for versions 0.0.X
         if (preg_match('{^\^' . $versionRegex . '($)}i', $constraint, $matches)) {
         if (preg_match('{^\^' . $versionRegex . '($)}i', $constraint, $matches)) {
             // Work out which position in the version we are operating at
             // Work out which position in the version we are operating at
-            if ('0' !== $matches[1] || '' === $matches[2]) {
+            if ('0' !== $matches[1] || '' === $matches[2] || null === $matches[2]) {
                 $position = 1;
                 $position = 1;
-            } elseif ('0' !== $matches[2] || '' === $matches[3]) {
+            } elseif ('0' !== $matches[2] || '' === $matches[3] || null === $matches[3]) {
                 $position = 2;
                 $position = 2;
             } else {
             } else {
                 $position = 3;
                 $position = 3;
@@ -378,7 +392,7 @@ class VersionParser
 
 
             // Calculate the stability suffix
             // Calculate the stability suffix
             $stabilitySuffix = '';
             $stabilitySuffix = '';
-            if (empty($matches[5]) && empty($matches[7])) {
+            if (empty($matches[5]) && empty($matches[7]) && empty($matches[8])) {
                 $stabilitySuffix .= '-dev';
                 $stabilitySuffix .= '-dev';
             }
             }
 
 
@@ -401,9 +415,9 @@ class VersionParser
         // Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple.
         // Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple.
         // A partial version range is treated as an X-Range, so the special character is in fact optional.
         // A partial version range is treated as an X-Range, so the special character is in fact optional.
         if (preg_match('{^v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.[xX*])++$}', $constraint, $matches)) {
         if (preg_match('{^v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.[xX*])++$}', $constraint, $matches)) {
-            if (isset($matches[3]) && '' !== $matches[3]) {
+            if (isset($matches[3]) && '' !== $matches[3] && null !== $matches[3]) {
                 $position = 3;
                 $position = 3;
-            } elseif (isset($matches[2]) && '' !== $matches[2]) {
+            } elseif (isset($matches[2]) && '' !== $matches[2] && null !== $matches[2]) {
                 $position = 2;
                 $position = 2;
             } else {
             } else {
                 $position = 1;
                 $position = 1;
@@ -431,7 +445,7 @@ class VersionParser
         if (preg_match('{^(?P<from>' . $versionRegex . ') +- +(?P<to>' . $versionRegex . ')($)}i', $constraint, $matches)) {
         if (preg_match('{^(?P<from>' . $versionRegex . ') +- +(?P<to>' . $versionRegex . ')($)}i', $constraint, $matches)) {
             // Calculate the stability suffix
             // Calculate the stability suffix
             $lowStabilitySuffix = '';
             $lowStabilitySuffix = '';
-            if (empty($matches[6]) && empty($matches[8])) {
+            if (empty($matches[6]) && empty($matches[8]) && empty($matches[9])) {
                 $lowStabilitySuffix = '-dev';
                 $lowStabilitySuffix = '-dev';
             }
             }
 
 
@@ -442,12 +456,16 @@ class VersionParser
                 return ($x === 0 || $x === '0') ? false : empty($x);
                 return ($x === 0 || $x === '0') ? false : empty($x);
             };
             };
 
 
-            if ((!$empty($matches[11]) && !$empty($matches[12])) || !empty($matches[14]) || !empty($matches[16])) {
+            if ((!$empty($matches[12]) && !$empty($matches[13])) || !empty($matches[15]) || !empty($matches[17]) || !empty($matches[18])) {
                 $highVersion = $this->normalize($matches['to']);
                 $highVersion = $this->normalize($matches['to']);
                 $upperBound = new Constraint('<=', $highVersion);
                 $upperBound = new Constraint('<=', $highVersion);
             } else {
             } else {
-                $highMatch = array('', $matches[10], $matches[11], $matches[12], $matches[13]);
-                $highVersion = $this->manipulateVersionString($highMatch, $empty($matches[11]) ? 1 : 2, 1) . '-dev';
+                $highMatch = array('', $matches[11], $matches[12], $matches[13], $matches[14]);
+
+                // validate to version
+                $this->normalize($matches['to']);
+
+                $highVersion = $this->manipulateVersionString($highMatch, $empty($matches[12]) ? 1 : 2, 1) . '-dev';
                 $upperBound = new Constraint('<', $highVersion);
                 $upperBound = new Constraint('<', $highVersion);
             }
             }
 
 
@@ -460,13 +478,25 @@ class VersionParser
         // Basic Comparators
         // Basic Comparators
         if (preg_match('{^(<>|!=|>=?|<=?|==?)?\s*(.*)}', $constraint, $matches)) {
         if (preg_match('{^(<>|!=|>=?|<=?|==?)?\s*(.*)}', $constraint, $matches)) {
             try {
             try {
-                $version = $this->normalize($matches[2]);
+                try {
+                    $version = $this->normalize($matches[2]);
+                } catch (\UnexpectedValueException $e) {
+                    // recover from an invalid constraint like foobar-dev which should be dev-foobar
+                    // except if the constraint uses a known operator, in which case it must be a parse error
+                    if (substr($matches[2], -4) === '-dev' && preg_match('{^[0-9a-zA-Z-./]+$}', $matches[2])) {
+                        $version = $this->normalize('dev-'.substr($matches[2], 0, -4));
+                    } else {
+                        throw $e;
+                    }
+                }
+
+                $op = $matches[1] ?: '=';
 
 
-                if (!empty($stabilityModifier) && $this->parseStability($version) === 'stable') {
+                if ($op !== '==' && $op !== '=' && !empty($stabilityModifier) && self::parseStability($version) === 'stable') {
                     $version .= '-' . $stabilityModifier;
                     $version .= '-' . $stabilityModifier;
-                } elseif ('<' === $matches[1] || '>=' === $matches[1]) {
+                } elseif ('<' === $op || '>=' === $op) {
                     if (!preg_match('/-' . self::$modifierRegex . '$/', strtolower($matches[2]))) {
                     if (!preg_match('/-' . self::$modifierRegex . '$/', strtolower($matches[2]))) {
-                        if (substr($matches[2], 0, 4) !== 'dev-') {
+                        if (strpos($matches[2], 'dev-') !== 0) {
                             $version .= '-dev';
                             $version .= '-dev';
                         }
                         }
                     }
                     }
@@ -490,12 +520,12 @@ class VersionParser
      *
      *
      * Support function for {@link parseConstraint()}
      * Support function for {@link parseConstraint()}
      *
      *
-     * @param array $matches Array with version parts in array indexes 1,2,3,4
-     * @param int $position 1,2,3,4 - which segment of the version to increment/decrement
-     * @param int $increment
-     * @param string $pad The string to pad version parts after $position
+     * @param array  $matches   Array with version parts in array indexes 1,2,3,4
+     * @param int    $position  1,2,3,4 - which segment of the version to increment/decrement
+     * @param int    $increment
+     * @param string $pad       The string to pad version parts after $position
      *
      *
-     * @return string The new version
+     * @return string|null The new version
      */
      */
     private function manipulateVersionString($matches, $position, $increment = 0, $pad = '0')
     private function manipulateVersionString($matches, $position, $increment = 0, $pad = '0')
     {
     {
@@ -511,7 +541,7 @@ class VersionParser
 
 
                     // Return null on a carry overflow
                     // Return null on a carry overflow
                     if ($i === 1) {
                     if ($i === 1) {
-                        return;
+                        return null;
                     }
                     }
                 }
                 }
             }
             }

+ 33 - 1
api/vendor/guzzlehttp/guzzle/CHANGELOG.md

@@ -2,7 +2,39 @@
 
 
 Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
 Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
 
 
-## UNRELEASED
+## 7.3.0 - 2021-03-23
+
+### Added
+
+- Support for DER and P12 certificates [#2413](https://github.com/guzzle/guzzle/pull/2413)
+- Support the cURL (http://) scheme for StreamHandler proxies [#2850](https://github.com/guzzle/guzzle/pull/2850)
+- Support for `guzzlehttp/psr7:^2.0` [#2878](https://github.com/guzzle/guzzle/pull/2878)
+
+### Fixed
+
+- Handle exceptions on invalid header consistently between PHP versions and handlers [#2872](https://github.com/guzzle/guzzle/pull/2872)
+
+## 7.2.0 - 2020-10-10
+
+### Added
+
+- Support for PHP 8 [#2712](https://github.com/guzzle/guzzle/pull/2712), [#2715](https://github.com/guzzle/guzzle/pull/2715), [#2789](https://github.com/guzzle/guzzle/pull/2789)
+- Support passing a body summarizer to the http errors middleware [#2795](https://github.com/guzzle/guzzle/pull/2795)
+
+### Fixed
+
+- Handle exceptions during response creation [#2591](https://github.com/guzzle/guzzle/pull/2591)
+- Fix CURLOPT_ENCODING not to be overwritten [#2595](https://github.com/guzzle/guzzle/pull/2595)
+- Make sure the Request always has a body object [#2804](https://github.com/guzzle/guzzle/pull/2804)
+
+### Changed
+
+- The `TooManyRedirectsException` has a response [#2660](https://github.com/guzzle/guzzle/pull/2660)
+- Avoid "functions" from dependencies [#2712](https://github.com/guzzle/guzzle/pull/2712)
+
+### Deprecated
+
+- Using environment variable GUZZLE_CURL_SELECT_TIMEOUT [#2786](https://github.com/guzzle/guzzle/pull/2786)
 
 
 ## 7.1.1 - 2020-09-30
 ## 7.1.1 - 2020-09-30
 
 

+ 7 - 6
api/vendor/guzzlehttp/guzzle/composer.json

@@ -28,10 +28,10 @@
         }
         }
     ],
     ],
     "require": {
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.2.5 || ^8.0",
         "ext-json": "*",
         "ext-json": "*",
-        "guzzlehttp/promises": "^1.0",
-        "guzzlehttp/psr7": "^1.6.1",
+        "guzzlehttp/promises": "^1.4",
+        "guzzlehttp/psr7": "^1.7 || ^2.0",
         "psr/http-client": "^1.0"
         "psr/http-client": "^1.0"
     },
     },
     "provide": {
     "provide": {
@@ -39,8 +39,9 @@
     },
     },
     "require-dev": {
     "require-dev": {
         "ext-curl": "*",
         "ext-curl": "*",
-        "php-http/client-integration-tests": "dev-phpunit8",
-        "phpunit/phpunit": "^8.5.5",
+        "bamarni/composer-bin-plugin": "^1.4.1",
+        "php-http/client-integration-tests": "^3.0",
+        "phpunit/phpunit": "^8.5.5 || ^9.3.5",
         "psr/log": "^1.1"
         "psr/log": "^1.1"
     },
     },
     "suggest": {
     "suggest": {
@@ -53,7 +54,7 @@
     },
     },
     "extra": {
     "extra": {
         "branch-alias": {
         "branch-alias": {
-            "dev-master": "7.1-dev"
+            "dev-master": "7.3-dev"
         }
         }
     },
     },
     "autoload": {
     "autoload": {

+ 0 - 87
api/vendor/guzzlehttp/guzzle/psalm.baseline.xml

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.11.5@3c60609c218d4d4b3b257728b8089094e5c6c6c2">
-  <file src="src/Client.php">
-    <NullArgument occurrences="1">
-      <code>null</code>
-    </NullArgument>
-    <PossiblyUndefinedVariable occurrences="1">
-      <code>$options</code>
-    </PossiblyUndefinedVariable>
-    <UndefinedInterfaceMethod occurrences="1">
-      <code>getBoundary</code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="src/Cookie/CookieJar.php">
-    <PossiblyFalseOperand occurrences="1">
-      <code>$result</code>
-    </PossiblyFalseOperand>
-  </file>
-  <file src="src/Exception/RequestException.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$uri</code>
-    </ImplicitToStringCast>
-  </file>
-  <file src="src/Handler/CurlFactory.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$easy-&gt;request-&gt;getUri()</code>
-    </ImplicitToStringCast>
-    <TypeDoesNotContainType occurrences="1">
-      <code>$timeoutRequiresNoSignal &amp;&amp; \strtoupper(\substr(\PHP_OS, 0, 3)) !== 'WIN'</code>
-    </TypeDoesNotContainType>
-  </file>
-  <file src="src/Handler/CurlMultiHandler.php">
-    <InvalidArgument occurrences="1">
-      <code>$this-&gt;active</code>
-    </InvalidArgument>
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$this-&gt;active</code>
-    </InvalidPropertyAssignmentValue>
-    <UndefinedThisPropertyAssignment occurrences="1">
-      <code>$this-&gt;_mh</code>
-    </UndefinedThisPropertyAssignment>
-  </file>
-  <file src="src/Handler/MockHandler.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$options['delay'] * 1000</code>
-    </InvalidScalarArgument>
-  </file>
-  <file src="src/Handler/StreamHandler.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$uri</code>
-    </ImplicitToStringCast>
-  </file>
-  <file src="src/HandlerStack.php">
-    <PropertyTypeCoercion occurrences="4">
-      <code>$this-&gt;stack</code>
-      <code>$this-&gt;stack</code>
-      <code>$this-&gt;stack</code>
-      <code>$this-&gt;stack</code>
-    </PropertyTypeCoercion>
-  </file>
-  <file src="src/MessageFormatter.php">
-    <InvalidScalarArgument occurrences="1"/>
-  </file>
-  <file src="src/Middleware.php">
-    <InvalidArgument occurrences="1">
-      <code>$request</code>
-    </InvalidArgument>
-  </file>
-  <file src="src/RedirectMiddleware.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$location</code>
-    </ImplicitToStringCast>
-  </file>
-  <file src="src/RetryMiddleware.php">
-    <TooManyArguments occurrences="1">
-      <code>($this-&gt;delay)(++$options['retries'], $response)</code>
-    </TooManyArguments>
-  </file>
-  <file src="src/Utils.php">
-    <ForbiddenCode occurrences="1">
-      <code>\var_dump($input)</code>
-    </ForbiddenCode>
-    <PossiblyNullArgument occurrences="1">
-      <code>$info</code>
-    </PossiblyNullArgument>
-  </file>
-</files>

+ 0 - 16
api/vendor/guzzlehttp/guzzle/psalm.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="3"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm.baseline.xml"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>

+ 28 - 0
api/vendor/guzzlehttp/guzzle/src/BodySummarizer.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace GuzzleHttp;
+
+use Psr\Http\Message\MessageInterface;
+
+final class BodySummarizer implements BodySummarizerInterface
+{
+    /**
+     * @var int|null
+     */
+    private $truncateAt;
+
+    public function __construct(int $truncateAt = null)
+    {
+        $this->truncateAt = $truncateAt;
+    }
+
+    /**
+     * Returns a summarized message body.
+     */
+    public function summarize(MessageInterface $message): ?string
+    {
+        return $this->truncateAt === null
+            ? \GuzzleHttp\Psr7\Message::bodySummary($message)
+            : \GuzzleHttp\Psr7\Message::bodySummary($message, $this->truncateAt);
+    }
+}

+ 13 - 0
api/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace GuzzleHttp;
+
+use Psr\Http\Message\MessageInterface;
+
+interface BodySummarizerInterface
+{
+    /**
+     * Returns a summarized message body.
+     */
+    public function summarize(MessageInterface $message): ?string;
+}

+ 15 - 14
api/vendor/guzzlehttp/guzzle/src/Client.php

@@ -5,6 +5,7 @@ namespace GuzzleHttp;
 use GuzzleHttp\Cookie\CookieJar;
 use GuzzleHttp\Cookie\CookieJar;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\InvalidArgumentException;
 use GuzzleHttp\Exception\InvalidArgumentException;
+use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -63,7 +64,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
 
 
         // Convert the base_uri to a UriInterface
         // Convert the base_uri to a UriInterface
         if (isset($config['base_uri'])) {
         if (isset($config['base_uri'])) {
-            $config['base_uri'] = Psr7\uri_for($config['base_uri']);
+            $config['base_uri'] = Psr7\Utils::uriFor($config['base_uri']);
         }
         }
 
 
         $this->configureDefaults($config);
         $this->configureDefaults($config);
@@ -156,7 +157,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
         $body = $options['body'] ?? null;
         $body = $options['body'] ?? null;
         $version = $options['version'] ?? '1.1';
         $version = $options['version'] ?? '1.1';
         // Merge the URI into the base URI.
         // Merge the URI into the base URI.
-        $uri = $this->buildUri(Psr7\uri_for($uri), $options);
+        $uri = $this->buildUri(Psr7\Utils::uriFor($uri), $options);
         if (\is_array($body)) {
         if (\is_array($body)) {
             throw $this->invalidBody();
             throw $this->invalidBody();
         }
         }
@@ -203,13 +204,13 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
     {
     {
         return $option === null
         return $option === null
             ? $this->config
             ? $this->config
-            : (isset($this->config[$option]) ? $this->config[$option] : null);
+            : ($this->config[$option] ?? null);
     }
     }
 
 
     private function buildUri(UriInterface $uri, array $config): UriInterface
     private function buildUri(UriInterface $uri, array $config): UriInterface
     {
     {
         if (isset($config['base_uri'])) {
         if (isset($config['base_uri'])) {
-            $uri = Psr7\UriResolver::resolve(Psr7\uri_for($config['base_uri']), $uri);
+            $uri = Psr7\UriResolver::resolve(Psr7\Utils::uriFor($config['base_uri']), $uri);
         }
         }
 
 
         if (isset($config['idn_conversion']) && ($config['idn_conversion'] !== false)) {
         if (isset($config['idn_conversion']) && ($config['idn_conversion'] !== false)) {
@@ -327,9 +328,9 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
         $handler = $options['handler'];
         $handler = $options['handler'];
 
 
         try {
         try {
-            return Promise\promise_for($handler($request, $options));
+            return P\Create::promiseFor($handler($request, $options));
         } catch (\Exception $e) {
         } catch (\Exception $e) {
-            return Promise\rejection_for($e);
+            return P\Create::rejectionFor($e);
         }
         }
     }
     }
 
 
@@ -358,7 +359,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
             $options['body'] = \http_build_query($options['form_params'], '', '&');
             $options['body'] = \http_build_query($options['form_params'], '', '&');
             unset($options['form_params']);
             unset($options['form_params']);
             // Ensure that we don't have the header in different case and set the new value.
             // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\_caseless_remove(['Content-Type'], $options['_conditional']);
+            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
             $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
             $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
         }
         }
 
 
@@ -371,7 +372,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
             $options['body'] = Utils::jsonEncode($options['json']);
             $options['body'] = Utils::jsonEncode($options['json']);
             unset($options['json']);
             unset($options['json']);
             // Ensure that we don't have the header in different case and set the new value.
             // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\_caseless_remove(['Content-Type'], $options['_conditional']);
+            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
             $options['_conditional']['Content-Type'] = 'application/json';
             $options['_conditional']['Content-Type'] = 'application/json';
         }
         }
 
 
@@ -379,7 +380,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
             && $options['decode_content'] !== true
             && $options['decode_content'] !== true
         ) {
         ) {
             // Ensure that we don't have the header in different case and set the new value.
             // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\_caseless_remove(['Accept-Encoding'], $options['_conditional']);
+            $options['_conditional'] = Psr7\Utils::caselessRemove(['Accept-Encoding'], $options['_conditional']);
             $modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
             $modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
         }
         }
 
 
@@ -387,7 +388,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
             if (\is_array($options['body'])) {
             if (\is_array($options['body'])) {
                 throw $this->invalidBody();
                 throw $this->invalidBody();
             }
             }
-            $modify['body'] = Psr7\stream_for($options['body']);
+            $modify['body'] = Psr7\Utils::streamFor($options['body']);
             unset($options['body']);
             unset($options['body']);
         }
         }
 
 
@@ -397,7 +398,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
             switch ($type) {
             switch ($type) {
                 case 'basic':
                 case 'basic':
                     // Ensure that we don't have the header in different case and set the new value.
                     // Ensure that we don't have the header in different case and set the new value.
-                    $modify['set_headers'] = Psr7\_caseless_remove(['Authorization'], $modify['set_headers']);
+                    $modify['set_headers'] = Psr7\Utils::caselessRemove(['Authorization'], $modify['set_headers']);
                     $modify['set_headers']['Authorization'] = 'Basic '
                     $modify['set_headers']['Authorization'] = 'Basic '
                         . \base64_encode("$value[0]:$value[1]");
                         . \base64_encode("$value[0]:$value[1]");
                     break;
                     break;
@@ -433,11 +434,11 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
             }
             }
         }
         }
 
 
-        $request = Psr7\modify_request($request, $modify);
+        $request = Psr7\Utils::modifyRequest($request, $modify);
         if ($request->getBody() instanceof Psr7\MultipartStream) {
         if ($request->getBody() instanceof Psr7\MultipartStream) {
             // Use a multipart/form-data POST if a Content-Type is not set.
             // Use a multipart/form-data POST if a Content-Type is not set.
             // Ensure that we don't have the header in different case and set the new value.
             // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\_caseless_remove(['Content-Type'], $options['_conditional']);
+            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
             $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='
             $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='
                 . $request->getBody()->getBoundary();
                 . $request->getBody()->getBoundary();
         }
         }
@@ -451,7 +452,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
                     $modify['set_headers'][$k] = $v;
                     $modify['set_headers'][$k] = $v;
                 }
                 }
             }
             }
-            $request = Psr7\modify_request($request, $modify);
+            $request = Psr7\Utils::modifyRequest($request, $modify);
             // Don't pass this internal value along to middleware/handlers.
             // Don't pass this internal value along to middleware/handlers.
             unset($options['_conditional']);
             unset($options['_conditional']);
         }
         }

+ 1 - 4
api/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php

@@ -36,10 +36,7 @@ interface CookieJarInterface extends \Countable, \IteratorAggregate
      * @param RequestInterface  $request  Request that was sent
      * @param RequestInterface  $request  Request that was sent
      * @param ResponseInterface $response Response that was received
      * @param ResponseInterface $response Response that was received
      */
      */
-    public function extractCookies(
-        RequestInterface $request,
-        ResponseInterface $response
-    ): void;
+    public function extractCookies(RequestInterface $request, ResponseInterface $response): void;
 
 
     /**
     /**
      * Sets a cookie in the cookie jar.
      * Sets a cookie in the cookie jar.

+ 13 - 11
api/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php

@@ -2,6 +2,8 @@
 
 
 namespace GuzzleHttp\Exception;
 namespace GuzzleHttp\Exception;
 
 
+use GuzzleHttp\BodySummarizer;
+use GuzzleHttp\BodySummarizerInterface;
 use Psr\Http\Client\RequestExceptionInterface;
 use Psr\Http\Client\RequestExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -47,24 +49,24 @@ class RequestException extends TransferException implements RequestExceptionInte
      */
      */
     public static function wrapException(RequestInterface $request, \Throwable $e): RequestException
     public static function wrapException(RequestInterface $request, \Throwable $e): RequestException
     {
     {
-        return $e instanceof RequestException
-            ? $e
-            : new RequestException($e->getMessage(), $request, null, $e);
+        return $e instanceof RequestException ? $e : new RequestException($e->getMessage(), $request, null, $e);
     }
     }
 
 
     /**
     /**
      * Factory method to create a new exception with a normalized error message
      * Factory method to create a new exception with a normalized error message
      *
      *
-     * @param RequestInterface  $request  Request
-     * @param ResponseInterface $response Response received
-     * @param \Throwable        $previous Previous exception
-     * @param array             $ctx      Optional handler context.
+     * @param RequestInterface             $request        Request sent
+     * @param ResponseInterface            $response       Response received
+     * @param \Throwable|null              $previous       Previous exception
+     * @param array                        $handlerContext Optional handler context
+     * @param BodySummarizerInterface|null $bodySummarizer Optional body summarizer
      */
      */
     public static function create(
     public static function create(
         RequestInterface $request,
         RequestInterface $request,
         ResponseInterface $response = null,
         ResponseInterface $response = null,
         \Throwable $previous = null,
         \Throwable $previous = null,
-        array $ctx = []
+        array $handlerContext = [],
+        BodySummarizerInterface $bodySummarizer = null
     ): self {
     ): self {
         if (!$response) {
         if (!$response) {
             return new self(
             return new self(
@@ -72,7 +74,7 @@ class RequestException extends TransferException implements RequestExceptionInte
                 $request,
                 $request,
                 null,
                 null,
                 $previous,
                 $previous,
-                $ctx
+                $handlerContext
             );
             );
         }
         }
 
 
@@ -102,13 +104,13 @@ class RequestException extends TransferException implements RequestExceptionInte
             $response->getReasonPhrase()
             $response->getReasonPhrase()
         );
         );
 
 
-        $summary = \GuzzleHttp\Psr7\get_message_body_summary($response);
+        $summary = ($bodySummarizer ?? new BodySummarizer())->summarize($response);
 
 
         if ($summary !== null) {
         if ($summary !== null) {
             $message .= ":\n{$summary}\n";
             $message .= ":\n{$summary}\n";
         }
         }
 
 
-        return new $className($message, $request, $response, $previous, $ctx);
+        return new $className($message, $request, $response, $previous, $handlerContext);
     }
     }
 
 
     /**
     /**

+ 59 - 67
api/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php

@@ -4,6 +4,7 @@ namespace GuzzleHttp\Handler;
 
 
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7\LazyOpenStream;
 use GuzzleHttp\Psr7\LazyOpenStream;
@@ -26,7 +27,7 @@ class CurlFactory implements CurlFactoryInterface
     public const LOW_CURL_VERSION_NUMBER = '7.21.2';
     public const LOW_CURL_VERSION_NUMBER = '7.21.2';
 
 
     /**
     /**
-     * @var resource[]
+     * @var resource[]|\CurlHandle[]
      */
      */
     private $handles = [];
     private $handles = [];
 
 
@@ -65,9 +66,7 @@ class CurlFactory implements CurlFactoryInterface
         }
         }
 
 
         $conf[\CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy);
         $conf[\CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy);
-        $easy->handle = $this->handles
-            ? \array_pop($this->handles)
-            : \curl_init();
+        $easy->handle = $this->handles ? \array_pop($this->handles) : \curl_init();
         curl_setopt_array($easy->handle, $conf);
         curl_setopt_array($easy->handle, $conf);
 
 
         return $easy;
         return $easy;
@@ -101,11 +100,8 @@ class CurlFactory implements CurlFactoryInterface
      * @param callable(RequestInterface, array): PromiseInterface $handler
      * @param callable(RequestInterface, array): PromiseInterface $handler
      * @param CurlFactoryInterface                                $factory Dictates how the handle is released
      * @param CurlFactoryInterface                                $factory Dictates how the handle is released
      */
      */
-    public static function finish(
-        callable $handler,
-        EasyHandle $easy,
-        CurlFactoryInterface $factory
-    ): PromiseInterface {
+    public static function finish(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface
+    {
         if (isset($easy->options['on_stats'])) {
         if (isset($easy->options['on_stats'])) {
             self::invokeStats($easy);
             self::invokeStats($easy);
         }
         }
@@ -143,11 +139,8 @@ class CurlFactory implements CurlFactoryInterface
     /**
     /**
      * @param callable(RequestInterface, array): PromiseInterface $handler
      * @param callable(RequestInterface, array): PromiseInterface $handler
      */
      */
-    private static function finishError(
-        callable $handler,
-        EasyHandle $easy,
-        CurlFactoryInterface $factory
-    ): PromiseInterface {
+    private static function finishError(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface
+    {
         // Get error information and release the handle to the factory.
         // Get error information and release the handle to the factory.
         $ctx = [
         $ctx = [
             'errno' => $easy->errno,
             'errno' => $easy->errno,
@@ -158,9 +151,7 @@ class CurlFactory implements CurlFactoryInterface
         $factory->release($easy);
         $factory->release($easy);
 
 
         // Retry when nothing is present or when curl failed to rewind.
         // Retry when nothing is present or when curl failed to rewind.
-        if (empty($easy->options['_err_message'])
-            && (!$easy->errno || $easy->errno == 65)
-        ) {
+        if (empty($easy->options['_err_message']) && (!$easy->errno || $easy->errno == 65)) {
             return self::retryFailedRewind($handler, $easy, $ctx);
             return self::retryFailedRewind($handler, $easy, $ctx);
         }
         }
 
 
@@ -177,10 +168,22 @@ class CurlFactory implements CurlFactoryInterface
             \CURLE_GOT_NOTHING          => true,
             \CURLE_GOT_NOTHING          => true,
         ];
         ];
 
 
+        if ($easy->createResponseException) {
+            return P\Create::rejectionFor(
+                new RequestException(
+                    'An error was encountered while creating the response',
+                    $easy->request,
+                    $easy->response,
+                    $easy->createResponseException,
+                    $ctx
+                )
+            );
+        }
+
         // If an exception was encountered during the onHeaders event, then
         // If an exception was encountered during the onHeaders event, then
         // return a rejected promise that wraps that exception.
         // return a rejected promise that wraps that exception.
         if ($easy->onHeadersException) {
         if ($easy->onHeadersException) {
-            return \GuzzleHttp\Promise\rejection_for(
+            return P\Create::rejectionFor(
                 new RequestException(
                 new RequestException(
                     'An error was encountered during the on_headers event',
                     'An error was encountered during the on_headers event',
                     $easy->request,
                     $easy->request,
@@ -207,7 +210,7 @@ class CurlFactory implements CurlFactoryInterface
             ? new ConnectException($message, $easy->request, null, $ctx)
             ? new ConnectException($message, $easy->request, null, $ctx)
             : new RequestException($message, $easy->request, $easy->response, null, $ctx);
             : new RequestException($message, $easy->request, $easy->response, null, $ctx);
 
 
-        return \GuzzleHttp\Promise\rejection_for($error);
+        return P\Create::rejectionFor($error);
     }
     }
 
 
     /**
     /**
@@ -275,9 +278,7 @@ class CurlFactory implements CurlFactoryInterface
 
 
         // Send the body as a string if the size is less than 1MB OR if the
         // Send the body as a string if the size is less than 1MB OR if the
         // [curl][body_as_string] request value is set.
         // [curl][body_as_string] request value is set.
-        if (($size !== null && $size < 1000000) ||
-            !empty($options['_body_as_string'])
-        ) {
+        if (($size !== null && $size < 1000000) || !empty($options['_body_as_string'])) {
             $conf[\CURLOPT_POSTFIELDS] = (string) $request->getBody();
             $conf[\CURLOPT_POSTFIELDS] = (string) $request->getBody();
             // Don't duplicate the Content-Length header
             // Don't duplicate the Content-Length header
             $this->removeHeader('Content-Length', $conf);
             $this->removeHeader('Content-Length', $conf);
@@ -359,9 +360,7 @@ class CurlFactory implements CurlFactoryInterface
                 if (\is_string($options['verify'])) {
                 if (\is_string($options['verify'])) {
                     // Throw an error if the file/folder/link path is not valid or doesn't exist.
                     // Throw an error if the file/folder/link path is not valid or doesn't exist.
                     if (!\file_exists($options['verify'])) {
                     if (!\file_exists($options['verify'])) {
-                        throw new \InvalidArgumentException(
-                            "SSL CA bundle not found: {$options['verify']}"
-                        );
+                        throw new \InvalidArgumentException("SSL CA bundle not found: {$options['verify']}");
                     }
                     }
                     // If it's a directory or a link to a directory use CURLOPT_CAPATH.
                     // If it's a directory or a link to a directory use CURLOPT_CAPATH.
                     // If not, it's probably a file, or a link to a file, so use CURLOPT_CAINFO.
                     // If not, it's probably a file, or a link to a file, so use CURLOPT_CAINFO.
@@ -381,7 +380,7 @@ class CurlFactory implements CurlFactoryInterface
             }
             }
         }
         }
 
 
-        if (!empty($options['decode_content'])) {
+        if (!isset($options['curl'][\CURLOPT_ENCODING]) && !empty($options['decode_content'])) {
             $accept = $easy->request->getHeaderLine('Accept-Encoding');
             $accept = $easy->request->getHeaderLine('Accept-Encoding');
             if ($accept) {
             if ($accept) {
                 $conf[\CURLOPT_ENCODING] = $accept;
                 $conf[\CURLOPT_ENCODING] = $accept;
@@ -392,30 +391,23 @@ class CurlFactory implements CurlFactoryInterface
             }
             }
         }
         }
 
 
-        // Do not connect a sink for HEAD requests.
-        if ($easy->request->getMethod() !== 'HEAD') {
-            if (!isset($options['sink'])) {
-                // Use a default temp stream if no sink was set.
-                $options['sink'] = \fopen('php://temp', 'w+');
-            }
-            $sink = $options['sink'];
-            if (!\is_string($sink)) {
-                $sink = \GuzzleHttp\Psr7\stream_for($sink);
-            } elseif (!\is_dir(\dirname($sink))) {
-                // Ensure that the directory exists before failing in curl.
-                throw new \RuntimeException(\sprintf(
-                    'Directory %s does not exist for sink value of %s',
-                    \dirname($sink),
-                    $sink
-                ));
-            } else {
-                $sink = new LazyOpenStream($sink, 'w+');
-            }
-            $easy->sink = $sink;
-            $conf[\CURLOPT_WRITEFUNCTION] = static function ($ch, $write) use ($sink): int {
-                return $sink->write($write);
-            };
+        if (!isset($options['sink'])) {
+            // Use a default temp stream if no sink was set.
+            $options['sink'] = \GuzzleHttp\Psr7\Utils::tryFopen('php://temp', 'w+');
+        }
+        $sink = $options['sink'];
+        if (!\is_string($sink)) {
+            $sink = \GuzzleHttp\Psr7\Utils::streamFor($sink);
+        } elseif (!\is_dir(\dirname($sink))) {
+            // Ensure that the directory exists before failing in curl.
+            throw new \RuntimeException(\sprintf('Directory %s does not exist for sink value of %s', \dirname($sink), $sink));
+        } else {
+            $sink = new LazyOpenStream($sink, 'w+');
         }
         }
+        $easy->sink = $sink;
+        $conf[\CURLOPT_WRITEFUNCTION] = static function ($ch, $write) use ($sink): int {
+            return $sink->write($write);
+        };
 
 
         $timeoutRequiresNoSignal = false;
         $timeoutRequiresNoSignal = false;
         if (isset($options['timeout'])) {
         if (isset($options['timeout'])) {
@@ -448,9 +440,7 @@ class CurlFactory implements CurlFactoryInterface
                 $scheme = $easy->request->getUri()->getScheme();
                 $scheme = $easy->request->getUri()->getScheme();
                 if (isset($options['proxy'][$scheme])) {
                 if (isset($options['proxy'][$scheme])) {
                     $host = $easy->request->getUri()->getHost();
                     $host = $easy->request->getUri()->getHost();
-                    if (!isset($options['proxy']['no']) ||
-                        !Utils::isHostInNoProxy($host, $options['proxy']['no'])
-                    ) {
+                    if (!isset($options['proxy']['no']) || !Utils::isHostInNoProxy($host, $options['proxy']['no'])) {
                         $conf[\CURLOPT_PROXY] = $options['proxy'][$scheme];
                         $conf[\CURLOPT_PROXY] = $options['proxy'][$scheme];
                     }
                     }
                 }
                 }
@@ -464,9 +454,13 @@ class CurlFactory implements CurlFactoryInterface
                 $cert = $cert[0];
                 $cert = $cert[0];
             }
             }
             if (!\file_exists($cert)) {
             if (!\file_exists($cert)) {
-                throw new \InvalidArgumentException(
-                    "SSL certificate not found: {$cert}"
-                );
+                throw new \InvalidArgumentException("SSL certificate not found: {$cert}");
+            }
+            # OpenSSL (versions 0.9.3 and later) also support "P12" for PKCS#12-encoded files.
+            # see https://curl.se/libcurl/c/CURLOPT_SSLCERTTYPE.html
+            $ext = pathinfo($cert, \PATHINFO_EXTENSION);
+            if (preg_match('#^(der|p12)$#i', $ext)) {
+                $conf[\CURLOPT_SSLCERTTYPE] = strtoupper($ext);
             }
             }
             $conf[\CURLOPT_SSLCERT] = $cert;
             $conf[\CURLOPT_SSLCERT] = $cert;
         }
         }
@@ -483,9 +477,7 @@ class CurlFactory implements CurlFactoryInterface
             $sslKey = $sslKey ?? $options['ssl_key'];
             $sslKey = $sslKey ?? $options['ssl_key'];
 
 
             if (!\file_exists($sslKey)) {
             if (!\file_exists($sslKey)) {
-                throw new \InvalidArgumentException(
-                    "SSL private key not found: {$sslKey}"
-                );
+                throw new \InvalidArgumentException("SSL private key not found: {$sslKey}");
             }
             }
             $conf[\CURLOPT_SSLKEY] = $sslKey;
             $conf[\CURLOPT_SSLKEY] = $sslKey;
         }
         }
@@ -493,9 +485,7 @@ class CurlFactory implements CurlFactoryInterface
         if (isset($options['progress'])) {
         if (isset($options['progress'])) {
             $progress = $options['progress'];
             $progress = $options['progress'];
             if (!\is_callable($progress)) {
             if (!\is_callable($progress)) {
-                throw new \InvalidArgumentException(
-                    'progress client option must be callable'
-                );
+                throw new \InvalidArgumentException('progress client option must be callable');
             }
             }
             $conf[\CURLOPT_NOPROGRESS] = false;
             $conf[\CURLOPT_NOPROGRESS] = false;
             $conf[\CURLOPT_PROGRESSFUNCTION] = static function ($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use ($progress) {
             $conf[\CURLOPT_PROGRESSFUNCTION] = static function ($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use ($progress) {
@@ -520,11 +510,8 @@ class CurlFactory implements CurlFactoryInterface
      *
      *
      * @param callable(RequestInterface, array): PromiseInterface $handler
      * @param callable(RequestInterface, array): PromiseInterface $handler
      */
      */
-    private static function retryFailedRewind(
-        callable $handler,
-        EasyHandle $easy,
-        array $ctx
-    ): PromiseInterface {
+    private static function retryFailedRewind(callable $handler, EasyHandle $easy, array $ctx): PromiseInterface
+    {
         try {
         try {
             // Only rewind if the body has been read from.
             // Only rewind if the body has been read from.
             $body = $easy->request->getBody();
             $body = $easy->request->getBody();
@@ -577,7 +564,12 @@ class CurlFactory implements CurlFactoryInterface
             $value = \trim($h);
             $value = \trim($h);
             if ($value === '') {
             if ($value === '') {
                 $startingResponse = true;
                 $startingResponse = true;
-                $easy->createResponse();
+                try {
+                    $easy->createResponse();
+                } catch (\Exception $e) {
+                    $easy->createResponseException = $e;
+                    return -1;
+                }
                 if ($onHeaders !== null) {
                 if ($onHeaders !== null) {
                     try {
                     try {
                         $onHeaders($easy->response);
                         $onHeaders($easy->response);

+ 8 - 13
api/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php

@@ -15,7 +15,7 @@ use Psr\Http\Message\RequestInterface;
  * associative array of curl option constants mapping to values in the
  * associative array of curl option constants mapping to values in the
  * **curl** key of the provided request options.
  * **curl** key of the provided request options.
  *
  *
- * @property resource $_mh Internal use only. Lazy loaded multi-handle.
+ * @property resource|\CurlMultiHandle $_mh Internal use only. Lazy loaded multi-handle.
  *
  *
  * @final
  * @final
  */
  */
@@ -32,7 +32,7 @@ class CurlMultiHandler
     private $selectTimeout;
     private $selectTimeout;
 
 
     /**
     /**
-     * @var resource|null the currently executing resource in `curl_multi_exec`.
+     * @var resource|\CurlMultiHandle|null the currently executing resource in `curl_multi_exec`.
      */
      */
     private $active;
     private $active;
 
 
@@ -71,6 +71,7 @@ class CurlMultiHandler
         if (isset($options['select_timeout'])) {
         if (isset($options['select_timeout'])) {
             $this->selectTimeout = $options['select_timeout'];
             $this->selectTimeout = $options['select_timeout'];
         } elseif ($selectTimeout = Utils::getenv('GUZZLE_CURL_SELECT_TIMEOUT')) {
         } elseif ($selectTimeout = Utils::getenv('GUZZLE_CURL_SELECT_TIMEOUT')) {
+            @trigger_error('Since guzzlehttp/guzzle 7.2.0: Using environment variable GUZZLE_CURL_SELECT_TIMEOUT is deprecated. Use option "select_timeout" instead.', \E_USER_DEPRECATED);
             $this->selectTimeout = (int) $selectTimeout;
             $this->selectTimeout = (int) $selectTimeout;
         } else {
         } else {
             $this->selectTimeout = 1;
             $this->selectTimeout = 1;
@@ -82,7 +83,7 @@ class CurlMultiHandler
     /**
     /**
      * @param string $name
      * @param string $name
      *
      *
-     * @return resource
+     * @return resource|\CurlMultiHandle
      *
      *
      * @throws \BadMethodCallException when another field as `_mh` will be gotten
      * @throws \BadMethodCallException when another field as `_mh` will be gotten
      * @throws \RuntimeException       when curl can not initialize a multi handle
      * @throws \RuntimeException       when curl can not initialize a multi handle
@@ -154,11 +155,9 @@ class CurlMultiHandler
         }
         }
 
 
         // Step through the task queue which may add additional requests.
         // Step through the task queue which may add additional requests.
-        P\queue()->run();
+        P\Utils::queue()->run();
 
 
-        if ($this->active &&
-            \curl_multi_select($this->_mh, $this->selectTimeout) === -1
-        ) {
+        if ($this->active && \curl_multi_select($this->_mh, $this->selectTimeout) === -1) {
             // Perform a usleep if a select returns -1.
             // Perform a usleep if a select returns -1.
             // See: https://bugs.php.net/bug.php?id=61141
             // See: https://bugs.php.net/bug.php?id=61141
             \usleep(250);
             \usleep(250);
@@ -174,7 +173,7 @@ class CurlMultiHandler
      */
      */
     public function execute(): void
     public function execute(): void
     {
     {
-        $queue = P\queue();
+        $queue = P\Utils::queue();
 
 
         while ($this->handles || !$queue->isEmpty()) {
         while ($this->handles || !$queue->isEmpty()) {
             // If there are no transfers, then sleep for the next delay
             // If there are no transfers, then sleep for the next delay
@@ -234,11 +233,7 @@ class CurlMultiHandler
             unset($this->handles[$id], $this->delays[$id]);
             unset($this->handles[$id], $this->delays[$id]);
             $entry['easy']->errno = $done['result'];
             $entry['easy']->errno = $done['result'];
             $entry['deferred']->resolve(
             $entry['deferred']->resolve(
-                CurlFactory::finish(
-                    $this,
-                    $entry['easy'],
-                    $this->factory
-                )
+                CurlFactory::finish($this, $entry['easy'], $this->factory)
             );
             );
         }
         }
     }
     }

+ 16 - 23
api/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php

@@ -16,7 +16,7 @@ use Psr\Http\Message\StreamInterface;
 final class EasyHandle
 final class EasyHandle
 {
 {
     /**
     /**
-     * @var resource cURL resource
+     * @var resource|\CurlHandle cURL resource
      */
      */
     public $handle;
     public $handle;
 
 
@@ -55,31 +55,28 @@ final class EasyHandle
      */
      */
     public $onHeadersException;
     public $onHeadersException;
 
 
+    /**
+     * @var \Exception|null Exception during createResponse (if any)
+     */
+    public $createResponseException;
+
     /**
     /**
      * Attach a response to the easy handle based on the received headers.
      * Attach a response to the easy handle based on the received headers.
      *
      *
-     * @throws \RuntimeException if no headers have been received.
+     * @throws \RuntimeException if no headers have been received or the first
+     *                           header line is invalid.
      */
      */
     public function createResponse(): void
     public function createResponse(): void
     {
     {
-        if (empty($this->headers)) {
-            throw new \RuntimeException('No headers have been received');
-        }
+        [$ver, $status, $reason, $headers] = HeaderProcessor::parseHeaders($this->headers);
 
 
-        // HTTP-version SP status-code SP reason-phrase
-        $startLine = \explode(' ', \array_shift($this->headers), 3);
-        $headers = Utils::headersFromLines($this->headers);
         $normalizedKeys = Utils::normalizeHeaderKeys($headers);
         $normalizedKeys = Utils::normalizeHeaderKeys($headers);
 
 
-        if (!empty($this->options['decode_content'])
-            && isset($normalizedKeys['content-encoding'])
-        ) {
-            $headers['x-encoded-content-encoding']
-                = $headers[$normalizedKeys['content-encoding']];
+        if (!empty($this->options['decode_content']) && isset($normalizedKeys['content-encoding'])) {
+            $headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']];
             unset($headers[$normalizedKeys['content-encoding']]);
             unset($headers[$normalizedKeys['content-encoding']]);
             if (isset($normalizedKeys['content-length'])) {
             if (isset($normalizedKeys['content-length'])) {
-                $headers['x-encoded-content-length']
-                    = $headers[$normalizedKeys['content-length']];
+                $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
 
 
                 $bodyLength = (int) $this->sink->getSize();
                 $bodyLength = (int) $this->sink->getSize();
                 if ($bodyLength) {
                 if ($bodyLength) {
@@ -90,15 +87,13 @@ final class EasyHandle
             }
             }
         }
         }
 
 
-        $statusCode = (int) $startLine[1];
-
         // Attach a response to the easy handle with the parsed headers.
         // Attach a response to the easy handle with the parsed headers.
         $this->response = new Response(
         $this->response = new Response(
-            $statusCode,
+            $status,
             $headers,
             $headers,
             $this->sink,
             $this->sink,
-            \substr($startLine[0], 5),
-            isset($startLine[2]) ? (string) $startLine[2] : null
+            $ver,
+            $reason
         );
         );
     }
     }
 
 
@@ -111,9 +106,7 @@ final class EasyHandle
      */
      */
     public function __get($name)
     public function __get($name)
     {
     {
-        $msg = $name === 'handle'
-            ? 'The EasyHandle has been released'
-            : 'Invalid property: ' . $name;
+        $msg = $name === 'handle' ? 'The EasyHandle has been released' : 'Invalid property: ' . $name;
         throw new \BadMethodCallException($msg);
         throw new \BadMethodCallException($msg);
     }
     }
 }
 }

+ 42 - 0
api/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace GuzzleHttp\Handler;
+
+use GuzzleHttp\Utils;
+
+/**
+ * @internal
+ */
+final class HeaderProcessor
+{
+    /**
+     * Returns the HTTP version, status code, reason phrase, and headers.
+     *
+     * @param string[] $headers
+     *
+     * @throws \RuntimeException
+     *
+     * @return array{0:string, 1:int, 2:?string, 3:array}
+     */
+    public static function parseHeaders(array $headers): array
+    {
+        if ($headers === []) {
+            throw new \RuntimeException('Expected a non-empty array of header data');
+        }
+
+        $parts = \explode(' ', \array_shift($headers), 3);
+        $version = \explode('/', $parts[0])[1] ?? null;
+
+        if ($version === null) {
+            throw new \RuntimeException('HTTP version missing from header data');
+        }
+
+        $status = $parts[1] ?? null;
+
+        if ($status === null) {
+            throw new \RuntimeException('HTTP status code missing from header data');
+        }
+
+        return [$version, (int) $status, $parts[2] ?? null, Utils::headersFromLines($headers)];
+    }
+}

+ 8 - 13
api/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php

@@ -4,6 +4,7 @@ namespace GuzzleHttp\Handler;
 
 
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\TransferStats;
 use GuzzleHttp\TransferStats;
 use GuzzleHttp\Utils;
 use GuzzleHttp\Utils;
@@ -51,11 +52,8 @@ class MockHandler implements \Countable
      * @param callable|null $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null $onRejected  Callback to invoke when the return value is rejected.
      * @param callable|null $onRejected  Callback to invoke when the return value is rejected.
      */
      */
-    public static function createWithMiddleware(
-        array $queue = null,
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ): HandlerStack {
+    public static function createWithMiddleware(array $queue = null, callable $onFulfilled = null, callable $onRejected = null): HandlerStack
+    {
         return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
         return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
     }
     }
 
 
@@ -68,11 +66,8 @@ class MockHandler implements \Countable
      * @param callable|null          $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null          $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null          $onRejected  Callback to invoke when the return value is rejected.
      * @param callable|null          $onRejected  Callback to invoke when the return value is rejected.
      */
      */
-    public function __construct(
-        array $queue = null,
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
+    public function __construct(array $queue = null, callable $onFulfilled = null, callable $onRejected = null)
+    {
         $this->onFulfilled = $onFulfilled;
         $this->onFulfilled = $onFulfilled;
         $this->onRejected = $onRejected;
         $this->onRejected = $onRejected;
 
 
@@ -113,8 +108,8 @@ class MockHandler implements \Countable
         }
         }
 
 
         $response = $response instanceof \Throwable
         $response = $response instanceof \Throwable
-            ? \GuzzleHttp\Promise\rejection_for($response)
-            : \GuzzleHttp\Promise\promise_for($response);
+            ? P\Create::rejectionFor($response)
+            : P\Create::promiseFor($response);
 
 
         return $response->then(
         return $response->then(
             function (?ResponseInterface $value) use ($request, $options) {
             function (?ResponseInterface $value) use ($request, $options) {
@@ -143,7 +138,7 @@ class MockHandler implements \Countable
                 if ($this->onRejected) {
                 if ($this->onRejected) {
                     ($this->onRejected)($reason);
                     ($this->onRejected)($reason);
                 }
                 }
-                return \GuzzleHttp\Promise\rejection_for($reason);
+                return P\Create::rejectionFor($reason);
             }
             }
         );
         );
     }
     }

+ 6 - 14
api/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php

@@ -22,14 +22,10 @@ class Proxy
      *
      *
      * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
      * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
      */
      */
-    public static function wrapSync(
-        callable $default,
-        callable $sync
-    ): callable {
+    public static function wrapSync(callable $default, callable $sync): callable
+    {
         return static function (RequestInterface $request, array $options) use ($default, $sync): PromiseInterface {
         return static function (RequestInterface $request, array $options) use ($default, $sync): PromiseInterface {
-            return empty($options[RequestOptions::SYNCHRONOUS])
-                ? $default($request, $options)
-                : $sync($request, $options);
+            return empty($options[RequestOptions::SYNCHRONOUS]) ? $default($request, $options) : $sync($request, $options);
         };
         };
     }
     }
 
 
@@ -46,14 +42,10 @@ class Proxy
      *
      *
      * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
      * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
      */
      */
-    public static function wrapStreaming(
-        callable $default,
-        callable $streaming
-    ): callable {
+    public static function wrapStreaming(callable $default, callable $streaming): callable
+    {
         return static function (RequestInterface $request, array $options) use ($default, $streaming): PromiseInterface {
         return static function (RequestInterface $request, array $options) use ($default, $streaming): PromiseInterface {
-            return empty($options['stream'])
-                ? $default($request, $options)
-                : $streaming($request, $options);
+            return empty($options['stream']) ? $default($request, $options) : $streaming($request, $options);
         };
         };
     }
     }
 }
 }

+ 89 - 83
api/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php

@@ -4,6 +4,7 @@ namespace GuzzleHttp\Handler;
 
 
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7;
@@ -74,7 +75,7 @@ class StreamHandler
             }
             }
             $this->invokeStats($options, $request, $startTime, null, $e);
             $this->invokeStats($options, $request, $startTime, null, $e);
 
 
-            return \GuzzleHttp\Promise\rejection_for($e);
+            return P\Create::rejectionFor($e);
         }
         }
     }
     }
 
 
@@ -86,13 +87,7 @@ class StreamHandler
         \Throwable $error = null
         \Throwable $error = null
     ): void {
     ): void {
         if (isset($options['on_stats'])) {
         if (isset($options['on_stats'])) {
-            $stats = new TransferStats(
-                $request,
-                $response,
-                Utils::currentTime() - $startTime,
-                $error,
-                []
-            );
+            $stats = new TransferStats($request, $response, Utils::currentTime() - $startTime, $error, []);
             ($options['on_stats'])($stats);
             ($options['on_stats'])($stats);
         }
         }
     }
     }
@@ -100,47 +95,49 @@ class StreamHandler
     /**
     /**
      * @param resource $stream
      * @param resource $stream
      */
      */
-    private function createResponse(
-        RequestInterface $request,
-        array $options,
-        $stream,
-        ?float $startTime
-    ): PromiseInterface {
+    private function createResponse(RequestInterface $request, array $options, $stream, ?float $startTime): PromiseInterface
+    {
         $hdrs = $this->lastHeaders;
         $hdrs = $this->lastHeaders;
         $this->lastHeaders = [];
         $this->lastHeaders = [];
-        $parts = \explode(' ', \array_shift($hdrs), 3);
-        $ver = \explode('/', $parts[0])[1];
-        $status = (int) $parts[1];
-        $reason = $parts[2] ?? null;
-        $headers = Utils::headersFromLines($hdrs);
+
+        try {
+            [$ver, $status, $reason, $headers] = HeaderProcessor::parseHeaders($hdrs);
+        } catch (\Exception $e) {
+            return P\Create::rejectionFor(
+                new RequestException('An error was encountered while creating the response', $request, null, $e)
+            );
+        }
+
         [$stream, $headers] = $this->checkDecode($options, $headers, $stream);
         [$stream, $headers] = $this->checkDecode($options, $headers, $stream);
-        $stream = Psr7\stream_for($stream);
+        $stream = Psr7\Utils::streamFor($stream);
         $sink = $stream;
         $sink = $stream;
 
 
         if (\strcasecmp('HEAD', $request->getMethod())) {
         if (\strcasecmp('HEAD', $request->getMethod())) {
             $sink = $this->createSink($stream, $options);
             $sink = $this->createSink($stream, $options);
         }
         }
 
 
-        $response = new Psr7\Response($status, $headers, $sink, $ver, $reason);
+        try {
+            $response = new Psr7\Response($status, $headers, $sink, $ver, $reason);
+        } catch (\Exception $e) {
+            return P\Create::rejectionFor(
+                new RequestException('An error was encountered while creating the response', $request, null, $e)
+            );
+        }
 
 
         if (isset($options['on_headers'])) {
         if (isset($options['on_headers'])) {
             try {
             try {
                 $options['on_headers']($response);
                 $options['on_headers']($response);
             } catch (\Exception $e) {
             } catch (\Exception $e) {
-                $msg = 'An error was encountered during the on_headers event';
-                $ex = new RequestException($msg, $request, $response, $e);
-                return \GuzzleHttp\Promise\rejection_for($ex);
+                return P\Create::rejectionFor(
+                    new RequestException('An error was encountered during the on_headers event', $request, $response, $e)
+                );
             }
             }
         }
         }
 
 
         // Do not drain when the request is a HEAD request because they have
         // Do not drain when the request is a HEAD request because they have
         // no body.
         // no body.
         if ($sink !== $stream) {
         if ($sink !== $stream) {
-            $this->drain(
-                $stream,
-                $sink,
-                $response->getHeaderLine('Content-Length')
-            );
+            $this->drain($stream, $sink, $response->getHeaderLine('Content-Length'));
         }
         }
 
 
         $this->invokeStats($options, $request, $startTime, $response, null);
         $this->invokeStats($options, $request, $startTime, $response, null);
@@ -154,12 +151,9 @@ class StreamHandler
             return $stream;
             return $stream;
         }
         }
 
 
-        $sink = $options['sink']
-            ?? \fopen('php://temp', 'r+');
+        $sink = $options['sink'] ?? Psr7\Utils::tryFopen('php://temp', 'r+');
 
 
-        return \is_string($sink)
-            ? new Psr7\LazyOpenStream($sink, 'w+')
-            : Psr7\stream_for($sink);
+        return \is_string($sink) ? new Psr7\LazyOpenStream($sink, 'w+') : Psr7\Utils::streamFor($sink);
     }
     }
 
 
     /**
     /**
@@ -173,18 +167,15 @@ class StreamHandler
             if (isset($normalizedKeys['content-encoding'])) {
             if (isset($normalizedKeys['content-encoding'])) {
                 $encoding = $headers[$normalizedKeys['content-encoding']];
                 $encoding = $headers[$normalizedKeys['content-encoding']];
                 if ($encoding[0] === 'gzip' || $encoding[0] === 'deflate') {
                 if ($encoding[0] === 'gzip' || $encoding[0] === 'deflate') {
-                    $stream = new Psr7\InflateStream(
-                        Psr7\stream_for($stream)
-                    );
-                    $headers['x-encoded-content-encoding']
-                        = $headers[$normalizedKeys['content-encoding']];
+                    $stream = new Psr7\InflateStream(Psr7\Utils::streamFor($stream));
+                    $headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']];
+
                     // Remove content-encoding header
                     // Remove content-encoding header
                     unset($headers[$normalizedKeys['content-encoding']]);
                     unset($headers[$normalizedKeys['content-encoding']]);
+
                     // Fix content-length header
                     // Fix content-length header
                     if (isset($normalizedKeys['content-length'])) {
                     if (isset($normalizedKeys['content-length'])) {
-                        $headers['x-encoded-content-length']
-                            = $headers[$normalizedKeys['content-length']];
-
+                        $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
                         $length = (int) $stream->getSize();
                         $length = (int) $stream->getSize();
                         if ($length === 0) {
                         if ($length === 0) {
                             unset($headers[$normalizedKeys['content-length']]);
                             unset($headers[$normalizedKeys['content-length']]);
@@ -207,16 +198,13 @@ class StreamHandler
      *
      *
      * @throws \RuntimeException when the sink option is invalid.
      * @throws \RuntimeException when the sink option is invalid.
      */
      */
-    private function drain(
-        StreamInterface $source,
-        StreamInterface $sink,
-        string $contentLength
-    ): StreamInterface {
+    private function drain(StreamInterface $source, StreamInterface $sink, string $contentLength): StreamInterface
+    {
         // If a content-length header is provided, then stop reading once
         // If a content-length header is provided, then stop reading once
         // that number of bytes has been read. This can prevent infinitely
         // that number of bytes has been read. This can prevent infinitely
         // reading from a stream when dealing with servers that do not honor
         // reading from a stream when dealing with servers that do not honor
         // Connection: Close headers.
         // Connection: Close headers.
-        Psr7\copy_to_stream(
+        Psr7\Utils::copyToStream(
             $source,
             $source,
             $sink,
             $sink,
             (\strlen($contentLength) > 0 && (int) $contentLength > 0) ? (int) $contentLength : -1
             (\strlen($contentLength) > 0 && (int) $contentLength > 0) ? (int) $contentLength : -1
@@ -308,10 +296,7 @@ class StreamHandler
             if (!\is_array($options['stream_context'])) {
             if (!\is_array($options['stream_context'])) {
                 throw new \InvalidArgumentException('stream_context must be an array');
                 throw new \InvalidArgumentException('stream_context must be an array');
             }
             }
-            $context = \array_replace_recursive(
-                $context,
-                $options['stream_context']
-            );
+            $context = \array_replace_recursive($context, $options['stream_context']);
         }
         }
 
 
         // Microsoft NTLM authentication only supported with curl handler
         // Microsoft NTLM authentication only supported with curl handler
@@ -329,16 +314,11 @@ class StreamHandler
 
 
         return $this->createResource(
         return $this->createResource(
             function () use ($uri, &$http_response_header, $contextResource, $context, $options, $request) {
             function () use ($uri, &$http_response_header, $contextResource, $context, $options, $request) {
-                $resource = \fopen((string) $uri, 'r', false, $contextResource);
+                $resource = @\fopen((string) $uri, 'r', false, $contextResource);
                 $this->lastHeaders = $http_response_header;
                 $this->lastHeaders = $http_response_header;
 
 
                 if (false === $resource) {
                 if (false === $resource) {
-                    throw new ConnectException(
-                        sprintf('Connection refused for URI %s', $uri),
-                        $request,
-                        null,
-                        $context
-                    );
+                    throw new ConnectException(sprintf('Connection refused for URI %s', $uri), $request, null, $context);
                 }
                 }
 
 
                 if (isset($options['read_timeout'])) {
                 if (isset($options['read_timeout'])) {
@@ -361,26 +341,14 @@ class StreamHandler
             if ('v4' === $options['force_ip_resolve']) {
             if ('v4' === $options['force_ip_resolve']) {
                 $records = \dns_get_record($uri->getHost(), \DNS_A);
                 $records = \dns_get_record($uri->getHost(), \DNS_A);
                 if (false === $records || !isset($records[0]['ip'])) {
                 if (false === $records || !isset($records[0]['ip'])) {
-                    throw new ConnectException(
-                        \sprintf(
-                            "Could not resolve IPv4 address for host '%s'",
-                            $uri->getHost()
-                        ),
-                        $request
-                    );
+                    throw new ConnectException(\sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request);
                 }
                 }
                 return $uri->withHost($records[0]['ip']);
                 return $uri->withHost($records[0]['ip']);
             }
             }
             if ('v6' === $options['force_ip_resolve']) {
             if ('v6' === $options['force_ip_resolve']) {
                 $records = \dns_get_record($uri->getHost(), \DNS_AAAA);
                 $records = \dns_get_record($uri->getHost(), \DNS_AAAA);
                 if (false === $records || !isset($records[0]['ipv6'])) {
                 if (false === $records || !isset($records[0]['ipv6'])) {
-                    throw new ConnectException(
-                        \sprintf(
-                            "Could not resolve IPv6 address for host '%s'",
-                            $uri->getHost()
-                        ),
-                        $request
-                    );
+                    throw new ConnectException(\sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
                 }
                 }
                 return $uri->withHost('[' . $records[0]['ipv6'] . ']');
                 return $uri->withHost('[' . $records[0]['ipv6'] . ']');
             }
             }
@@ -428,21 +396,60 @@ class StreamHandler
      */
      */
     private function add_proxy(RequestInterface $request, array &$options, $value, array &$params): void
     private function add_proxy(RequestInterface $request, array &$options, $value, array &$params): void
     {
     {
+        $uri = null;
+
         if (!\is_array($value)) {
         if (!\is_array($value)) {
-            $options['http']['proxy'] = $value;
+            $uri = $value;
         } else {
         } else {
             $scheme = $request->getUri()->getScheme();
             $scheme = $request->getUri()->getScheme();
             if (isset($value[$scheme])) {
             if (isset($value[$scheme])) {
-                if (!isset($value['no'])
-                    || !Utils::isHostInNoProxy(
-                        $request->getUri()->getHost(),
-                        $value['no']
-                    )
-                ) {
-                    $options['http']['proxy'] = $value[$scheme];
+                if (!isset($value['no']) || !Utils::isHostInNoProxy($request->getUri()->getHost(), $value['no'])) {
+                    $uri = $value[$scheme];
+                }
+            }
+        }
+
+        if (!$uri) {
+            return;
+        }
+
+        $parsed = $this->parse_proxy($uri);
+        $options['http']['proxy'] = $parsed['proxy'];
+
+        if ($parsed['auth']) {
+            if (!isset($options['http']['header'])) {
+                $options['http']['header'] = [];
+            }
+            $options['http']['header'] .= "\r\nProxy-Authorization: {$parsed['auth']}";
+        }
+    }
+
+    /**
+     * Parses the given proxy URL to make it compatible with the format PHP's stream context expects.
+     */
+    private function parse_proxy(string $url): array
+    {
+        $parsed = \parse_url($url);
+
+        if ($parsed !== false && isset($parsed['scheme']) && $parsed['scheme'] === 'http') {
+            if (isset($parsed['host']) && isset($parsed['port'])) {
+                $auth = null;
+                if (isset($parsed['user']) && isset($parsed['pass'])) {
+                    $auth = \base64_encode("{$parsed['user']}:{$parsed['pass']}");
                 }
                 }
+
+                return [
+                    'proxy' => "tcp://{$parsed['host']}:{$parsed['port']}",
+                    'auth' => $auth ? "Basic {$auth}" : null,
+                ];
             }
             }
         }
         }
+
+        // Return proxy as-is.
+        return [
+            'proxy' => $url,
+            'auth' => null,
+        ];
     }
     }
 
 
     /**
     /**
@@ -534,8 +541,7 @@ class StreamHandler
             \STREAM_NOTIFY_COMPLETED     => 'COMPLETED',
             \STREAM_NOTIFY_COMPLETED     => 'COMPLETED',
             \STREAM_NOTIFY_RESOLVE       => 'RESOLVE',
             \STREAM_NOTIFY_RESOLVE       => 'RESOLVE',
         ];
         ];
-        static $args = ['severity', 'message', 'message_code',
-            'bytes_transferred', 'bytes_max'];
+        static $args = ['severity', 'message', 'message_code', 'bytes_transferred', 'bytes_max'];
 
 
         $value = Utils::debugResource($value);
         $value = Utils::debugResource($value);
         $ident = $request->getMethod() . ' ' . $request->getUri()->withFragment('');
         $ident = $request->getMethod() . ' ' . $request->getUri()->withFragment('');

+ 4 - 7
api/vendor/guzzlehttp/guzzle/src/MessageFormatter.php

@@ -68,11 +68,8 @@ class MessageFormatter implements MessageFormatterInterface
      * @param ResponseInterface|null $response Response that was received
      * @param ResponseInterface|null $response Response that was received
      * @param \Throwable|null        $error    Exception that was received
      * @param \Throwable|null        $error    Exception that was received
      */
      */
-    public function format(
-        RequestInterface $request,
-        ?ResponseInterface $response = null,
-        ?\Throwable $error = null
-    ): string {
+    public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null): string
+    {
         $cache = [];
         $cache = [];
 
 
         /** @var string */
         /** @var string */
@@ -86,10 +83,10 @@ class MessageFormatter implements MessageFormatterInterface
                 $result = '';
                 $result = '';
                 switch ($matches[1]) {
                 switch ($matches[1]) {
                     case 'request':
                     case 'request':
-                        $result = Psr7\str($request);
+                        $result = Psr7\Message::toString($request);
                         break;
                         break;
                     case 'response':
                     case 'response':
-                        $result = $response ? Psr7\str($response) : '';
+                        $result = $response ? Psr7\Message::toString($response) : '';
                         break;
                         break;
                     case 'req_headers':
                     case 'req_headers':
                         $result = \trim($request->getMethod()
                         $result = \trim($request->getMethod()

+ 1 - 5
api/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php

@@ -14,9 +14,5 @@ interface MessageFormatterInterface
      * @param ResponseInterface|null $response Response that was received
      * @param ResponseInterface|null $response Response that was received
      * @param \Throwable|null        $error    Exception that was received
      * @param \Throwable|null        $error    Exception that was received
      */
      */
-    public function format(
-        RequestInterface $request,
-        ?ResponseInterface $response = null,
-        ?\Throwable $error = null
-    ): string;
+    public function format(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null): string;
 }
 }

+ 13 - 12
api/vendor/guzzlehttp/guzzle/src/Middleware.php

@@ -4,6 +4,7 @@ namespace GuzzleHttp;
 
 
 use GuzzleHttp\Cookie\CookieJarInterface;
 use GuzzleHttp\Cookie\CookieJarInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -46,24 +47,26 @@ final class Middleware
 
 
     /**
     /**
      * Middleware that throws exceptions for 4xx or 5xx responses when the
      * Middleware that throws exceptions for 4xx or 5xx responses when the
-     * "http_error" request option is set to true.
+     * "http_errors" request option is set to true.
+     *
+     * @param BodySummarizerInterface|null $bodySummarizer The body summarizer to use in exception messages.
      *
      *
      * @return callable(callable): callable Returns a function that accepts the next handler.
      * @return callable(callable): callable Returns a function that accepts the next handler.
      */
      */
-    public static function httpErrors(): callable
+    public static function httpErrors(BodySummarizerInterface $bodySummarizer = null): callable
     {
     {
-        return static function (callable $handler): callable {
-            return static function ($request, array $options) use ($handler) {
+        return static function (callable $handler) use ($bodySummarizer): callable {
+            return static function ($request, array $options) use ($handler, $bodySummarizer) {
                 if (empty($options['http_errors'])) {
                 if (empty($options['http_errors'])) {
                     return $handler($request, $options);
                     return $handler($request, $options);
                 }
                 }
                 return $handler($request, $options)->then(
                 return $handler($request, $options)->then(
-                    static function (ResponseInterface $response) use ($request) {
+                    static function (ResponseInterface $response) use ($request, $bodySummarizer) {
                         $code = $response->getStatusCode();
                         $code = $response->getStatusCode();
                         if ($code < 400) {
                         if ($code < 400) {
                             return $response;
                             return $response;
                         }
                         }
-                        throw RequestException::create($request, $response);
+                        throw RequestException::create($request, $response, null, [], $bodySummarizer);
                     }
                     }
                 );
                 );
             };
             };
@@ -104,7 +107,7 @@ final class Middleware
                             'error'    => $reason,
                             'error'    => $reason,
                             'options'  => $options
                             'options'  => $options
                         ];
                         ];
-                        return \GuzzleHttp\Promise\rejection_for($reason);
+                        return P\Create::rejectionFor($reason);
                     }
                     }
                 );
                 );
             };
             };
@@ -202,12 +205,10 @@ final class Middleware
                         return $response;
                         return $response;
                     },
                     },
                     static function ($reason) use ($logger, $request, $formatter): PromiseInterface {
                     static function ($reason) use ($logger, $request, $formatter): PromiseInterface {
-                        $response = $reason instanceof RequestException
-                            ? $reason->getResponse()
-                            : null;
-                        $message = $formatter->format($request, $response, \GuzzleHttp\Promise\exception_for($reason));
+                        $response = $reason instanceof RequestException ? $reason->getResponse() : null;
+                        $message = $formatter->format($request, $response, P\Create::exceptionFor($reason));
                         $logger->error($message);
                         $logger->error($message);
-                        return \GuzzleHttp\Promise\rejection_for($reason);
+                        return P\Create::rejectionFor($reason);
                     }
                     }
                 );
                 );
             };
             };

+ 7 - 15
api/vendor/guzzlehttp/guzzle/src/Pool.php

@@ -2,6 +2,7 @@
 
 
 namespace GuzzleHttp;
 namespace GuzzleHttp;
 
 
+use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\EachPromise;
 use GuzzleHttp\Promise\EachPromise;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromisorInterface;
 use GuzzleHttp\Promise\PromisorInterface;
@@ -37,11 +38,8 @@ class Pool implements PromisorInterface
      *                                  - fulfilled: (callable) Function to invoke when a request completes.
      *                                  - fulfilled: (callable) Function to invoke when a request completes.
      *                                  - rejected: (callable) Function to invoke when a request is rejected.
      *                                  - rejected: (callable) Function to invoke when a request is rejected.
      */
      */
-    public function __construct(
-        ClientInterface $client,
-        $requests,
-        array $config = []
-    ) {
+    public function __construct(ClientInterface $client, $requests, array $config = [])
+    {
         if (!isset($config['concurrency'])) {
         if (!isset($config['concurrency'])) {
             $config['concurrency'] = 25;
             $config['concurrency'] = 25;
         }
         }
@@ -53,7 +51,7 @@ class Pool implements PromisorInterface
             $opts = [];
             $opts = [];
         }
         }
 
 
-        $iterable = \GuzzleHttp\Promise\iter_for($requests);
+        $iterable = P\Create::iterFor($requests);
         $requests = static function () use ($iterable, $client, $opts) {
         $requests = static function () use ($iterable, $client, $opts) {
             foreach ($iterable as $key => $rfn) {
             foreach ($iterable as $key => $rfn) {
                 if ($rfn instanceof RequestInterface) {
                 if ($rfn instanceof RequestInterface) {
@@ -61,10 +59,7 @@ class Pool implements PromisorInterface
                 } elseif (\is_callable($rfn)) {
                 } elseif (\is_callable($rfn)) {
                     yield $key => $rfn($opts);
                     yield $key => $rfn($opts);
                 } else {
                 } else {
-                    throw new \InvalidArgumentException('Each value yielded by '
-                        . 'the iterator must be a Psr7\Http\Message\RequestInterface '
-                        . 'or a callable that returns a promise that fulfills '
-                        . 'with a Psr7\Message\Http\ResponseInterface object.');
+                    throw new \InvalidArgumentException('Each value yielded by the iterator must be a Psr7\Http\Message\RequestInterface or a callable that returns a promise that fulfills with a Psr7\Message\Http\ResponseInterface object.');
                 }
                 }
             }
             }
         };
         };
@@ -98,11 +93,8 @@ class Pool implements PromisorInterface
      *
      *
      * @throws \InvalidArgumentException if the event format is incorrect.
      * @throws \InvalidArgumentException if the event format is incorrect.
      */
      */
-    public static function batch(
-        ClientInterface $client,
-        $requests,
-        array $options = []
-    ): array {
+    public static function batch(ClientInterface $client, $requests, array $options = []): array
+    {
         $res = [];
         $res = [];
         self::cmpCallback($options, 'fulfilled', $res);
         self::cmpCallback($options, 'fulfilled', $res);
         self::cmpCallback($options, 'rejected', $res);
         self::cmpCallback($options, 'rejected', $res);

+ 4 - 7
api/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php

@@ -40,7 +40,7 @@ class PrepareBodyMiddleware
         // Add a default content-type if possible.
         // Add a default content-type if possible.
         if (!$request->hasHeader('Content-Type')) {
         if (!$request->hasHeader('Content-Type')) {
             if ($uri = $request->getBody()->getMetadata('uri')) {
             if ($uri = $request->getBody()->getMetadata('uri')) {
-                if (is_string($uri) && $type = Psr7\mimetype_from_filename($uri)) {
+                if (is_string($uri) && $type = Psr7\MimeType::fromFilename($uri)) {
                     $modify['set_headers']['Content-Type'] = $type;
                     $modify['set_headers']['Content-Type'] = $type;
                 }
                 }
             }
             }
@@ -61,17 +61,14 @@ class PrepareBodyMiddleware
         // Add the expect header if needed.
         // Add the expect header if needed.
         $this->addExpectHeader($request, $options, $modify);
         $this->addExpectHeader($request, $options, $modify);
 
 
-        return $fn(Psr7\modify_request($request, $modify), $options);
+        return $fn(Psr7\Utils::modifyRequest($request, $modify), $options);
     }
     }
 
 
     /**
     /**
      * Add expect header
      * Add expect header
      */
      */
-    private function addExpectHeader(
-        RequestInterface $request,
-        array $options,
-        array &$modify
-    ): void {
+    private function addExpectHeader(RequestInterface $request, array $options, array &$modify): void
+    {
         // Determine if the Expect header should be used
         // Determine if the Expect header should be used
         if ($request->hasHeader('Expect')) {
         if ($request->hasHeader('Expect')) {
             return;
             return;

+ 12 - 32
api/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php

@@ -77,18 +77,15 @@ class RedirectMiddleware
     /**
     /**
      * @return ResponseInterface|PromiseInterface
      * @return ResponseInterface|PromiseInterface
      */
      */
-    public function checkRedirect(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response
-    ) {
+    public function checkRedirect(RequestInterface $request, array $options, ResponseInterface $response)
+    {
         if (\strpos((string) $response->getStatusCode(), '3') !== 0
         if (\strpos((string) $response->getStatusCode(), '3') !== 0
             || !$response->hasHeader('Location')
             || !$response->hasHeader('Location')
         ) {
         ) {
             return $response;
             return $response;
         }
         }
 
 
-        $this->guardMax($request, $options);
+        $this->guardMax($request, $response, $options);
         $nextRequest = $this->modifyRequest($request, $options, $response);
         $nextRequest = $this->modifyRequest($request, $options, $response);
 
 
         if (isset($options['allow_redirects']['on_redirect'])) {
         if (isset($options['allow_redirects']['on_redirect'])) {
@@ -139,7 +136,7 @@ class RedirectMiddleware
      *
      *
      * @throws TooManyRedirectsException Too many redirects.
      * @throws TooManyRedirectsException Too many redirects.
      */
      */
-    private function guardMax(RequestInterface $request, array &$options): void
+    private function guardMax(RequestInterface $request, ResponseInterface $response, array &$options): void
     {
     {
         $current = $options['__redirect_count']
         $current = $options['__redirect_count']
             ?? 0;
             ?? 0;
@@ -147,18 +144,12 @@ class RedirectMiddleware
         $max = $options['allow_redirects']['max'];
         $max = $options['allow_redirects']['max'];
 
 
         if ($options['__redirect_count'] > $max) {
         if ($options['__redirect_count'] > $max) {
-            throw new TooManyRedirectsException(
-                "Will not follow more than {$max} redirects",
-                $request
-            );
+            throw new TooManyRedirectsException("Will not follow more than {$max} redirects", $request, $response);
         }
         }
     }
     }
 
 
-    public function modifyRequest(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response
-    ): RequestInterface {
+    public function modifyRequest(RequestInterface $request, array $options, ResponseInterface $response): RequestInterface
+    {
         // Request modifications to apply.
         // Request modifications to apply.
         $modify = [];
         $modify = [];
         $protocols = $options['allow_redirects']['protocols'];
         $protocols = $options['allow_redirects']['protocols'];
@@ -184,7 +175,7 @@ class RedirectMiddleware
         }
         }
 
 
         $modify['uri'] = $uri;
         $modify['uri'] = $uri;
-        Psr7\rewind_body($request);
+        Psr7\Message::rewindBody($request);
 
 
         // Add the Referer header if it is told to do so and only
         // Add the Referer header if it is told to do so and only
         // add the header if we are not redirecting from https to http.
         // add the header if we are not redirecting from https to http.
@@ -202,17 +193,14 @@ class RedirectMiddleware
             $modify['remove_headers'][] = 'Authorization';
             $modify['remove_headers'][] = 'Authorization';
         }
         }
 
 
-        return Psr7\modify_request($request, $modify);
+        return Psr7\Utils::modifyRequest($request, $modify);
     }
     }
 
 
     /**
     /**
      * Set the appropriate URL on the request based on the location header
      * Set the appropriate URL on the request based on the location header
      */
      */
-    private function redirectUri(
-        RequestInterface $request,
-        ResponseInterface $response,
-        array $protocols
-    ): UriInterface {
+    private function redirectUri(RequestInterface $request, ResponseInterface $response, array $protocols): UriInterface
+    {
         $location = Psr7\UriResolver::resolve(
         $location = Psr7\UriResolver::resolve(
             $request->getUri(),
             $request->getUri(),
             new Psr7\Uri($response->getHeaderLine('Location'))
             new Psr7\Uri($response->getHeaderLine('Location'))
@@ -220,15 +208,7 @@ class RedirectMiddleware
 
 
         // Ensure that the redirect URI is allowed based on the protocols.
         // Ensure that the redirect URI is allowed based on the protocols.
         if (!\in_array($location->getScheme(), $protocols)) {
         if (!\in_array($location->getScheme(), $protocols)) {
-            throw new BadResponseException(
-                \sprintf(
-                    'Redirect URI, %s, does not use one of the allowed redirect protocols: %s',
-                    $location,
-                    \implode(', ', $protocols)
-                ),
-                $request,
-                $response
-            );
+            throw new BadResponseException(\sprintf('Redirect URI, %s, does not use one of the allowed redirect protocols: %s', $location, \implode(', ', $protocols)), $request, $response);
         }
         }
 
 
         return $location;
         return $location;

+ 4 - 6
api/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php

@@ -2,6 +2,7 @@
 
 
 namespace GuzzleHttp;
 namespace GuzzleHttp;
 
 
+use GuzzleHttp\Promise as P;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -39,11 +40,8 @@ class RetryMiddleware
      *                                                                         and returns the number of
      *                                                                         and returns the number of
      *                                                                         milliseconds to delay.
      *                                                                         milliseconds to delay.
      */
      */
-    public function __construct(
-        callable $decider,
-        callable $nextHandler,
-        callable $delay = null
-    ) {
+    public function __construct(callable $decider, callable $nextHandler, callable $delay = null)
+    {
         $this->decider = $decider;
         $this->decider = $decider;
         $this->nextHandler = $nextHandler;
         $this->nextHandler = $nextHandler;
         $this->delay = $delay ?: __CLASS__ . '::exponentialDelay';
         $this->delay = $delay ?: __CLASS__ . '::exponentialDelay';
@@ -103,7 +101,7 @@ class RetryMiddleware
                 null,
                 null,
                 $reason
                 $reason
             )) {
             )) {
-                return \GuzzleHttp\Promise\rejection_for($reason);
+                return P\Create::rejectionFor($reason);
             }
             }
             return $this->doRetry($req, $options);
             return $this->doRetry($req, $options);
         };
         };

+ 1 - 3
api/vendor/guzzlehttp/guzzle/src/TransferStats.php

@@ -128,8 +128,6 @@ final class TransferStats
      */
      */
     public function getHandlerStat(string $stat)
     public function getHandlerStat(string $stat)
     {
     {
-        return isset($this->handlerStats[$stat])
-            ? $this->handlerStats[$stat]
-            : null;
+        return $this->handlerStats[$stat] ?? null;
     }
     }
 }
 }

+ 6 - 18
api/vendor/guzzlehttp/guzzle/src/Utils.php

@@ -49,9 +49,7 @@ final class Utils
 
 
         foreach ($lines as $line) {
         foreach ($lines as $line) {
             $parts = \explode(':', $line, 2);
             $parts = \explode(':', $line, 2);
-            $headers[\trim($parts[0])][] = isset($parts[1])
-                ? \trim($parts[1])
-                : null;
+            $headers[\trim($parts[0])][] = isset($parts[1]) ? \trim($parts[1]) : null;
         }
         }
 
 
         return $headers;
         return $headers;
@@ -73,12 +71,7 @@ final class Utils
             return \STDOUT;
             return \STDOUT;
         }
         }
 
 
-        $resource = \fopen('php://output', 'w');
-        if (false === $resource) {
-            throw new \RuntimeException('Can not open php output for writing to debug the resource.');
-        }
-
-        return $resource;
+        return \GuzzleHttp\Psr7\Utils::tryFopen('php://output', 'w');
     }
     }
 
 
     /**
     /**
@@ -106,8 +99,7 @@ final class Utils
                 ? Proxy::wrapStreaming($handler, new StreamHandler())
                 ? Proxy::wrapStreaming($handler, new StreamHandler())
                 : new StreamHandler();
                 : new StreamHandler();
         } elseif (!$handler) {
         } elseif (!$handler) {
-            throw new \RuntimeException('GuzzleHttp requires cURL, the '
-                . 'allow_url_fopen ini setting, or a custom HTTP handler.');
+            throw new \RuntimeException('GuzzleHttp requires cURL, the allow_url_fopen ini setting, or a custom HTTP handler.');
         }
         }
 
 
         return $handler;
         return $handler;
@@ -235,7 +227,7 @@ EOT
         // Strip port if present.
         // Strip port if present.
         if (\strpos($host, ':')) {
         if (\strpos($host, ':')) {
             /** @var string[] $hostParts will never be false because of the checks above */
             /** @var string[] $hostParts will never be false because of the checks above */
-            $hostParts = \explode($host, ':', 2);
+            $hostParts = \explode(':', $host, 2);
             $host = $hostParts[0];
             $host = $hostParts[0];
         }
         }
 
 
@@ -280,9 +272,7 @@ EOT
     {
     {
         $data = \json_decode($json, $assoc, $depth, $options);
         $data = \json_decode($json, $assoc, $depth, $options);
         if (\JSON_ERROR_NONE !== \json_last_error()) {
         if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException(
-                'json_decode error: ' . \json_last_error_msg()
-            );
+            throw new InvalidArgumentException('json_decode error: ' . \json_last_error_msg());
         }
         }
 
 
         return $data;
         return $data;
@@ -303,9 +293,7 @@ EOT
     {
     {
         $json = \json_encode($value, $options, $depth);
         $json = \json_encode($value, $options, $depth);
         if (\JSON_ERROR_NONE !== \json_last_error()) {
         if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException(
-                'json_encode error: ' . \json_last_error_msg()
-            );
+            throw new InvalidArgumentException('json_encode error: ' . \json_last_error_msg());
         }
         }
 
 
         /** @var string */
         /** @var string */

+ 9 - 0
api/vendor/guzzlehttp/guzzle/vendor-bin/php-cs-fixer/composer.json

@@ -0,0 +1,9 @@
+{
+    "require": {
+        "php": "^7.2.5 || ^8.0",
+        "friendsofphp/php-cs-fixer": "2.18.3"
+    },
+    "config": {
+        "preferred-install": "dist"
+    }
+}

+ 10 - 0
api/vendor/guzzlehttp/guzzle/vendor-bin/phpstan/composer.json

@@ -0,0 +1,10 @@
+{
+    "require": {
+        "php": "^7.2.5 || ^8.0",
+        "phpstan/phpstan": "0.12.81",
+        "phpstan/phpstan-deprecation-rules": "0.12.6"
+    },
+    "config": {
+        "preferred-install": "dist"
+    }
+}

+ 9 - 0
api/vendor/guzzlehttp/guzzle/vendor-bin/psalm/composer.json

@@ -0,0 +1,9 @@
+{
+    "require": {
+        "php": "^7.2.5 || ^8.0",
+        "psalm/phar": "4.6.2"
+    },
+    "config": {
+        "preferred-install": "dist"
+    }
+}

+ 19 - 0
api/vendor/guzzlehttp/promises/CHANGELOG.md

@@ -1,5 +1,24 @@
 # CHANGELOG
 # CHANGELOG
 
 
+## 1.4.1 - 2021-02-18
+
+- Fixed `each_limit` skipping promises and failing
+
+## 1.4.0 - 2020-09-30
+
+### Added
+
+- Support for PHP 8
+- Optional `$recursive` flag to `all`
+- Replaced functions by static methods
+
+### Fixed
+
+- Fix empty `each` processing
+- Fix promise handling for Iterators of non-unique keys
+- Fixed `method_exists` crashes on PHP 8
+- Memory leak on exceptions
+
 
 
 ## 1.3.1 - 2016-12-20
 ## 1.3.1 - 2016-12-20
 
 

+ 35 - 7
api/vendor/guzzlehttp/promises/README.md

@@ -26,7 +26,7 @@ for a general introduction to promises.
 - Promises can be cancelled.
 - Promises can be cancelled.
 - Works with any object that has a `then` function.
 - Works with any object that has a `then` function.
 - C# style async/await coroutine promises using
 - C# style async/await coroutine promises using
-  `GuzzleHttp\Promise\coroutine()`.
+  `GuzzleHttp\Promise\Coroutine::of()`.
 
 
 
 
 # Quick start
 # Quick start
@@ -88,7 +88,7 @@ $promise
     });
     });
 
 
 // Resolving the promise triggers the $onFulfilled callbacks and outputs
 // Resolving the promise triggers the $onFulfilled callbacks and outputs
-// "Hello, reader".
+// "Hello, reader."
 $promise->resolve('reader.');
 $promise->resolve('reader.');
 ```
 ```
 
 
@@ -150,7 +150,7 @@ use GuzzleHttp\Promise\Promise;
 
 
 $promise = new Promise();
 $promise = new Promise();
 $promise->then(null, function ($reason) {
 $promise->then(null, function ($reason) {
-    throw new \Exception($reason);
+    throw new Exception($reason);
 })->then(null, function ($reason) {
 })->then(null, function ($reason) {
     assert($reason->getMessage() === 'Error!');
     assert($reason->getMessage() === 'Error!');
 });
 });
@@ -182,7 +182,6 @@ invoked using the value returned from the `$onRejected` callback.
 
 
 ```php
 ```php
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Promise\RejectedPromise;
 
 
 $promise = new Promise();
 $promise = new Promise();
 $promise
 $promise
@@ -220,7 +219,7 @@ the promise is rejected with the exception and the exception is thrown.
 
 
 ```php
 ```php
 $promise = new Promise(function () use (&$promise) {
 $promise = new Promise(function () use (&$promise) {
-    throw new \Exception('foo');
+    throw new Exception('foo');
 });
 });
 
 
 $promise->wait(); // throws the exception.
 $promise->wait(); // throws the exception.
@@ -397,7 +396,7 @@ $deferred = new React\Promise\Deferred();
 $reactPromise = $deferred->promise();
 $reactPromise = $deferred->promise();
 
 
 // Create a Guzzle promise that is fulfilled with a React promise.
 // Create a Guzzle promise that is fulfilled with a React promise.
-$guzzlePromise = new \GuzzleHttp\Promise\Promise();
+$guzzlePromise = new GuzzleHttp\Promise\Promise();
 $guzzlePromise->then(function ($value) use ($reactPromise) {
 $guzzlePromise->then(function ($value) use ($reactPromise) {
     // Do something something with the value...
     // Do something something with the value...
     // Return the React promise
     // Return the React promise
@@ -424,7 +423,7 @@ instance.
 
 
 ```php
 ```php
 // Get the global task queue
 // Get the global task queue
-$queue = \GuzzleHttp\Promise\queue();
+$queue = GuzzleHttp\Promise\Utils::queue();
 $queue->run();
 $queue->run();
 ```
 ```
 
 
@@ -502,3 +501,32 @@ $promise->then(function ($value) { echo $value; });
 $promise->resolve('foo');
 $promise->resolve('foo');
 // prints "foo"
 // prints "foo"
 ```
 ```
+
+
+## Upgrading from Function API
+
+A static API was first introduced in 1.4.0, in order to mitigate problems with functions conflicting between global and local copies of the package. The function API will be removed in 2.0.0. A migration table has been provided here for your convenience:
+
+| Original Function | Replacement Method |
+|----------------|----------------|
+| `queue` | `Utils::queue` |
+| `task` | `Utils::task` |
+| `promise_for` | `Create::promiseFor` |
+| `rejection_for` | `Create::rejectionFor` |
+| `exception_for` | `Create::exceptionFor` |
+| `iter_for` | `Create::iterFor` |
+| `inspect` | `Utils::inspect` |
+| `inspect_all` | `Utils::inspectAll` |
+| `unwrap` | `Utils::unwrap` |
+| `all` | `Utils::all` |
+| `some` | `Utils::some` |
+| `any` | `Utils::any` |
+| `settle` | `Utils::settle` |
+| `each` | `Each::of` |
+| `each_limit` | `Each::ofLimit` |
+| `each_limit_all` | `Each::ofLimitAll` |
+| `!is_fulfilled` | `Is::pending` |
+| `is_fulfilled` | `Is::fulfilled` |
+| `is_rejected` | `Is::rejected` |
+| `is_settled` | `Is::settled` |
+| `coroutine` | `Coroutine::of` |

+ 9 - 4
api/vendor/guzzlehttp/promises/composer.json

@@ -11,10 +11,10 @@
         }
         }
     ],
     ],
     "require": {
     "require": {
-        "php": ">=5.5.0"
+        "php": ">=5.5"
     },
     },
     "require-dev": {
     "require-dev": {
-        "phpunit/phpunit": "^4.0"
+        "symfony/phpunit-bridge": "^4.4 || ^5.1"
     },
     },
     "autoload": {
     "autoload": {
         "psr-4": {
         "psr-4": {
@@ -22,9 +22,14 @@
         },
         },
         "files": ["src/functions_include.php"]
         "files": ["src/functions_include.php"]
     },
     },
+    "autoload-dev": {
+        "psr-4": {
+            "GuzzleHttp\\Promise\\Tests\\": "tests/"
+        }
+    },
     "scripts": {
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-ci": "vendor/bin/phpunit --coverage-text"
+        "test": "vendor/bin/simple-phpunit",
+        "test-ci": "vendor/bin/simple-phpunit --coverage-text"
     },
     },
     "extra": {
     "extra": {
         "branch-alias": {
         "branch-alias": {

+ 1 - 0
api/vendor/guzzlehttp/promises/src/AggregateException.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**

+ 1 - 0
api/vendor/guzzlehttp/promises/src/CancellationException.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**

+ 23 - 5
api/vendor/guzzlehttp/promises/src/Coroutine.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 use Exception;
 use Exception;
@@ -9,7 +10,7 @@ use Throwable;
  * Creates a promise that is resolved using a generator that yields values or
  * Creates a promise that is resolved using a generator that yields values or
  * promises (somewhat similar to C#'s async keyword).
  * promises (somewhat similar to C#'s async keyword).
  *
  *
- * When called, the coroutine function will start an instance of the generator
+ * When called, the Coroutine::of method will start an instance of the generator
  * and returns a promise that is fulfilled with its final yielded value.
  * and returns a promise that is fulfilled with its final yielded value.
  *
  *
  * Control is returned back to the generator when the yielded promise settles.
  * Control is returned back to the generator when the yielded promise settles.
@@ -22,7 +23,7 @@ use Throwable;
  *         return new Promise\FulfilledPromise($value);
  *         return new Promise\FulfilledPromise($value);
  *     }
  *     }
  *
  *
- *     $promise = Promise\coroutine(function () {
+ *     $promise = Promise\Coroutine::of(function () {
  *         $value = (yield createPromise('a'));
  *         $value = (yield createPromise('a'));
  *         try {
  *         try {
  *             $value = (yield createPromise($value . 'b'));
  *             $value = (yield createPromise($value . 'b'));
@@ -38,6 +39,7 @@ use Throwable;
  * @param callable $generatorFn Generator function to wrap into a promise.
  * @param callable $generatorFn Generator function to wrap into a promise.
  *
  *
  * @return Promise
  * @return Promise
+ *
  * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
  * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
  */
  */
 final class Coroutine implements PromiseInterface
 final class Coroutine implements PromiseInterface
@@ -65,7 +67,23 @@ final class Coroutine implements PromiseInterface
                 $this->currentPromise->wait();
                 $this->currentPromise->wait();
             }
             }
         });
         });
-        $this->nextCoroutine($this->generator->current());
+        try {
+            $this->nextCoroutine($this->generator->current());
+        } catch (\Exception $exception) {
+            $this->result->reject($exception);
+        } catch (Throwable $throwable) {
+            $this->result->reject($throwable);
+        }
+    }
+
+    /**
+     * Create a new coroutine.
+     *
+     * @return self
+     */
+    public static function of(callable $generatorFn)
+    {
+        return new self($generatorFn);
     }
     }
 
 
     public function then(
     public function then(
@@ -108,7 +126,7 @@ final class Coroutine implements PromiseInterface
 
 
     private function nextCoroutine($yielded)
     private function nextCoroutine($yielded)
     {
     {
-        $this->currentPromise = promise_for($yielded)
+        $this->currentPromise = Create::promiseFor($yielded)
             ->then([$this, '_handleSuccess'], [$this, '_handleFailure']);
             ->then([$this, '_handleSuccess'], [$this, '_handleFailure']);
     }
     }
 
 
@@ -139,7 +157,7 @@ final class Coroutine implements PromiseInterface
     {
     {
         unset($this->currentPromise);
         unset($this->currentPromise);
         try {
         try {
-            $nextYield = $this->generator->throw(exception_for($reason));
+            $nextYield = $this->generator->throw(Create::exceptionFor($reason));
             // The throw was caught, so keep iterating on the coroutine
             // The throw was caught, so keep iterating on the coroutine
             $this->nextCoroutine($nextYield);
             $this->nextCoroutine($nextYield);
         } catch (Exception $exception) {
         } catch (Exception $exception) {

+ 84 - 0
api/vendor/guzzlehttp/promises/src/Create.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace GuzzleHttp\Promise;
+
+final class Create
+{
+    /**
+     * Creates a promise for a value if the value is not a promise.
+     *
+     * @param mixed $value Promise or value.
+     *
+     * @return PromiseInterface
+     */
+    public static function promiseFor($value)
+    {
+        if ($value instanceof PromiseInterface) {
+            return $value;
+        }
+
+        // Return a Guzzle promise that shadows the given promise.
+        if (is_object($value) && method_exists($value, 'then')) {
+            $wfn = method_exists($value, 'wait') ? [$value, 'wait'] : null;
+            $cfn = method_exists($value, 'cancel') ? [$value, 'cancel'] : null;
+            $promise = new Promise($wfn, $cfn);
+            $value->then([$promise, 'resolve'], [$promise, 'reject']);
+            return $promise;
+        }
+
+        return new FulfilledPromise($value);
+    }
+
+    /**
+     * Creates a rejected promise for a reason if the reason is not a promise.
+     * If the provided reason is a promise, then it is returned as-is.
+     *
+     * @param mixed $reason Promise or reason.
+     *
+     * @return PromiseInterface
+     */
+    public static function rejectionFor($reason)
+    {
+        if ($reason instanceof PromiseInterface) {
+            return $reason;
+        }
+
+        return new RejectedPromise($reason);
+    }
+
+    /**
+     * Create an exception for a rejected promise value.
+     *
+     * @param mixed $reason
+     *
+     * @return \Exception|\Throwable
+     */
+    public static function exceptionFor($reason)
+    {
+        if ($reason instanceof \Exception || $reason instanceof \Throwable) {
+            return $reason;
+        }
+
+        return new RejectionException($reason);
+    }
+
+    /**
+     * Returns an iterator for the given value.
+     *
+     * @param mixed $value
+     *
+     * @return \Iterator
+     */
+    public static function iterFor($value)
+    {
+        if ($value instanceof \Iterator) {
+            return $value;
+        }
+
+        if (is_array($value)) {
+            return new \ArrayIterator($value);
+        }
+
+        return new \ArrayIterator([$value]);
+    }
+}

+ 90 - 0
api/vendor/guzzlehttp/promises/src/Each.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace GuzzleHttp\Promise;
+
+final class Each
+{
+    /**
+     * Given an iterator that yields promises or values, returns a promise that
+     * is fulfilled with a null value when the iterator has been consumed or
+     * the aggregate promise has been fulfilled or rejected.
+     *
+     * $onFulfilled is a function that accepts the fulfilled value, iterator
+     * index, and the aggregate promise. The callback can invoke any necessary
+     * side effects and choose to resolve or reject the aggregate if needed.
+     *
+     * $onRejected is a function that accepts the rejection reason, iterator
+     * index, and the aggregate promise. The callback can invoke any necessary
+     * side effects and choose to resolve or reject the aggregate if needed.
+     *
+     * @param mixed    $iterable    Iterator or array to iterate over.
+     * @param callable $onFulfilled
+     * @param callable $onRejected
+     *
+     * @return PromiseInterface
+     */
+    public static function of(
+        $iterable,
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        return (new EachPromise($iterable, [
+            'fulfilled' => $onFulfilled,
+            'rejected'  => $onRejected
+        ]))->promise();
+    }
+
+    /**
+     * Like of, but only allows a certain number of outstanding promises at any
+     * given time.
+     *
+     * $concurrency may be an integer or a function that accepts the number of
+     * pending promises and returns a numeric concurrency limit value to allow
+     * for dynamic a concurrency size.
+     *
+     * @param mixed        $iterable
+     * @param int|callable $concurrency
+     * @param callable     $onFulfilled
+     * @param callable     $onRejected
+     *
+     * @return PromiseInterface
+     */
+    public static function ofLimit(
+        $iterable,
+        $concurrency,
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        return (new EachPromise($iterable, [
+            'fulfilled'   => $onFulfilled,
+            'rejected'    => $onRejected,
+            'concurrency' => $concurrency
+        ]))->promise();
+    }
+
+    /**
+     * Like limit, but ensures that no promise in the given $iterable argument
+     * is rejected. If any promise is rejected, then the aggregate promise is
+     * rejected with the encountered rejection.
+     *
+     * @param mixed        $iterable
+     * @param int|callable $concurrency
+     * @param callable     $onFulfilled
+     *
+     * @return PromiseInterface
+     */
+    public static function ofLimitAll(
+        $iterable,
+        $concurrency,
+        callable $onFulfilled = null
+    ) {
+        return each_limit(
+            $iterable,
+            $concurrency,
+            $onFulfilled,
+            function ($reason, $idx, PromiseInterface $aggregate) {
+                $aggregate->reject($reason);
+            }
+        );
+    }
+}

+ 48 - 23
api/vendor/guzzlehttp/promises/src/EachPromise.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -9,22 +10,24 @@ class EachPromise implements PromisorInterface
 {
 {
     private $pending = [];
     private $pending = [];
 
 
-    /** @var \Iterator */
+    private $nextPendingIndex = 0;
+
+    /** @var \Iterator|null */
     private $iterable;
     private $iterable;
 
 
-    /** @var callable|int */
+    /** @var callable|int|null */
     private $concurrency;
     private $concurrency;
 
 
-    /** @var callable */
+    /** @var callable|null */
     private $onFulfilled;
     private $onFulfilled;
 
 
-    /** @var callable */
+    /** @var callable|null */
     private $onRejected;
     private $onRejected;
 
 
-    /** @var Promise */
+    /** @var Promise|null */
     private $aggregate;
     private $aggregate;
 
 
-    /** @var bool */
+    /** @var bool|null */
     private $mutex;
     private $mutex;
 
 
     /**
     /**
@@ -45,12 +48,12 @@ class EachPromise implements PromisorInterface
      *   allowed number of outstanding concurrently executing promises,
      *   allowed number of outstanding concurrently executing promises,
      *   creating a capped pool of promises. There is no limit by default.
      *   creating a capped pool of promises. There is no limit by default.
      *
      *
-     * @param mixed    $iterable Promises or values to iterate.
-     * @param array    $config   Configuration options
+     * @param mixed $iterable Promises or values to iterate.
+     * @param array $config   Configuration options
      */
      */
     public function __construct($iterable, array $config = [])
     public function __construct($iterable, array $config = [])
     {
     {
-        $this->iterable = iter_for($iterable);
+        $this->iterable = Create::iterFor($iterable);
 
 
         if (isset($config['concurrency'])) {
         if (isset($config['concurrency'])) {
             $this->concurrency = $config['concurrency'];
             $this->concurrency = $config['concurrency'];
@@ -65,6 +68,7 @@ class EachPromise implements PromisorInterface
         }
         }
     }
     }
 
 
+    /** @psalm-suppress InvalidNullableReturnType */
     public function promise()
     public function promise()
     {
     {
         if ($this->aggregate) {
         if ($this->aggregate) {
@@ -73,14 +77,29 @@ class EachPromise implements PromisorInterface
 
 
         try {
         try {
             $this->createPromise();
             $this->createPromise();
+            /** @psalm-assert Promise $this->aggregate */
             $this->iterable->rewind();
             $this->iterable->rewind();
-            $this->refillPending();
+            if (!$this->checkIfFinished()) {
+                $this->refillPending();
+            }
         } catch (\Throwable $e) {
         } catch (\Throwable $e) {
+            /**
+             * @psalm-suppress NullReference
+             * @phpstan-ignore-next-line
+             */
             $this->aggregate->reject($e);
             $this->aggregate->reject($e);
         } catch (\Exception $e) {
         } catch (\Exception $e) {
+            /**
+             * @psalm-suppress NullReference
+             * @phpstan-ignore-next-line
+             */
             $this->aggregate->reject($e);
             $this->aggregate->reject($e);
         }
         }
 
 
+        /**
+         * @psalm-suppress NullableReturnStatement
+         * @phpstan-ignore-next-line
+         */
         return $this->aggregate;
         return $this->aggregate;
     }
     }
 
 
@@ -89,17 +108,12 @@ class EachPromise implements PromisorInterface
         $this->mutex = false;
         $this->mutex = false;
         $this->aggregate = new Promise(function () {
         $this->aggregate = new Promise(function () {
             reset($this->pending);
             reset($this->pending);
-            if (empty($this->pending) && !$this->iterable->valid()) {
-                $this->aggregate->resolve(null);
-                return;
-            }
-
             // Consume a potentially fluctuating list of promises while
             // Consume a potentially fluctuating list of promises while
             // ensuring that indexes are maintained (precluding array_shift).
             // ensuring that indexes are maintained (precluding array_shift).
             while ($promise = current($this->pending)) {
             while ($promise = current($this->pending)) {
                 next($this->pending);
                 next($this->pending);
                 $promise->wait();
                 $promise->wait();
-                if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
+                if (Is::settled($this->aggregate)) {
                     return;
                     return;
                 }
                 }
             }
             }
@@ -109,6 +123,7 @@ class EachPromise implements PromisorInterface
         $clearFn = function () {
         $clearFn = function () {
             $this->iterable = $this->concurrency = $this->pending = null;
             $this->iterable = $this->concurrency = $this->pending = null;
             $this->onFulfilled = $this->onRejected = null;
             $this->onFulfilled = $this->onRejected = null;
+            $this->nextPendingIndex = 0;
         };
         };
 
 
         $this->aggregate->then($clearFn, $clearFn);
         $this->aggregate->then($clearFn, $clearFn);
@@ -148,22 +163,32 @@ class EachPromise implements PromisorInterface
             return false;
             return false;
         }
         }
 
 
-        $promise = promise_for($this->iterable->current());
-        $idx = $this->iterable->key();
+        $promise = Create::promiseFor($this->iterable->current());
+        $key = $this->iterable->key();
+
+        // Iterable keys may not be unique, so we use a counter to
+        // guarantee uniqueness
+        $idx = $this->nextPendingIndex++;
 
 
         $this->pending[$idx] = $promise->then(
         $this->pending[$idx] = $promise->then(
-            function ($value) use ($idx) {
+            function ($value) use ($idx, $key) {
                 if ($this->onFulfilled) {
                 if ($this->onFulfilled) {
                     call_user_func(
                     call_user_func(
-                        $this->onFulfilled, $value, $idx, $this->aggregate
+                        $this->onFulfilled,
+                        $value,
+                        $key,
+                        $this->aggregate
                     );
                     );
                 }
                 }
                 $this->step($idx);
                 $this->step($idx);
             },
             },
-            function ($reason) use ($idx) {
+            function ($reason) use ($idx, $key) {
                 if ($this->onRejected) {
                 if ($this->onRejected) {
                     call_user_func(
                     call_user_func(
-                        $this->onRejected, $reason, $idx, $this->aggregate
+                        $this->onRejected,
+                        $reason,
+                        $key,
+                        $this->aggregate
                     );
                     );
                 }
                 }
                 $this->step($idx);
                 $this->step($idx);
@@ -201,7 +226,7 @@ class EachPromise implements PromisorInterface
     private function step($idx)
     private function step($idx)
     {
     {
         // If the promise was already resolved, then ignore this step.
         // If the promise was already resolved, then ignore this step.
-        if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
+        if (Is::settled($this->aggregate)) {
             return;
             return;
         }
         }
 
 

+ 6 - 4
api/vendor/guzzlehttp/promises/src/FulfilledPromise.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -13,9 +14,10 @@ class FulfilledPromise implements PromiseInterface
 
 
     public function __construct($value)
     public function __construct($value)
     {
     {
-        if (method_exists($value, 'then')) {
+        if (is_object($value) && method_exists($value, 'then')) {
             throw new \InvalidArgumentException(
             throw new \InvalidArgumentException(
-                'You cannot create a FulfilledPromise with a promise.');
+                'You cannot create a FulfilledPromise with a promise.'
+            );
         }
         }
 
 
         $this->value = $value;
         $this->value = $value;
@@ -30,11 +32,11 @@ class FulfilledPromise implements PromiseInterface
             return $this;
             return $this;
         }
         }
 
 
-        $queue = queue();
+        $queue = Utils::queue();
         $p = new Promise([$queue, 'run']);
         $p = new Promise([$queue, 'run']);
         $value = $this->value;
         $value = $this->value;
         $queue->add(static function () use ($p, $value, $onFulfilled) {
         $queue->add(static function () use ($p, $value, $onFulfilled) {
-            if ($p->getState() === self::PENDING) {
+            if (Is::pending($p)) {
                 try {
                 try {
                     $p->resolve($onFulfilled($value));
                     $p->resolve($onFulfilled($value));
                 } catch (\Throwable $e) {
                 } catch (\Throwable $e) {

+ 46 - 0
api/vendor/guzzlehttp/promises/src/Is.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace GuzzleHttp\Promise;
+
+final class Is
+{
+    /**
+     * Returns true if a promise is pending.
+     *
+     * @return bool
+     */
+    public static function pending(PromiseInterface $promise)
+    {
+        return $promise->getState() === PromiseInterface::PENDING;
+    }
+
+    /**
+     * Returns true if a promise is fulfilled or rejected.
+     *
+     * @return bool
+     */
+    public static function settled(PromiseInterface $promise)
+    {
+        return $promise->getState() !== PromiseInterface::PENDING;
+    }
+
+    /**
+     * Returns true if a promise is fulfilled.
+     *
+     * @return bool
+     */
+    public static function fulfilled(PromiseInterface $promise)
+    {
+        return $promise->getState() === PromiseInterface::FULFILLED;
+    }
+
+    /**
+     * Returns true if a promise is rejected.
+     *
+     * @return bool
+     */
+    public static function rejected(PromiseInterface $promise)
+    {
+        return $promise->getState() === PromiseInterface::REJECTED;
+    }
+}

+ 33 - 35
api/vendor/guzzlehttp/promises/src/Promise.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -41,14 +42,13 @@ class Promise implements PromiseInterface
 
 
         // Return a fulfilled promise and immediately invoke any callbacks.
         // Return a fulfilled promise and immediately invoke any callbacks.
         if ($this->state === self::FULFILLED) {
         if ($this->state === self::FULFILLED) {
-            return $onFulfilled
-                ? promise_for($this->result)->then($onFulfilled)
-                : promise_for($this->result);
+            $promise = Create::promiseFor($this->result);
+            return $onFulfilled ? $promise->then($onFulfilled) : $promise;
         }
         }
 
 
         // It's either cancelled or rejected, so return a rejected promise
         // It's either cancelled or rejected, so return a rejected promise
         // and immediately invoke any callbacks.
         // and immediately invoke any callbacks.
-        $rejection = rejection_for($this->result);
+        $rejection = Create::rejectionFor($this->result);
         return $onRejected ? $rejection->then(null, $onRejected) : $rejection;
         return $onRejected ? $rejection->then(null, $onRejected) : $rejection;
     }
     }
 
 
@@ -61,19 +61,15 @@ class Promise implements PromiseInterface
     {
     {
         $this->waitIfPending();
         $this->waitIfPending();
 
 
-        $inner = $this->result instanceof PromiseInterface
-            ? $this->result->wait($unwrap)
-            : $this->result;
-
+        if ($this->result instanceof PromiseInterface) {
+            return $this->result->wait($unwrap);
+        }
         if ($unwrap) {
         if ($unwrap) {
-            if ($this->result instanceof PromiseInterface
-                || $this->state === self::FULFILLED
-            ) {
-                return $inner;
-            } else {
-                // It's rejected so "unwrap" and throw an exception.
-                throw exception_for($inner);
+            if ($this->state === self::FULFILLED) {
+                return $this->result;
             }
             }
+            // It's rejected so "unwrap" and throw an exception.
+            throw Create::exceptionFor($this->result);
         }
         }
     }
     }
 
 
@@ -103,6 +99,7 @@ class Promise implements PromiseInterface
         }
         }
 
 
         // Reject the promise only if it wasn't rejected in a then callback.
         // Reject the promise only if it wasn't rejected in a then callback.
+        /** @psalm-suppress RedundantCondition */
         if ($this->state === self::PENDING) {
         if ($this->state === self::PENDING) {
             $this->reject(new CancellationException('Promise has been cancelled'));
             $this->reject(new CancellationException('Promise has been cancelled'));
         }
         }
@@ -148,17 +145,15 @@ class Promise implements PromiseInterface
 
 
         // If the value was not a settled promise or a thenable, then resolve
         // If the value was not a settled promise or a thenable, then resolve
         // it in the task queue using the correct ID.
         // it in the task queue using the correct ID.
-        if (!method_exists($value, 'then')) {
+        if (!is_object($value) || !method_exists($value, 'then')) {
             $id = $state === self::FULFILLED ? 1 : 2;
             $id = $state === self::FULFILLED ? 1 : 2;
             // It's a success, so resolve the handlers in the queue.
             // It's a success, so resolve the handlers in the queue.
-            queue()->add(static function () use ($id, $value, $handlers) {
+            Utils::queue()->add(static function () use ($id, $value, $handlers) {
                 foreach ($handlers as $handler) {
                 foreach ($handlers as $handler) {
                     self::callHandler($id, $value, $handler);
                     self::callHandler($id, $value, $handler);
                 }
                 }
             });
             });
-        } elseif ($value instanceof Promise
-            && $value->getState() === self::PENDING
-        ) {
+        } elseif ($value instanceof Promise && Is::pending($value)) {
             // We can just merge our handlers onto the next promise.
             // We can just merge our handlers onto the next promise.
             $value->handlers = array_merge($value->handlers, $handlers);
             $value->handlers = array_merge($value->handlers, $handlers);
         } else {
         } else {
@@ -184,8 +179,6 @@ class Promise implements PromiseInterface
      * @param int   $index   1 (resolve) or 2 (reject).
      * @param int   $index   1 (resolve) or 2 (reject).
      * @param mixed $value   Value to pass to the callback.
      * @param mixed $value   Value to pass to the callback.
      * @param array $handler Array of handler data (promise and callbacks).
      * @param array $handler Array of handler data (promise and callbacks).
-     *
-     * @return array Returns the next group to resolve.
      */
      */
     private static function callHandler($index, $value, array $handler)
     private static function callHandler($index, $value, array $handler)
     {
     {
@@ -194,13 +187,21 @@ class Promise implements PromiseInterface
 
 
         // The promise may have been cancelled or resolved before placing
         // The promise may have been cancelled or resolved before placing
         // this thunk in the queue.
         // this thunk in the queue.
-        if ($promise->getState() !== self::PENDING) {
+        if (Is::settled($promise)) {
             return;
             return;
         }
         }
 
 
         try {
         try {
             if (isset($handler[$index])) {
             if (isset($handler[$index])) {
-                $promise->resolve($handler[$index]($value));
+                /*
+                 * If $f throws an exception, then $handler will be in the exception
+                 * stack trace. Since $handler contains a reference to the callable
+                 * itself we get a circular reference. We clear the $handler
+                 * here to avoid that memory leak.
+                 */
+                $f = $handler[$index];
+                unset($handler);
+                $promise->resolve($f($value));
             } elseif ($index === 1) {
             } elseif ($index === 1) {
                 // Forward resolution values as-is.
                 // Forward resolution values as-is.
                 $promise->resolve($value);
                 $promise->resolve($value);
@@ -224,15 +225,16 @@ class Promise implements PromiseInterface
         } elseif ($this->waitList) {
         } elseif ($this->waitList) {
             $this->invokeWaitList();
             $this->invokeWaitList();
         } else {
         } else {
-            // If there's not wait function, then reject the promise.
+            // If there's no wait function, then reject the promise.
             $this->reject('Cannot wait on a promise that has '
             $this->reject('Cannot wait on a promise that has '
                 . 'no internal wait function. You must provide a wait '
                 . 'no internal wait function. You must provide a wait '
                 . 'function when constructing the promise to be able to '
                 . 'function when constructing the promise to be able to '
                 . 'wait on a promise.');
                 . 'wait on a promise.');
         }
         }
 
 
-        queue()->run();
+        Utils::queue()->run();
 
 
+        /** @psalm-suppress RedundantCondition */
         if ($this->state === self::PENDING) {
         if ($this->state === self::PENDING) {
             $this->reject('Invoking the wait callback did not resolve the promise');
             $this->reject('Invoking the wait callback did not resolve the promise');
         }
         }
@@ -263,17 +265,13 @@ class Promise implements PromiseInterface
         $this->waitList = null;
         $this->waitList = null;
 
 
         foreach ($waitList as $result) {
         foreach ($waitList as $result) {
-            while (true) {
+            do {
                 $result->waitIfPending();
                 $result->waitIfPending();
+                $result = $result->result;
+            } while ($result instanceof Promise);
 
 
-                if ($result->result instanceof Promise) {
-                    $result = $result->result;
-                } else {
-                    if ($result->result instanceof PromiseInterface) {
-                        $result->result->wait(false);
-                    }
-                    break;
-                }
+            if ($result instanceof PromiseInterface) {
+                $result->wait(false);
             }
             }
         }
         }
     }
     }

+ 4 - 0
api/vendor/guzzlehttp/promises/src/PromiseInterface.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -56,6 +57,7 @@ interface PromiseInterface
      * Resolve the promise with the given value.
      * Resolve the promise with the given value.
      *
      *
      * @param mixed $value
      * @param mixed $value
+     *
      * @throws \RuntimeException if the promise is already resolved.
      * @throws \RuntimeException if the promise is already resolved.
      */
      */
     public function resolve($value);
     public function resolve($value);
@@ -64,6 +66,7 @@ interface PromiseInterface
      * Reject the promise with the given reason.
      * Reject the promise with the given reason.
      *
      *
      * @param mixed $reason
      * @param mixed $reason
+     *
      * @throws \RuntimeException if the promise is already resolved.
      * @throws \RuntimeException if the promise is already resolved.
      */
      */
     public function reject($reason);
     public function reject($reason);
@@ -86,6 +89,7 @@ interface PromiseInterface
      * @param bool $unwrap
      * @param bool $unwrap
      *
      *
      * @return mixed
      * @return mixed
+     *
      * @throws \LogicException if the promise has no wait function or if the
      * @throws \LogicException if the promise has no wait function or if the
      *                         promise does not settle after waiting.
      *                         promise does not settle after waiting.
      */
      */

+ 1 - 0
api/vendor/guzzlehttp/promises/src/PromisorInterface.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**

+ 9 - 5
api/vendor/guzzlehttp/promises/src/RejectedPromise.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -13,9 +14,10 @@ class RejectedPromise implements PromiseInterface
 
 
     public function __construct($reason)
     public function __construct($reason)
     {
     {
-        if (method_exists($reason, 'then')) {
+        if (is_object($reason) && method_exists($reason, 'then')) {
             throw new \InvalidArgumentException(
             throw new \InvalidArgumentException(
-                'You cannot create a RejectedPromise with a promise.');
+                'You cannot create a RejectedPromise with a promise.'
+            );
         }
         }
 
 
         $this->reason = $reason;
         $this->reason = $reason;
@@ -30,11 +32,11 @@ class RejectedPromise implements PromiseInterface
             return $this;
             return $this;
         }
         }
 
 
-        $queue = queue();
+        $queue = Utils::queue();
         $reason = $this->reason;
         $reason = $this->reason;
         $p = new Promise([$queue, 'run']);
         $p = new Promise([$queue, 'run']);
         $queue->add(static function () use ($p, $reason, $onRejected) {
         $queue->add(static function () use ($p, $reason, $onRejected) {
-            if ($p->getState() === self::PENDING) {
+            if (Is::pending($p)) {
                 try {
                 try {
                     // Return a resolved promise if onRejected does not throw.
                     // Return a resolved promise if onRejected does not throw.
                     $p->resolve($onRejected($reason));
                     $p->resolve($onRejected($reason));
@@ -59,8 +61,10 @@ class RejectedPromise implements PromiseInterface
     public function wait($unwrap = true, $defaultDelivery = null)
     public function wait($unwrap = true, $defaultDelivery = null)
     {
     {
         if ($unwrap) {
         if ($unwrap) {
-            throw exception_for($this->reason);
+            throw Create::exceptionFor($this->reason);
         }
         }
+
+        return null;
     }
     }
 
 
     public function getState()
     public function getState()

+ 2 - 1
api/vendor/guzzlehttp/promises/src/RejectionException.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -12,7 +13,7 @@ class RejectionException extends \RuntimeException
     private $reason;
     private $reason;
 
 
     /**
     /**
-     * @param mixed $reason       Rejection reason.
+     * @param mixed  $reason      Rejection reason.
      * @param string $description Optional description
      * @param string $description Optional description
      */
      */
     public function __construct($reason, $description = null)
     public function __construct($reason, $description = null)

+ 3 - 2
api/vendor/guzzlehttp/promises/src/TaskQueue.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -8,7 +9,7 @@ namespace GuzzleHttp\Promise;
  * maintains a constant stack size. You can use the task queue asynchronously
  * maintains a constant stack size. You can use the task queue asynchronously
  * by calling the `run()` function of the global task queue in an event loop.
  * by calling the `run()` function of the global task queue in an event loop.
  *
  *
- *     GuzzleHttp\Promise\queue()->run();
+ *     GuzzleHttp\Promise\Utils::queue()->run();
  */
  */
 class TaskQueue implements TaskQueueInterface
 class TaskQueue implements TaskQueueInterface
 {
 {
@@ -42,8 +43,8 @@ class TaskQueue implements TaskQueueInterface
 
 
     public function run()
     public function run()
     {
     {
-        /** @var callable $task */
         while ($task = array_shift($this->queue)) {
         while ($task = array_shift($this->queue)) {
+            /** @var callable $task */
             $task();
             $task();
         }
         }
     }
     }

+ 1 - 2
api/vendor/guzzlehttp/promises/src/TaskQueueInterface.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 interface TaskQueueInterface
 interface TaskQueueInterface
@@ -13,8 +14,6 @@ interface TaskQueueInterface
     /**
     /**
      * Adds a task to the queue that will be executed the next time run is
      * Adds a task to the queue that will be executed the next time run is
      * called.
      * called.
-     *
-     * @param callable $task
      */
      */
     public function add(callable $task);
     public function add(callable $task);
 
 

+ 274 - 0
api/vendor/guzzlehttp/promises/src/Utils.php

@@ -0,0 +1,274 @@
+<?php
+
+namespace GuzzleHttp\Promise;
+
+final class Utils
+{
+    /**
+     * Get the global task queue used for promise resolution.
+     *
+     * This task queue MUST be run in an event loop in order for promises to be
+     * settled asynchronously. It will be automatically run when synchronously
+     * waiting on a promise.
+     *
+     * <code>
+     * while ($eventLoop->isRunning()) {
+     *     GuzzleHttp\Promise\Utils::queue()->run();
+     * }
+     * </code>
+     *
+     * @param TaskQueueInterface $assign Optionally specify a new queue instance.
+     *
+     * @return TaskQueueInterface
+     */
+    public static function queue(TaskQueueInterface $assign = null)
+    {
+        static $queue;
+
+        if ($assign) {
+            $queue = $assign;
+        } elseif (!$queue) {
+            $queue = new TaskQueue();
+        }
+
+        return $queue;
+    }
+
+    /**
+     * Adds a function to run in the task queue when it is next `run()` and
+     * returns a promise that is fulfilled or rejected with the result.
+     *
+     * @param callable $task Task function to run.
+     *
+     * @return PromiseInterface
+     */
+    public static function task(callable $task)
+    {
+        $queue = self::queue();
+        $promise = new Promise([$queue, 'run']);
+        $queue->add(function () use ($task, $promise) {
+            try {
+                $promise->resolve($task());
+            } catch (\Throwable $e) {
+                $promise->reject($e);
+            } catch (\Exception $e) {
+                $promise->reject($e);
+            }
+        });
+
+        return $promise;
+    }
+
+    /**
+     * Synchronously waits on a promise to resolve and returns an inspection
+     * state array.
+     *
+     * Returns a state associative array containing a "state" key mapping to a
+     * valid promise state. If the state of the promise is "fulfilled", the
+     * array will contain a "value" key mapping to the fulfilled value of the
+     * promise. If the promise is rejected, the array will contain a "reason"
+     * key mapping to the rejection reason of the promise.
+     *
+     * @param PromiseInterface $promise Promise or value.
+     *
+     * @return array
+     */
+    public static function inspect(PromiseInterface $promise)
+    {
+        try {
+            return [
+                'state' => PromiseInterface::FULFILLED,
+                'value' => $promise->wait()
+            ];
+        } catch (RejectionException $e) {
+            return ['state' => PromiseInterface::REJECTED, 'reason' => $e->getReason()];
+        } catch (\Throwable $e) {
+            return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
+        } catch (\Exception $e) {
+            return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
+        }
+    }
+
+    /**
+     * Waits on all of the provided promises, but does not unwrap rejected
+     * promises as thrown exception.
+     *
+     * Returns an array of inspection state arrays.
+     *
+     * @see inspect for the inspection state array format.
+     *
+     * @param PromiseInterface[] $promises Traversable of promises to wait upon.
+     *
+     * @return array
+     */
+    public static function inspectAll($promises)
+    {
+        $results = [];
+        foreach ($promises as $key => $promise) {
+            $results[$key] = inspect($promise);
+        }
+
+        return $results;
+    }
+
+    /**
+     * Waits on all of the provided promises and returns the fulfilled values.
+     *
+     * Returns an array that contains the value of each promise (in the same
+     * order the promises were provided). An exception is thrown if any of the
+     * promises are rejected.
+     *
+     * @param iterable<PromiseInterface> $promises Iterable of PromiseInterface objects to wait on.
+     *
+     * @return array
+     *
+     * @throws \Exception on error
+     * @throws \Throwable on error in PHP >=7
+     */
+    public static function unwrap($promises)
+    {
+        $results = [];
+        foreach ($promises as $key => $promise) {
+            $results[$key] = $promise->wait();
+        }
+
+        return $results;
+    }
+
+    /**
+     * Given an array of promises, return a promise that is fulfilled when all
+     * the items in the array are fulfilled.
+     *
+     * The promise's fulfillment value is an array with fulfillment values at
+     * respective positions to the original array. If any promise in the array
+     * rejects, the returned promise is rejected with the rejection reason.
+     *
+     * @param mixed $promises  Promises or values.
+     * @param bool  $recursive If true, resolves new promises that might have been added to the stack during its own resolution.
+     *
+     * @return PromiseInterface
+     */
+    public static function all($promises, $recursive = false)
+    {
+        $results = [];
+        $promise = Each::of(
+            $promises,
+            function ($value, $idx) use (&$results) {
+                $results[$idx] = $value;
+            },
+            function ($reason, $idx, Promise $aggregate) {
+                $aggregate->reject($reason);
+            }
+        )->then(function () use (&$results) {
+            ksort($results);
+            return $results;
+        });
+
+        if (true === $recursive) {
+            $promise = $promise->then(function ($results) use ($recursive, &$promises) {
+                foreach ($promises as $promise) {
+                    if (Is::pending($promise)) {
+                        return self::all($promises, $recursive);
+                    }
+                }
+                return $results;
+            });
+        }
+
+        return $promise;
+    }
+
+    /**
+     * Initiate a competitive race between multiple promises or values (values
+     * will become immediately fulfilled promises).
+     *
+     * When count amount of promises have been fulfilled, the returned promise
+     * is fulfilled with an array that contains the fulfillment values of the
+     * winners in order of resolution.
+     *
+     * This promise is rejected with a {@see AggregateException} if the number
+     * of fulfilled promises is less than the desired $count.
+     *
+     * @param int   $count    Total number of promises.
+     * @param mixed $promises Promises or values.
+     *
+     * @return PromiseInterface
+     */
+    public static function some($count, $promises)
+    {
+        $results = [];
+        $rejections = [];
+
+        return Each::of(
+            $promises,
+            function ($value, $idx, PromiseInterface $p) use (&$results, $count) {
+                if (Is::settled($p)) {
+                    return;
+                }
+                $results[$idx] = $value;
+                if (count($results) >= $count) {
+                    $p->resolve(null);
+                }
+            },
+            function ($reason) use (&$rejections) {
+                $rejections[] = $reason;
+            }
+        )->then(
+            function () use (&$results, &$rejections, $count) {
+                if (count($results) !== $count) {
+                    throw new AggregateException(
+                        'Not enough promises to fulfill count',
+                        $rejections
+                    );
+                }
+                ksort($results);
+                return array_values($results);
+            }
+        );
+    }
+
+    /**
+     * Like some(), with 1 as count. However, if the promise fulfills, the
+     * fulfillment value is not an array of 1 but the value directly.
+     *
+     * @param mixed $promises Promises or values.
+     *
+     * @return PromiseInterface
+     */
+    public static function any($promises)
+    {
+        return self::some(1, $promises)->then(function ($values) {
+            return $values[0];
+        });
+    }
+
+    /**
+     * Returns a promise that is fulfilled when all of the provided promises have
+     * been fulfilled or rejected.
+     *
+     * The returned promise is fulfilled with an array of inspection state arrays.
+     *
+     * @see inspect for the inspection state array format.
+     *
+     * @param mixed $promises Promises or values.
+     *
+     * @return PromiseInterface
+     */
+    public static function settle($promises)
+    {
+        $results = [];
+
+        return Each::of(
+            $promises,
+            function ($value, $idx) use (&$results) {
+                $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value];
+            },
+            function ($reason, $idx) use (&$results) {
+                $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason];
+            }
+        )->then(function () use (&$results) {
+            ksort($results);
+            return $results;
+        });
+    }
+}

+ 80 - 174
api/vendor/guzzlehttp/promises/src/functions.php

@@ -1,4 +1,5 @@
 <?php
 <?php
+
 namespace GuzzleHttp\Promise;
 namespace GuzzleHttp\Promise;
 
 
 /**
 /**
@@ -17,18 +18,12 @@ namespace GuzzleHttp\Promise;
  * @param TaskQueueInterface $assign Optionally specify a new queue instance.
  * @param TaskQueueInterface $assign Optionally specify a new queue instance.
  *
  *
  * @return TaskQueueInterface
  * @return TaskQueueInterface
+ *
+ * @deprecated queue will be removed in guzzlehttp/promises:2.0. Use Utils::queue instead.
  */
  */
 function queue(TaskQueueInterface $assign = null)
 function queue(TaskQueueInterface $assign = null)
 {
 {
-    static $queue;
-
-    if ($assign) {
-        $queue = $assign;
-    } elseif (!$queue) {
-        $queue = new TaskQueue();
-    }
-
-    return $queue;
+    return Utils::queue($assign);
 }
 }
 
 
 /**
 /**
@@ -38,22 +33,12 @@ function queue(TaskQueueInterface $assign = null)
  * @param callable $task Task function to run.
  * @param callable $task Task function to run.
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated task will be removed in guzzlehttp/promises:2.0. Use Utils::task instead.
  */
  */
 function task(callable $task)
 function task(callable $task)
 {
 {
-    $queue = queue();
-    $promise = new Promise([$queue, 'run']);
-    $queue->add(function () use ($task, $promise) {
-        try {
-            $promise->resolve($task());
-        } catch (\Throwable $e) {
-            $promise->reject($e);
-        } catch (\Exception $e) {
-            $promise->reject($e);
-        }
-    });
-
-    return $promise;
+    return Utils::task($task);
 }
 }
 
 
 /**
 /**
@@ -62,23 +47,12 @@ function task(callable $task)
  * @param mixed $value Promise or value.
  * @param mixed $value Promise or value.
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated promise_for will be removed in guzzlehttp/promises:2.0. Use Create::promiseFor instead.
  */
  */
 function promise_for($value)
 function promise_for($value)
 {
 {
-    if ($value instanceof PromiseInterface) {
-        return $value;
-    }
-
-    // Return a Guzzle promise that shadows the given promise.
-    if (method_exists($value, 'then')) {
-        $wfn = method_exists($value, 'wait') ? [$value, 'wait'] : null;
-        $cfn = method_exists($value, 'cancel') ? [$value, 'cancel'] : null;
-        $promise = new Promise($wfn, $cfn);
-        $value->then([$promise, 'resolve'], [$promise, 'reject']);
-        return $promise;
-    }
-
-    return new FulfilledPromise($value);
+    return Create::promiseFor($value);
 }
 }
 
 
 /**
 /**
@@ -88,14 +62,12 @@ function promise_for($value)
  * @param mixed $reason Promise or reason.
  * @param mixed $reason Promise or reason.
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated rejection_for will be removed in guzzlehttp/promises:2.0. Use Create::rejectionFor instead.
  */
  */
 function rejection_for($reason)
 function rejection_for($reason)
 {
 {
-    if ($reason instanceof PromiseInterface) {
-        return $reason;
-    }
-
-    return new RejectedPromise($reason);
+    return Create::rejectionFor($reason);
 }
 }
 
 
 /**
 /**
@@ -104,12 +76,12 @@ function rejection_for($reason)
  * @param mixed $reason
  * @param mixed $reason
  *
  *
  * @return \Exception|\Throwable
  * @return \Exception|\Throwable
+ *
+ * @deprecated exception_for will be removed in guzzlehttp/promises:2.0. Use Create::exceptionFor instead.
  */
  */
 function exception_for($reason)
 function exception_for($reason)
 {
 {
-    return $reason instanceof \Exception || $reason instanceof \Throwable
-        ? $reason
-        : new RejectionException($reason);
+    return Create::exceptionFor($reason);
 }
 }
 
 
 /**
 /**
@@ -118,16 +90,12 @@ function exception_for($reason)
  * @param mixed $value
  * @param mixed $value
  *
  *
  * @return \Iterator
  * @return \Iterator
+ *
+ * @deprecated iter_for will be removed in guzzlehttp/promises:2.0. Use Create::iterFor instead.
  */
  */
 function iter_for($value)
 function iter_for($value)
 {
 {
-    if ($value instanceof \Iterator) {
-        return $value;
-    } elseif (is_array($value)) {
-        return new \ArrayIterator($value);
-    } else {
-        return new \ArrayIterator([$value]);
-    }
+    return Create::iterFor($value);
 }
 }
 
 
 /**
 /**
@@ -143,21 +111,12 @@ function iter_for($value)
  * @param PromiseInterface $promise Promise or value.
  * @param PromiseInterface $promise Promise or value.
  *
  *
  * @return array
  * @return array
+ *
+ * @deprecated inspect will be removed in guzzlehttp/promises:2.0. Use Utils::inspect instead.
  */
  */
 function inspect(PromiseInterface $promise)
 function inspect(PromiseInterface $promise)
 {
 {
-    try {
-        return [
-            'state' => PromiseInterface::FULFILLED,
-            'value' => $promise->wait()
-        ];
-    } catch (RejectionException $e) {
-        return ['state' => PromiseInterface::REJECTED, 'reason' => $e->getReason()];
-    } catch (\Throwable $e) {
-        return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
-    } catch (\Exception $e) {
-        return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
-    }
+    return Utils::inspect($promise);
 }
 }
 
 
 /**
 /**
@@ -166,19 +125,17 @@ function inspect(PromiseInterface $promise)
  *
  *
  * Returns an array of inspection state arrays.
  * Returns an array of inspection state arrays.
  *
  *
+ * @see inspect for the inspection state array format.
+ *
  * @param PromiseInterface[] $promises Traversable of promises to wait upon.
  * @param PromiseInterface[] $promises Traversable of promises to wait upon.
  *
  *
  * @return array
  * @return array
- * @see GuzzleHttp\Promise\inspect for the inspection state array format.
+ *
+ * @deprecated inspect will be removed in guzzlehttp/promises:2.0. Use Utils::inspectAll instead.
  */
  */
 function inspect_all($promises)
 function inspect_all($promises)
 {
 {
-    $results = [];
-    foreach ($promises as $key => $promise) {
-        $results[$key] = inspect($promise);
-    }
-
-    return $results;
+    return Utils::inspectAll($promises);
 }
 }
 
 
 /**
 /**
@@ -188,20 +145,18 @@ function inspect_all($promises)
  * the promises were provided). An exception is thrown if any of the promises
  * the promises were provided). An exception is thrown if any of the promises
  * are rejected.
  * are rejected.
  *
  *
- * @param mixed $promises Iterable of PromiseInterface objects to wait on.
+ * @param iterable<PromiseInterface> $promises Iterable of PromiseInterface objects to wait on.
  *
  *
  * @return array
  * @return array
+ *
  * @throws \Exception on error
  * @throws \Exception on error
  * @throws \Throwable on error in PHP >=7
  * @throws \Throwable on error in PHP >=7
+ *
+ * @deprecated unwrap will be removed in guzzlehttp/promises:2.0. Use Utils::unwrap instead.
  */
  */
 function unwrap($promises)
 function unwrap($promises)
 {
 {
-    $results = [];
-    foreach ($promises as $key => $promise) {
-        $results[$key] = $promise->wait();
-    }
-
-    return $results;
+    return Utils::unwrap($promises);
 }
 }
 
 
 /**
 /**
@@ -212,25 +167,16 @@ function unwrap($promises)
  * respective positions to the original array. If any promise in the array
  * respective positions to the original array. If any promise in the array
  * rejects, the returned promise is rejected with the rejection reason.
  * rejects, the returned promise is rejected with the rejection reason.
  *
  *
- * @param mixed $promises Promises or values.
+ * @param mixed $promises  Promises or values.
+ * @param bool  $recursive If true, resolves new promises that might have been added to the stack during its own resolution.
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated all will be removed in guzzlehttp/promises:2.0. Use Utils::all instead.
  */
  */
-function all($promises)
+function all($promises, $recursive = false)
 {
 {
-    $results = [];
-    return each(
-        $promises,
-        function ($value, $idx) use (&$results) {
-            $results[$idx] = $value;
-        },
-        function ($reason, $idx, Promise $aggregate) {
-            $aggregate->reject($reason);
-        }
-    )->then(function () use (&$results) {
-        ksort($results);
-        return $results;
-    });
+    return Utils::all($promises, $recursive);
 }
 }
 
 
 /**
 /**
@@ -241,45 +187,19 @@ function all($promises)
  * fulfilled with an array that contains the fulfillment values of the winners
  * fulfilled with an array that contains the fulfillment values of the winners
  * in order of resolution.
  * in order of resolution.
  *
  *
- * This prommise is rejected with a {@see GuzzleHttp\Promise\AggregateException}
- * if the number of fulfilled promises is less than the desired $count.
+ * This promise is rejected with a {@see AggregateException} if the number of
+ * fulfilled promises is less than the desired $count.
  *
  *
  * @param int   $count    Total number of promises.
  * @param int   $count    Total number of promises.
  * @param mixed $promises Promises or values.
  * @param mixed $promises Promises or values.
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated some will be removed in guzzlehttp/promises:2.0. Use Utils::some instead.
  */
  */
 function some($count, $promises)
 function some($count, $promises)
 {
 {
-    $results = [];
-    $rejections = [];
-
-    return each(
-        $promises,
-        function ($value, $idx, PromiseInterface $p) use (&$results, $count) {
-            if ($p->getState() !== PromiseInterface::PENDING) {
-                return;
-            }
-            $results[$idx] = $value;
-            if (count($results) >= $count) {
-                $p->resolve(null);
-            }
-        },
-        function ($reason) use (&$rejections) {
-            $rejections[] = $reason;
-        }
-    )->then(
-        function () use (&$results, &$rejections, $count) {
-            if (count($results) !== $count) {
-                throw new AggregateException(
-                    'Not enough promises to fulfill count',
-                    $rejections
-                );
-            }
-            ksort($results);
-            return array_values($results);
-        }
-    );
+    return Utils::some($count, $promises);
 }
 }
 
 
 /**
 /**
@@ -289,10 +209,12 @@ function some($count, $promises)
  * @param mixed $promises Promises or values.
  * @param mixed $promises Promises or values.
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated any will be removed in guzzlehttp/promises:2.0. Use Utils::any instead.
  */
  */
 function any($promises)
 function any($promises)
 {
 {
-    return some(1, $promises)->then(function ($values) { return $values[0]; });
+    return Utils::any($promises);
 }
 }
 
 
 /**
 /**
@@ -301,27 +223,17 @@ function any($promises)
  *
  *
  * The returned promise is fulfilled with an array of inspection state arrays.
  * The returned promise is fulfilled with an array of inspection state arrays.
  *
  *
+ * @see inspect for the inspection state array format.
+ *
  * @param mixed $promises Promises or values.
  * @param mixed $promises Promises or values.
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
- * @see GuzzleHttp\Promise\inspect for the inspection state array format.
+ *
+ * @deprecated settle will be removed in guzzlehttp/promises:2.0. Use Utils::settle instead.
  */
  */
 function settle($promises)
 function settle($promises)
 {
 {
-    $results = [];
-
-    return each(
-        $promises,
-        function ($value, $idx) use (&$results) {
-            $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value];
-        },
-        function ($reason, $idx) use (&$results) {
-            $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason];
-        }
-    )->then(function () use (&$results) {
-        ksort($results);
-        return $results;
-    });
+    return Utils::settle($promises);
 }
 }
 
 
 /**
 /**
@@ -329,29 +241,28 @@ function settle($promises)
  * fulfilled with a null value when the iterator has been consumed or the
  * fulfilled with a null value when the iterator has been consumed or the
  * aggregate promise has been fulfilled or rejected.
  * aggregate promise has been fulfilled or rejected.
  *
  *
- * $onFulfilled is a function that accepts the fulfilled value, iterator
- * index, and the aggregate promise. The callback can invoke any necessary side
- * effects and choose to resolve or reject the aggregate promise if needed.
+ * $onFulfilled is a function that accepts the fulfilled value, iterator index,
+ * and the aggregate promise. The callback can invoke any necessary side
+ * effects and choose to resolve or reject the aggregate if needed.
  *
  *
- * $onRejected is a function that accepts the rejection reason, iterator
- * index, and the aggregate promise. The callback can invoke any necessary side
- * effects and choose to resolve or reject the aggregate promise if needed.
+ * $onRejected is a function that accepts the rejection reason, iterator index,
+ * and the aggregate promise. The callback can invoke any necessary side
+ * effects and choose to resolve or reject the aggregate if needed.
  *
  *
  * @param mixed    $iterable    Iterator or array to iterate over.
  * @param mixed    $iterable    Iterator or array to iterate over.
  * @param callable $onFulfilled
  * @param callable $onFulfilled
  * @param callable $onRejected
  * @param callable $onRejected
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated each will be removed in guzzlehttp/promises:2.0. Use Each::of instead.
  */
  */
 function each(
 function each(
     $iterable,
     $iterable,
     callable $onFulfilled = null,
     callable $onFulfilled = null,
     callable $onRejected = null
     callable $onRejected = null
 ) {
 ) {
-    return (new EachPromise($iterable, [
-        'fulfilled' => $onFulfilled,
-        'rejected'  => $onRejected
-    ]))->promise();
+    return Each::of($iterable, $onFulfilled, $onRejected);
 }
 }
 
 
 /**
 /**
@@ -368,6 +279,8 @@ function each(
  * @param callable     $onRejected
  * @param callable     $onRejected
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated each_limit will be removed in guzzlehttp/promises:2.0. Use Each::ofLimit instead.
  */
  */
 function each_limit(
 function each_limit(
     $iterable,
     $iterable,
@@ -375,11 +288,7 @@ function each_limit(
     callable $onFulfilled = null,
     callable $onFulfilled = null,
     callable $onRejected = null
     callable $onRejected = null
 ) {
 ) {
-    return (new EachPromise($iterable, [
-        'fulfilled'   => $onFulfilled,
-        'rejected'    => $onRejected,
-        'concurrency' => $concurrency
-    ]))->promise();
+    return Each::ofLimit($iterable, $concurrency, $onFulfilled, $onRejected);
 }
 }
 
 
 /**
 /**
@@ -392,66 +301,63 @@ function each_limit(
  * @param callable     $onFulfilled
  * @param callable     $onFulfilled
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated each_limit_all will be removed in guzzlehttp/promises:2.0. Use Each::ofLimitAll instead.
  */
  */
 function each_limit_all(
 function each_limit_all(
     $iterable,
     $iterable,
     $concurrency,
     $concurrency,
     callable $onFulfilled = null
     callable $onFulfilled = null
 ) {
 ) {
-    return each_limit(
-        $iterable,
-        $concurrency,
-        $onFulfilled,
-        function ($reason, $idx, PromiseInterface $aggregate) {
-            $aggregate->reject($reason);
-        }
-    );
+    return Each::ofLimitAll($iterable, $concurrency, $onFulfilled);
 }
 }
 
 
 /**
 /**
  * Returns true if a promise is fulfilled.
  * Returns true if a promise is fulfilled.
  *
  *
- * @param PromiseInterface $promise
- *
  * @return bool
  * @return bool
+ *
+ * @deprecated is_fulfilled will be removed in guzzlehttp/promises:2.0. Use Is::fulfilled instead.
  */
  */
 function is_fulfilled(PromiseInterface $promise)
 function is_fulfilled(PromiseInterface $promise)
 {
 {
-    return $promise->getState() === PromiseInterface::FULFILLED;
+    return Is::fulfilled($promise);
 }
 }
 
 
 /**
 /**
  * Returns true if a promise is rejected.
  * Returns true if a promise is rejected.
  *
  *
- * @param PromiseInterface $promise
- *
  * @return bool
  * @return bool
+ *
+ * @deprecated is_rejected will be removed in guzzlehttp/promises:2.0. Use Is::rejected instead.
  */
  */
 function is_rejected(PromiseInterface $promise)
 function is_rejected(PromiseInterface $promise)
 {
 {
-    return $promise->getState() === PromiseInterface::REJECTED;
+    return Is::rejected($promise);
 }
 }
 
 
 /**
 /**
  * Returns true if a promise is fulfilled or rejected.
  * Returns true if a promise is fulfilled or rejected.
  *
  *
- * @param PromiseInterface $promise
- *
  * @return bool
  * @return bool
+ *
+ * @deprecated is_settled will be removed in guzzlehttp/promises:2.0. Use Is::settled instead.
  */
  */
 function is_settled(PromiseInterface $promise)
 function is_settled(PromiseInterface $promise)
 {
 {
-    return $promise->getState() !== PromiseInterface::PENDING;
+    return Is::settled($promise);
 }
 }
 
 
 /**
 /**
- * @see Coroutine
+ * Create a new coroutine.
  *
  *
- * @param callable $generatorFn
+ * @see Coroutine
  *
  *
  * @return PromiseInterface
  * @return PromiseInterface
+ *
+ * @deprecated coroutine will be removed in guzzlehttp/promises:2.0. Use Coroutine::of instead.
  */
  */
 function coroutine(callable $generatorFn)
 function coroutine(callable $generatorFn)
 {
 {
-    return new Coroutine($generatorFn);
+    return Coroutine::of($generatorFn);
 }
 }

+ 1 - 1
api/vendor/paragonie/random_compat/composer.json

@@ -22,7 +22,7 @@
     "source":     "https://github.com/paragonie/random_compat"
     "source":     "https://github.com/paragonie/random_compat"
   },
   },
   "require": {
   "require": {
-    "php": "^7"
+    "php": ">= 7"
   },
   },
   "require-dev": {
   "require-dev": {
     "vimeo/psalm": "^1",
     "vimeo/psalm": "^1",

+ 67 - 60
api/vendor/phpmailer/phpmailer/README.md

@@ -1,46 +1,45 @@
 ![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
 ![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
 
 
-# PHPMailer - A full-featured email creation and transfer class for PHP
+# PHPMailer  A full-featured email creation and transfer class for PHP
 
 
-Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer)
-[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/quality-score.png?s=3758e21d279becdf847a557a56a3ed16dfec9d5d)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/)
-[![Code Coverage](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/coverage.png?s=3fe6ca5fe8cd2cdf96285756e42932f7ca256962)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/)
+[![Test status](https://github.com/PHPMailer/PHPMailer/workflows/Tests/badge.svg)](https://github.com/PHPMailer/PHPMailer/actions) [![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer) [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](https://phpmailer.github.io/PHPMailer/)
 
 
-[![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer) [![Latest Unstable Version](https://poser.pugx.org/phpmailer/phpmailer/v/unstable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](http://phpmailer.github.io/PHPMailer/)
-
-## Class Features
+## Features
 - Probably the world's most popular code for sending email from PHP!
 - Probably the world's most popular code for sending email from PHP!
 - Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
 - Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
-- Integrated SMTP support - send without a local mail server
+- Integrated SMTP support  send without a local mail server
 - Send emails with multiple To, CC, BCC and Reply-to addresses
 - Send emails with multiple To, CC, BCC and Reply-to addresses
 - Multipart/alternative emails for mail clients that do not read HTML email
 - Multipart/alternative emails for mail clients that do not read HTML email
 - Add attachments, including inline
 - Add attachments, including inline
 - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
 - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
-- SMTP authentication with LOGIN, PLAIN, CRAM-MD5, and XOAUTH2 mechanisms over SSL and SMTP+STARTTLS transports
+- SMTP authentication with LOGIN, PLAIN, CRAM-MD5, and XOAUTH2 mechanisms over SMTPS and SMTP+STARTTLS transports
 - Validates email addresses automatically
 - Validates email addresses automatically
-- Protect against header injection attacks
+- Protects against header injection attacks
 - Error messages in over 50 languages!
 - Error messages in over 50 languages!
 - DKIM and S/MIME signing support
 - DKIM and S/MIME signing support
-- Compatible with PHP 5.5 and later
+- Compatible with PHP 5.5 and later, including PHP 8.0
 - Namespaced to prevent name clashes
 - Namespaced to prevent name clashes
 - Much more!
 - Much more!
 
 
 ## Why you might need it
 ## Why you might need it
-Many PHP developers need to send email from their code. The only PHP function that supports this is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as encryption, authentication, HTML messages, and attachments.
+Many PHP developers need to send email from their code. The only PHP function that supports this directly is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as encryption, authentication, HTML messages, and attachments.
+
+Formatting email correctly is surprisingly difficult. There are myriad overlapping (and conflicting) standards, requiring tight adherence to horribly complicated formatting and encoding rules – the vast majority of code that you'll find online that uses the `mail()` function directly is just plain wrong, if not unsafe!
 
 
-Formatting email correctly is surprisingly difficult. There are myriad overlapping RFCs, requiring tight adherence to horribly complicated formatting and encoding rules – the vast majority of code that you'll find online that uses the `mail()` function directly is just plain wrong!
-*Please* don't be tempted to do it yourself – if you don't use PHPMailer, there are many other excellent libraries that you should look at before rolling your own. Try [SwiftMailer](https://swiftmailer.symfony.com/), [Zend/Mail](https://zendframework.github.io/zend-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail) etc.
+The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD, and macOS platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP client allows email sending on all platforms without needing a local mail server. Be aware though, that the `mail()` function should be avoided when possible; it's both faster and [safer](https://exploitbox.io/paper/Pwning-PHP-Mail-Function-For-Fun-And-RCE.html) to use SMTP to localhost.
 
 
-The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD, and macOS platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP implementation allows email sending on Windows platforms without a local mail server.
+*Please* don't be tempted to do it yourself – if you don't use PHPMailer, there are many other excellent libraries that
+you should look at before rolling your own. Try [SwiftMailer](https://swiftmailer.symfony.com/)
+, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail) etc.
 
 
 ## License
 ## License
-This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read LICENSE for information on the software availability and distribution.
+This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
 
 
 ## Installation & loading
 ## Installation & loading
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 
 
 ```json
 ```json
-"phpmailer/phpmailer": "~6.1"
+"phpmailer/phpmailer": "^6.2"
 ```
 ```
 
 
 or run
 or run
@@ -53,7 +52,8 @@ Note that the `vendor` folder and the `vendor/autoload.php` script are generated
 
 
 If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package in your `composer.json`.
 If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package in your `composer.json`.
 
 
-Alternatively, if you're not using Composer, copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration and load each class file manually:
+Alternatively, if you're not using Composer, you
+can [download PHPMailer as a zip file](https://github.com/PHPMailer/PHPMailer/archive/master.zip), (note that docs and examples are not included in the zip file), then copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration and load each class file manually:
 
 
 ```php
 ```php
 <?php
 <?php
@@ -65,60 +65,58 @@ require 'path/to/PHPMailer/src/PHPMailer.php';
 require 'path/to/PHPMailer/src/SMTP.php';
 require 'path/to/PHPMailer/src/SMTP.php';
 ```
 ```
 
 
-If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for the SMTP class.
-
-If you don't speak git or just want a tarball, click the 'zip' button on the right of the project page in GitHub, though note that docs and examples are not included in the tarball.
+If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for the SMTP class. Even if you're not using exceptions, you do still need to load the `Exception` class as it is used internally.
 
 
 ## Legacy versions
 ## Legacy versions
-PHPMailer 5.2 (which is compatible with PHP 5.0 - 7.0) is no longer being supported, even for security updates. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable). If you're using PHP 5.5 or later (which you should be), switch to the 6.x releases.
+PHPMailer 5.2 (which is compatible with PHP 5.0 — 7.0) is no longer supported, even for security updates. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable). If you're using PHP 5.5 or later (which you should be), switch to the 6.x releases.
 
 
 ### Upgrading from 5.2
 ### Upgrading from 5.2
 The biggest changes are that source files are now in the `src/` folder, and PHPMailer now declares the namespace `PHPMailer\PHPMailer`. This has several important effects – [read the upgrade guide](https://github.com/PHPMailer/PHPMailer/tree/master/UPGRADING.md) for more details.
 The biggest changes are that source files are now in the `src/` folder, and PHPMailer now declares the namespace `PHPMailer\PHPMailer`. This has several important effects – [read the upgrade guide](https://github.com/PHPMailer/PHPMailer/tree/master/UPGRADING.md) for more details.
 
 
 ### Minimal installation
 ### Minimal installation
-While installing the entire package manually or with Composer is simple, convenient, and reliable, you may want to include only vital files in your project. At the very least you will need [src/PHPMailer.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/PHPMailer.php). If you're using SMTP, you'll need [src/SMTP.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/SMTP.php), and if you're using POP-before SMTP, you'll need [src/POP3.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/POP3.php). You can skip the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder if you're not showing errors to users and can make do with English-only errors. If you're using XOAUTH2 you will need [src/OAuth.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/OAuth.php) as well as the Composer dependencies for the services you wish to authenticate with. Really, it's much easier to use Composer!
+While installing the entire package manually or with Composer is simple, convenient, and reliable, you may want to include only vital files in your project. At the very least you will need [src/PHPMailer.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/PHPMailer.php). If you're using SMTP, you'll need [src/SMTP.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/SMTP.php), and if you're using POP-before SMTP (*very* unlikely!), you'll need [src/POP3.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/POP3.php). You can skip the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder if you're not showing errors to users and can make do with English-only errors. If you're using XOAUTH2 you will need [src/OAuth.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/OAuth.php) as well as the Composer dependencies for the services you wish to authenticate with. Really, it's much easier to use Composer!
 
 
 ## A Simple Example
 ## A Simple Example
 
 
 ```php
 ```php
 <?php
 <?php
-// Import PHPMailer classes into the global namespace
-// These must be at the top of your script, not inside a function
+//Import PHPMailer classes into the global namespace
+//These must be at the top of your script, not inside a function
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\Exception;
 use PHPMailer\PHPMailer\Exception;
 
 
-// Load Composer's autoloader
+//Load Composer's autoloader
 require 'vendor/autoload.php';
 require 'vendor/autoload.php';
 
 
-// Instantiation and passing `true` enables exceptions
+//Instantiation and passing `true` enables exceptions
 $mail = new PHPMailer(true);
 $mail = new PHPMailer(true);
 
 
 try {
 try {
     //Server settings
     //Server settings
-    $mail->SMTPDebug = SMTP::DEBUG_SERVER;                      // Enable verbose debug output
-    $mail->isSMTP();                                            // Send using SMTP
-    $mail->Host       = 'smtp1.example.com';                    // Set the SMTP server to send through
-    $mail->SMTPAuth   = true;                                   // Enable SMTP authentication
-    $mail->Username   = 'user@example.com';                     // SMTP username
-    $mail->Password   = 'secret';                               // SMTP password
-    $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;         // Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` encouraged
-    $mail->Port       = 587;                                    // TCP port to connect to, use 465 for `PHPMailer::ENCRYPTION_SMTPS` above
+    $mail->SMTPDebug = SMTP::DEBUG_SERVER;                      //Enable verbose debug output
+    $mail->isSMTP();                                            //Send using SMTP
+    $mail->Host       = 'smtp.example.com';                     //Set the SMTP server to send through
+    $mail->SMTPAuth   = true;                                   //Enable SMTP authentication
+    $mail->Username   = 'user@example.com';                     //SMTP username
+    $mail->Password   = 'secret';                               //SMTP password
+    $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;         //Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` encouraged
+    $mail->Port       = 587;                                    //TCP port to connect to, use 465 for `PHPMailer::ENCRYPTION_SMTPS` above
 
 
     //Recipients
     //Recipients
     $mail->setFrom('from@example.com', 'Mailer');
     $mail->setFrom('from@example.com', 'Mailer');
-    $mail->addAddress('joe@example.net', 'Joe User');     // Add a recipient
-    $mail->addAddress('ellen@example.com');               // Name is optional
+    $mail->addAddress('joe@example.net', 'Joe User');     //Add a recipient
+    $mail->addAddress('ellen@example.com');               //Name is optional
     $mail->addReplyTo('info@example.com', 'Information');
     $mail->addReplyTo('info@example.com', 'Information');
     $mail->addCC('cc@example.com');
     $mail->addCC('cc@example.com');
     $mail->addBCC('bcc@example.com');
     $mail->addBCC('bcc@example.com');
 
 
-    // Attachments
-    $mail->addAttachment('/var/tmp/file.tar.gz');         // Add attachments
-    $mail->addAttachment('/tmp/image.jpg', 'new.jpg');    // Optional name
+    //Attachments
+    $mail->addAttachment('/var/tmp/file.tar.gz');         //Add attachments
+    $mail->addAttachment('/tmp/image.jpg', 'new.jpg');    //Optional name
 
 
-    // Content
-    $mail->isHTML(true);                                  // Set email format to HTML
+    //Content
+    $mail->isHTML(true);                                  //Set email format to HTML
     $mail->Subject = 'Here is the subject';
     $mail->Subject = 'Here is the subject';
     $mail->Body    = 'This is the HTML message body <b>in bold!</b>';
     $mail->Body    = 'This is the HTML message body <b>in bold!</b>';
     $mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
     $mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
@@ -130,7 +128,7 @@ try {
 }
 }
 ```
 ```
 
 
-You'll find plenty more to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder.
+You'll find plenty to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder, which covers many common scenarios including sending through gmail, building contact forms, sending to mailing lists, and more.
 
 
 If you are re-using the instance (e.g. when sending to a mailing list), you may need to clear the recipient list to avoid sending duplicate messages. See [the mailing list example](https://github.com/PHPMailer/PHPMailer/blob/master/examples/mailing_list.phps) for further guidance.
 If you are re-using the instance (e.g. when sending to a mailing list), you may need to clear the recipient list to avoid sending duplicate messages. See [the mailing list example](https://github.com/PHPMailer/PHPMailer/blob/master/examples/mailing_list.phps) for further guidance.
 
 
@@ -140,43 +138,43 @@ That's it. You should now be ready to use PHPMailer!
 PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
 PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
 
 
 ```php
 ```php
-// To load the French version
+//To load the French version
 $mail->setLanguage('fr', '/optional/path/to/language/directory/');
 $mail->setLanguage('fr', '/optional/path/to/language/directory/');
 ```
 ```
 
 
-We welcome corrections and new languages - if you're looking for corrections to do, run the [PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php) script in the tests folder and it will show any missing translations.
+We welcome corrections and new languages – if you're looking for corrections, run the [PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php) script in the tests folder and it will show any missing translations.
 
 
 ## Documentation
 ## Documentation
-Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, this should be the first place you look as it's the most frequently updated.
+Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, head for [the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting) as it's frequently updated.
 
 
 Examples of how to use PHPMailer for common scenarios can be found in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder. If you're looking for a good starting point, we recommend you start with [the Gmail example](https://github.com/PHPMailer/PHPMailer/tree/master/examples/gmail.phps).
 Examples of how to use PHPMailer for common scenarios can be found in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder. If you're looking for a good starting point, we recommend you start with [the Gmail example](https://github.com/PHPMailer/PHPMailer/tree/master/examples/gmail.phps).
 
 
-Note that in order to reduce PHPMailer's deployed code footprint, the examples are no longer included if you load PHPMailer via Composer or via [GitHub's zip file download](https://github.com/PHPMailer/PHPMailer/archive/master.zip), so you'll need to either clone the git repository or use the above links to get to the examples directly.
+To reduce PHPMailer's deployed code footprint, examples are not included if you load PHPMailer via Composer or via [GitHub's zip file download](https://github.com/PHPMailer/PHPMailer/archive/master.zip), so you'll need to either clone the git repository or use the above links to get to the examples directly.
 
 
-Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/).
+Complete generated API documentation is [available online](https://phpmailer.github.io/PHPMailer/).
 
 
-You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailerTest.php) a good source of how to do various operations such as encryption.
+You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailerTest.php) a good reference for how to do various operations such as encryption.
 
 
 If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
 If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
 
 
 ## Tests
 ## Tests
-There is a PHPUnit test script in the [test](https://github.com/PHPMailer/PHPMailer/tree/master/test/) folder. PHPMailer uses PHPUnit 4.8 - we would use 5.x but we need to run on PHP 5.5.
+[PHPMailer tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/) use PHPUnit 9, with [a polyfill](https://github.com/Yoast/PHPUnit-Polyfills) to let 9-style tests run on older PHPUnit and PHP versions.
 
 
-Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer)
+[![Test status](https://github.com/PHPMailer/PHPMailer/workflows/Tests/badge.svg)](https://github.com/PHPMailer/PHPMailer/actions)
 
 
 If this isn't passing, is there something you can do to help?
 If this isn't passing, is there something you can do to help?
 
 
 ## Security
 ## Security
 Please disclose any vulnerabilities found responsibly – report security issues to the maintainers privately.
 Please disclose any vulnerabilities found responsibly – report security issues to the maintainers privately.
 
 
-See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for details on security issues.
+See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) and [PHPMailer's security advisories on GitHub](https://github.com/PHPMailer/PHPMailer/security). 
 
 
 ## Contributing
 ## Contributing
 Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
 Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
 
 
 We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
 We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
 
 
-If you found a mistake in the docs, or want to add something, go ahead and amend the wiki - anyone can edit it.
+If you found a mistake in the docs, or want to add something, go ahead and amend the wiki  anyone can edit it.
 
 
 If you have git clones from prior to the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
 If you have git clones from prior to the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
 
 
@@ -187,27 +185,36 @@ git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git
 Please *don't* use the SourceForge or Google Code projects any more; they are obsolete and no longer maintained.
 Please *don't* use the SourceForge or Google Code projects any more; they are obsolete and no longer maintained.
 
 
 ## Sponsorship
 ## Sponsorship
-Development time and resources for PHPMailer are provided by [Smartmessages.net](https://info.smartmessages.net/), a powerful email marketing system.
+Development time and resources for PHPMailer are provided by [Smartmessages.net](https://info.smartmessages.net/), the world's only privacy-first email marketing system.
+
+<a href="https://info.smartmessages.net/"><img src="https://www.smartmessages.net/img/smartmessages-logo.svg" width="550" alt="Smartmessages.net privacy-first email marketing logo"></a>
+
+Donations are very welcome, whether in beer 🍺, T-shirts 👕, or cold, hard cash 💰. Sponsorship through GitHub is a simple and convenient way to say "thank you" to PHPMailer's maintainers and contributors – just click the "Sponsor" button [on the project page](https://github.com/PHPMailer/PHPMailer). If your company uses PHPMailer, consider taking part in Tidelift's enterprise support programme.
+
+## PHPMailer For Enterprise
 
 
-<a href="https://info.smartmessages.net/"><img src="https://www.smartmessages.net/img/smartmessages-logo.svg" width="250" height="28" alt="Smartmessages email marketing"></a>
+Available as part of the Tidelift Subscription.
 
 
-Other contributions are gladly received, whether in beer 🍺, T-shirts 👕, Amazon wishlist raids, or cold, hard cash 💰. If you'd like to donate to say "thank you" to maintainers or contributors, please contact them through individual profile pages via [the contributors page](https://github.com/PHPMailer/PHPMailer/graphs/contributors).
+The maintainers of PHPMailer and thousands of other packages are working with Tidelift to deliver commercial
+support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and
+improve code health, while paying the maintainers of the exact packages you
+use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-phpmailer?utm_source=packagist-phpmailer-phpmailer&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
 
 
 ## Changelog
 ## Changelog
 See [changelog](changelog.md).
 See [changelog](changelog.md).
 
 
 ## History
 ## History
 - PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
 - PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
-- Marcus Bointon (coolbru on SF) and Andy Prevost (codeworxtech) took over the project in 2004.
+- [Marcus Bointon](https://github.com/Synchro) (`coolbru` on SF) and Andy Prevost (`codeworxtech`) took over the project in 2004.
 - Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
 - Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
-- Marcus created his fork on [GitHub](https://github.com/Synchro/PHPMailer) in 2008.
+- Marcus created [his fork on GitHub](https://github.com/Synchro/PHPMailer) in 2008.
 - Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer in 2013.
 - Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer in 2013.
-- PHPMailer moves to the [PHPMailer organisation](https://github.com/PHPMailer) on GitHub in 2013.
+- PHPMailer moves to [the PHPMailer organisation](https://github.com/PHPMailer) on GitHub in 2013.
 
 
 ### What's changed since moving from SourceForge?
 ### What's changed since moving from SourceForge?
 - Official successor to the SourceForge and Google Code projects.
 - Official successor to the SourceForge and Google Code projects.
 - Test suite.
 - Test suite.
-- Continuous integration with Travis-CI.
+- Continuous integration with Github Actions.
 - Composer support.
 - Composer support.
 - Public development.
 - Public development.
 - Additional languages and language strings.
 - Additional languages and language strings.

+ 3 - 1
api/vendor/phpmailer/phpmailer/SECURITY.md

@@ -1,6 +1,8 @@
 # Security notices relating to PHPMailer
 # Security notices relating to PHPMailer
 
 
-Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+Please disclose any security issues or vulnerabilities found through [Tidelift's coordinated disclosure system](https://tidelift.com/security) or to the maintainers privately.
+
+PHPMailer versions between 6.1.8 and 6.4.0 contain a regression of the earlier CVE-2018-19296 object injection vulnerability as a result of [a fix for Windows UNC paths in 6.1.8](https://github.com/PHPMailer/PHPMailer/commit/e2e07a355ee8ff36aba21d0242c5950c56e4c6f9). Recorded as [CVE-2020-36326](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-36326). Reported by Fariskhi Vidyan via Tidelift. 6.4.1 fixes this issue, and also enforces stricter checks for URL schemes in local path contexts.
 
 
 PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security.
 PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security.
 
 

+ 1 - 1
api/vendor/phpmailer/phpmailer/VERSION

@@ -1 +1 @@
-6.2.0
+6.4.1

+ 6 - 2
api/vendor/phpmailer/phpmailer/composer.json

@@ -40,7 +40,7 @@
         "yoast/phpunit-polyfills": "^0.2.0"
         "yoast/phpunit-polyfills": "^0.2.0"
     },
     },
     "suggest": {
     "suggest": {
-        "ext-mbstring": "Needed to send email in multibyte encoding charset",
+        "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
         "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
         "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
         "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
         "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
         "psr/log": "For optional PSR-3 debug logging",
         "psr/log": "For optional PSR-3 debug logging",
@@ -57,5 +57,9 @@
             "PHPMailer\\Test\\": "test/"
             "PHPMailer\\Test\\": "test/"
         }
         }
     },
     },
-    "license": "LGPL-2.1-only"
+    "license": "LGPL-2.1-only",
+    "scripts": {
+        "check": "./vendor/bin/phpcs",
+        "test": "./vendor/bin/phpunit"
+    }
 }
 }

+ 12 - 12
api/vendor/phpmailer/phpmailer/get_oauth_token.php

@@ -38,20 +38,20 @@ namespace PHPMailer\PHPMailer;
  * Plenty to choose from here:
  * Plenty to choose from here:
  * @see http://oauth2-client.thephpleague.com/providers/thirdparty/
  * @see http://oauth2-client.thephpleague.com/providers/thirdparty/
  */
  */
-// @see https://github.com/thephpleague/oauth2-google
+//@see https://github.com/thephpleague/oauth2-google
 use League\OAuth2\Client\Provider\Google;
 use League\OAuth2\Client\Provider\Google;
-// @see https://packagist.org/packages/hayageek/oauth2-yahoo
+//@see https://packagist.org/packages/hayageek/oauth2-yahoo
 use Hayageek\OAuth2\Client\Provider\Yahoo;
 use Hayageek\OAuth2\Client\Provider\Yahoo;
-// @see https://github.com/stevenmaguire/oauth2-microsoft
+//@see https://github.com/stevenmaguire/oauth2-microsoft
 use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
 use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
 
 
 if (!isset($_GET['code']) && !isset($_GET['provider'])) {
 if (!isset($_GET['code']) && !isset($_GET['provider'])) {
     ?>
     ?>
 <html>
 <html>
-<body>Select Provider:<br/>
-<a href='?provider=Google'>Google</a><br/>
-<a href='?provider=Yahoo'>Yahoo</a><br/>
-<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br/>
+<body>Select Provider:<br>
+<a href='?provider=Google'>Google</a><br>
+<a href='?provider=Yahoo'>Yahoo</a><br>
+<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br>
 </body>
 </body>
 </html>
 </html>
     <?php
     <?php
@@ -121,26 +121,26 @@ if (null === $provider) {
 }
 }
 
 
 if (!isset($_GET['code'])) {
 if (!isset($_GET['code'])) {
-    // If we don't have an authorization code then get one
+    //If we don't have an authorization code then get one
     $authUrl = $provider->getAuthorizationUrl($options);
     $authUrl = $provider->getAuthorizationUrl($options);
     $_SESSION['oauth2state'] = $provider->getState();
     $_SESSION['oauth2state'] = $provider->getState();
     header('Location: ' . $authUrl);
     header('Location: ' . $authUrl);
     exit;
     exit;
-// Check given state against previously stored one to mitigate CSRF attack
+    //Check given state against previously stored one to mitigate CSRF attack
 } elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
 } elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
     unset($_SESSION['oauth2state']);
     unset($_SESSION['oauth2state']);
     unset($_SESSION['provider']);
     unset($_SESSION['provider']);
     exit('Invalid state');
     exit('Invalid state');
 } else {
 } else {
     unset($_SESSION['provider']);
     unset($_SESSION['provider']);
-    // Try to get an access token (using the authorization code grant)
+    //Try to get an access token (using the authorization code grant)
     $token = $provider->getAccessToken(
     $token = $provider->getAccessToken(
         'authorization_code',
         'authorization_code',
         [
         [
             'code' => $_GET['code']
             'code' => $_GET['code']
         ]
         ]
     );
     );
-    // Use this to interact with an API on the users behalf
-    // Use this to get a new access token if the old one expires
+    //Use this to interact with an API on the users behalf
+    //Use this to get a new access token if the old one expires
     echo 'Refresh Token: ', $token->getRefreshToken();
     echo 'Refresh Token: ', $token->getRefreshToken();
 }
 }

+ 2 - 0
api/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php

@@ -16,6 +16,8 @@ $PHPMAILER_LANG['file_open']            = 'Chyba souboru: Nelze otevřít soubor
 $PHPMAILER_LANG['from_failed']          = 'Následující adresa odesílatele je nesprávná: ';
 $PHPMAILER_LANG['from_failed']          = 'Následující adresa odesílatele je nesprávná: ';
 $PHPMAILER_LANG['instantiate']          = 'Nelze vytvořit instanci emailové funkce.';
 $PHPMAILER_LANG['instantiate']          = 'Nelze vytvořit instanci emailové funkce.';
 $PHPMAILER_LANG['invalid_address']      = 'Neplatná adresa: ';
 $PHPMAILER_LANG['invalid_address']      = 'Neplatná adresa: ';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Záznam hostitele je nesprávný: ';
+$PHPMAILER_LANG['invalid_host']         = 'Hostitel je nesprávný: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer není podporován.';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer není podporován.';
 $PHPMAILER_LANG['provide_address']      = 'Musíte zadat alespoň jednu emailovou adresu příjemce.';
 $PHPMAILER_LANG['provide_address']      = 'Musíte zadat alespoň jednu emailovou adresu příjemce.';
 $PHPMAILER_LANG['recipients_failed']    = 'Chyba SMTP: Následující adresy příjemců nejsou správně: ';
 $PHPMAILER_LANG['recipients_failed']    = 'Chyba SMTP: Následující adresy příjemců nejsou správně: ';

+ 2 - 0
api/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php

@@ -18,6 +18,8 @@ $PHPMAILER_LANG['file_open']            = 'File Error: Súbor sa otvoriť pre č
 $PHPMAILER_LANG['from_failed']          = 'Následujúca adresa From je nesprávna: ';
 $PHPMAILER_LANG['from_failed']          = 'Následujúca adresa From je nesprávna: ';
 $PHPMAILER_LANG['instantiate']          = 'Nedá sa vytvoriť inštancia emailovej funkcie.';
 $PHPMAILER_LANG['instantiate']          = 'Nedá sa vytvoriť inštancia emailovej funkcie.';
 $PHPMAILER_LANG['invalid_address']      = 'Neodoslané, emailová adresa je nesprávna: ';
 $PHPMAILER_LANG['invalid_address']      = 'Neodoslané, emailová adresa je nesprávna: ';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Záznam hostiteľa je nesprávny: ';
+$PHPMAILER_LANG['invalid_host']         = 'Hostiteľ je nesprávny: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' emailový klient nieje podporovaný.';
 $PHPMAILER_LANG['mailer_not_supported'] = ' emailový klient nieje podporovaný.';
 $PHPMAILER_LANG['provide_address']      = 'Musíte zadať aspoň jednu emailovú adresu príjemcu.';
 $PHPMAILER_LANG['provide_address']      = 'Musíte zadať aspoň jednu emailovú adresu príjemcu.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: Adresy príjemcov niesu správne ';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: Adresy príjemcov niesu správne ';

+ 28 - 0
api/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Serbian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Александар Јевремовић <ajevremovic@gmail.com>
+ * @author Miloš Milanović <mmilanovic016@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP greška: autentifikacija nije uspela.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP greška: povezivanje sa SMTP serverom nije uspelo.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP greška: podaci nisu prihvaćeni.';
+$PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznato kodiranje: ';
+$PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: ';
+$PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: ';
+$PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP greška: slanje sa sledećih adresa nije uspelo: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP greška: slanje na sledeće adrese nije uspelo: ';
+$PHPMAILER_LANG['instantiate']          = 'Nije moguće pokrenuti mail funkciju.';
+$PHPMAILER_LANG['invalid_address']      = 'Poruka nije poslata. Neispravna adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' majler nije podržan.';
+$PHPMAILER_LANG['provide_address']      = 'Definišite bar jednu adresu primaoca.';
+$PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Povezivanje sa SMTP serverom nije uspelo.';
+$PHPMAILER_LANG['smtp_error']           = 'Greška SMTP servera: ';
+$PHPMAILER_LANG['variable_set']         = 'Nije moguće zadati niti resetovati promenljivu: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nedostaje proširenje: ';

+ 2 - 2
api/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php

@@ -16,11 +16,11 @@ $PHPMAILER_LANG['file_access']          = 'Немає доступу до фай
 $PHPMAILER_LANG['file_open']            = 'Помилка файлової системи: не вдається відкрити файл: ';
 $PHPMAILER_LANG['file_open']            = 'Помилка файлової системи: не вдається відкрити файл: ';
 $PHPMAILER_LANG['from_failed']          = 'Невірна адреса відправника: ';
 $PHPMAILER_LANG['from_failed']          = 'Невірна адреса відправника: ';
 $PHPMAILER_LANG['instantiate']          = 'Неможливо запустити функцію mail().';
 $PHPMAILER_LANG['instantiate']          = 'Неможливо запустити функцію mail().';
-$PHPMAILER_LANG['provide_address']      = 'Будь-ласка, введіть хоча б одну email-адресу отримувача.';
+$PHPMAILER_LANG['provide_address']      = 'Будь ласка, введіть хоча б одну email-адресу отримувача.';
 $PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий сервер не підтримується.';
 $PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий сервер не підтримується.';
 $PHPMAILER_LANG['recipients_failed']    = 'Помилка SMTP: не вдалося відправлення для таких отримувачів: ';
 $PHPMAILER_LANG['recipients_failed']    = 'Помилка SMTP: не вдалося відправлення для таких отримувачів: ';
 $PHPMAILER_LANG['empty_message']        = 'Пусте повідомлення';
 $PHPMAILER_LANG['empty_message']        = 'Пусте повідомлення';
-$PHPMAILER_LANG['invalid_address']      = 'Не відправлено через невірний формат email-адреси: ';
+$PHPMAILER_LANG['invalid_address']      = 'Не відправлено через неправильний формат email-адреси: ';
 $PHPMAILER_LANG['signing']              = 'Помилка підпису: ';
 $PHPMAILER_LANG['signing']              = 'Помилка підпису: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка з\'єднання з SMTP-сервером';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка з\'єднання з SMTP-сервером';
 $PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-сервера: ';
 $PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-сервера: ';

+ 35 - 0
api/vendor/phpmailer/phpmailer/phpunit.xml.dist

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         backupGlobals="true"
+         bootstrap="vendor/autoload.php"
+         verbose="true"
+         colors="true"
+         forceCoversAnnotation="false"
+    >
+    <testsuites>
+        <testsuite name="PHPMailerTests">
+            <directory>./test/</directory>
+        </testsuite>
+    </testsuites>
+    <listeners>
+        <listener class="PHPMailer\Test\DebugLogTestListener" />
+    </listeners>
+    <groups>
+        <exclude>
+            <group>languages</group>
+            <group>pop3</group>
+        </exclude>
+    </groups>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="junit" target="build/logs/junit.xml"/>
+    </logging>
+</phpunit>

+ 1 - 1
api/vendor/phpmailer/phpmailer/src/OAuth.php

@@ -123,7 +123,7 @@ class OAuth
      */
      */
     public function getOauth64()
     public function getOauth64()
     {
     {
-        // Get a new token if it's not available or has expired
+        //Get a new token if it's not available or has expired
         if (null === $this->oauthToken || $this->oauthToken->hasExpired()) {
         if (null === $this->oauthToken || $this->oauthToken->hasExpired()) {
             $this->oauthToken = $this->getToken();
             $this->oauthToken = $this->getToken();
         }
         }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 208 - 142
api/vendor/phpmailer/phpmailer/src/PHPMailer.php


+ 22 - 22
api/vendor/phpmailer/phpmailer/src/POP3.php

@@ -46,7 +46,7 @@ class POP3
      *
      *
      * @var string
      * @var string
      */
      */
-    const VERSION = '6.2.0';
+    const VERSION = '6.4.1';
 
 
     /**
     /**
      * Default POP3 port number.
      * Default POP3 port number.
@@ -199,13 +199,13 @@ class POP3
     public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
     public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
     {
     {
         $this->host = $host;
         $this->host = $host;
-        // If no port value provided, use default
+        //If no port value provided, use default
         if (false === $port) {
         if (false === $port) {
             $this->port = static::DEFAULT_PORT;
             $this->port = static::DEFAULT_PORT;
         } else {
         } else {
             $this->port = (int) $port;
             $this->port = (int) $port;
         }
         }
-        // If no timeout value provided, use default
+        //If no timeout value provided, use default
         if (false === $timeout) {
         if (false === $timeout) {
             $this->tval = static::DEFAULT_TIMEOUT;
             $this->tval = static::DEFAULT_TIMEOUT;
         } else {
         } else {
@@ -214,9 +214,9 @@ class POP3
         $this->do_debug = $debug_level;
         $this->do_debug = $debug_level;
         $this->username = $username;
         $this->username = $username;
         $this->password = $password;
         $this->password = $password;
-        //  Reset the error log
+        //Reset the error log
         $this->errors = [];
         $this->errors = [];
-        //  connect
+        //Connect
         $result = $this->connect($this->host, $this->port, $this->tval);
         $result = $this->connect($this->host, $this->port, $this->tval);
         if ($result) {
         if ($result) {
             $login_result = $this->login($this->username, $this->password);
             $login_result = $this->login($this->username, $this->password);
@@ -226,7 +226,7 @@ class POP3
                 return true;
                 return true;
             }
             }
         }
         }
-        // We need to disconnect regardless of whether the login succeeded
+        //We need to disconnect regardless of whether the login succeeded
         $this->disconnect();
         $this->disconnect();
 
 
         return false;
         return false;
@@ -243,7 +243,7 @@ class POP3
      */
      */
     public function connect($host, $port = false, $tval = 30)
     public function connect($host, $port = false, $tval = 30)
     {
     {
-        //  Are we already connected?
+        //Are we already connected?
         if ($this->connected) {
         if ($this->connected) {
             return true;
             return true;
         }
         }
@@ -256,22 +256,22 @@ class POP3
             $port = static::DEFAULT_PORT;
             $port = static::DEFAULT_PORT;
         }
         }
 
 
-        //  connect to the POP3 server
+        //Connect to the POP3 server
         $errno = 0;
         $errno = 0;
         $errstr = '';
         $errstr = '';
         $this->pop_conn = fsockopen(
         $this->pop_conn = fsockopen(
-            $host, //  POP3 Host
-            $port, //  Port #
-            $errno, //  Error Number
-            $errstr, //  Error Message
+            $host, //POP3 Host
+            $port, //Port #
+            $errno, //Error Number
+            $errstr, //Error Message
             $tval
             $tval
-        ); //  Timeout (seconds)
-        //  Restore the error handler
+        ); //Timeout (seconds)
+        //Restore the error handler
         restore_error_handler();
         restore_error_handler();
 
 
-        //  Did we connect?
+        //Did we connect?
         if (false === $this->pop_conn) {
         if (false === $this->pop_conn) {
-            //  It would appear not...
+            //It would appear not...
             $this->setError(
             $this->setError(
                 "Failed to connect to server $host on port $port. errno: $errno; errstr: $errstr"
                 "Failed to connect to server $host on port $port. errno: $errno; errstr: $errstr"
             );
             );
@@ -279,14 +279,14 @@ class POP3
             return false;
             return false;
         }
         }
 
 
-        //  Increase the stream time-out
+        //Increase the stream time-out
         stream_set_timeout($this->pop_conn, $tval, 0);
         stream_set_timeout($this->pop_conn, $tval, 0);
 
 
-        //  Get the POP3 server response
+        //Get the POP3 server response
         $pop3_response = $this->getResponse();
         $pop3_response = $this->getResponse();
-        //  Check for the +OK
+        //Check for the +OK
         if ($this->checkResponse($pop3_response)) {
         if ($this->checkResponse($pop3_response)) {
-            //  The connection is established and the POP3 server is talking
+            //The connection is established and the POP3 server is talking
             $this->connected = true;
             $this->connected = true;
 
 
             return true;
             return true;
@@ -316,11 +316,11 @@ class POP3
             $password = $this->password;
             $password = $this->password;
         }
         }
 
 
-        // Send the Username
+        //Send the Username
         $this->sendString("USER $username" . static::LE);
         $this->sendString("USER $username" . static::LE);
         $pop3_response = $this->getResponse();
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
         if ($this->checkResponse($pop3_response)) {
-            // Send the Password
+            //Send the Password
             $this->sendString("PASS $password" . static::LE);
             $this->sendString("PASS $password" . static::LE);
             $pop3_response = $this->getResponse();
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
             if ($this->checkResponse($pop3_response)) {

+ 70 - 46
api/vendor/phpmailer/phpmailer/src/SMTP.php

@@ -35,7 +35,7 @@ class SMTP
      *
      *
      * @var string
      * @var string
      */
      */
-    const VERSION = '6.2.0';
+    const VERSION = '6.4.1';
 
 
     /**
     /**
      * SMTP line break constant.
      * SMTP line break constant.
@@ -312,11 +312,11 @@ class SMTP
      */
      */
     public function connect($host, $port = null, $timeout = 30, $options = [])
     public function connect($host, $port = null, $timeout = 30, $options = [])
     {
     {
-        // Clear errors to avoid confusion
+        //Clear errors to avoid confusion
         $this->setError('');
         $this->setError('');
-        // Make sure we are __not__ connected
+        //Make sure we are __not__ connected
         if ($this->connected()) {
         if ($this->connected()) {
-            // Already connected, generate error
+            //Already connected, generate error
             $this->setError('Already connected to a server');
             $this->setError('Already connected to a server');
 
 
             return false;
             return false;
@@ -324,7 +324,7 @@ class SMTP
         if (empty($port)) {
         if (empty($port)) {
             $port = self::DEFAULT_PORT;
             $port = self::DEFAULT_PORT;
         }
         }
-        // Connect to the SMTP server
+        //Connect to the SMTP server
         $this->edebug(
         $this->edebug(
             "Connection: opening to $host:$port, timeout=$timeout, options=" .
             "Connection: opening to $host:$port, timeout=$timeout, options=" .
             (count($options) > 0 ? var_export($options, true) : 'array()'),
             (count($options) > 0 ? var_export($options, true) : 'array()'),
@@ -340,11 +340,23 @@ class SMTP
 
 
         $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
         $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
 
 
-        // Get any announcement
+        //Get any announcement
         $this->last_reply = $this->get_lines();
         $this->last_reply = $this->get_lines();
         $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
         $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
-
-        return true;
+        $responseCode = (int)substr($this->last_reply, 0, 3);
+        if ($responseCode === 220) {
+            return true;
+        }
+        //Anything other than a 220 response means something went wrong
+        //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
+        //https://tools.ietf.org/html/rfc5321#section-3.1
+        if ($responseCode === 554) {
+            $this->quit();
+        }
+        //This will handle 421 responses which may not wait for a QUIT (e.g. if the server is being shut down)
+        $this->edebug('Connection: closing due to error', self::DEBUG_CONNECTION);
+        $this->close();
+        return false;
     }
     }
 
 
     /**
     /**
@@ -397,7 +409,7 @@ class SMTP
             restore_error_handler();
             restore_error_handler();
         }
         }
 
 
-        // Verify we connected properly
+        //Verify we connected properly
         if (!is_resource($connection)) {
         if (!is_resource($connection)) {
             $this->setError(
             $this->setError(
                 'Failed to connect to server',
                 'Failed to connect to server',
@@ -414,11 +426,11 @@ class SMTP
             return false;
             return false;
         }
         }
 
 
-        // SMTP server can take longer to respond, give longer timeout for first read
-        // Windows does not have support for this timeout function
+        //SMTP server can take longer to respond, give longer timeout for first read
+        //Windows does not have support for this timeout function
         if (strpos(PHP_OS, 'WIN') !== 0) {
         if (strpos(PHP_OS, 'WIN') !== 0) {
             $max = (int)ini_get('max_execution_time');
             $max = (int)ini_get('max_execution_time');
-            // Don't bother if unlimited, or if set_time_limit is disabled
+            //Don't bother if unlimited, or if set_time_limit is disabled
             if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
             if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
                 @set_time_limit($timeout);
                 @set_time_limit($timeout);
             }
             }
@@ -449,7 +461,7 @@ class SMTP
             $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
             $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
         }
         }
 
 
-        // Begin encrypted connection
+        //Begin encrypted connection
         set_error_handler([$this, 'errorHandler']);
         set_error_handler([$this, 'errorHandler']);
         $crypto_ok = stream_socket_enable_crypto(
         $crypto_ok = stream_socket_enable_crypto(
             $this->smtp_conn,
             $this->smtp_conn,
@@ -487,11 +499,11 @@ class SMTP
         }
         }
 
 
         if (array_key_exists('EHLO', $this->server_caps)) {
         if (array_key_exists('EHLO', $this->server_caps)) {
-            // SMTP extensions are available; try to find a proper authentication method
+            //SMTP extensions are available; try to find a proper authentication method
             if (!array_key_exists('AUTH', $this->server_caps)) {
             if (!array_key_exists('AUTH', $this->server_caps)) {
                 $this->setError('Authentication is not allowed at this stage');
                 $this->setError('Authentication is not allowed at this stage');
-                // 'at this stage' means that auth may be allowed after the stage changes
-                // e.g. after STARTTLS
+                //'at this stage' means that auth may be allowed after the stage changes
+                //e.g. after STARTTLS
 
 
                 return false;
                 return false;
             }
             }
@@ -535,12 +547,14 @@ class SMTP
         }
         }
         switch ($authtype) {
         switch ($authtype) {
             case 'PLAIN':
             case 'PLAIN':
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
                 if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
                     return false;
                     return false;
                 }
                 }
-                // Send encoded username and password
+                //Send encoded username and password
                 if (
                 if (
+                    //Format from https://tools.ietf.org/html/rfc4616#section-2
+                    //We skip the first field (it's forgery), so the string starts with a null byte
                     !$this->sendCommand(
                     !$this->sendCommand(
                         'User & Password',
                         'User & Password',
                         base64_encode("\0" . $username . "\0" . $password),
                         base64_encode("\0" . $username . "\0" . $password),
@@ -551,7 +565,7 @@ class SMTP
                 }
                 }
                 break;
                 break;
             case 'LOGIN':
             case 'LOGIN':
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
                 if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
                     return false;
                     return false;
                 }
                 }
@@ -563,17 +577,17 @@ class SMTP
                 }
                 }
                 break;
                 break;
             case 'CRAM-MD5':
             case 'CRAM-MD5':
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
                 if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
                     return false;
                     return false;
                 }
                 }
-                // Get the challenge
+                //Get the challenge
                 $challenge = base64_decode(substr($this->last_reply, 4));
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
 
-                // Build the response
+                //Build the response
                 $response = $username . ' ' . $this->hmac($challenge, $password);
                 $response = $username . ' ' . $this->hmac($challenge, $password);
 
 
-                // send encoded credentials
+                //send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
                 return $this->sendCommand('Username', base64_encode($response), 235);
             case 'XOAUTH2':
             case 'XOAUTH2':
                 //The OAuth instance must be set up prior to requesting auth.
                 //The OAuth instance must be set up prior to requesting auth.
@@ -582,7 +596,7 @@ class SMTP
                 }
                 }
                 $oauth = $OAuth->getOauth64();
                 $oauth = $OAuth->getOauth64();
 
 
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
                 if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
                     return false;
                     return false;
                 }
                 }
@@ -612,15 +626,15 @@ class SMTP
             return hash_hmac('md5', $data, $key);
             return hash_hmac('md5', $data, $key);
         }
         }
 
 
-        // The following borrowed from
-        // http://php.net/manual/en/function.mhash.php#27225
+        //The following borrowed from
+        //http://php.net/manual/en/function.mhash.php#27225
 
 
-        // RFC 2104 HMAC implementation for php.
-        // Creates an md5 HMAC.
-        // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
+        //RFC 2104 HMAC implementation for php.
+        //Creates an md5 HMAC.
+        //Eliminates the need to install mhash to compute a HMAC
+        //by Lance Rushing
 
 
-        $bytelen = 64; // byte length for md5
+        $bytelen = 64; //byte length for md5
         if (strlen($key) > $bytelen) {
         if (strlen($key) > $bytelen) {
             $key = pack('H*', md5($key));
             $key = pack('H*', md5($key));
         }
         }
@@ -643,7 +657,7 @@ class SMTP
         if (is_resource($this->smtp_conn)) {
         if (is_resource($this->smtp_conn)) {
             $sock_status = stream_get_meta_data($this->smtp_conn);
             $sock_status = stream_get_meta_data($this->smtp_conn);
             if ($sock_status['eof']) {
             if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
+                //The socket is valid but we are not connected
                 $this->edebug(
                 $this->edebug(
                     'SMTP NOTICE: EOF caught while checking if connected',
                     'SMTP NOTICE: EOF caught while checking if connected',
                     self::DEBUG_CLIENT
                     self::DEBUG_CLIENT
@@ -653,7 +667,7 @@ class SMTP
                 return false;
                 return false;
             }
             }
 
 
-            return true; // everything looks good
+            return true; //everything looks good
         }
         }
 
 
         return false;
         return false;
@@ -671,7 +685,7 @@ class SMTP
         $this->server_caps = null;
         $this->server_caps = null;
         $this->helo_rply = null;
         $this->helo_rply = null;
         if (is_resource($this->smtp_conn)) {
         if (is_resource($this->smtp_conn)) {
-            // close the connection and cleanup
+            //Close the connection and cleanup
             fclose($this->smtp_conn);
             fclose($this->smtp_conn);
             $this->smtp_conn = null; //Makes for cleaner serialization
             $this->smtp_conn = null; //Makes for cleaner serialization
             $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
             $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
@@ -706,7 +720,7 @@ class SMTP
          * NOTE: this does not count towards line-length limit.
          * NOTE: this does not count towards line-length limit.
          */
          */
 
 
-        // Normalize line breaks before exploding
+        //Normalize line breaks before exploding
         $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data));
         $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data));
 
 
         /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
         /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
@@ -752,7 +766,8 @@ class SMTP
 
 
             //Send the lines to the server
             //Send the lines to the server
             foreach ($lines_out as $line_out) {
             foreach ($lines_out as $line_out) {
-                //RFC2821 section 4.5.2
+                //Dot-stuffing as per RFC5321 section 4.5.2
+                //https://tools.ietf.org/html/rfc5321#section-4.5.2
                 if (!empty($line_out) && $line_out[0] === '.') {
                 if (!empty($line_out) && $line_out[0] === '.') {
                     $line_out = '.' . $line_out;
                     $line_out = '.' . $line_out;
                 }
                 }
@@ -786,7 +801,16 @@ class SMTP
     public function hello($host = '')
     public function hello($host = '')
     {
     {
         //Try extended hello first (RFC 2821)
         //Try extended hello first (RFC 2821)
-        return $this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host);
+        if ($this->sendHello('EHLO', $host)) {
+            return true;
+        }
+
+        //Some servers shut down the SMTP service here (RFC 5321)
+        if (substr($this->helo_rply, 0, 3) == '421') {
+            return false;
+        }
+
+        return $this->sendHello('HELO', $host);
     }
     }
 
 
     /**
     /**
@@ -976,12 +1000,12 @@ class SMTP
         $this->client_send($commandstring . static::LE, $command);
         $this->client_send($commandstring . static::LE, $command);
 
 
         $this->last_reply = $this->get_lines();
         $this->last_reply = $this->get_lines();
-        // Fetch SMTP code and possible error code explanation
+        //Fetch SMTP code and possible error code explanation
         $matches = [];
         $matches = [];
         if (preg_match('/^([\d]{3})[ -](?:([\d]\\.[\d]\\.[\d]{1,2}) )?/', $this->last_reply, $matches)) {
         if (preg_match('/^([\d]{3})[ -](?:([\d]\\.[\d]\\.[\d]{1,2}) )?/', $this->last_reply, $matches)) {
             $code = (int) $matches[1];
             $code = (int) $matches[1];
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
-            // Cut off error code from each response line
+            //Cut off error code from each response line
             $detail = preg_replace(
             $detail = preg_replace(
                 "/{$code}[ -]" .
                 "/{$code}[ -]" .
                 ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
                 ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
@@ -989,7 +1013,7 @@ class SMTP
                 $this->last_reply
                 $this->last_reply
             );
             );
         } else {
         } else {
-            // Fall back to simple parsing if regex fails
+            //Fall back to simple parsing if regex fails
             $code = (int) substr($this->last_reply, 0, 3);
             $code = (int) substr($this->last_reply, 0, 3);
             $code_ex = null;
             $code_ex = null;
             $detail = substr($this->last_reply, 4);
             $detail = substr($this->last_reply, 4);
@@ -1184,7 +1208,7 @@ class SMTP
      */
      */
     protected function get_lines()
     protected function get_lines()
     {
     {
-        // If the connection is bad, give up straight away
+        //If the connection is bad, give up straight away
         if (!is_resource($this->smtp_conn)) {
         if (!is_resource($this->smtp_conn)) {
             return '';
             return '';
         }
         }
@@ -1237,13 +1261,13 @@ class SMTP
             $str = @fgets($this->smtp_conn, self::MAX_REPLY_LENGTH);
             $str = @fgets($this->smtp_conn, self::MAX_REPLY_LENGTH);
             $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
             $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
             $data .= $str;
             $data .= $str;
-            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
-            // or 4th character is a space or a line break char, we are done reading, break the loop.
-            // String array access is a significant micro-optimisation over strlen
+            //If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            //or 4th character is a space or a line break char, we are done reading, break the loop.
+            //String array access is a significant micro-optimisation over strlen
             if (!isset($str[3]) || $str[3] === ' ' || $str[3] === "\r" || $str[3] === "\n") {
             if (!isset($str[3]) || $str[3] === ' ' || $str[3] === "\r" || $str[3] === "\n") {
                 break;
                 break;
             }
             }
-            // Timed-out? Log and break
+            //Timed-out? Log and break
             $info = stream_get_meta_data($this->smtp_conn);
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
             if ($info['timed_out']) {
                 $this->edebug(
                 $this->edebug(
@@ -1252,7 +1276,7 @@ class SMTP
                 );
                 );
                 break;
                 break;
             }
             }
-            // Now check if reads took too long
+            //Now check if reads took too long
             if ($endtime && time() > $endtime) {
             if ($endtime && time() > $endtime) {
                 $this->edebug(
                 $this->edebug(
                     'SMTP -> get_lines(): timelimit reached (' .
                     'SMTP -> get_lines(): timelimit reached (' .

+ 11 - 3
api/vendor/psr/container/README.md

@@ -1,5 +1,13 @@
-# PSR Container
+Container interface
+==============
 
 
-This repository holds all interfaces/classes/traits related to [PSR-11](https://github.com/container-interop/fig-standards/blob/master/proposed/container.md).
+This repository holds all interfaces related to [PSR-11 (Container Interface)][psr-url].
+
+Note that this is not a Container implementation of its own. It is merely abstractions that describe the components of a Dependency Injection Container.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-11/
+[package-url]: https://packagist.org/packages/psr/container
+[implementation-url]: https://packagist.org/providers/psr/container-implementation
 
 
-Note that this is not a container implementation of its own. See the specification for more details.

+ 2 - 7
api/vendor/psr/container/composer.json

@@ -8,20 +8,15 @@
     "authors": [
     "authors": [
         {
         {
             "name": "PHP-FIG",
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
         }
     ],
     ],
     "require": {
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=7.2.0"
     },
     },
     "autoload": {
     "autoload": {
         "psr-4": {
         "psr-4": {
             "Psr\\Container\\": "src/"
             "Psr\\Container\\": "src/"
         }
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
     }
     }
 }
 }

+ 0 - 3
api/vendor/psr/container/src/ContainerExceptionInterface.php

@@ -1,7 +1,4 @@
 <?php
 <?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 
 namespace Psr\Container;
 namespace Psr\Container;
 
 

+ 4 - 5
api/vendor/psr/container/src/ContainerInterface.php

@@ -1,7 +1,6 @@
 <?php
 <?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
+
+declare(strict_types=1);
 
 
 namespace Psr\Container;
 namespace Psr\Container;
 
 
@@ -20,7 +19,7 @@ interface ContainerInterface
      *
      *
      * @return mixed Entry.
      * @return mixed Entry.
      */
      */
-    public function get($id);
+    public function get(string $id);
 
 
     /**
     /**
      * Returns true if the container can return an entry for the given identifier.
      * Returns true if the container can return an entry for the given identifier.
@@ -33,5 +32,5 @@ interface ContainerInterface
      *
      *
      * @return bool
      * @return bool
      */
      */
-    public function has($id);
+    public function has(string $id);
 }
 }

+ 0 - 3
api/vendor/psr/container/src/NotFoundExceptionInterface.php

@@ -1,7 +1,4 @@
 <?php
 <?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 
 namespace Psr\Container;
 namespace Psr\Container;
 
 

+ 0 - 1
api/vendor/psr/log/.gitignore

@@ -1 +0,0 @@
-vendor

+ 16 - 16
api/vendor/psr/log/Psr/Log/AbstractLogger.php

@@ -14,8 +14,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
     /**
      * System is unusable.
      * System is unusable.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -30,8 +30,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Entire website down, database unavailable, etc. This should
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      * trigger the SMS alerts and wake you up.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -45,8 +45,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      *
      * Example: Application component unavailable, unexpected exception.
      * Example: Application component unavailable, unexpected exception.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -59,8 +59,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Runtime errors that do not require immediate action but should typically
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      * be logged and monitored.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -75,8 +75,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      * that are not necessarily wrong.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -88,8 +88,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
     /**
      * Normal but significant events.
      * Normal but significant events.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -103,8 +103,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      *
      * Example: User logs in, SQL logs.
      * Example: User logs in, SQL logs.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -116,8 +116,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
     /**
      * Detailed debug information.
      * Detailed debug information.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */

+ 1 - 1
api/vendor/psr/log/Psr/Log/LoggerAwareTrait.php

@@ -10,7 +10,7 @@ trait LoggerAwareTrait
     /**
     /**
      * The logger instance.
      * The logger instance.
      *
      *
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
      */
     protected $logger;
     protected $logger;
 
 

+ 21 - 19
api/vendor/psr/log/Psr/Log/LoggerInterface.php

@@ -22,8 +22,8 @@ interface LoggerInterface
     /**
     /**
      * System is unusable.
      * System is unusable.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -35,8 +35,8 @@ interface LoggerInterface
      * Example: Entire website down, database unavailable, etc. This should
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      * trigger the SMS alerts and wake you up.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -47,8 +47,8 @@ interface LoggerInterface
      *
      *
      * Example: Application component unavailable, unexpected exception.
      * Example: Application component unavailable, unexpected exception.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -58,8 +58,8 @@ interface LoggerInterface
      * Runtime errors that do not require immediate action but should typically
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      * be logged and monitored.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -71,8 +71,8 @@ interface LoggerInterface
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      * that are not necessarily wrong.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -81,8 +81,8 @@ interface LoggerInterface
     /**
     /**
      * Normal but significant events.
      * Normal but significant events.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -93,8 +93,8 @@ interface LoggerInterface
      *
      *
      * Example: User logs in, SQL logs.
      * Example: User logs in, SQL logs.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -103,8 +103,8 @@ interface LoggerInterface
     /**
     /**
      * Detailed debug information.
      * Detailed debug information.
      *
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
      */
      */
@@ -113,11 +113,13 @@ interface LoggerInterface
     /**
     /**
      * Logs with an arbitrary level.
      * Logs with an arbitrary level.
      *
      *
-     * @param mixed  $level
-     * @param string $message
-     * @param array  $context
+     * @param mixed   $level
+     * @param string  $message
+     * @param mixed[] $context
      *
      *
      * @return void
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
      */
     public function log($level, $message, array $context = array());
     public function log($level, $message, array $context = array());
 }
 }

+ 2 - 0
api/vendor/psr/log/Psr/Log/LoggerTrait.php

@@ -135,6 +135,8 @@ trait LoggerTrait
      * @param array  $context
      * @param array  $context
      *
      *
      * @return void
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
      */
     abstract public function log($level, $message, array $context = array());
     abstract public function log($level, $message, array $context = array());
 }
 }

+ 2 - 0
api/vendor/psr/log/Psr/Log/NullLogger.php

@@ -20,6 +20,8 @@ class NullLogger extends AbstractLogger
      * @param array  $context
      * @param array  $context
      *
      *
      * @return void
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
      */
     public function log($level, $message, array $context = array())
     public function log($level, $message, array $context = array())
     {
     {

+ 18 - 0
api/vendor/psr/log/Psr/Log/Test/DummyTest.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log\Test;
+
+/**
+ * This class is internal and does not follow the BC promise.
+ *
+ * Do NOT use this class in any way.
+ *
+ * @internal
+ */
+class DummyTest
+{
+    public function __toString()
+    {
+        return 'DummyTest';
+    }
+}

+ 2 - 8
api/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php

@@ -4,6 +4,7 @@ namespace Psr\Log\Test;
 
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Psr\Log\LogLevel;
+use PHPUnit\Framework\TestCase;
 
 
 /**
 /**
  * Provides a base test class for ensuring compliance with the LoggerInterface.
  * Provides a base test class for ensuring compliance with the LoggerInterface.
@@ -11,7 +12,7 @@ use Psr\Log\LogLevel;
  * Implementors can extend the class and implement abstract methods to run this
  * Implementors can extend the class and implement abstract methods to run this
  * as part of their test suite.
  * as part of their test suite.
  */
  */
-abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
+abstract class LoggerInterfaceTest extends TestCase
 {
 {
     /**
     /**
      * @return LoggerInterface
      * @return LoggerInterface
@@ -135,10 +136,3 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $this->getLogs());
         $this->assertEquals($expected, $this->getLogs());
     }
     }
 }
 }
-
-class DummyTest
-{
-    public function __toString()
-    {
-    }
-}

+ 6 - 0
api/vendor/psr/log/README.md

@@ -38,6 +38,12 @@ class Foo
         if ($this->logger) {
         if ($this->logger) {
             $this->logger->info('Doing work');
             $this->logger->info('Doing work');
         }
         }
+           
+        try {
+            $this->doSomethingElse();
+        } catch (Exception $exception) {
+            $this->logger->error('Oh no!', array('exception' => $exception));
+        }
 
 
         // do something useful
         // do something useful
     }
     }

+ 2 - 2
api/vendor/psr/log/composer.json

@@ -7,7 +7,7 @@
     "authors": [
     "authors": [
         {
         {
             "name": "PHP-FIG",
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
         }
     ],
     ],
     "require": {
     "require": {
@@ -20,7 +20,7 @@
     },
     },
     "extra": {
     "extra": {
         "branch-alias": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
         }
     }
     }
 }
 }

+ 4 - 0
api/vendor/symfony/polyfill-ctype/bootstrap.php

@@ -11,6 +11,10 @@
 
 
 use Symfony\Polyfill\Ctype as p;
 use Symfony\Polyfill\Ctype as p;
 
 
+if (\PHP_VERSION_ID >= 80000) {
+    return require __DIR__.'/bootstrap80.php';
+}
+
 if (!function_exists('ctype_alnum')) {
 if (!function_exists('ctype_alnum')) {
     function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); }
     function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); }
 }
 }

+ 46 - 0
api/vendor/symfony/polyfill-ctype/bootstrap80.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Ctype as p;
+
+if (!function_exists('ctype_alnum')) {
+    function ctype_alnum(mixed $text): bool { return p\Ctype::ctype_alnum($text); }
+}
+if (!function_exists('ctype_alpha')) {
+    function ctype_alpha(mixed $text): bool { return p\Ctype::ctype_alpha($text); }
+}
+if (!function_exists('ctype_cntrl')) {
+    function ctype_cntrl(mixed $text): bool { return p\Ctype::ctype_cntrl($text); }
+}
+if (!function_exists('ctype_digit')) {
+    function ctype_digit(mixed $text): bool { return p\Ctype::ctype_digit($text); }
+}
+if (!function_exists('ctype_graph')) {
+    function ctype_graph(mixed $text): bool { return p\Ctype::ctype_graph($text); }
+}
+if (!function_exists('ctype_lower')) {
+    function ctype_lower(mixed $text): bool { return p\Ctype::ctype_lower($text); }
+}
+if (!function_exists('ctype_print')) {
+    function ctype_print(mixed $text): bool { return p\Ctype::ctype_print($text); }
+}
+if (!function_exists('ctype_punct')) {
+    function ctype_punct(mixed $text): bool { return p\Ctype::ctype_punct($text); }
+}
+if (!function_exists('ctype_space')) {
+    function ctype_space(mixed $text): bool { return p\Ctype::ctype_space($text); }
+}
+if (!function_exists('ctype_upper')) {
+    function ctype_upper(mixed $text): bool { return p\Ctype::ctype_upper($text); }
+}
+if (!function_exists('ctype_xdigit')) {
+    function ctype_xdigit(mixed $text): bool { return p\Ctype::ctype_xdigit($text); }
+}

+ 2 - 2
api/vendor/symfony/polyfill-ctype/composer.json

@@ -16,7 +16,7 @@
         }
         }
     ],
     ],
     "require": {
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=7.1"
     },
     },
     "autoload": {
     "autoload": {
         "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" },
         "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" },
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "minimum-stability": "dev",
     "extra": {
     "extra": {
         "branch-alias": {
         "branch-alias": {
-            "dev-master": "1.18-dev"
+            "dev-main": "1.22-dev"
         },
         },
         "thanks": {
         "thanks": {
             "name": "symfony/polyfill",
             "name": "symfony/polyfill",

+ 82 - 60
api/vendor/symfony/polyfill-mbstring/Mbstring.php

@@ -67,15 +67,15 @@ namespace Symfony\Polyfill\Mbstring;
  */
  */
 final class Mbstring
 final class Mbstring
 {
 {
-    const MB_CASE_FOLD = PHP_INT_MAX;
+    public const MB_CASE_FOLD = \PHP_INT_MAX;
 
 
-    private static $encodingList = array('ASCII', 'UTF-8');
+    private static $encodingList = ['ASCII', 'UTF-8'];
     private static $language = 'neutral';
     private static $language = 'neutral';
     private static $internalEncoding = 'UTF-8';
     private static $internalEncoding = 'UTF-8';
-    private static $caseFold = array(
-        array('µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE"),
-        array('μ', 's', 'ι',        'σ', 'β',        'θ',        'φ',        'π',        'κ',        'ρ',        'ε',        "\xE1\xB9\xA1", 'ι'),
-    );
+    private static $caseFold = [
+        ['µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE"],
+        ['μ', 's', 'ι',        'σ', 'β',        'θ',        'φ',        'π',        'κ',        'ρ',        'ε',        "\xE1\xB9\xA1", 'ι'],
+    ];
 
 
     public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
     public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
     {
     {
@@ -104,24 +104,22 @@ final class Mbstring
                 $s = iconv($fromEncoding, 'UTF-8//IGNORE', $s);
                 $s = iconv($fromEncoding, 'UTF-8//IGNORE', $s);
             }
             }
 
 
-            return preg_replace_callback('/[\x80-\xFF]+/', array(__CLASS__, 'html_encoding_callback'), $s);
+            return preg_replace_callback('/[\x80-\xFF]+/', [__CLASS__, 'html_encoding_callback'], $s);
         }
         }
 
 
         if ('HTML-ENTITIES' === $fromEncoding) {
         if ('HTML-ENTITIES' === $fromEncoding) {
-            $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
+            $s = html_entity_decode($s, \ENT_COMPAT, 'UTF-8');
             $fromEncoding = 'UTF-8';
             $fromEncoding = 'UTF-8';
         }
         }
 
 
         return iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
         return iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
     }
     }
 
 
-    public static function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null)
+    public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars)
     {
     {
-        $vars = array(&$a, &$b, &$c, &$d, &$e, &$f);
-
         $ok = true;
         $ok = true;
         array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) {
         array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) {
-            if (false === $v = Mbstring::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
+            if (false === $v = self::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
                 $ok = false;
                 $ok = false;
             }
             }
         });
         });
@@ -136,23 +134,23 @@ final class Mbstring
 
 
     public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null)
     public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null)
     {
     {
-        trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', E_USER_WARNING);
+        trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', \E_USER_WARNING);
     }
     }
 
 
     public static function mb_decode_numericentity($s, $convmap, $encoding = null)
     public static function mb_decode_numericentity($s, $convmap, $encoding = null)
     {
     {
-        if (null !== $s && !\is_scalar($s) && !(\is_object($s) && \method_exists($s, '__toString'))) {
-            trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', E_USER_WARNING);
+        if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+            trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
 
 
             return null;
             return null;
         }
         }
 
 
-        if (!\is_array($convmap) || !$convmap) {
+        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
             return false;
             return false;
         }
         }
 
 
-        if (null !== $encoding && !\is_scalar($encoding)) {
-            trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', E_USER_WARNING);
+        if (null !== $encoding && !is_scalar($encoding)) {
+            trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
 
 
             return '';  // Instead of null (cf. mb_encode_numericentity).
             return '';  // Instead of null (cf. mb_encode_numericentity).
         }
         }
@@ -185,7 +183,7 @@ final class Mbstring
             $c = isset($m[2]) ? (int) hexdec($m[2]) : $m[1];
             $c = isset($m[2]) ? (int) hexdec($m[2]) : $m[1];
             for ($i = 0; $i < $cnt; $i += 4) {
             for ($i = 0; $i < $cnt; $i += 4) {
                 if ($c >= $convmap[$i] && $c <= $convmap[$i + 1]) {
                 if ($c >= $convmap[$i] && $c <= $convmap[$i + 1]) {
-                    return Mbstring::mb_chr($c - $convmap[$i + 2]);
+                    return self::mb_chr($c - $convmap[$i + 2]);
                 }
                 }
             }
             }
 
 
@@ -201,24 +199,24 @@ final class Mbstring
 
 
     public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false)
     public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false)
     {
     {
-        if (null !== $s && !\is_scalar($s) && !(\is_object($s) && \method_exists($s, '__toString'))) {
-            trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', E_USER_WARNING);
+        if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+            trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
 
 
             return null;
             return null;
         }
         }
 
 
-        if (!\is_array($convmap) || !$convmap) {
+        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
             return false;
             return false;
         }
         }
 
 
-        if (null !== $encoding && !\is_scalar($encoding)) {
-            trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', E_USER_WARNING);
+        if (null !== $encoding && !is_scalar($encoding)) {
+            trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
 
 
             return null;  // Instead of '' (cf. mb_decode_numericentity).
             return null;  // Instead of '' (cf. mb_decode_numericentity).
         }
         }
 
 
-        if (null !== $is_hex && !\is_scalar($is_hex)) {
-            trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', E_USER_WARNING);
+        if (null !== $is_hex && !is_scalar($is_hex)) {
+            trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', \E_USER_WARNING);
 
 
             return null;
             return null;
         }
         }
@@ -239,7 +237,7 @@ final class Mbstring
             $s = iconv($encoding, 'UTF-8//IGNORE', $s);
             $s = iconv($encoding, 'UTF-8//IGNORE', $s);
         }
         }
 
 
-        static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
+        static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
 
 
         $cnt = floor(\count($convmap) / 4) * 4;
         $cnt = floor(\count($convmap) / 4) * 4;
         $i = 0;
         $i = 0;
@@ -287,14 +285,14 @@ final class Mbstring
             $s = iconv($encoding, 'UTF-8//IGNORE', $s);
             $s = iconv($encoding, 'UTF-8//IGNORE', $s);
         }
         }
 
 
-        if (MB_CASE_TITLE == $mode) {
+        if (\MB_CASE_TITLE == $mode) {
             static $titleRegexp = null;
             static $titleRegexp = null;
             if (null === $titleRegexp) {
             if (null === $titleRegexp) {
                 $titleRegexp = self::getData('titleCaseRegexp');
                 $titleRegexp = self::getData('titleCaseRegexp');
             }
             }
-            $s = preg_replace_callback($titleRegexp, array(__CLASS__, 'title_case'), $s);
+            $s = preg_replace_callback($titleRegexp, [__CLASS__, 'title_case'], $s);
         } else {
         } else {
-            if (MB_CASE_UPPER == $mode) {
+            if (\MB_CASE_UPPER == $mode) {
                 static $upper = null;
                 static $upper = null;
                 if (null === $upper) {
                 if (null === $upper) {
                     $upper = self::getData('upperCase');
                     $upper = self::getData('upperCase');
@@ -312,7 +310,7 @@ final class Mbstring
                 $map = $lower;
                 $map = $lower;
             }
             }
 
 
-            static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
+            static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
 
 
             $i = 0;
             $i = 0;
             $len = \strlen($s);
             $len = \strlen($s);
@@ -353,15 +351,19 @@ final class Mbstring
             return self::$internalEncoding;
             return self::$internalEncoding;
         }
         }
 
 
-        $encoding = self::getEncoding($encoding);
+        $normalizedEncoding = self::getEncoding($encoding);
 
 
-        if ('UTF-8' === $encoding || false !== @iconv($encoding, $encoding, ' ')) {
-            self::$internalEncoding = $encoding;
+        if ('UTF-8' === $normalizedEncoding || false !== @iconv($normalizedEncoding, $normalizedEncoding, ' ')) {
+            self::$internalEncoding = $normalizedEncoding;
 
 
             return true;
             return true;
         }
         }
 
 
-        return false;
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+
+        throw new \ValueError(sprintf('Argument #1 ($encoding) must be a valid encoding, "%s" given', $encoding));
     }
     }
 
 
     public static function mb_language($lang = null)
     public static function mb_language($lang = null)
@@ -370,20 +372,24 @@ final class Mbstring
             return self::$language;
             return self::$language;
         }
         }
 
 
-        switch ($lang = strtolower($lang)) {
+        switch ($normalizedLang = strtolower($lang)) {
             case 'uni':
             case 'uni':
             case 'neutral':
             case 'neutral':
-                self::$language = $lang;
+                self::$language = $normalizedLang;
 
 
                 return true;
                 return true;
         }
         }
 
 
-        return false;
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+
+        throw new \ValueError(sprintf('Argument #1 ($language) must be a valid language, "%s" given', $lang));
     }
     }
 
 
     public static function mb_list_encodings()
     public static function mb_list_encodings()
     {
     {
-        return array('UTF-8');
+        return ['UTF-8'];
     }
     }
 
 
     public static function mb_encoding_aliases($encoding)
     public static function mb_encoding_aliases($encoding)
@@ -391,7 +397,7 @@ final class Mbstring
         switch (strtoupper($encoding)) {
         switch (strtoupper($encoding)) {
             case 'UTF8':
             case 'UTF8':
             case 'UTF-8':
             case 'UTF-8':
-                return array('utf8');
+                return ['utf8'];
         }
         }
 
 
         return false;
         return false;
@@ -406,7 +412,7 @@ final class Mbstring
             $encoding = self::$internalEncoding;
             $encoding = self::$internalEncoding;
         }
         }
 
 
-        return self::mb_detect_encoding($var, array($encoding)) || false !== @iconv($encoding, $encoding, $var);
+        return self::mb_detect_encoding($var, [$encoding]) || false !== @iconv($encoding, $encoding, $var);
     }
     }
 
 
     public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
     public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
@@ -493,9 +499,13 @@ final class Mbstring
 
 
         $needle = (string) $needle;
         $needle = (string) $needle;
         if ('' === $needle) {
         if ('' === $needle) {
-            trigger_error(__METHOD__.': Empty delimiter', E_USER_WARNING);
+            if (80000 > \PHP_VERSION_ID) {
+                trigger_error(__METHOD__.': Empty delimiter', \E_USER_WARNING);
 
 
-            return false;
+                return false;
+            }
+
+            return 0;
         }
         }
 
 
         return iconv_strpos($haystack, $needle, $offset, $encoding);
         return iconv_strpos($haystack, $needle, $offset, $encoding);
@@ -521,23 +531,28 @@ final class Mbstring
             }
             }
         }
         }
 
 
-        $pos = iconv_strrpos($haystack, $needle, $encoding);
+        $pos = '' !== $needle || 80000 > \PHP_VERSION_ID
+            ? iconv_strrpos($haystack, $needle, $encoding)
+            : self::mb_strlen($haystack, $encoding);
 
 
         return false !== $pos ? $offset + $pos : false;
         return false !== $pos ? $offset + $pos : false;
     }
     }
 
 
     public static function mb_str_split($string, $split_length = 1, $encoding = null)
     public static function mb_str_split($string, $split_length = 1, $encoding = null)
     {
     {
-        if (null !== $string && !\is_scalar($string) && !(\is_object($string) && \method_exists($string, '__toString'))) {
-            trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', E_USER_WARNING);
+        if (null !== $string && !is_scalar($string) && !(\is_object($string) && method_exists($string, '__toString'))) {
+            trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', \E_USER_WARNING);
 
 
             return null;
             return null;
         }
         }
 
 
         if (1 > $split_length = (int) $split_length) {
         if (1 > $split_length = (int) $split_length) {
-            trigger_error('The length of each segment must be greater than zero', E_USER_WARNING);
+            if (80000 > \PHP_VERSION_ID) {
+                trigger_error('The length of each segment must be greater than zero', \E_USER_WARNING);
+                return false;
+            }
 
 
-            return false;
+            throw new \ValueError('Argument #2 ($length) must be greater than 0');
         }
         }
 
 
         if (null === $encoding) {
         if (null === $encoding) {
@@ -552,10 +567,10 @@ final class Mbstring
             }
             }
             $rx .= '.{'.$split_length.'})/us';
             $rx .= '.{'.$split_length.'})/us';
 
 
-            return preg_split($rx, $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+            return preg_split($rx, $string, null, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY);
         }
         }
 
 
-        $result = array();
+        $result = [];
         $length = mb_strlen($string, $encoding);
         $length = mb_strlen($string, $encoding);
 
 
         for ($i = 0; $i < $length; $i += $split_length) {
         for ($i = 0; $i < $length; $i += $split_length) {
@@ -567,21 +582,27 @@ final class Mbstring
 
 
     public static function mb_strtolower($s, $encoding = null)
     public static function mb_strtolower($s, $encoding = null)
     {
     {
-        return self::mb_convert_case($s, MB_CASE_LOWER, $encoding);
+        return self::mb_convert_case($s, \MB_CASE_LOWER, $encoding);
     }
     }
 
 
     public static function mb_strtoupper($s, $encoding = null)
     public static function mb_strtoupper($s, $encoding = null)
     {
     {
-        return self::mb_convert_case($s, MB_CASE_UPPER, $encoding);
+        return self::mb_convert_case($s, \MB_CASE_UPPER, $encoding);
     }
     }
 
 
     public static function mb_substitute_character($c = null)
     public static function mb_substitute_character($c = null)
     {
     {
+        if (null === $c) {
+            return 'none';
+        }
         if (0 === strcasecmp($c, 'none')) {
         if (0 === strcasecmp($c, 'none')) {
             return true;
             return true;
         }
         }
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
 
 
-        return null !== $c ? false : 'none';
+        throw new \ValueError('Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint');
     }
     }
 
 
     public static function mb_substr($s, $start, $length = null, $encoding = null)
     public static function mb_substr($s, $start, $length = null, $encoding = null)
@@ -629,10 +650,11 @@ final class Mbstring
     {
     {
         $encoding = self::getEncoding($encoding);
         $encoding = self::getEncoding($encoding);
         if ('CP850' === $encoding || 'ASCII' === $encoding) {
         if ('CP850' === $encoding || 'ASCII' === $encoding) {
-            return strrchr($haystack, $needle, $part);
+            $pos = strrpos($haystack, $needle);
+        } else {
+            $needle = self::mb_substr($needle, 0, 1, $encoding);
+            $pos = iconv_strrpos($haystack, $needle, $encoding);
         }
         }
-        $needle = self::mb_substr($needle, 0, 1, $encoding);
-        $pos = iconv_strrpos($haystack, $needle, $encoding);
 
 
         return self::getSubpart($pos, $part, $haystack, $encoding);
         return self::getSubpart($pos, $part, $haystack, $encoding);
     }
     }
@@ -668,7 +690,7 @@ final class Mbstring
 
 
     public static function mb_get_info($type = 'all')
     public static function mb_get_info($type = 'all')
     {
     {
-        $info = array(
+        $info = [
             'internal_encoding' => self::$internalEncoding,
             'internal_encoding' => self::$internalEncoding,
             'http_output' => 'pass',
             'http_output' => 'pass',
             'http_output_conv_mimetypes' => '^(text/|application/xhtml\+xml)',
             'http_output_conv_mimetypes' => '^(text/|application/xhtml\+xml)',
@@ -683,7 +705,7 @@ final class Mbstring
             'detect_order' => self::$encodingList,
             'detect_order' => self::$encodingList,
             'substitute_character' => 'none',
             'substitute_character' => 'none',
             'strict_detection' => 'Off',
             'strict_detection' => 'Off',
-        );
+        ];
 
 
         if ('all' === $type) {
         if ('all' === $type) {
             return $info;
             return $info;
@@ -787,7 +809,7 @@ final class Mbstring
     {
     {
         $i = 1;
         $i = 1;
         $entities = '';
         $entities = '';
-        $m = unpack('C*', htmlentities($m[0], ENT_COMPAT, 'UTF-8'));
+        $m = unpack('C*', htmlentities($m[0], \ENT_COMPAT, 'UTF-8'));
 
 
         while (isset($m[$i])) {
         while (isset($m[$i])) {
             if (0x80 > $m[$i]) {
             if (0x80 > $m[$i]) {
@@ -810,7 +832,7 @@ final class Mbstring
 
 
     private static function title_case(array $s)
     private static function title_case(array $s)
     {
     {
-        return self::mb_convert_case($s[1], MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s[2], MB_CASE_LOWER, 'UTF-8');
+        return self::mb_convert_case($s[1], \MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s[2], \MB_CASE_LOWER, 'UTF-8');
     }
     }
 
 
     private static function getData($file)
     private static function getData($file)

+ 1 - 1
api/vendor/symfony/polyfill-mbstring/README.md

@@ -2,7 +2,7 @@ Symfony Polyfill / Mbstring
 ===========================
 ===========================
 
 
 This component provides a partial, native PHP implementation for the
 This component provides a partial, native PHP implementation for the
-[Mbstring](http://php.net/mbstring) extension.
+[Mbstring](https://php.net/mbstring) extension.
 
 
 More information can be found in the
 More information can be found in the
 [main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
 [main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).

+ 302 - 1
api/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php

@@ -1,6 +1,6 @@
 <?php
 <?php
 
 
-return array(
+return array (
   'A' => 'a',
   'A' => 'a',
   'B' => 'b',
   'B' => 'b',
   'C' => 'c',
   'C' => 'c',
@@ -510,6 +510,138 @@ return array(
   'Ⴥ' => 'ⴥ',
   'Ⴥ' => 'ⴥ',
   'Ⴧ' => 'ⴧ',
   'Ⴧ' => 'ⴧ',
   'Ⴭ' => 'ⴭ',
   'Ⴭ' => 'ⴭ',
+  'Ꭰ' => 'ꭰ',
+  'Ꭱ' => 'ꭱ',
+  'Ꭲ' => 'ꭲ',
+  'Ꭳ' => 'ꭳ',
+  'Ꭴ' => 'ꭴ',
+  'Ꭵ' => 'ꭵ',
+  'Ꭶ' => 'ꭶ',
+  'Ꭷ' => 'ꭷ',
+  'Ꭸ' => 'ꭸ',
+  'Ꭹ' => 'ꭹ',
+  'Ꭺ' => 'ꭺ',
+  'Ꭻ' => 'ꭻ',
+  'Ꭼ' => 'ꭼ',
+  'Ꭽ' => 'ꭽ',
+  'Ꭾ' => 'ꭾ',
+  'Ꭿ' => 'ꭿ',
+  'Ꮀ' => 'ꮀ',
+  'Ꮁ' => 'ꮁ',
+  'Ꮂ' => 'ꮂ',
+  'Ꮃ' => 'ꮃ',
+  'Ꮄ' => 'ꮄ',
+  'Ꮅ' => 'ꮅ',
+  'Ꮆ' => 'ꮆ',
+  'Ꮇ' => 'ꮇ',
+  'Ꮈ' => 'ꮈ',
+  'Ꮉ' => 'ꮉ',
+  'Ꮊ' => 'ꮊ',
+  'Ꮋ' => 'ꮋ',
+  'Ꮌ' => 'ꮌ',
+  'Ꮍ' => 'ꮍ',
+  'Ꮎ' => 'ꮎ',
+  'Ꮏ' => 'ꮏ',
+  'Ꮐ' => 'ꮐ',
+  'Ꮑ' => 'ꮑ',
+  'Ꮒ' => 'ꮒ',
+  'Ꮓ' => 'ꮓ',
+  'Ꮔ' => 'ꮔ',
+  'Ꮕ' => 'ꮕ',
+  'Ꮖ' => 'ꮖ',
+  'Ꮗ' => 'ꮗ',
+  'Ꮘ' => 'ꮘ',
+  'Ꮙ' => 'ꮙ',
+  'Ꮚ' => 'ꮚ',
+  'Ꮛ' => 'ꮛ',
+  'Ꮜ' => 'ꮜ',
+  'Ꮝ' => 'ꮝ',
+  'Ꮞ' => 'ꮞ',
+  'Ꮟ' => 'ꮟ',
+  'Ꮠ' => 'ꮠ',
+  'Ꮡ' => 'ꮡ',
+  'Ꮢ' => 'ꮢ',
+  'Ꮣ' => 'ꮣ',
+  'Ꮤ' => 'ꮤ',
+  'Ꮥ' => 'ꮥ',
+  'Ꮦ' => 'ꮦ',
+  'Ꮧ' => 'ꮧ',
+  'Ꮨ' => 'ꮨ',
+  'Ꮩ' => 'ꮩ',
+  'Ꮪ' => 'ꮪ',
+  'Ꮫ' => 'ꮫ',
+  'Ꮬ' => 'ꮬ',
+  'Ꮭ' => 'ꮭ',
+  'Ꮮ' => 'ꮮ',
+  'Ꮯ' => 'ꮯ',
+  'Ꮰ' => 'ꮰ',
+  'Ꮱ' => 'ꮱ',
+  'Ꮲ' => 'ꮲ',
+  'Ꮳ' => 'ꮳ',
+  'Ꮴ' => 'ꮴ',
+  'Ꮵ' => 'ꮵ',
+  'Ꮶ' => 'ꮶ',
+  'Ꮷ' => 'ꮷ',
+  'Ꮸ' => 'ꮸ',
+  'Ꮹ' => 'ꮹ',
+  'Ꮺ' => 'ꮺ',
+  'Ꮻ' => 'ꮻ',
+  'Ꮼ' => 'ꮼ',
+  'Ꮽ' => 'ꮽ',
+  'Ꮾ' => 'ꮾ',
+  'Ꮿ' => 'ꮿ',
+  'Ᏸ' => 'ᏸ',
+  'Ᏹ' => 'ᏹ',
+  'Ᏺ' => 'ᏺ',
+  'Ᏻ' => 'ᏻ',
+  'Ᏼ' => 'ᏼ',
+  'Ᏽ' => 'ᏽ',
+  'Ა' => 'ა',
+  'Ბ' => 'ბ',
+  'Გ' => 'გ',
+  'Დ' => 'დ',
+  'Ე' => 'ე',
+  'Ვ' => 'ვ',
+  'Ზ' => 'ზ',
+  'Თ' => 'თ',
+  'Ი' => 'ი',
+  'Კ' => 'კ',
+  'Ლ' => 'ლ',
+  'Მ' => 'მ',
+  'Ნ' => 'ნ',
+  'Ო' => 'ო',
+  'Პ' => 'პ',
+  'Ჟ' => 'ჟ',
+  'Რ' => 'რ',
+  'Ს' => 'ს',
+  'Ტ' => 'ტ',
+  'Უ' => 'უ',
+  'Ფ' => 'ფ',
+  'Ქ' => 'ქ',
+  'Ღ' => 'ღ',
+  'Ყ' => 'ყ',
+  'Შ' => 'შ',
+  'Ჩ' => 'ჩ',
+  'Ც' => 'ც',
+  'Ძ' => 'ძ',
+  'Წ' => 'წ',
+  'Ჭ' => 'ჭ',
+  'Ხ' => 'ხ',
+  'Ჯ' => 'ჯ',
+  'Ჰ' => 'ჰ',
+  'Ჱ' => 'ჱ',
+  'Ჲ' => 'ჲ',
+  'Ჳ' => 'ჳ',
+  'Ჴ' => 'ჴ',
+  'Ჵ' => 'ჵ',
+  'Ჶ' => 'ჶ',
+  'Ჷ' => 'ჷ',
+  'Ჸ' => 'ჸ',
+  'Ჹ' => 'ჹ',
+  'Ჺ' => 'ჺ',
+  'Ჽ' => 'ჽ',
+  'Ჾ' => 'ჾ',
+  'Ჿ' => 'ჿ',
   'Ḁ' => 'ḁ',
   'Ḁ' => 'ḁ',
   'Ḃ' => 'ḃ',
   'Ḃ' => 'ḃ',
   'Ḅ' => 'ḅ',
   'Ḅ' => 'ḅ',
@@ -993,8 +1125,24 @@ return array(
   'Ɜ' => 'ɜ',
   'Ɜ' => 'ɜ',
   'Ɡ' => 'ɡ',
   'Ɡ' => 'ɡ',
   'Ɬ' => 'ɬ',
   'Ɬ' => 'ɬ',
+  'Ɪ' => 'ɪ',
   'Ʞ' => 'ʞ',
   'Ʞ' => 'ʞ',
   'Ʇ' => 'ʇ',
   'Ʇ' => 'ʇ',
+  'Ʝ' => 'ʝ',
+  'Ꭓ' => 'ꭓ',
+  'Ꞵ' => 'ꞵ',
+  'Ꞷ' => 'ꞷ',
+  'Ꞹ' => 'ꞹ',
+  'Ꞻ' => 'ꞻ',
+  'Ꞽ' => 'ꞽ',
+  'Ꞿ' => 'ꞿ',
+  'Ꟃ' => 'ꟃ',
+  'Ꞔ' => 'ꞔ',
+  'Ʂ' => 'ʂ',
+  'Ᶎ' => 'ᶎ',
+  'Ꟈ' => 'ꟈ',
+  'Ꟊ' => 'ꟊ',
+  'Ꟶ' => 'ꟶ',
   'A' => 'a',
   'A' => 'a',
   'B' => 'b',
   'B' => 'b',
   'C' => 'c',
   'C' => 'c',
@@ -1061,6 +1209,93 @@ return array(
   '𐐥' => '𐑍',
   '𐐥' => '𐑍',
   '𐐦' => '𐑎',
   '𐐦' => '𐑎',
   '𐐧' => '𐑏',
   '𐐧' => '𐑏',
+  '𐒰' => '𐓘',
+  '𐒱' => '𐓙',
+  '𐒲' => '𐓚',
+  '𐒳' => '𐓛',
+  '𐒴' => '𐓜',
+  '𐒵' => '𐓝',
+  '𐒶' => '𐓞',
+  '𐒷' => '𐓟',
+  '𐒸' => '𐓠',
+  '𐒹' => '𐓡',
+  '𐒺' => '𐓢',
+  '𐒻' => '𐓣',
+  '𐒼' => '𐓤',
+  '𐒽' => '𐓥',
+  '𐒾' => '𐓦',
+  '𐒿' => '𐓧',
+  '𐓀' => '𐓨',
+  '𐓁' => '𐓩',
+  '𐓂' => '𐓪',
+  '𐓃' => '𐓫',
+  '𐓄' => '𐓬',
+  '𐓅' => '𐓭',
+  '𐓆' => '𐓮',
+  '𐓇' => '𐓯',
+  '𐓈' => '𐓰',
+  '𐓉' => '𐓱',
+  '𐓊' => '𐓲',
+  '𐓋' => '𐓳',
+  '𐓌' => '𐓴',
+  '𐓍' => '𐓵',
+  '𐓎' => '𐓶',
+  '𐓏' => '𐓷',
+  '𐓐' => '𐓸',
+  '𐓑' => '𐓹',
+  '𐓒' => '𐓺',
+  '𐓓' => '𐓻',
+  '𐲀' => '𐳀',
+  '𐲁' => '𐳁',
+  '𐲂' => '𐳂',
+  '𐲃' => '𐳃',
+  '𐲄' => '𐳄',
+  '𐲅' => '𐳅',
+  '𐲆' => '𐳆',
+  '𐲇' => '𐳇',
+  '𐲈' => '𐳈',
+  '𐲉' => '𐳉',
+  '𐲊' => '𐳊',
+  '𐲋' => '𐳋',
+  '𐲌' => '𐳌',
+  '𐲍' => '𐳍',
+  '𐲎' => '𐳎',
+  '𐲏' => '𐳏',
+  '𐲐' => '𐳐',
+  '𐲑' => '𐳑',
+  '𐲒' => '𐳒',
+  '𐲓' => '𐳓',
+  '𐲔' => '𐳔',
+  '𐲕' => '𐳕',
+  '𐲖' => '𐳖',
+  '𐲗' => '𐳗',
+  '𐲘' => '𐳘',
+  '𐲙' => '𐳙',
+  '𐲚' => '𐳚',
+  '𐲛' => '𐳛',
+  '𐲜' => '𐳜',
+  '𐲝' => '𐳝',
+  '𐲞' => '𐳞',
+  '𐲟' => '𐳟',
+  '𐲠' => '𐳠',
+  '𐲡' => '𐳡',
+  '𐲢' => '𐳢',
+  '𐲣' => '𐳣',
+  '𐲤' => '𐳤',
+  '𐲥' => '𐳥',
+  '𐲦' => '𐳦',
+  '𐲧' => '𐳧',
+  '𐲨' => '𐳨',
+  '𐲩' => '𐳩',
+  '𐲪' => '𐳪',
+  '𐲫' => '𐳫',
+  '𐲬' => '𐳬',
+  '𐲭' => '𐳭',
+  '𐲮' => '𐳮',
+  '𐲯' => '𐳯',
+  '𐲰' => '𐳰',
+  '𐲱' => '𐳱',
+  '𐲲' => '𐳲',
   '𑢠' => '𑣀',
   '𑢠' => '𑣀',
   '𑢡' => '𑣁',
   '𑢡' => '𑣁',
   '𑢢' => '𑣂',
   '𑢢' => '𑣂',
@@ -1093,4 +1328,70 @@ return array(
   '𑢽' => '𑣝',
   '𑢽' => '𑣝',
   '𑢾' => '𑣞',
   '𑢾' => '𑣞',
   '𑢿' => '𑣟',
   '𑢿' => '𑣟',
+  '𖹀' => '𖹠',
+  '𖹁' => '𖹡',
+  '𖹂' => '𖹢',
+  '𖹃' => '𖹣',
+  '𖹄' => '𖹤',
+  '𖹅' => '𖹥',
+  '𖹆' => '𖹦',
+  '𖹇' => '𖹧',
+  '𖹈' => '𖹨',
+  '𖹉' => '𖹩',
+  '𖹊' => '𖹪',
+  '𖹋' => '𖹫',
+  '𖹌' => '𖹬',
+  '𖹍' => '𖹭',
+  '𖹎' => '𖹮',
+  '𖹏' => '𖹯',
+  '𖹐' => '𖹰',
+  '𖹑' => '𖹱',
+  '𖹒' => '𖹲',
+  '𖹓' => '𖹳',
+  '𖹔' => '𖹴',
+  '𖹕' => '𖹵',
+  '𖹖' => '𖹶',
+  '𖹗' => '𖹷',
+  '𖹘' => '𖹸',
+  '𖹙' => '𖹹',
+  '𖹚' => '𖹺',
+  '𖹛' => '𖹻',
+  '𖹜' => '𖹼',
+  '𖹝' => '𖹽',
+  '𖹞' => '𖹾',
+  '𖹟' => '𖹿',
+  '𞤀' => '𞤢',
+  '𞤁' => '𞤣',
+  '𞤂' => '𞤤',
+  '𞤃' => '𞤥',
+  '𞤄' => '𞤦',
+  '𞤅' => '𞤧',
+  '𞤆' => '𞤨',
+  '𞤇' => '𞤩',
+  '𞤈' => '𞤪',
+  '𞤉' => '𞤫',
+  '𞤊' => '𞤬',
+  '𞤋' => '𞤭',
+  '𞤌' => '𞤮',
+  '𞤍' => '𞤯',
+  '𞤎' => '𞤰',
+  '𞤏' => '𞤱',
+  '𞤐' => '𞤲',
+  '𞤑' => '𞤳',
+  '𞤒' => '𞤴',
+  '𞤓' => '𞤵',
+  '𞤔' => '𞤶',
+  '𞤕' => '𞤷',
+  '𞤖' => '𞤸',
+  '𞤗' => '𞤹',
+  '𞤘' => '𞤺',
+  '𞤙' => '𞤻',
+  '𞤚' => '𞤼',
+  '𞤛' => '𞤽',
+  '𞤜' => '𞤾',
+  '𞤝' => '𞤿',
+  '𞤞' => '𞥀',
+  '𞤟' => '𞥁',
+  '𞤠' => '𞥂',
+  '𞤡' => '𞥃',
 );
 );

+ 311 - 1
api/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php

@@ -1,6 +1,6 @@
 <?php
 <?php
 
 
-return array(
+return array (
   'a' => 'A',
   'a' => 'A',
   'b' => 'B',
   'b' => 'B',
   'c' => 'C',
   'c' => 'C',
@@ -225,6 +225,7 @@ return array(
   'ɦ' => 'Ɦ',
   'ɦ' => 'Ɦ',
   'ɨ' => 'Ɨ',
   'ɨ' => 'Ɨ',
   'ɩ' => 'Ɩ',
   'ɩ' => 'Ɩ',
+  'ɪ' => 'Ɪ',
   'ɫ' => 'Ɫ',
   'ɫ' => 'Ɫ',
   'ɬ' => 'Ɬ',
   'ɬ' => 'Ɬ',
   'ɯ' => 'Ɯ',
   'ɯ' => 'Ɯ',
@@ -233,6 +234,7 @@ return array(
   'ɵ' => 'Ɵ',
   'ɵ' => 'Ɵ',
   'ɽ' => 'Ɽ',
   'ɽ' => 'Ɽ',
   'ʀ' => 'Ʀ',
   'ʀ' => 'Ʀ',
+  'ʂ' => 'Ʂ',
   'ʃ' => 'Ʃ',
   'ʃ' => 'Ʃ',
   'ʇ' => 'Ʇ',
   'ʇ' => 'Ʇ',
   'ʈ' => 'Ʈ',
   'ʈ' => 'Ʈ',
@@ -241,6 +243,7 @@ return array(
   'ʋ' => 'Ʋ',
   'ʋ' => 'Ʋ',
   'ʌ' => 'Ʌ',
   'ʌ' => 'Ʌ',
   'ʒ' => 'Ʒ',
   'ʒ' => 'Ʒ',
+  'ʝ' => 'Ʝ',
   'ʞ' => 'Ʞ',
   'ʞ' => 'Ʞ',
   'ͅ' => 'Ι',
   'ͅ' => 'Ι',
   'ͱ' => 'Ͱ',
   'ͱ' => 'Ͱ',
@@ -493,8 +496,70 @@ return array(
   'ք' => 'Ք',
   'ք' => 'Ք',
   'օ' => 'Օ',
   'օ' => 'Օ',
   'ֆ' => 'Ֆ',
   'ֆ' => 'Ֆ',
+  'ა' => 'Ა',
+  'ბ' => 'Ბ',
+  'გ' => 'Გ',
+  'დ' => 'Დ',
+  'ე' => 'Ე',
+  'ვ' => 'Ვ',
+  'ზ' => 'Ზ',
+  'თ' => 'Თ',
+  'ი' => 'Ი',
+  'კ' => 'Კ',
+  'ლ' => 'Ლ',
+  'მ' => 'Მ',
+  'ნ' => 'Ნ',
+  'ო' => 'Ო',
+  'პ' => 'Პ',
+  'ჟ' => 'Ჟ',
+  'რ' => 'Რ',
+  'ს' => 'Ს',
+  'ტ' => 'Ტ',
+  'უ' => 'Უ',
+  'ფ' => 'Ფ',
+  'ქ' => 'Ქ',
+  'ღ' => 'Ღ',
+  'ყ' => 'Ყ',
+  'შ' => 'Შ',
+  'ჩ' => 'Ჩ',
+  'ც' => 'Ც',
+  'ძ' => 'Ძ',
+  'წ' => 'Წ',
+  'ჭ' => 'Ჭ',
+  'ხ' => 'Ხ',
+  'ჯ' => 'Ჯ',
+  'ჰ' => 'Ჰ',
+  'ჱ' => 'Ჱ',
+  'ჲ' => 'Ჲ',
+  'ჳ' => 'Ჳ',
+  'ჴ' => 'Ჴ',
+  'ჵ' => 'Ჵ',
+  'ჶ' => 'Ჶ',
+  'ჷ' => 'Ჷ',
+  'ჸ' => 'Ჸ',
+  'ჹ' => 'Ჹ',
+  'ჺ' => 'Ჺ',
+  'ჽ' => 'Ჽ',
+  'ჾ' => 'Ჾ',
+  'ჿ' => 'Ჿ',
+  'ᏸ' => 'Ᏸ',
+  'ᏹ' => 'Ᏹ',
+  'ᏺ' => 'Ᏺ',
+  'ᏻ' => 'Ᏻ',
+  'ᏼ' => 'Ᏼ',
+  'ᏽ' => 'Ᏽ',
+  'ᲀ' => 'В',
+  'ᲁ' => 'Д',
+  'ᲂ' => 'О',
+  'ᲃ' => 'С',
+  'ᲄ' => 'Т',
+  'ᲅ' => 'Т',
+  'ᲆ' => 'Ъ',
+  'ᲇ' => 'Ѣ',
+  'ᲈ' => 'Ꙋ',
   'ᵹ' => 'Ᵹ',
   'ᵹ' => 'Ᵹ',
   'ᵽ' => 'Ᵽ',
   'ᵽ' => 'Ᵽ',
+  'ᶎ' => 'Ᶎ',
   'ḁ' => 'Ḁ',
   'ḁ' => 'Ḁ',
   'ḃ' => 'Ḃ',
   'ḃ' => 'Ḃ',
   'ḅ' => 'Ḅ',
   'ḅ' => 'Ḅ',
@@ -993,6 +1058,7 @@ return array(
   'ꞌ' => 'Ꞌ',
   'ꞌ' => 'Ꞌ',
   'ꞑ' => 'Ꞑ',
   'ꞑ' => 'Ꞑ',
   'ꞓ' => 'Ꞓ',
   'ꞓ' => 'Ꞓ',
+  'ꞔ' => 'Ꞔ',
   'ꞗ' => 'Ꞗ',
   'ꞗ' => 'Ꞗ',
   'ꞙ' => 'Ꞙ',
   'ꞙ' => 'Ꞙ',
   'ꞛ' => 'Ꞛ',
   'ꞛ' => 'Ꞛ',
@@ -1003,6 +1069,97 @@ return array(
   'ꞥ' => 'Ꞥ',
   'ꞥ' => 'Ꞥ',
   'ꞧ' => 'Ꞧ',
   'ꞧ' => 'Ꞧ',
   'ꞩ' => 'Ꞩ',
   'ꞩ' => 'Ꞩ',
+  'ꞵ' => 'Ꞵ',
+  'ꞷ' => 'Ꞷ',
+  'ꞹ' => 'Ꞹ',
+  'ꞻ' => 'Ꞻ',
+  'ꞽ' => 'Ꞽ',
+  'ꞿ' => 'Ꞿ',
+  'ꟃ' => 'Ꟃ',
+  'ꟈ' => 'Ꟈ',
+  'ꟊ' => 'Ꟊ',
+  'ꟶ' => 'Ꟶ',
+  'ꭓ' => 'Ꭓ',
+  'ꭰ' => 'Ꭰ',
+  'ꭱ' => 'Ꭱ',
+  'ꭲ' => 'Ꭲ',
+  'ꭳ' => 'Ꭳ',
+  'ꭴ' => 'Ꭴ',
+  'ꭵ' => 'Ꭵ',
+  'ꭶ' => 'Ꭶ',
+  'ꭷ' => 'Ꭷ',
+  'ꭸ' => 'Ꭸ',
+  'ꭹ' => 'Ꭹ',
+  'ꭺ' => 'Ꭺ',
+  'ꭻ' => 'Ꭻ',
+  'ꭼ' => 'Ꭼ',
+  'ꭽ' => 'Ꭽ',
+  'ꭾ' => 'Ꭾ',
+  'ꭿ' => 'Ꭿ',
+  'ꮀ' => 'Ꮀ',
+  'ꮁ' => 'Ꮁ',
+  'ꮂ' => 'Ꮂ',
+  'ꮃ' => 'Ꮃ',
+  'ꮄ' => 'Ꮄ',
+  'ꮅ' => 'Ꮅ',
+  'ꮆ' => 'Ꮆ',
+  'ꮇ' => 'Ꮇ',
+  'ꮈ' => 'Ꮈ',
+  'ꮉ' => 'Ꮉ',
+  'ꮊ' => 'Ꮊ',
+  'ꮋ' => 'Ꮋ',
+  'ꮌ' => 'Ꮌ',
+  'ꮍ' => 'Ꮍ',
+  'ꮎ' => 'Ꮎ',
+  'ꮏ' => 'Ꮏ',
+  'ꮐ' => 'Ꮐ',
+  'ꮑ' => 'Ꮑ',
+  'ꮒ' => 'Ꮒ',
+  'ꮓ' => 'Ꮓ',
+  'ꮔ' => 'Ꮔ',
+  'ꮕ' => 'Ꮕ',
+  'ꮖ' => 'Ꮖ',
+  'ꮗ' => 'Ꮗ',
+  'ꮘ' => 'Ꮘ',
+  'ꮙ' => 'Ꮙ',
+  'ꮚ' => 'Ꮚ',
+  'ꮛ' => 'Ꮛ',
+  'ꮜ' => 'Ꮜ',
+  'ꮝ' => 'Ꮝ',
+  'ꮞ' => 'Ꮞ',
+  'ꮟ' => 'Ꮟ',
+  'ꮠ' => 'Ꮠ',
+  'ꮡ' => 'Ꮡ',
+  'ꮢ' => 'Ꮢ',
+  'ꮣ' => 'Ꮣ',
+  'ꮤ' => 'Ꮤ',
+  'ꮥ' => 'Ꮥ',
+  'ꮦ' => 'Ꮦ',
+  'ꮧ' => 'Ꮧ',
+  'ꮨ' => 'Ꮨ',
+  'ꮩ' => 'Ꮩ',
+  'ꮪ' => 'Ꮪ',
+  'ꮫ' => 'Ꮫ',
+  'ꮬ' => 'Ꮬ',
+  'ꮭ' => 'Ꮭ',
+  'ꮮ' => 'Ꮮ',
+  'ꮯ' => 'Ꮯ',
+  'ꮰ' => 'Ꮰ',
+  'ꮱ' => 'Ꮱ',
+  'ꮲ' => 'Ꮲ',
+  'ꮳ' => 'Ꮳ',
+  'ꮴ' => 'Ꮴ',
+  'ꮵ' => 'Ꮵ',
+  'ꮶ' => 'Ꮶ',
+  'ꮷ' => 'Ꮷ',
+  'ꮸ' => 'Ꮸ',
+  'ꮹ' => 'Ꮹ',
+  'ꮺ' => 'Ꮺ',
+  'ꮻ' => 'Ꮻ',
+  'ꮼ' => 'Ꮼ',
+  'ꮽ' => 'Ꮽ',
+  'ꮾ' => 'Ꮾ',
+  'ꮿ' => 'Ꮿ',
   'a' => 'A',
   'a' => 'A',
   'b' => 'B',
   'b' => 'B',
   'c' => 'C',
   'c' => 'C',
@@ -1069,6 +1226,93 @@ return array(
   '𐑍' => '𐐥',
   '𐑍' => '𐐥',
   '𐑎' => '𐐦',
   '𐑎' => '𐐦',
   '𐑏' => '𐐧',
   '𐑏' => '𐐧',
+  '𐓘' => '𐒰',
+  '𐓙' => '𐒱',
+  '𐓚' => '𐒲',
+  '𐓛' => '𐒳',
+  '𐓜' => '𐒴',
+  '𐓝' => '𐒵',
+  '𐓞' => '𐒶',
+  '𐓟' => '𐒷',
+  '𐓠' => '𐒸',
+  '𐓡' => '𐒹',
+  '𐓢' => '𐒺',
+  '𐓣' => '𐒻',
+  '𐓤' => '𐒼',
+  '𐓥' => '𐒽',
+  '𐓦' => '𐒾',
+  '𐓧' => '𐒿',
+  '𐓨' => '𐓀',
+  '𐓩' => '𐓁',
+  '𐓪' => '𐓂',
+  '𐓫' => '𐓃',
+  '𐓬' => '𐓄',
+  '𐓭' => '𐓅',
+  '𐓮' => '𐓆',
+  '𐓯' => '𐓇',
+  '𐓰' => '𐓈',
+  '𐓱' => '𐓉',
+  '𐓲' => '𐓊',
+  '𐓳' => '𐓋',
+  '𐓴' => '𐓌',
+  '𐓵' => '𐓍',
+  '𐓶' => '𐓎',
+  '𐓷' => '𐓏',
+  '𐓸' => '𐓐',
+  '𐓹' => '𐓑',
+  '𐓺' => '𐓒',
+  '𐓻' => '𐓓',
+  '𐳀' => '𐲀',
+  '𐳁' => '𐲁',
+  '𐳂' => '𐲂',
+  '𐳃' => '𐲃',
+  '𐳄' => '𐲄',
+  '𐳅' => '𐲅',
+  '𐳆' => '𐲆',
+  '𐳇' => '𐲇',
+  '𐳈' => '𐲈',
+  '𐳉' => '𐲉',
+  '𐳊' => '𐲊',
+  '𐳋' => '𐲋',
+  '𐳌' => '𐲌',
+  '𐳍' => '𐲍',
+  '𐳎' => '𐲎',
+  '𐳏' => '𐲏',
+  '𐳐' => '𐲐',
+  '𐳑' => '𐲑',
+  '𐳒' => '𐲒',
+  '𐳓' => '𐲓',
+  '𐳔' => '𐲔',
+  '𐳕' => '𐲕',
+  '𐳖' => '𐲖',
+  '𐳗' => '𐲗',
+  '𐳘' => '𐲘',
+  '𐳙' => '𐲙',
+  '𐳚' => '𐲚',
+  '𐳛' => '𐲛',
+  '𐳜' => '𐲜',
+  '𐳝' => '𐲝',
+  '𐳞' => '𐲞',
+  '𐳟' => '𐲟',
+  '𐳠' => '𐲠',
+  '𐳡' => '𐲡',
+  '𐳢' => '𐲢',
+  '𐳣' => '𐲣',
+  '𐳤' => '𐲤',
+  '𐳥' => '𐲥',
+  '𐳦' => '𐲦',
+  '𐳧' => '𐲧',
+  '𐳨' => '𐲨',
+  '𐳩' => '𐲩',
+  '𐳪' => '𐲪',
+  '𐳫' => '𐲫',
+  '𐳬' => '𐲬',
+  '𐳭' => '𐲭',
+  '𐳮' => '𐲮',
+  '𐳯' => '𐲯',
+  '𐳰' => '𐲰',
+  '𐳱' => '𐲱',
+  '𐳲' => '𐲲',
   '𑣀' => '𑢠',
   '𑣀' => '𑢠',
   '𑣁' => '𑢡',
   '𑣁' => '𑢡',
   '𑣂' => '𑢢',
   '𑣂' => '𑢢',
@@ -1101,4 +1345,70 @@ return array(
   '𑣝' => '𑢽',
   '𑣝' => '𑢽',
   '𑣞' => '𑢾',
   '𑣞' => '𑢾',
   '𑣟' => '𑢿',
   '𑣟' => '𑢿',
+  '𖹠' => '𖹀',
+  '𖹡' => '𖹁',
+  '𖹢' => '𖹂',
+  '𖹣' => '𖹃',
+  '𖹤' => '𖹄',
+  '𖹥' => '𖹅',
+  '𖹦' => '𖹆',
+  '𖹧' => '𖹇',
+  '𖹨' => '𖹈',
+  '𖹩' => '𖹉',
+  '𖹪' => '𖹊',
+  '𖹫' => '𖹋',
+  '𖹬' => '𖹌',
+  '𖹭' => '𖹍',
+  '𖹮' => '𖹎',
+  '𖹯' => '𖹏',
+  '𖹰' => '𖹐',
+  '𖹱' => '𖹑',
+  '𖹲' => '𖹒',
+  '𖹳' => '𖹓',
+  '𖹴' => '𖹔',
+  '𖹵' => '𖹕',
+  '𖹶' => '𖹖',
+  '𖹷' => '𖹗',
+  '𖹸' => '𖹘',
+  '𖹹' => '𖹙',
+  '𖹺' => '𖹚',
+  '𖹻' => '𖹛',
+  '𖹼' => '𖹜',
+  '𖹽' => '𖹝',
+  '𖹾' => '𖹞',
+  '𖹿' => '𖹟',
+  '𞤢' => '𞤀',
+  '𞤣' => '𞤁',
+  '𞤤' => '𞤂',
+  '𞤥' => '𞤃',
+  '𞤦' => '𞤄',
+  '𞤧' => '𞤅',
+  '𞤨' => '𞤆',
+  '𞤩' => '𞤇',
+  '𞤪' => '𞤈',
+  '𞤫' => '𞤉',
+  '𞤬' => '𞤊',
+  '𞤭' => '𞤋',
+  '𞤮' => '𞤌',
+  '𞤯' => '𞤍',
+  '𞤰' => '𞤎',
+  '𞤱' => '𞤏',
+  '𞤲' => '𞤐',
+  '𞤳' => '𞤑',
+  '𞤴' => '𞤒',
+  '𞤵' => '𞤓',
+  '𞤶' => '𞤔',
+  '𞤷' => '𞤕',
+  '𞤸' => '𞤖',
+  '𞤹' => '𞤗',
+  '𞤺' => '𞤘',
+  '𞤻' => '𞤙',
+  '𞤼' => '𞤚',
+  '𞤽' => '𞤛',
+  '𞤾' => '𞤜',
+  '𞤿' => '𞤝',
+  '𞥀' => '𞤞',
+  '𞥁' => '𞤟',
+  '𞥂' => '𞤠',
+  '𞥃' => '𞤡',
 );
 );

+ 125 - 40
api/vendor/symfony/polyfill-mbstring/bootstrap.php

@@ -11,52 +11,137 @@
 
 
 use Symfony\Polyfill\Mbstring as p;
 use Symfony\Polyfill\Mbstring as p;
 
 
-if (!function_exists('mb_strlen')) {
-    define('MB_CASE_UPPER', 0);
-    define('MB_CASE_LOWER', 1);
-    define('MB_CASE_TITLE', 2);
+if (\PHP_VERSION_ID >= 80000) {
+    return require __DIR__.'/bootstrap80.php';
+}
 
 
-    function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); }
-    function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); }
-    function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); }
-    function mb_decode_numericentity($s, $convmap, $enc = null) { return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc); }
-    function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false) { return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex); }
-    function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); }
-    function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); }
-    function mb_language($lang = null) { return p\Mbstring::mb_language($lang); }
+if (!function_exists('mb_convert_encoding')) {
+    function mb_convert_encoding($string, $to_encoding, $from_encoding = null) { return p\Mbstring::mb_convert_encoding($string, $to_encoding, $from_encoding); }
+}
+if (!function_exists('mb_decode_mimeheader')) {
+    function mb_decode_mimeheader($string) { return p\Mbstring::mb_decode_mimeheader($string); }
+}
+if (!function_exists('mb_encode_mimeheader')) {
+    function mb_encode_mimeheader($string, $charset = null, $transfer_encoding = null, $newline = "\r\n", $indent = 0) { return p\Mbstring::mb_encode_mimeheader($string, $charset, $transfer_encoding, $newline, $indent); }
+}
+if (!function_exists('mb_decode_numericentity')) {
+    function mb_decode_numericentity($string, $map, $encoding = null) { return p\Mbstring::mb_decode_numericentity($string, $map, $encoding); }
+}
+if (!function_exists('mb_encode_numericentity')) {
+    function mb_encode_numericentity($string, $map, $encoding = null, $hex = false) { return p\Mbstring::mb_encode_numericentity($string, $map, $encoding, $hex); }
+}
+if (!function_exists('mb_convert_case')) {
+    function mb_convert_case($string, $mode, $encoding = null) { return p\Mbstring::mb_convert_case($string, $mode, $encoding); }
+}
+if (!function_exists('mb_internal_encoding')) {
+    function mb_internal_encoding($encoding = null) { return p\Mbstring::mb_internal_encoding($encoding); }
+}
+if (!function_exists('mb_language')) {
+    function mb_language($language = null) { return p\Mbstring::mb_language($language); }
+}
+if (!function_exists('mb_list_encodings')) {
     function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
     function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
+}
+if (!function_exists('mb_encoding_aliases')) {
     function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
     function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
-    function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); }
-    function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); }
-    function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); }
-    function mb_parse_str($s, &$result = array()) { parse_str($s, $result); }
-    function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); }
-    function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); }
-    function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); }
-    function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); }
-    function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); }
-    function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); }
-    function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); }
-    function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); }
-    function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); }
-    function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); }
-    function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); }
-    function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); }
-    function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); }
+}
+if (!function_exists('mb_check_encoding')) {
+    function mb_check_encoding($value = null, $encoding = null) { return p\Mbstring::mb_check_encoding($value, $encoding); }
+}
+if (!function_exists('mb_detect_encoding')) {
+    function mb_detect_encoding($string, $encodings = null, $strict = false) { return p\Mbstring::mb_detect_encoding($string, $encodings, $strict); }
+}
+if (!function_exists('mb_detect_order')) {
+    function mb_detect_order($encoding = null) { return p\Mbstring::mb_detect_order($encoding); }
+}
+if (!function_exists('mb_parse_str')) {
+    function mb_parse_str($string, &$result = []) { parse_str($string, $result); }
+}
+if (!function_exists('mb_strlen')) {
+    function mb_strlen($string, $encoding = null) { return p\Mbstring::mb_strlen($string, $encoding); }
+}
+if (!function_exists('mb_strpos')) {
+    function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strpos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strtolower')) {
+    function mb_strtolower($string, $encoding = null) { return p\Mbstring::mb_strtolower($string, $encoding); }
+}
+if (!function_exists('mb_strtoupper')) {
+    function mb_strtoupper($string, $encoding = null) { return p\Mbstring::mb_strtoupper($string, $encoding); }
+}
+if (!function_exists('mb_substitute_character')) {
+    function mb_substitute_character($substitute_character = null) { return p\Mbstring::mb_substitute_character($substitute_character); }
+}
+if (!function_exists('mb_substr')) {
+    function mb_substr($string, $start, $length = 2147483647, $encoding = null) { return p\Mbstring::mb_substr($string, $start, $length, $encoding); }
+}
+if (!function_exists('mb_stripos')) {
+    function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_stripos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_stristr')) {
+    function mb_stristr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_stristr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrchr')) {
+    function mb_strrchr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrchr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrichr')) {
+    function mb_strrichr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrichr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strripos')) {
+    function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strripos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strrpos')) {
+    function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strrpos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strstr')) {
+    function mb_strstr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strstr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_get_info')) {
     function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
     function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
-    function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); }
-    function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); }
-    function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); }
-    function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); }
-    function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); }
-    function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); }
 }
 }
-if (!function_exists('mb_chr')) {
-    function mb_ord($s, $enc = null) { return p\Mbstring::mb_ord($s, $enc); }
-    function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); }
-    function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
+if (!function_exists('mb_http_output')) {
+    function mb_http_output($encoding = null) { return p\Mbstring::mb_http_output($encoding); }
+}
+if (!function_exists('mb_strwidth')) {
+    function mb_strwidth($string, $encoding = null) { return p\Mbstring::mb_strwidth($string, $encoding); }
+}
+if (!function_exists('mb_substr_count')) {
+    function mb_substr_count($haystack, $needle, $encoding = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $encoding); }
+}
+if (!function_exists('mb_output_handler')) {
+    function mb_output_handler($string, $status) { return p\Mbstring::mb_output_handler($string, $status); }
+}
+if (!function_exists('mb_http_input')) {
+    function mb_http_input($type = null) { return p\Mbstring::mb_http_input($type); }
+}
+
+if (!function_exists('mb_convert_variables')) {
+    function mb_convert_variables($to_encoding, $from_encoding, &...$vars) { return p\Mbstring::mb_convert_variables($to_encoding, $from_encoding, ...$vars); }
 }
 }
 
 
+if (!function_exists('mb_ord')) {
+    function mb_ord($string, $encoding = null) { return p\Mbstring::mb_ord($string, $encoding); }
+}
+if (!function_exists('mb_chr')) {
+    function mb_chr($codepoint, $encoding = null) { return p\Mbstring::mb_chr($codepoint, $encoding); }
+}
+if (!function_exists('mb_scrub')) {
+    function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
+}
 if (!function_exists('mb_str_split')) {
 if (!function_exists('mb_str_split')) {
-    function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); }
+    function mb_str_split($string, $length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $length, $encoding); }
+}
+
+if (extension_loaded('mbstring')) {
+    return;
+}
+
+if (!defined('MB_CASE_UPPER')) {
+    define('MB_CASE_UPPER', 0);
+}
+if (!defined('MB_CASE_LOWER')) {
+    define('MB_CASE_LOWER', 1);
+}
+if (!defined('MB_CASE_TITLE')) {
+    define('MB_CASE_TITLE', 2);
 }
 }

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott