From 53192da5717318f8c450f7d9871a1c7cb6253739 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Tue, 22 Aug 2023 13:04:01 +0900
Subject: [PATCH] www folder composer updates

---
 www/composer.lock                             |   49 +-
 www/vendor/composer/autoload_classmap.php     |    7 +-
 www/vendor/composer/autoload_static.php       |    7 +-
 www/vendor/composer/installed.json            |   57 +-
 www/vendor/composer/installed.php             |   24 +-
 www/vendor/nikic/php-parser/grammar/php5.y    |    2 +-
 www/vendor/nikic/php-parser/grammar/php7.y    |   16 +-
 .../lib/PhpParser/Builder/ClassConst.php      |   18 +-
 .../lib/PhpParser/BuilderFactory.php          |    6 +-
 .../Internal/PrintableNewAnonClassNode.php    |    9 +-
 .../PhpParser/Node/Expr/ClassConstFetch.php   |   10 +-
 .../php-parser/lib/PhpParser/Node/Name.php    |   14 +-
 .../lib/PhpParser/Node/Stmt/ClassConst.php    |   19 +-
 .../php-parser/lib/PhpParser/Parser/Php5.php  |    2 +-
 .../php-parser/lib/PhpParser/Parser/Php7.php  | 2610 +++++++++--------
 .../lib/PhpParser/PrettyPrinter/Standard.php  |   27 +-
 .../lib/PhpParser/PrettyPrinterAbstract.php   |   69 +-
 .../php-code-coverage/ChangeLog-9.2.md        |   12 +
 .../phpunit/php-code-coverage/composer.json   |    3 +-
 .../php-code-coverage/src/CodeCoverage.php    |   31 +-
 .../php-code-coverage/src/Report/Clover.php   |    5 +-
 .../src/Report/Cobertura.php                  |    5 +-
 .../php-code-coverage/src/Report/Crap4j.php   |    5 +-
 .../php-code-coverage/src/Report/PHP.php      |    5 +-
 .../src/Report/Xml/Tests.php                  |    1 -
 .../src/StaticAnalysis/CacheWarmer.php        |    4 +-
 .../StaticAnalysis/CachingFileAnalyser.php    |   43 +-
 .../ExecutableLinesFindingVisitor.php         |    1 +
 .../phpunit/php-code-coverage/src/Version.php |    2 +-
 www/vendor/phpunit/phpunit/ChangeLog-9.6.md   |   22 +
 www/vendor/phpunit/phpunit/DEPRECATIONS.md    |   79 +
 www/vendor/phpunit/phpunit/README.md          |    2 +-
 www/vendor/phpunit/phpunit/phpunit.xsd        |    2 +-
 .../phpunit/phpunit/src/Framework/Assert.php  |  239 +-
 .../src/Framework/Assert/Functions.php        |   38 +-
 .../Constraint/Cardinality/Count.php          |    6 +-
 .../Constraint/Cardinality/IsEmpty.php        |    2 +-
 .../src/Framework/Constraint/Constraint.php   |    4 +-
 .../Framework/Constraint/Equality/IsEqual.php |   12 +-
 .../Equality/IsEqualCanonicalizing.php        |   10 +-
 .../Equality/IsEqualIgnoringCase.php          |   10 +-
 .../Constraint/Equality/IsEqualWithDelta.php  |    8 +-
 .../Constraint/Exception/Exception.php        |    6 +-
 .../Constraint/Exception/ExceptionCode.php    |    2 +-
 .../Constraint/Exception/ExceptionMessage.php |    4 +-
 .../ExceptionMessageRegularExpression.php     |    4 +-
 .../Constraint/Filesystem/DirectoryExists.php |    2 +-
 .../Constraint/Filesystem/FileExists.php      |    2 +-
 .../Constraint/Filesystem/IsReadable.php      |    2 +-
 .../Constraint/Filesystem/IsWritable.php      |    2 +-
 .../src/Framework/Constraint/IsIdentical.php  |    4 +-
 .../src/Framework/Constraint/JsonMatches.php  |    4 +-
 .../Constraint/Object/ClassHasAttribute.php   |    6 +-
 .../Object/ClassHasStaticAttribute.php        |    4 +-
 .../Constraint/Object/ObjectEquals.php        |   18 +-
 .../Constraint/Object/ObjectHasProperty.php   |   84 +
 .../Constraint/Operator/LogicalNot.php        |    6 +-
 .../Constraint/Operator/LogicalXor.php        |    2 +-
 .../Framework/Constraint/String/IsJson.php    |    4 +-
 .../Constraint/String/RegularExpression.php   |    2 +-
 .../Constraint/String/StringContains.php      |    2 +-
 .../String/StringMatchesFormatDescription.php |    8 +-
 .../Constraint/String/StringStartsWith.php    |    3 +-
 .../Traversable/TraversableContains.php       |    2 +-
 .../Traversable/TraversableContainsOnly.php   |    2 +-
 .../Constraint/Type/IsInstanceOf.php          |    4 +-
 .../src/Framework/Constraint/Type/IsType.php  |    6 +-
 .../phpunit/src/Framework/ErrorTestCase.php   |    6 +-
 .../ActualValueIsNotAnObjectException.php     |    2 +-
 ...hodDoesNotAcceptParameterTypeException.php |    4 +-
 ...dDoesNotDeclareBoolReturnTypeException.php |    4 +-
 ...NotDeclareExactlyOneParameterException.php |    4 +-
 ...odDoesNotDeclareParameterTypeException.php |    4 +-
 .../ComparisonMethodDoesNotExistException.php |    4 +-
 .../Exception/InvalidArgumentException.php    |    4 +-
 .../Framework/ExecutionOrderDependency.php    |    8 +-
 .../src/Framework/IncompleteTestCase.php      |    6 +-
 .../src/Framework/MockObject/Api/Api.php      |    4 +-
 .../src/Framework/MockObject/Api/Method.php   |    2 +-
 .../MockObject/Builder/InvocationMocker.php   |    4 +-
 .../MockObject/Builder/InvocationStubber.php  |   16 +-
 .../CannotUseAddMethodsException.php          |    4 +-
 .../CannotUseOnlyMethodsException.php         |    4 +-
 .../Exception/ClassAlreadyExistsException.php |    4 +-
 .../Exception/ClassIsFinalException.php       |    4 +-
 .../Exception/ClassIsReadonlyException.php    |    4 +-
 .../Exception/DuplicateMethodException.php    |    4 +-
 .../IncompatibleReturnValueException.php      |    4 +-
 .../Exception/InvalidMethodNameException.php  |    4 +-
 .../MatchBuilderNotFoundException.php         |    4 +-
 .../MatcherAlreadyRegisteredException.php     |    4 +-
 .../MethodCannotBeConfiguredException.php     |    4 +-
 .../ReturnValueNotConfiguredException.php     |    4 +-
 .../SoapExtensionNotAvailableException.php    |    2 +-
 .../Exception/UnknownClassException.php       |    4 +-
 .../Exception/UnknownTraitException.php       |    4 +-
 .../Exception/UnknownTypeException.php        |    4 +-
 .../src/Framework/MockObject/Generator.php    |   92 +-
 .../src/Framework/MockObject/Invocation.php   |   14 +-
 .../MockObject/InvocationHandler.php          |    2 +-
 .../src/Framework/MockObject/Matcher.php      |   20 +-
 .../MockObject/MethodNameConstraint.php       |    2 +-
 .../src/Framework/MockObject/MockBuilder.php  |   14 +-
 .../src/Framework/MockObject/MockClass.php    |    2 +-
 .../src/Framework/MockObject/MockMethod.php   |   22 +-
 .../MockObject/Rule/ConsecutiveParameters.php |   12 +-
 .../MockObject/Rule/InvokedAtIndex.php        |    4 +-
 .../MockObject/Rule/InvokedAtLeastCount.php   |    2 +-
 .../MockObject/Rule/InvokedAtLeastOnce.php    |    2 +-
 .../MockObject/Rule/InvokedAtMostCount.php    |    2 +-
 .../MockObject/Rule/InvokedCount.php          |    6 +-
 .../Framework/MockObject/Rule/Parameters.php  |    8 +-
 .../MockObject/Stub/ConsecutiveCalls.php      |    2 +-
 .../Framework/MockObject/Stub/Exception.php   |    2 +-
 .../MockObject/Stub/ReturnCallback.php        |    2 +-
 .../MockObject/Stub/ReturnReference.php       |    2 +-
 .../Framework/MockObject/Stub/ReturnStub.php  |    2 +-
 .../phpunit/src/Framework/SkippedTestCase.php |    6 +-
 .../phpunit/src/Framework/TestBuilder.php     |   32 +-
 .../phpunit/src/Framework/TestCase.php        |  164 +-
 .../phpunit/src/Framework/TestFailure.php     |    2 +-
 .../phpunit/src/Framework/TestResult.php      |   68 +-
 .../phpunit/src/Framework/TestSuite.php       |   62 +-
 .../src/Framework/TestSuiteIterator.php       |    2 +-
 .../phpunit/src/Framework/WarningTestCase.php |    6 +-
 .../phpunit/src/Runner/BaseTestRunner.php     |    6 +-
 .../src/Runner/DefaultTestResultCache.php     |   10 +-
 .../src/Runner/Extension/ExtensionHandler.php |   14 +-
 .../src/Runner/Extension/PharLoader.php       |   23 +-
 .../phpunit/src/Runner/Filter/Factory.php     |    4 +-
 .../src/Runner/Filter/GroupFilterIterator.php |    2 +-
 .../src/Runner/Filter/NameFilterIterator.php  |   10 +-
 .../phpunit/src/Runner/PhptTestCase.php       |   22 +-
 .../src/Runner/StandardTestSuiteLoader.php    |   28 +-
 .../phpunit/src/Runner/TestSuiteSorter.php    |   10 +-
 .../phpunit/phpunit/src/Runner/Version.php    |    2 +-
 .../src/TextUI/CliArguments/Builder.php       |    6 +-
 .../phpunit/phpunit/src/TextUI/Command.php    |   74 +-
 .../src/TextUI/DefaultResultPrinter.php       |   40 +-
 .../TestDirectoryNotFoundException.php        |    4 +-
 .../Exception/TestFileNotFoundException.php   |    4 +-
 .../phpunit/phpunit/src/TextUI/Help.php       |    2 +-
 .../phpunit/phpunit/src/TextUI/TestRunner.php |   78 +-
 .../phpunit/src/TextUI/TestSuiteMapper.php    |    4 +-
 .../CodeCoverage/CodeCoverage.php             |   16 +-
 .../CodeCoverage/FilterMapper.php             |    4 +-
 .../src/TextUI/XmlConfiguration/Generator.php |    2 +-
 .../src/TextUI/XmlConfiguration/Loader.php    |  160 +-
 .../Migration/MigrationBuilder.php            |    6 +-
 .../Migrations/IntroduceCoverageElement.php   |    2 +-
 .../Migrations/LogToReportMigration.php       |    2 +-
 .../MoveWhitelistExcludesToCoverage.php       |    2 +-
 ...hp => MoveWhitelistIncludesToCoverage.php} |    8 +-
 .../Migrations/UpdateSchemaLocationTo93.php   |    2 +-
 .../XmlConfiguration/Migration/Migrator.php   |    4 +-
 .../XmlConfiguration/PHP/PhpHandler.php       |    2 +-
 .../phpunit/src/Util/Annotation/DocBlock.php  |   30 +-
 .../phpunit/src/Util/Annotation/Registry.php  |    4 +-
 www/vendor/phpunit/phpunit/src/Util/Color.php |    2 +-
 .../phpunit/phpunit/src/Util/ErrorHandler.php |    2 +-
 .../phpunit/phpunit/src/Util/ExcludeList.php  |    4 +-
 .../phpunit/phpunit/src/Util/FileLoader.php   |    2 +-
 .../phpunit/phpunit/src/Util/Filesystem.php   |    2 +-
 .../phpunit/phpunit/src/Util/Filter.php       |    4 +-
 .../phpunit/phpunit/src/Util/GlobalState.php  |    8 +-
 www/vendor/phpunit/phpunit/src/Util/Json.php  |    2 +-
 .../phpunit/phpunit/src/Util/Log/JUnit.php    |   30 +-
 .../phpunit/phpunit/src/Util/Log/TeamCity.php |   12 +-
 .../src/Util/PHP/AbstractPhpProcess.php       |   36 +-
 .../src/Util/PHP/DefaultPhpProcess.php        |   10 +-
 .../src/Util/PHP/WindowsPhpProcess.php        |    2 +-
 .../phpunit/phpunit/src/Util/Printer.php      |    8 +-
 .../phpunit/src/Util/RegularExpression.php    |    2 +-
 www/vendor/phpunit/phpunit/src/Util/Test.php  |   54 +-
 .../src/Util/TestDox/CliTestDoxPrinter.php    |    2 +-
 .../src/Util/TestDox/HtmlResultPrinter.php    |    8 +-
 .../src/Util/TestDox/NamePrettifier.php       |    6 +-
 .../src/Util/TestDox/TestDoxPrinter.php       |    4 +-
 .../src/Util/TestDox/XmlResultPrinter.php     |    6 +-
 .../phpunit/src/Util/TextTestListRenderer.php |    4 +-
 .../src/Util/VersionComparisonOperator.php    |    4 +-
 .../src/Util/XdebugFilterScriptGenerator.php  |    6 +-
 www/vendor/phpunit/phpunit/src/Util/Xml.php   |    6 +-
 .../phpunit/phpunit/src/Util/Xml/Loader.php   |    8 +-
 .../phpunit/src/Util/Xml/SchemaDetector.php   |    2 +-
 .../phpunit/src/Util/Xml/SchemaFinder.php     |    4 +-
 .../phpunit/src/Util/XmlTestListRenderer.php  |    4 +-
 .../sebastian/global-state/ChangeLog.md       |    7 +
 .../sebastian/global-state/src/Restorer.php   |    4 +-
 189 files changed, 2850 insertions(+), 2364 deletions(-)
 create mode 100644 www/vendor/phpunit/phpunit/DEPRECATIONS.md
 create mode 100644 www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasProperty.php
 rename www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/{MoveWhitelistDirectoriesToCoverage.php => MoveWhitelistIncludesToCoverage.php} (83%)

diff --git a/www/composer.lock b/www/composer.lock
index d3fa2255..fe2f4a8d 100644
--- a/www/composer.lock
+++ b/www/composer.lock
@@ -273,16 +273,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.5",
+            "version": "v4.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
                 "shasum": ""
             },
             "require": {
@@ -323,9 +323,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
             },
-            "time": "2023-05-19T20:20:00+00:00"
+            "time": "2023-08-13T19:53:39+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -440,16 +440,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.26",
+            "version": "9.2.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1",
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1",
                 "shasum": ""
             },
             "require": {
@@ -505,7 +505,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27"
             },
             "funding": [
                 {
@@ -513,7 +514,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-06T12:58:08+00:00"
+            "time": "2023-07-26T13:44:30+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -758,16 +759,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.8",
+            "version": "9.6.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
+                "reference": "810500e92855eba8a7a5319ae913be2da6f957b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0",
+                "reference": "810500e92855eba8a7a5319ae913be2da6f957b0",
                 "shasum": ""
             },
             "require": {
@@ -841,7 +842,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11"
             },
             "funding": [
                 {
@@ -857,7 +858,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-11T05:14:45+00:00"
+            "time": "2023-08-19T07:10:56+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1365,16 +1366,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "5.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
                 "shasum": ""
             },
             "require": {
@@ -1417,7 +1418,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
             },
             "funding": [
                 {
@@ -1425,7 +1426,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2023-08-02T09:26:13+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
diff --git a/www/vendor/composer/autoload_classmap.php b/www/vendor/composer/autoload_classmap.php
index 54d6059d..936b320c 100644
--- a/www/vendor/composer/autoload_classmap.php
+++ b/www/vendor/composer/autoload_classmap.php
@@ -139,6 +139,7 @@ return array(
     'PHPUnit\\Framework\\Constraint\\LogicalXor' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalXor.php',
     'PHPUnit\\Framework\\Constraint\\ObjectEquals' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Object/ObjectEquals.php',
     'PHPUnit\\Framework\\Constraint\\ObjectHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasAttribute.php',
+    'PHPUnit\\Framework\\Constraint\\ObjectHasProperty' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasProperty.php',
     'PHPUnit\\Framework\\Constraint\\Operator' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Operator/Operator.php',
     'PHPUnit\\Framework\\Constraint\\RegularExpression' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/String/RegularExpression.php',
     'PHPUnit\\Framework\\Constraint\\SameSize' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Cardinality/SameSize.php',
@@ -369,8 +370,8 @@ return array(
     'PHPUnit\\TextUI\\XmlConfiguration\\Migrator' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrator.php',
     'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromFilterWhitelistToCoverage' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php',
     'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromRootToCoverage' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromRootToCoverage.php',
-    'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistDirectoriesToCoverage' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistDirectoriesToCoverage.php',
     'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistExcludesToCoverage' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php',
+    'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistIncludesToCoverage' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistIncludesToCoverage.php',
     'PHPUnit\\TextUI\\XmlConfiguration\\PHPUnit' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php',
     'PHPUnit\\TextUI\\XmlConfiguration\\Php' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Php.php',
     'PHPUnit\\TextUI\\XmlConfiguration\\PhpHandler' => $vendorDir . '/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/PhpHandler.php',
@@ -876,8 +877,8 @@ return array(
     'Smarty_Variable' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_variable.php',
     'TPC_yyStackEntry' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfileparser.php',
     'TP_yyStackEntry' => $vendorDir . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php',
-    'Test\\DB\\TestDB' => $baseDir . '/lib/Test/DB/TestDB.php',
-    'Test\\Test' => $baseDir . '/lib/Test/Test.php',
+    'TestCalls\\DB\\TestDB' => $baseDir . '/lib/Test/DB/TestDB.php',
+    'TestCalls\\Test' => $baseDir . '/lib/Test/Test.php',
     'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php',
     'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php',
     'TheSeer\\Tokenizer\\NamespaceUriException' => $vendorDir . '/theseer/tokenizer/src/NamespaceUriException.php',
diff --git a/www/vendor/composer/autoload_static.php b/www/vendor/composer/autoload_static.php
index 301c1914..b78b744a 100644
--- a/www/vendor/composer/autoload_static.php
+++ b/www/vendor/composer/autoload_static.php
@@ -190,6 +190,7 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'PHPUnit\\Framework\\Constraint\\LogicalXor' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalXor.php',
         'PHPUnit\\Framework\\Constraint\\ObjectEquals' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Constraint/Object/ObjectEquals.php',
         'PHPUnit\\Framework\\Constraint\\ObjectHasAttribute' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasAttribute.php',
+        'PHPUnit\\Framework\\Constraint\\ObjectHasProperty' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasProperty.php',
         'PHPUnit\\Framework\\Constraint\\Operator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Constraint/Operator/Operator.php',
         'PHPUnit\\Framework\\Constraint\\RegularExpression' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Constraint/String/RegularExpression.php',
         'PHPUnit\\Framework\\Constraint\\SameSize' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Constraint/Cardinality/SameSize.php',
@@ -420,8 +421,8 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'PHPUnit\\TextUI\\XmlConfiguration\\Migrator' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrator.php',
         'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromFilterWhitelistToCoverage' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromFilterWhitelistToCoverage.php',
         'PHPUnit\\TextUI\\XmlConfiguration\\MoveAttributesFromRootToCoverage' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveAttributesFromRootToCoverage.php',
-        'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistDirectoriesToCoverage' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistDirectoriesToCoverage.php',
         'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistExcludesToCoverage' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php',
+        'PHPUnit\\TextUI\\XmlConfiguration\\MoveWhitelistIncludesToCoverage' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistIncludesToCoverage.php',
         'PHPUnit\\TextUI\\XmlConfiguration\\PHPUnit' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php',
         'PHPUnit\\TextUI\\XmlConfiguration\\Php' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Php.php',
         'PHPUnit\\TextUI\\XmlConfiguration\\PhpHandler' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/PhpHandler.php',
@@ -927,8 +928,8 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'Smarty_Variable' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_variable.php',
         'TPC_yyStackEntry' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_configfileparser.php',
         'TP_yyStackEntry' => __DIR__ . '/..' . '/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php',
-        'Test\\DB\\TestDB' => __DIR__ . '/../..' . '/lib/Test/DB/TestDB.php',
-        'Test\\Test' => __DIR__ . '/../..' . '/lib/Test/Test.php',
+        'TestCalls\\DB\\TestDB' => __DIR__ . '/../..' . '/lib/Test/DB/TestDB.php',
+        'TestCalls\\Test' => __DIR__ . '/../..' . '/lib/Test/Test.php',
         'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php',
         'TheSeer\\Tokenizer\\NamespaceUri' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUri.php',
         'TheSeer\\Tokenizer\\NamespaceUriException' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUriException.php',
diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json
index 916dedc0..39a37449 100644
--- a/www/vendor/composer/installed.json
+++ b/www/vendor/composer/installed.json
@@ -227,17 +227,17 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.5",
-            "version_normalized": "4.15.5.0",
+            "version": "v4.17.1",
+            "version_normalized": "4.17.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
                 "shasum": ""
             },
             "require": {
@@ -248,7 +248,7 @@
                 "ircmaxell/php-yacc": "^0.0.7",
                 "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
-            "time": "2023-05-19T20:20:00+00:00",
+            "time": "2023-08-13T19:53:39+00:00",
             "bin": [
                 "bin/php-parse"
             ],
@@ -280,7 +280,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
             },
             "install-path": "../nikic/php-parser"
         },
@@ -403,17 +403,17 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.26",
-            "version_normalized": "9.2.26.0",
+            "version": "9.2.27",
+            "version_normalized": "9.2.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1",
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1",
                 "shasum": ""
             },
             "require": {
@@ -438,7 +438,7 @@
                 "ext-pcov": "PHP extension that provides line coverage",
                 "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
-            "time": "2023-03-06T12:58:08+00:00",
+            "time": "2023-07-26T13:44:30+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -471,7 +471,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27"
             },
             "funding": [
                 {
@@ -736,17 +737,17 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.8",
-            "version_normalized": "9.6.8.0",
+            "version": "9.6.11",
+            "version_normalized": "9.6.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
+                "reference": "810500e92855eba8a7a5319ae913be2da6f957b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0",
+                "reference": "810500e92855eba8a7a5319ae913be2da6f957b0",
                 "shasum": ""
             },
             "require": {
@@ -782,7 +783,7 @@
                 "ext-soap": "To be able to generate mocks based on WSDL files",
                 "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
-            "time": "2023-05-11T05:14:45+00:00",
+            "time": "2023-08-19T07:10:56+00:00",
             "bin": [
                 "phpunit"
             ],
@@ -822,7 +823,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11"
             },
             "funding": [
                 {
@@ -1423,17 +1424,17 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
-            "version_normalized": "5.0.5.0",
+            "version": "5.0.6",
+            "version_normalized": "5.0.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
                 "shasum": ""
             },
             "require": {
@@ -1448,7 +1449,7 @@
             "suggest": {
                 "ext-uopz": "*"
             },
-            "time": "2022-02-14T08:28:10+00:00",
+            "time": "2023-08-02T09:26:13+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1478,7 +1479,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
             },
             "funding": [
                 {
diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php
index 4d05e1ca..b0c48147 100644
--- a/www/vendor/composer/installed.php
+++ b/www/vendor/composer/installed.php
@@ -56,9 +56,9 @@
             'dev_requirement' => true,
         ),
         'nikic/php-parser' => array(
-            'pretty_version' => 'v4.15.5',
-            'version' => '4.15.5.0',
-            'reference' => '11e2663a5bc9db5d714eedb4277ee300403b4a9e',
+            'pretty_version' => 'v4.17.1',
+            'version' => '4.17.1.0',
+            'reference' => 'a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),
@@ -83,9 +83,9 @@
             'dev_requirement' => true,
         ),
         'phpunit/php-code-coverage' => array(
-            'pretty_version' => '9.2.26',
-            'version' => '9.2.26.0',
-            'reference' => '443bc6912c9bd5b409254a40f4b0f4ced7c80ea1',
+            'pretty_version' => '9.2.27',
+            'version' => '9.2.27.0',
+            'reference' => 'b0a88255cb70d52653d80c890bd7f38740ea50d1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/php-code-coverage',
             'aliases' => array(),
@@ -128,9 +128,9 @@
             'dev_requirement' => true,
         ),
         'phpunit/phpunit' => array(
-            'pretty_version' => '9.6.8',
-            'version' => '9.6.8.0',
-            'reference' => '17d621b3aff84d0c8b62539e269e87d8d5baa76e',
+            'pretty_version' => '9.6.11',
+            'version' => '9.6.11.0',
+            'reference' => '810500e92855eba8a7a5319ae913be2da6f957b0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpunit/phpunit',
             'aliases' => array(),
@@ -218,9 +218,9 @@
             'dev_requirement' => true,
         ),
         'sebastian/global-state' => array(
-            'pretty_version' => '5.0.5',
-            'version' => '5.0.5.0',
-            'reference' => '0ca8db5a5fc9c8646244e629625ac486fa286bf2',
+            'pretty_version' => '5.0.6',
+            'version' => '5.0.6.0',
+            'reference' => 'bde739e7565280bda77be70044ac1047bc007e34',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/global-state',
             'aliases' => array(),
diff --git a/www/vendor/nikic/php-parser/grammar/php5.y b/www/vendor/nikic/php-parser/grammar/php5.y
index 2920dead..77e4fb7e 100644
--- a/www/vendor/nikic/php-parser/grammar/php5.y
+++ b/www/vendor/nikic/php-parser/grammar/php5.y
@@ -1008,7 +1008,7 @@ array_pair:
     | expr                                                  { $$ = Expr\ArrayItem[$1, null, false]; }
     | expr T_DOUBLE_ARROW ampersand variable                { $$ = Expr\ArrayItem[$4, $1,   true]; }
     | ampersand variable                                    { $$ = Expr\ArrayItem[$2, null, true]; }
-    | T_ELLIPSIS expr                                       { $$ = Expr\ArrayItem[$2, null, false, attributes(), true]; }
+    | T_ELLIPSIS expr                                       { $$ = new Expr\ArrayItem($2, null, false, attributes(), true); }
 ;
 
 encaps_list:
diff --git a/www/vendor/nikic/php-parser/grammar/php7.y b/www/vendor/nikic/php-parser/grammar/php7.y
index fc7862c3..1ef60bfe 100644
--- a/www/vendor/nikic/php-parser/grammar/php7.y
+++ b/www/vendor/nikic/php-parser/grammar/php7.y
@@ -221,7 +221,10 @@ non_empty_class_const_list:
 ;
 
 class_const:
-    identifier_maybe_reserved '=' expr                      { $$ = Node\Const_[$1, $3]; }
+      T_STRING '=' expr
+          { $$ = Node\Const_[new Node\Identifier($1, stackAttributes(#1)), $3]; }
+    | semi_reserved '=' expr
+          { $$ = Node\Const_[new Node\Identifier($1, stackAttributes(#1)), $3]; }
 ;
 
 inner_statement_list_ex:
@@ -722,6 +725,9 @@ class_statement:
     | optional_attributes method_modifiers T_CONST class_const_list semi
           { $$ = new Stmt\ClassConst($4, $2, attributes(), $1);
             $this->checkClassConst($$, #2); }
+    | optional_attributes method_modifiers T_CONST type_expr class_const_list semi
+          { $$ = new Stmt\ClassConst($5, $2, attributes(), $1, $4);
+            $this->checkClassConst($$, #2); }
     | optional_attributes method_modifiers T_FUNCTION optional_ref identifier_maybe_reserved '(' parameter_list ')'
       optional_return_type method_body
           { $$ = Stmt\ClassMethod[$5, ['type' => $2, 'byRef' => $4, 'params' => $7, 'returnType' => $9, 'stmts' => $10, 'attrGroups' => $1]];
@@ -943,8 +949,8 @@ expr:
 ;
 
 anonymous_class:
-      optional_attributes T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
-          { $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]], $3);
+      optional_attributes class_entry_type ctor_arguments extends_from implements_list '{' class_statement_list '}'
+          { $$ = array(Stmt\Class_[null, ['type' => $2, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]], $3);
             $this->checkClass($$[0], -1); }
 ;
 
@@ -1040,6 +1046,8 @@ constant:
 class_constant:
       class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_maybe_reserved
           { $$ = Expr\ClassConstFetch[$1, $3]; }
+    | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '{' expr '}'
+          { $$ = Expr\ClassConstFetch[$1, $4]; }
     /* We interpret an isolated FOO:: as an unfinished class constant fetch. It could also be
        an unfinished static property fetch or unfinished scoped call. */
     | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM error
@@ -1194,7 +1202,7 @@ array_pair:
     | expr T_DOUBLE_ARROW expr                              { $$ = Expr\ArrayItem[$3, $1,   false]; }
     | expr T_DOUBLE_ARROW ampersand variable                { $$ = Expr\ArrayItem[$4, $1,   true]; }
     | expr T_DOUBLE_ARROW list_expr                         { $$ = Expr\ArrayItem[$3, $1,   false]; }
-    | T_ELLIPSIS expr                                       { $$ = Expr\ArrayItem[$2, null, false, attributes(), true]; }
+    | T_ELLIPSIS expr                                       { $$ = new Expr\ArrayItem($2, null, false, attributes(), true); }
     | /* empty */                                           { $$ = null; }
 ;
 
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php b/www/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
index f616c627..a7fe129b 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
@@ -19,6 +19,8 @@ class ClassConst implements PhpParser\Builder
 
     /** @var Node\AttributeGroup[] */
     protected $attributeGroups = [];
+    /** @var Identifier|Node\Name|Node\ComplexType */
+    protected $type;
 
     /**
      * Creates a class constant builder
@@ -116,6 +118,19 @@ class ClassConst implements PhpParser\Builder
         return $this;
     }
 
+    /**
+     * Sets the constant type.
+     *
+     * @param string|Node\Name|Identifier|Node\ComplexType $type
+     *
+     * @return $this
+     */
+    public function setType($type) {
+        $this->type = BuilderHelpers::normalizeType($type);
+
+        return $this;
+    }
+
     /**
      * Returns the built class node.
      *
@@ -126,7 +141,8 @@ class ClassConst implements PhpParser\Builder
             $this->constants,
             $this->flags,
             $this->attributes,
-            $this->attributeGroups
+            $this->attributeGroups,
+            $this->type
         );
     }
 }
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php b/www/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php
index fef2579b..af010e02 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php
@@ -349,15 +349,15 @@ class BuilderFactory
     /**
      * Creates a class constant fetch node.
      *
-     * @param string|Name|Expr  $class Class name
-     * @param string|Identifier $name  Constant name
+     * @param string|Name|Expr $class Class name
+     * @param string|Identifier|Expr $name  Constant name
      *
      * @return Expr\ClassConstFetch
      */
     public function classConstFetch($class, $name): Expr\ClassConstFetch {
         return new Expr\ClassConstFetch(
             BuilderHelpers::normalizeNameOrExpr($class),
-            BuilderHelpers::normalizeIdentifier($name)
+            BuilderHelpers::normalizeIdentifierOrExpr($name)
         );
     }
 
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php b/www/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
index 3eeac04a..67632270 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
@@ -19,6 +19,8 @@ class PrintableNewAnonClassNode extends Expr
 {
     /** @var Node\AttributeGroup[] PHP attribute groups */
     public $attrGroups;
+    /** @var int Modifiers */
+    public $flags;
     /** @var Node\Arg[] Arguments */
     public $args;
     /** @var null|Node\Name Name of extended class */
@@ -29,11 +31,12 @@ class PrintableNewAnonClassNode extends Expr
     public $stmts;
 
     public function __construct(
-        array $attrGroups, array $args, Node\Name $extends = null, array $implements,
+        array $attrGroups, int $flags, array $args, Node\Name $extends = null, array $implements,
         array $stmts, array $attributes
     ) {
         parent::__construct($attributes);
         $this->attrGroups = $attrGroups;
+        $this->flags = $flags;
         $this->args = $args;
         $this->extends = $extends;
         $this->implements = $implements;
@@ -46,7 +49,7 @@ class PrintableNewAnonClassNode extends Expr
         // We don't assert that $class->name is null here, to allow consumers to assign unique names
         // to anonymous classes for their own purposes. We simplify ignore the name here.
         return new self(
-            $class->attrGroups, $newNode->args, $class->extends, $class->implements,
+            $class->attrGroups, $class->flags, $newNode->args, $class->extends, $class->implements,
             $class->stmts, $newNode->getAttributes()
         );
     }
@@ -56,6 +59,6 @@ class PrintableNewAnonClassNode extends Expr
     }
 
     public function getSubNodeNames() : array {
-        return ['attrGroups', 'args', 'extends', 'implements', 'stmts'];
+        return ['attrGroups', 'flags', 'args', 'extends', 'implements', 'stmts'];
     }
 }
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php
index faf832f9..0c45ffb4 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php
@@ -10,15 +10,15 @@ class ClassConstFetch extends Expr
 {
     /** @var Name|Expr Class name */
     public $class;
-    /** @var Identifier|Error Constant name */
+    /** @var Identifier|Expr|Error Constant name */
     public $name;
 
     /**
      * Constructs a class const fetch node.
      *
-     * @param Name|Expr               $class      Class name
-     * @param string|Identifier|Error $name       Constant name
-     * @param array                   $attributes Additional attributes
+     * @param Name|Expr                    $class      Class name
+     * @param string|Identifier|Expr|Error $name       Constant name
+     * @param array                        $attributes Additional attributes
      */
     public function __construct($class, $name, array $attributes = []) {
         $this->attributes = $attributes;
@@ -29,7 +29,7 @@ class ClassConstFetch extends Expr
     public function getSubNodeNames() : array {
         return ['class', 'name'];
     }
-    
+
     public function getType() : string {
         return 'Expr_ClassConstFetch';
     }
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php
index 17bd1c0f..f0a564ff 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php
@@ -6,7 +6,10 @@ use PhpParser\NodeAbstract;
 
 class Name extends NodeAbstract
 {
-    /** @var string[] Parts of the name */
+    /**
+     * @var string[] Parts of the name
+     * @deprecated Use getParts() instead
+     */
     public $parts;
 
     private static $specialClassNames = [
@@ -30,6 +33,15 @@ class Name extends NodeAbstract
         return ['parts'];
     }
 
+    /**
+     * Get parts of name (split by the namespace separator).
+     *
+     * @return string[] Parts of name
+     */
+    public function getParts(): array {
+        return $this->parts;
+    }
+
     /**
      * Gets the first part of the name, i.e. everything before the first namespace separator.
      *
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php
index 1fc7f336..8abaad6d 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php
@@ -10,31 +10,36 @@ class ClassConst extends Node\Stmt
     public $flags;
     /** @var Node\Const_[] Constant declarations */
     public $consts;
-    /** @var Node\AttributeGroup[] */
+    /** @var Node\AttributeGroup[] PHP attribute groups */
     public $attrGroups;
+    /** @var Node\Identifier|Node\Name|Node\ComplexType|null Type declaration */
+    public $type;
 
     /**
      * Constructs a class const list node.
      *
-     * @param Node\Const_[]         $consts     Constant declarations
-     * @param int                   $flags      Modifiers
-     * @param array                 $attributes Additional attributes
-     * @param Node\AttributeGroup[] $attrGroups PHP attribute groups
+     * @param Node\Const_[]                                          $consts     Constant declarations
+     * @param int                                                    $flags      Modifiers
+     * @param array                                                  $attributes Additional attributes
+     * @param Node\AttributeGroup[]                                  $attrGroups PHP attribute groups
+     * @param null|string|Node\Identifier|Node\Name|Node\ComplexType $type       Type declaration
      */
     public function __construct(
         array $consts,
         int $flags = 0,
         array $attributes = [],
-        array $attrGroups = []
+        array $attrGroups = [],
+        $type = null
     ) {
         $this->attributes = $attributes;
         $this->flags = $flags;
         $this->consts = $consts;
         $this->attrGroups = $attrGroups;
+        $this->type = \is_string($type) ? new Node\Identifier($type) : $type;
     }
 
     public function getSubNodeNames() : array {
-        return ['attrGroups', 'flags', 'consts'];
+        return ['attrGroups', 'flags', 'type', 'consts'];
     }
 
     /**
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php b/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
index 351db9ed..a4306710 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
@@ -2627,7 +2627,7 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             552 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true);
             },
             553 => function ($stackPos) {
                  $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php b/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
index c6b9abd0..fc895cb0 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
@@ -18,16 +18,16 @@ use PhpParser\Node\Stmt;
 class Php7 extends \PhpParser\ParserAbstract
 {
     protected $tokenToSymbolMapSize = 396;
-    protected $actionTableSize = 1223;
-    protected $gotoTableSize = 626;
+    protected $actionTableSize = 1241;
+    protected $gotoTableSize = 629;
 
     protected $invalidSymbol = 168;
     protected $errorSymbol = 1;
     protected $defaultAction = -32766;
     protected $unexpectedTokenRule = 32767;
 
-    protected $YY2TBLSTATE = 429;
-    protected $numNonLeafStates = 726;
+    protected $YY2TBLSTATE = 434;
+    protected $numNonLeafStates = 736;
 
     protected $symbolToName = array(
         "EOF",
@@ -244,262 +244,266 @@ class Php7 extends \PhpParser\ParserAbstract
     );
 
     protected $action = array(
-          132,  133,  134,  575,  135,  136,    0,  738,  739,  740,
-          137,   37,  850,  825,  851,  476,-32766,-32766,-32766,-32767,
-        -32767,-32767,-32767,  101,  102,  103,  104,  105, 1097, 1098,
-         1099, 1096, 1095, 1094, 1100,  732,  731,-32766, 1289,-32766,
+          133,  134,  135,  579,  136,  137,    0,  748,  749,  750,
+          138,   38,  327,-32766,-32766,-32766,-32766,-32766,-32766,-32767,
+        -32767,-32767,-32767,  102,  103,  104,  105,  106, 1109, 1110,
+         1111, 1108, 1107, 1106, 1112,  742,  741,-32766, 1232,-32766,
         -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,
-        -32767, 1022,  377,  376,    2,  741,-32766,-32766,-32766,-32766,
-        -32766,  822,  417,-32766,-32766,-32766,-32766,-32766,-32766,  267,
-          138,  399,  745,  746,  747,  748,  287,-32766,  423,-32766,
-        -32766,-32766,-32766,-32766,-32766,  749,  750,  751,  752,  753,
-          754,  755,  756,  757,  758,  759,  779,  576,  780,  781,
-          782,  783,  771,  772,  340,  341,  774,  775,  760,  761,
-          762,  764,  765,  766,  351,  806,  807,  808,  809,  810,
-          577,  767,  768,  578,  579,  800,  791,  789,  790,  803,
-          786,  787, -327,  423,  580,  581,  785,  582,  583,  584,
-          585,  586,  587,  605, -590,  477,  -86,  814,  788,  588,
-          589, -590,  139,-32766,-32766,-32766,  132,  133,  134,  575,
-          135,  136, 1046,  738,  739,  740,  137,   37,  323, 1013,
-          823,  824, 1334, 1324,-32766, 1335,-32766,-32766,-32766,-32766,
-        -32766,-32766,-32766, 1097, 1098, 1099, 1096, 1095, 1094, 1100,
-         -587,  732,  731,-32766,-32766,-32766,   12, -587,   81,-32766,
-        -32766,-32766,  945,  946,  322,  927,   34,  947, 1224, 1223,
-         1225,  741,  -86,  942,-32766, 1075,-32766,-32766,-32766,-32766,
-        -32766,  239,-32766,-32766,-32766,  267,  138,  399,  745,  746,
-          747,  748,  461,  462,  423,   35,  247,  103,  104,  105,
-          128,  749,  750,  751,  752,  753,  754,  755,  756,  757,
-          758,  759,  779,  576,  780,  781,  782,  783,  771,  772,
-          340,  341,  774,  775,  760,  761,  762,  764,  765,  766,
-          351,  806,  807,  808,  809,  810,  577,  767,  768,  578,
-          579,  800,  791,  789,  790,  803,  786,  787, -327,  144,
-          580,  581,  785,  582,  583,  584,  585,  586,  587, 1222,
-           82,   83,   84, -590,  788,  588,  589, -590,  148,  763,
-          733,  734,  735,  736,  737, 1309,  738,  739,  740,  776,
-          777,   36, 1308,   85,   86,   87,   88,   89,   90,   91,
-           92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
-          102,  103,  104,  105,  106,  107,  108,  288,  271, -587,
-         -193,  375,  376, -587,  976,-32766, 1021,  453,  454,  455,
-          109,  417,  945,  946,  741,  712,  819,  947,-32766,-32766,
-        -32766, -271, 1073,  941, 1224, 1223, 1225,  288,  742,  743,
-          744,  745,  746,  747,  748, -192, -365,  812, -365,-32766,
-          599,-32766,-32766,  549,  749,  750,  751,  752,  753,  754,
-          755,  756,  757,  758,  759,  779,  802,  780,  781,  782,
-          783,  771,  772,  773,  801,  774,  775,  760,  761,  762,
-          764,  765,  766,  805,  806,  807,  808,  809,  810,  811,
-          767,  768,  769,  770,  800,  791,  789,  790,  803,  786,
-          787,  251,  820,  778,  784,  785,  792,  793,  795,  794,
-          796,  797,  732,  731, 1261, 1022, 1019,  788,  799,  798,
-           49,   50,   51,  507,   52,   53, 1009, 1008, 1007, 1010,
-           54,   55, -111,   56,  816, 1045,   14, -111, 1022, -111,
-          287, 1305,  977,  306,  302, 1022,  238, -111, -111, -111,
-         -111, -111, -111, -111, -111,  106,  107,  108, 1089,  271,
-        -32766,-32766,-32766,  280,  284,  126, -193,  929,   57,   58,
-          287,  109, 1019, -541,   59,  308,   60,  244,  245,   61,
-           62,   63,   64,   65,   66,   67,   68, 1229,   27,  269,
-           69,  439,  508, -341, 1022,  929, 1255, 1256,  509,  907,
-          823, -192,  150,  907, 1253,   41,   24,  510,  352,  511,
-          818,  512,  386,  513,   11,  699,  514,  515,  648,   25,
-          814,   43,   44,  440,  372,  371,  907,   45,  516,  702,
-         1220,  667,  668,  363,  334, -540,  357, -541, -541,  320,
-         1215, 1249,  518,  519,  520, -581, 1074,  335,  724, -581,
-         1019,-32766, -541,  336,  521,  522,  703, 1243, 1244, 1245,
-         1246, 1240, 1241,  294, -541,  850, -547,  851,  823, 1247,
-         1242,  365, 1022, 1224, 1223, 1225,  295, -153, -153, -153,
-          369,   70,  897,  318,  319,  322,  897,  384,  149,  402,
-          373,  374, -153,  435, -153,  436, -153,  280, -153, -540,
-         -540,  141, 1220,  378,  379,  639,  640,  322,  370,  897,
-          907,  437,  438,  829, -540,  -88,  151,  732,  731,  945,
-          946,  153,  823,-32766,  517,  -51, -540,  154, -546,  883,
-          941, -111, -111, -111,   31,  110,  111,  112,  113,  114,
-          115,  116,  117,  118,  119,  120,  121,  122,  155,   74,
-           27,  157,   32,  322,  -85,  123,  124,  909,  129,  697,
-          130,  909,  823,  697, -153,  143, 1253,  158,-32766, -544,
-         1229, -542,  159,  160, 1222,  161,  -79, 1134, 1136,  -75,
-          285,-32766,-32766,-32766,  909,-32766,  697,-32766, -539,-32766,
-         -301,  -73,-32766,  897,  -72,  -71, 1220,-32766,-32766,-32766,
-          -16,  140, 1215,-32766,-32766,  732,  731,  322,  -70,-32766,
-          414,  -69,   -4,  907,  -68,  -67,  521,  522,-32766, 1243,
-         1244, 1245, 1246, 1240, 1241,  -66,  -47,  -18,  147,  270,
-          281, 1247, 1242, -544, -544, -542, -542,  732,  731,  713,
-          716,  906,-32766,   72,  146,  907,  319,  322, 1222, -297,
-         -542,  823, -539, -539,  276,-32766,-32766,-32766,  277,-32766,
-         -544,-32766, -542,-32766,  282,  283,-32766, -539,  909,  328,
-          697,-32766,-32766,-32766,-32766,  704,  286,-32766,-32766, -539,
-         1222,  923,  289,-32766,  414, 1220,  290,-32766,-32766,-32766,
-          271,-32766,-32766,-32766,   47,-32766,  897, -111,-32766,  677,
-          109,  814,  145,-32766,-32766,-32766,-32766,  823,  131,-32766,
-        -32766, 1336,-32766,  654,  670,-32766,  414, 1104,  370,  637,
-          430,  551,   73,   13,-32766,  293,  555,  295,  897,  945,
-          946,  649,   74,  434,  517,  458,  322,  487,  690,  842,
-          941, -111, -111, -111,  301, 1022,  561,  655,  671, 1260,
-          300,-32766, -539,-32766,  907,  603,  303, 1222,  296,  297,
-           39, 1262,    9,   40,-32766,-32766,-32766,    0,-32766,  907,
-        -32766,  909,-32766,  697,   -4,-32766,    0, 1229,  907,    0,
-        -32766,-32766,-32766,-32766,  307,  125,-32766,-32766,    0, 1222,
-          907,    0,-32766,  414,    0,    0,-32766,-32766,-32766,  707,
-        -32766,-32766,-32766,  962,-32766,  697, -505,-32766,  714, -495,
-            7,  482,-32766,-32766,-32766,-32766, -539, -539,-32766,-32766,
-           16, 1222,  567,  367,-32766,  414,  925,  295,-32766,-32766,
-        -32766, -539,-32766,-32766,-32766,  822,-32766,  897,  721,-32766,
-          722, -575,  888, -539,-32766,-32766,-32766,  986,  963,  970,
-        -32766,-32766,  897, -249, -249, -249,-32766,  414,  823,  370,
-          960,  897,  971,  886,  958,-32766, 1078, 1081,  718, 1082,
-          945,  946, 1079,  897, 1080,  517, 1086,   33, 1250,  834,
-          883,  941, -111, -111, -111,   27, 1275, 1293, 1327, -248,
-         -248, -248, 1220,  642,  884,  370,  317,  823,  366,  698,
-          701, 1253, 1331,  705, -111,  706,  945,  946,  708,  709,
-          710,  517,  909,-32766,  697, -249,  883,  941, -111, -111,
-         -111,  711,  715,  700, -509, 1333,  845,  909,   48,  697,
-         -573, 1220,  844,  853,  295,  935,  909, 1215,  697,   74,
-          978,  852, 1332,  322,  934,  932,  933,  936,  909, 1206,
-          697, -248,  522,  916, 1243, 1244, 1245, 1246, 1240, 1241,
-          926,  914,  968,  969, 1330, 1287, 1247, 1242, 1276, 1294,
-        -32766, 1300, 1303, 1191, -547, -546, 1222, -545,   72, -489,
-            1,  319,  322,-32766,-32766,-32766,   28,-32766,   29,-32766,
-           38,-32766,  298,  299,-32766,   42,   46,   71,   75,-32766,
-        -32766,-32766,   76,   77,   78,-32766,-32766,  368,   79,   80,
-          142,-32766,  414,  152,  156,  243,  324,  352,  353,  127,
-        -32766, -274,  354,  355,  356,  357,  358,  359,  360,  361,
-          362,  364,  431,    0, -272, -271,   18,   19,   20,   21,
-           23,  401,  478,  479,  486,  489,  490,  491,  492,  496,
-          497,  498,  505,  684, 1233, 1174, 1251, 1048, 1047, 1028,
-            0, 1210, 1024, -276, -103,   17,   22,   26,  292,  400,
-          596,  600,  628,  689, 1178, 1228, 1175, 1306,    0,    0,
-         1254,    0,  322
+        -32767,    2,  107,  108,  109,  751,  274,  381,  380,-32766,
+        -32766,-32766,-32766,  104,  105,  106, 1024,  422,  110,  265,
+          139,  403,  755,  756,  757,  758,  466,  467,  428,  938,
+          291,-32766,  287,-32766,-32766,  759,  760,  761,  762,  763,
+          764,  765,  766,  767,  768,  769,  789,  580,  790,  791,
+          792,  793,  781,  782,  344,  345,  784,  785,  770,  771,
+          772,  774,  775,  776,  355,  816,  817,  818,  819,  820,
+          581,  777,  778,  582,  583,  810,  801,  799,  800,  813,
+          796,  797,  687, -545,  584,  585,  795,  586,  587,  588,
+          589,  590,  591, -328, -593, -367, 1234, -367,  798,  592,
+          593, -593,  140,-32766,-32766,-32766,  133,  134,  135,  579,
+          136,  137, 1057,  748,  749,  750,  138,   38,  688, 1020,
+         1019, 1018, 1021,  390,-32766,    7,-32766,-32766,-32766,-32766,
+        -32766,-32766,-32766,-32766,-32766,-32766,  379,  380, 1033,  689,
+          690,  742,  741,-32766,-32766,-32766,  422, -545, -545, -590,
+        -32766,-32766,-32766, 1032,-32766,  127, -590, 1236, 1235, 1237,
+         1318,  751, -545,  290,-32766,  283,-32766,-32766,-32766,-32766,
+        -32766, 1236, 1235, 1237, -545,  265,  139,  403,  755,  756,
+          757,  758,   16,  481,  428,  458,  459,  460,  298,  722,
+           35,  759,  760,  761,  762,  763,  764,  765,  766,  767,
+          768,  769,  789,  580,  790,  791,  792,  793,  781,  782,
+          344,  345,  784,  785,  770,  771,  772,  774,  775,  776,
+          355,  816,  817,  818,  819,  820,  581,  777,  778,  582,
+          583,  810,  801,  799,  800,  813,  796,  797,  129,  824,
+          584,  585,  795,  586,  587,  588,  589,  590,  591, -328,
+           83,   84,   85, -593,  798,  592,  593, -593,  149,  773,
+          743,  744,  745,  746,  747,  824,  748,  749,  750,  786,
+          787,   37,  145,   86,   87,   88,   89,   90,   91,   92,
+           93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
+          103,  104,  105,  106,  107,  108,  109,  291,  274,  835,
+          254, 1109, 1110, 1111, 1108, 1107, 1106, 1112, -590,  860,
+          110,  861, -590,  482,  751,-32766,-32766,-32766,-32766,-32766,
+          142,  603, 1085,  742,  741, 1262,  326,  987,  752,  753,
+          754,  755,  756,  757,  758,  309,-32766,  822,-32766,-32766,
+        -32766,-32766,  242,  553,  759,  760,  761,  762,  763,  764,
+          765,  766,  767,  768,  769,  789,  812,  790,  791,  792,
+          793,  781,  782,  783,  811,  784,  785,  770,  771,  772,
+          774,  775,  776,  815,  816,  817,  818,  819,  820,  821,
+          777,  778,  779,  780,  810,  801,  799,  800,  813,  796,
+          797,  311,  940,  788,  794,  795,  802,  803,  805,  804,
+          806,  807,  323,  609, 1274, 1033,  833,  798,  809,  808,
+           50,   51,   52,  512,   53,   54,  860,  241,  861,  918,
+           55,   56, -111,   57,-32766,-32766,-32766, -111,  826, -111,
+          290, 1302, 1347,  356,  305, 1348,  339, -111, -111, -111,
+         -111, -111, -111, -111, -111,-32766, -194,-32766,-32766,-32766,
+         -193,  956,  957,  829,  -86,  988,  958,  834,   58,   59,
+          340,  428,  952, -544,   60,  832,   61,  247,  248,   62,
+           63,   64,   65,   66,   67,   68,   69, 1241,   28,  267,
+           70,  444,  513, -342,-32766,  141, 1268, 1269,  514,  918,
+          833,  326, -272,  918, 1266,   42,   25,  515,  940,  516,
+           14,  517,  908,  518,  828,  369,  519,  520,  373,  709,
+         1033,   44,   45,  445,  376,  375,  388,   46,  521,  712,
+          -86,  440, 1101,  367,  338, -543,  441, -544, -544,  830,
+         1227,  442,  523,  524,  525,  290, 1236, 1235, 1237,  361,
+         1030,  443, -544, 1087,  526,  527,  839, 1255, 1256, 1257,
+         1258, 1252, 1253,  297, -544,  151, -550, -584,  833, 1259,
+         1254, -584, 1033, 1236, 1235, 1237,  298, -154, -154, -154,
+          152,   71,  908,  321,  322,  326,  908,  920, 1030,  707,
+          833,  154, -154, 1337, -154,  155, -154,  283, -154, -543,
+         -543,   82, 1232, 1086, 1322,  734,  156,  326,  374,  158,
+         1033, 1321, -194,  -79, -543,  -88, -193,  742,  741,  956,
+          957,  653,   26,-32766,  522,  -51, -543,   33, -549,  894,
+          952, -111, -111, -111,   32,  111,  112,  113,  114,  115,
+          116,  117,  118,  119,  120,  121,  122,  123,  -59,   75,
+           28,  672,  673,  326,  -58,   36,  250,  920,  124,  707,
+          125,  920,  833,  707, -154,  130, 1266,  131,-32766, -547,
+          144, -542,  150,  406, 1234,  377,  378, 1146, 1148,  382,
+          383,-32766,-32766,-32766,  -85,-32766, 1056,-32766, -542,-32766,
+          644,  645,-32766,  159,  160,  161, 1232,-32766,-32766,-32766,
+          162,  -79, 1227,-32766,-32766,  742,  741,  163, -302,-32766,
+          419,  -75,   -4,  918,  -73,  287,  526,  527,-32766, 1255,
+         1256, 1257, 1258, 1252, 1253,  -72,  -71,  -70,  -69,  -68,
+          -67, 1259, 1254, -547, -547, -542, -542,  742,  741,  -66,
+          -47,  -18,-32766,   73,  148,  918,  322,  326, 1234,  273,
+         -542,  284, -542, -542,  723,-32766,-32766,-32766,  726,-32766,
+         -547,-32766, -542,-32766,  917,  147,-32766, -542,  288,  289,
+         -298,-32766,-32766,-32766,-32766,  713,  279,-32766,-32766, -542,
+         1234,  280,  285,-32766,  419,   48,  286,-32766,-32766,-32766,
+          332,-32766,-32766,-32766,  292,-32766,  908,  293,-32766,  934,
+          274, 1030,  918,-32766,-32766,-32766,  110,  682,  132,-32766,
+        -32766,  833,  146,-32766,  559,-32766,  419,  659,  374,  824,
+          435, 1349,   74, 1033,-32766,  296,  654, 1116,  908,  956,
+          957,  306,  714,  698,  522,  555,  303,   13,  310,  852,
+          952, -111, -111, -111,  700,  463,  492,  953,  283,  299,
+          300,-32766,   49,  675,  918,  304,  660, 1234,  676,  936,
+         1273,-32766,   10, 1263,-32766,-32766,-32766,  642,-32766,  918,
+        -32766,  920,-32766,  707,   -4,-32766,  126,   34,  918,  565,
+        -32766,-32766,-32766,-32766,    0,  908,-32766,-32766,    0, 1234,
+          918,    0,-32766,  419,    0,    0,-32766,-32766,-32766,  717,
+        -32766,-32766,-32766,  920,-32766,  707, 1033,-32766,  724, 1275,
+            0,  487,-32766,-32766,-32766,-32766,  301,  302,-32766,-32766,
+         -507, 1234,  571, -497,-32766,  419,  607,    8,-32766,-32766,
+        -32766,  372,-32766,-32766,-32766,   17,-32766,  908,  371,-32766,
+          832,  298,  320,  128,-32766,-32766,-32766,   40,  370,   41,
+        -32766,-32766,  908, -250, -250, -250,-32766,  419,  731,  374,
+          973,  908,  707,  732,  899,-32766,  997,  974,  728,  981,
+          956,  957,  971,  908,  982,  522,  897,  969, 1090, 1093,
+          894,  952, -111, -111, -111,   28, 1094, 1091, 1092, -249,
+         -249, -249, 1241, 1098,  708,  374,  844,  833, 1288, 1306,
+         1340, 1266,  647, 1267,  711,  715,  956,  957,  716, 1241,
+          718,  522,  920,  719,  707, -250,  894,  952, -111, -111,
+         -111,  720,  -16,  721,  725,  710, -511,  920,  895,  707,
+         -578, 1232, 1344, 1346,  855,  854,  920, 1227,  707, -577,
+          863,  946,  989,  862, 1345,  945,  943,  944,  920,  947,
+          707, -249,  527, 1218, 1255, 1256, 1257, 1258, 1252, 1253,
+          927,  937,  925,  979,  980,  631, 1259, 1254, 1343, 1300,
+        -32766, 1289, 1307,  833, 1316, -275, 1234, -576,   73, -550,
+         -549,  322,  326,-32766,-32766,-32766, -548,-32766, -491,-32766,
+          833,-32766,    1,   29,-32766,   30,   39,   43,   47,-32766,
+        -32766,-32766,   72,   76,   77,-32766,-32766, 1232, -111, -111,
+           78,-32766,  419, -111,   79,   80,   81,  143,  153, -111,
+        -32766,  157,  246,  328, 1232, -111, -111,  356,-32766,  357,
+         -111,  358,  359,  360,  361,  362, -111,  363,  364,  365,
+          366,  368,  436,    0, -273,-32766, -272,   19,   20,  298,
+           21,   22,   24,  405,   75, 1203,  483,  484,  326,  491,
+            0,  494,  495,  496,  497,  501,  298,  502,  503,  510,
+          693,   75,    0, 1245, 1186,  326, 1264, 1059, 1058, 1039,
+         1222, 1035, -277, -103,   18,   23,   27,  295,  404,  600,
+          604,  633,  699, 1190, 1240, 1187, 1319,    0,    0,    0,
+          326
     );
 
     protected $actionCheck = array(
             2,    3,    4,    5,    6,    7,    0,    9,   10,   11,
-           12,   13,  106,    1,  108,   31,    9,   10,   11,   44,
+           12,   13,   70,    9,   10,   11,    9,   10,   11,   44,
            45,   46,   47,   48,   49,   50,   51,   52,  116,  117,
-          118,  119,  120,  121,  122,   37,   38,   30,    1,   32,
+          118,  119,  120,  121,  122,   37,   38,   30,  116,   32,
            33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
-           43,  138,  106,  107,    8,   57,    9,   10,   11,    9,
-           10,  155,  116,    9,   10,   11,    9,   10,   11,   71,
-           72,   73,   74,   75,   76,   77,  163,   30,   80,   32,
-           33,   34,   35,   36,   30,   87,   88,   89,   90,   91,
+           43,    8,   53,   54,   55,   57,   57,  106,  107,  137,
+            9,   10,   11,   50,   51,   52,    1,  116,   69,   71,
+           72,   73,   74,   75,   76,   77,  134,  135,   80,    1,
+           30,   30,   30,   32,   33,   87,   88,   89,   90,   91,
            92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
           102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
           112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
           122,  123,  124,  125,  126,  127,  128,  129,  130,  131,
-          132,  133,    8,   80,  136,  137,  138,  139,  140,  141,
-          142,  143,  144,   51,    1,  161,   31,   80,  150,  151,
+          132,  133,   80,   70,  136,  137,  138,  139,  140,  141,
+          142,  143,  144,    8,    1,  106,   80,  108,  150,  151,
           152,    8,  154,    9,   10,   11,    2,    3,    4,    5,
-            6,    7,  164,    9,   10,   11,   12,   13,   70,    1,
-           82,  159,   80,   85,   30,   83,   32,   33,   34,   35,
-           36,   37,   38,  116,  117,  118,  119,  120,  121,  122,
-            1,   37,   38,    9,   10,   11,    8,    8,  161,    9,
-           10,   11,  117,  118,  167,    1,    8,  122,  155,  156,
-          157,   57,   97,  128,   30,  162,   32,   33,   34,   35,
-           30,   14,   32,   33,   34,   71,   72,   73,   74,   75,
-           76,   77,  134,  135,   80,  147,  148,   50,   51,   52,
+            6,    7,  164,    9,   10,   11,   12,   13,  116,  119,
+          120,  121,  122,  106,   30,  108,   32,   33,   34,   35,
+           36,   37,   38,    9,   10,   11,  106,  107,  138,  137,
+          138,   37,   38,    9,   10,   11,  116,  134,  135,    1,
+            9,   10,   11,  137,   30,   14,    8,  155,  156,  157,
+            1,   57,  149,  163,   30,  163,   32,   33,   34,   35,
+           36,  155,  156,  157,  161,   71,   72,   73,   74,   75,
+           76,   77,    8,   31,   80,  129,  130,  131,  158,  161,
             8,   87,   88,   89,   90,   91,   92,   93,   94,   95,
            96,   97,   98,   99,  100,  101,  102,  103,  104,  105,
           106,  107,  108,  109,  110,  111,  112,  113,  114,  115,
           116,  117,  118,  119,  120,  121,  122,  123,  124,  125,
-          126,  127,  128,  129,  130,  131,  132,  133,  164,    8,
-          136,  137,  138,  139,  140,  141,  142,  143,  144,   80,
+          126,  127,  128,  129,  130,  131,  132,  133,    8,   80,
+          136,  137,  138,  139,  140,  141,  142,  143,  144,  164,
             9,   10,   11,  160,  150,  151,  152,  164,  154,    2,
-            3,    4,    5,    6,    7,    1,    9,   10,   11,   12,
+            3,    4,    5,    6,    7,   80,    9,   10,   11,   12,
            13,   30,    8,   32,   33,   34,   35,   36,   37,   38,
            39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
-           49,   50,   51,   52,   53,   54,   55,   30,   57,  160,
-            8,  106,  107,  164,   31,    9,  137,  129,  130,  131,
-           69,  116,  117,  118,   57,  161,   80,  122,    9,   10,
-           11,  164,    1,  128,  155,  156,  157,   30,   71,   72,
-           73,   74,   75,   76,   77,    8,  106,   80,  108,   30,
-            1,   32,   33,   85,   87,   88,   89,   90,   91,   92,
+           49,   50,   51,   52,   53,   54,   55,   30,   57,    1,
+            8,  116,  117,  118,  119,  120,  121,  122,  160,  106,
+           69,  108,  164,  161,   57,    9,   10,   11,    9,   10,
+          161,    1,    1,   37,   38,    1,  167,   31,   71,   72,
+           73,   74,   75,   76,   77,    8,   30,   80,   32,   33,
+           34,   35,   14,   85,   87,   88,   89,   90,   91,   92,
            93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
           103,  104,  105,  106,  107,  108,  109,  110,  111,  112,
           113,  114,  115,  116,  117,  118,  119,  120,  121,  122,
           123,  124,  125,  126,  127,  128,  129,  130,  131,  132,
-          133,    8,  156,  136,  137,  138,  139,  140,  141,  142,
-          143,  144,   37,   38,  146,  138,  116,  150,  151,  152,
-            2,    3,    4,    5,    6,    7,  119,  120,  121,  122,
-           12,   13,  101,   15,   80,    1,  101,  106,  138,  108,
-          163,    1,  159,    8,  113,  138,   97,  116,  117,  118,
-          119,  120,  121,  122,  123,   53,   54,   55,  123,   57,
-            9,   10,   11,  163,   30,   14,  164,  122,   50,   51,
-          163,   69,  116,   70,   56,    8,   58,   59,   60,   61,
+          133,    8,  122,  136,  137,  138,  139,  140,  141,  142,
+          143,  144,    8,   51,  146,  138,   82,  150,  151,  152,
+            2,    3,    4,    5,    6,    7,  106,   97,  108,    1,
+           12,   13,  101,   15,    9,   10,   11,  106,   80,  108,
+          163,    1,   80,  163,  113,   83,    8,  116,  117,  118,
+          119,  120,  121,  122,  123,   30,    8,   32,   33,   34,
+            8,  117,  118,   80,   31,  159,  122,  159,   50,   51,
+            8,   80,  128,   70,   56,  155,   58,   59,   60,   61,
            62,   63,   64,   65,   66,   67,   68,    1,   70,   71,
-           72,   73,   74,  162,  138,  122,   78,   79,   80,    1,
-           82,  164,   14,    1,   86,   87,   88,   89,  163,   91,
-          156,   93,  106,   95,  108,  161,   98,   99,   75,   76,
-           80,  103,  104,  105,  106,  107,    1,  109,  110,   31,
-          116,   75,   76,  115,  116,   70,  163,  134,  135,    8,
-          122,    1,  124,  125,  126,  160,  159,    8,  161,  164,
-          116,  137,  149,    8,  136,  137,   31,  139,  140,  141,
-          142,  143,  144,  145,  161,  106,  163,  108,   82,  151,
-          152,    8,  138,  155,  156,  157,  158,   75,   76,   77,
-            8,  163,   84,  165,  166,  167,   84,    8,  101,  102,
-          106,  107,   90,    8,   92,    8,   94,  163,   96,  134,
-          135,  161,  116,  106,  107,  111,  112,  167,  106,   84,
-            1,    8,    8,    8,  149,   31,   14,   37,   38,  117,
-          118,   14,   82,  137,  122,   31,  161,   14,  163,  127,
+           72,   73,   74,  162,    9,  161,   78,   79,   80,    1,
+           82,  167,  164,    1,   86,   87,   88,   89,  122,   91,
+          101,   93,   84,   95,  156,    8,   98,   99,    8,  161,
+          138,  103,  104,  105,  106,  107,    8,  109,  110,   31,
+           97,    8,  123,  115,  116,   70,    8,  134,  135,  156,
+          122,    8,  124,  125,  126,  163,  155,  156,  157,  163,
+          116,    8,  149,  162,  136,  137,    8,  139,  140,  141,
+          142,  143,  144,  145,  161,   14,  163,  160,   82,  151,
+          152,  164,  138,  155,  156,  157,  158,   75,   76,   77,
+           14,  163,   84,  165,  166,  167,   84,  159,  116,  161,
+           82,   14,   90,   85,   92,   14,   94,  163,   96,  134,
+          135,  161,  116,  159,    1,  161,   14,  167,  106,   14,
+          138,    8,  164,   16,  149,   31,  164,   37,   38,  117,
+          118,   75,   76,  137,  122,   31,  161,   14,  163,  127,
           128,  129,  130,  131,   16,   17,   18,   19,   20,   21,
-           22,   23,   24,   25,   26,   27,   28,   29,   14,  163,
-           70,   14,   14,  167,   31,   16,   16,  159,   16,  161,
+           22,   23,   24,   25,   26,   27,   28,   29,   16,  163,
+           70,   75,   76,  167,   16,  147,  148,  159,   16,  161,
            16,  159,   82,  161,  162,   16,   86,   16,   74,   70,
-            1,   70,   16,   16,   80,   16,   31,   59,   60,   31,
-           37,   87,   88,   89,  159,   91,  161,   93,   70,   95,
-           35,   31,   98,   84,   31,   31,  116,  103,  104,  105,
-           31,  161,  122,  109,  110,   37,   38,  167,   31,  115,
-          116,   31,    0,    1,   31,   31,  136,  137,  124,  139,
+           16,   70,  101,  102,   80,  106,  107,   59,   60,  106,
+          107,   87,   88,   89,   31,   91,    1,   93,   70,   95,
+          111,  112,   98,   16,   16,   16,  116,  103,  104,  105,
+           16,   31,  122,  109,  110,   37,   38,   16,   35,  115,
+          116,   31,    0,    1,   31,   30,  136,  137,  124,  139,
           140,  141,  142,  143,  144,   31,   31,   31,   31,   31,
            31,  151,  152,  134,  135,  134,  135,   37,   38,   31,
-           31,   31,   74,  163,   31,    1,  166,  167,   80,   35,
-          149,   82,  134,  135,   35,   87,   88,   89,   35,   91,
-          161,   93,  161,   95,   35,   35,   98,  149,  159,   35,
-          161,  103,  104,  105,   74,   31,   37,  109,  110,  161,
-           80,   38,   37,  115,  116,  116,   37,   87,   88,   89,
-           57,   91,  124,   93,   70,   95,   84,  128,   98,   77,
-           69,   80,   70,  103,  104,  105,  137,   82,   31,  109,
-          110,   83,   85,   96,   94,  115,  116,   82,  106,  113,
-          108,   85,  154,   97,  124,  113,   89,  158,   84,  117,
-          118,   90,  163,  128,  122,   97,  167,   97,   92,  127,
-          128,  129,  130,  131,  133,  138,  153,  100,  100,  146,
-          132,   74,   70,  137,    1,  153,  114,   80,  134,  135,
-          159,  146,  150,  159,   87,   88,   89,   -1,   91,    1,
-           93,  159,   95,  161,  162,   98,   -1,    1,    1,   -1,
-          103,  104,  105,   74,  132,  161,  109,  110,   -1,   80,
+           31,   31,   74,  163,   31,    1,  166,  167,   80,   31,
+          149,   31,  134,  135,   31,   87,   88,   89,   31,   91,
+          161,   93,  161,   95,   31,   31,   98,  149,   37,   37,
+           35,  103,  104,  105,   74,   31,   35,  109,  110,  161,
+           80,   35,   35,  115,  116,   70,   35,   87,   88,   89,
+           35,   91,  124,   93,   37,   95,   84,   37,   98,   38,
+           57,  116,    1,  103,  104,  105,   69,   77,   31,  109,
+          110,   82,   70,   85,   89,  115,  116,   96,  106,   80,
+          108,   83,  154,  138,  124,  113,   90,   82,   84,  117,
+          118,  114,   31,   80,  122,   85,  132,   97,  132,  127,
+          128,  129,  130,  131,   92,   97,   97,  128,  163,  134,
+          135,   74,   70,   94,    1,  133,  100,   80,  100,  154,
+          146,  137,  150,  160,   87,   88,   89,  113,   91,    1,
+           93,  159,   95,  161,  162,   98,  161,  161,    1,  153,
+          103,  104,  105,   74,   -1,   84,  109,  110,   -1,   80,
             1,   -1,  115,  116,   -1,   -1,   87,   88,   89,   31,
-           91,  124,   93,  159,   95,  161,  149,   98,   31,  149,
-          149,  102,  103,  104,  105,   74,  134,  135,  109,  110,
-          149,   80,   81,  149,  115,  116,  154,  158,   87,   88,
-           89,  149,   91,  124,   93,  155,   95,   84,  159,   98,
-          159,  163,  159,  161,  103,  104,  105,  159,  159,  159,
-          109,  110,   84,  100,  101,  102,  115,  116,   82,  106,
-          159,   84,  159,  159,  159,  124,  159,  159,  162,  159,
-          117,  118,  159,   84,  159,  122,  159,  161,  160,  160,
-          127,  128,  129,  130,  131,   70,  160,  160,  160,  100,
-          101,  102,  116,  160,  162,  106,  161,   82,  161,  161,
-          161,   86,  162,  161,  128,  161,  117,  118,  161,  161,
-          161,  122,  159,  137,  161,  162,  127,  128,  129,  130,
-          131,  161,  161,  161,  165,  162,  162,  159,   70,  161,
-          163,  116,  162,  162,  158,  162,  159,  122,  161,  163,
-          162,  162,  162,  167,  162,  162,  162,  162,  159,  162,
+           91,  124,   93,  159,   95,  161,  138,   98,   31,  146,
+           -1,  102,  103,  104,  105,   74,  134,  135,  109,  110,
+          149,   80,   81,  149,  115,  116,  153,  149,   87,   88,
+           89,  149,   91,  124,   93,  149,   95,   84,  149,   98,
+          155,  158,  161,  161,  103,  104,  105,  159,  161,  159,
+          109,  110,   84,  100,  101,  102,  115,  116,  159,  106,
+          159,   84,  161,  159,  159,  124,  159,  159,  162,  159,
+          117,  118,  159,   84,  159,  122,  159,  159,  159,  159,
+          127,  128,  129,  130,  131,   70,  159,  159,  159,  100,
+          101,  102,    1,  159,  161,  106,  160,   82,  160,  160,
+          160,   86,  160,  166,  161,  161,  117,  118,  161,    1,
+          161,  122,  159,  161,  161,  162,  127,  128,  129,  130,
+          131,  161,   31,  161,  161,  161,  165,  159,  162,  161,
+          163,  116,  162,  162,  162,  162,  159,  122,  161,  163,
+          162,  162,  162,  162,  162,  162,  162,  162,  159,  162,
           161,  162,  137,  162,  139,  140,  141,  142,  143,  144,
           162,  162,  162,  162,  162,  162,  151,  152,  162,  162,
-           74,  162,  162,  165,  163,  163,   80,  163,  163,  163,
+           74,  162,  162,   82,  162,  164,   80,  163,  163,  163,
           163,  166,  167,   87,   88,   89,  163,   91,  163,   93,
-          163,   95,  134,  135,   98,  163,  163,  163,  163,  103,
-          104,  105,  163,  163,  163,  109,  110,  149,  163,  163,
-          163,  115,  116,  163,  163,  163,  163,  163,  163,  161,
-          124,  164,  163,  163,  163,  163,  163,  163,  163,  163,
-          163,  163,  163,   -1,  164,  164,  164,  164,  164,  164,
+           82,   95,  163,  163,   98,  163,  163,  163,  163,  103,
+          104,  105,  163,  163,  163,  109,  110,  116,  117,  118,
+          163,  115,  116,  122,  163,  163,  163,  163,  163,  128,
+          124,  163,  163,  163,  116,  117,  118,  163,  137,  163,
+          122,  163,  163,  163,  163,  163,  128,  163,  163,  163,
+          163,  163,  163,   -1,  164,  137,  164,  164,  164,  158,
+          164,  164,  164,  164,  163,  165,  164,  164,  167,  164,
+           -1,  164,  164,  164,  164,  164,  158,  164,  164,  164,
+          164,  163,   -1,  164,  164,  167,  164,  164,  164,  164,
           164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-          164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-           -1,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-          164,  164,  164,  164,  164,  164,  164,  164,   -1,   -1,
-          166,   -1,  167
+          164,  164,  164,  164,  164,  164,  164,   -1,   -1,   -1,
+          167
     );
 
     protected $actionBase = array(
-            0,   -2,  154,  542,  752,  893,  929,  580,   53,  394,
-          855,  307,  307,   67,  307,  307,  307,  565,  908,  908,
-          917,  908,  538,  784,  649,  649,  649,  708,  708,  708,
-          708,  740,  740,  849,  849,  881,  817,  634, 1036, 1036,
+            0,   -2,  154,  542,  752,  893,  929,   52,  374,  431,
+          398,  869,  793,  235,  307,  307,  793,  307,  784,  908,
+          908,  917,  908,  538,  841,  468,  468,  468,  708,  708,
+          708,  708,  740,  740,  849,  849,  881,  817,  634, 1036,
          1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
          1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
          1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
@@ -512,65 +516,67 @@ class Php7 extends \PhpParser\ParserAbstract
          1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
          1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
          1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
-         1036, 1036,   12,  323,  389,  678, 1044, 1050, 1046, 1051,
-         1042, 1041, 1045, 1047, 1052,  942,  943,  753,  946,  947,
-          949,  950, 1048,  873, 1043, 1049,  291,  291,  291,  291,
+         1036, 1036, 1036, 1036,  348,  346,  370,  653, 1063, 1069,
+         1065, 1070, 1061, 1060, 1064, 1066, 1071,  946,  947,  774,
+          949,  950,  943,  952, 1067,  882, 1062, 1068,  291,  291,
           291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
           291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-          291,  291,  346,  491,   50,   57,   57,   57,   57,   57,
-           57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-           57,   57,   57,   57,   57,   54,   54,   54,  620,  620,
-          359,  190,  184,  955,  955,  955,  955,  955,  955,  955,
-          955,  955,  955,  658,   47,  144,  144,    7,    7,    7,
-            7,    7,  371,  -25,  -25,  -25,  -25,  709,  347,  916,
-          474,  526,  375,  280,  317,  245,  340,  340,  187,  187,
-          396,  396,  -87,  -87,  396,  396,  396,  747,  747,  747,
-          747,  443,  505,  -94,  308,  454,  480,  480,  480,  480,
-          454,  454,  454,  454,  755, 1054,  454,  454,  454,  641,
-          822,  822,  998,  442,  442,  442,  822,  499,  776,   88,
-          499,   88,   37,   92,  756,   85,  -54,  425,  756,  639,
-          764,  189,  143,  820,  524,  820, 1040,  385,  767,  413,
-          735,  688,  857,  902, 1053,  787,  940,  788,  941,  228,
-           98,  685, 1039, 1039, 1039, 1039, 1039, 1039, 1039, 1039,
-         1039, 1039, 1039, 1055,  415, 1040,  286, 1055, 1055, 1055,
-          415,  415,  415,  415,  415,  415,  415,  415,  415,  415,
-          534,  286,  483,  496,  286,  774,  415,   12,  800,   12,
-           12,   12,   12,   12,   12,   12,   12,   12,   12,  736,
-          -16,   12,  323,  204,  204,  427,  168,  204,  204,  204,
-          204,   12,   12,   12,  524,  773,  733,  537,  742,  377,
-          773,  773,  773,  115,  124,  207,  342,  695,  754,  446,
-          761,  761,  775,  957,  957,  761,  765,  761,  775,  973,
-          761,  761,  957,  957,  809,  232,  625,  579,  612,  627,
-          957,  475,  761,  761,  761,  761,  792,  643,  761,  433,
-          281,  761,  761,  792,  758,  739,   46,  751,  957,  957,
-          957,  792,  603,  751,  751,  751,  819,  821,  746,  738,
-          571,  507,  645,  198,  783,  738,  738,  761,  619,  746,
-          738,  746,  738,  812,  738,  738,  738,  746,  738,  765,
-          585,  738,  691,  644,  188,  738,    6,  974,  975,  624,
-          979,  967,  980, 1009,  981,  985,  878,  956,  992,  972,
-          986,  965,  963,  750,  679,  680,  801,  797,  954,  771,
-          771,  771,  951,  771,  771,  771,  771,  771,  771,  771,
-          771,  679,  858,  814,  745,  777,  995,  682,  684,  743,
-          872,  899,  948,  994, 1030,  987,  741,  689, 1016,  999,
-          846,  875, 1000, 1001, 1017, 1031, 1032,  880,  772,  903,
-          904,  859, 1003,  879,  771,  974,  985,  663,  972,  986,
-          965,  963,  734,  724,  720,  723,  717,  704,  700,  703,
-          737, 1033,  907,  818,  866, 1002,  952,  679,  867, 1012,
-          856, 1018, 1019,  877,  778,  768,  868,  910, 1004, 1005,
-         1006,  882, 1034,  884,  744, 1013,  997, 1020,  780,  911,
-         1021, 1022, 1023, 1024,  887,  913,  888,  889,  823,  781,
-         1010,  757,  918,  528,  769,  770,  789, 1008,  642,  993,
-          900,  919,  920, 1025, 1026, 1027,  922,  923,  990,  828,
-         1014,  760, 1015, 1011,  829,  830,  647,  785, 1035,  759,
-          763,  779,  653,  674,  924,  925,  927,  991,  748,  762,
-          841,  843, 1037,  683, 1038,  931,  677,  844,  696,  938,
-         1029,  697,  699,  786,  901,  811,  782,  766, 1007,  749,
-          845,  939,  847,  848,  850, 1028,  853,    0,    0,    0,
+          291,  291,  291,  291,  291,  525,  191,  359,    4,    4,
+            4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+            4,    4,    4,    4,    4,    4,    4,    4,  174,  174,
+          174,  620,  620,   51,  465,  356,  955,  955,  955,  955,
+          955,  955,  955,  955,  955,  955,  658,  184,  144,  144,
+            7,    7,    7,    7,    7, 1031,  371, 1048,  -25,  -25,
+          -25,  -25,   50,  725,  526,  449,   39,  317,   80,  474,
+          474,   13,   13,  512,  512,  422,  422,  512,  512,  512,
+          808,  808,  808,  808,  443,  505,  360,  308,  -78,  209,
+          209,  209,  209,  -78,  -78,  -78,  -78,  803,  877,  -78,
+          -78,  -78,   63,  641,  641,  822,   -1,   -1,   -1,  641,
+          253,  790,  548,  253,  384,  548,  480,  402,  764,  759,
+          -49,  447,  764,  639,  755,  198,  143,  825,  609,  825,
+         1059,  320,  768,  426,  749,  720,  874,  904, 1072,  796,
+          941,  798,  942,  106,  -58,  710, 1058, 1058, 1058, 1058,
+         1058, 1058, 1058, 1058, 1058, 1058, 1058, 1073,  336, 1059,
+          423, 1073, 1073, 1073,  336,  336,  336,  336,  336,  336,
+          336,  336,  336,  336,  619,  423,  586,  616,  423,  795,
+          336,  348,  814,  348,  348,  348,  348,  348,  348,  348,
+          348,  348,  348,  750,  202,  348,  346,   78,   78,  484,
+           65,   78,   78,   78,   78,  348,  348,  348,  348,  609,
+          783,  766,  613,  813,  492,  783,  783,  783,  473,  135,
+          378,  488,  713,  775,   67,  779,  779,  785,  969,  969,
+          779,  769,  779,  785,  975,  779,  779,  969,  969,  823,
+          280,  563,  478,  550,  568,  969,  377,  779,  779,  779,
+          779,  746,  573,  779,  342,  314,  779,  779,  746,  744,
+          760,   43,  762,  969,  969,  969,  746,  547,  762,  762,
+          762,  839,  844,  794,  758,  444,  433,  588,  232,  801,
+          758,  758,  779,  558,  794,  758,  794,  758,  745,  758,
+          758,  758,  794,  758,  769,  502,  758,  717,  583,  224,
+          758,    6,  979,  980,  624,  981,  973,  987, 1019,  991,
+          992,  873,  965,  999,  974,  993,  972,  970,  773,  682,
+          684,  818,  811,  963,  777,  777,  777,  956,  777,  777,
+          777,  777,  777,  777,  777,  777,  682,  743,  829,  765,
+         1006,  689,  691,  754,  906,  901, 1030, 1004, 1049,  994,
+          828,  694, 1028, 1008,  846,  821, 1009, 1010, 1029, 1050,
+         1052,  910,  782,  911,  912,  876, 1012,  883,  777,  979,
+          992,  693,  974,  993,  972,  970,  748,  739,  737,  738,
+          736,  735,  723,  734,  753, 1053,  954,  907,  878, 1011,
+          957,  682,  879, 1023,  756, 1032, 1033,  827,  788,  778,
+          880,  913, 1014, 1015, 1016,  884, 1054,  887,  830, 1024,
+          951, 1035,  789,  918, 1037, 1038, 1039, 1040,  889,  919,
+          892,  916,  900,  845,  776, 1020,  761,  920,  591,  787,
+          791,  800, 1018,  606, 1000,  902,  921,  922, 1041, 1043,
+         1044,  923,  924,  995,  847, 1026,  799, 1027, 1022,  848,
+          850,  617,  797, 1055,  781,  786,  772,  621,  632,  925,
+          927,  931,  998,  763,  770,  853,  855, 1056,  771, 1057,
+          938,  635,  857,  718,  939, 1046,  719,  724,  637,  678,
+          672,  731,  792,  903,  826,  757,  780, 1017,  724,  767,
+          858,  940,  859,  860,  867, 1045,  868,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,  458,  458,  458,
-          458,  458,  458,  307,  307,  307,  307,    0,    0,  307,
-            0,    0,    0,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  307,  307,  307,  307,  307,  307,  307,
+            0,    0,  307,    0,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
@@ -584,182 +590,182 @@ class Php7 extends \PhpParser\ParserAbstract
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
           458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
-          458,  458,  458,  458,  458,  458,  458,  458,  291,  291,
           291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
           291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-          291,  291,    0,    0,    0,    0,    0,    0,    0,    0,
+          291,  291,  291,  291,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,  291,  291,
-          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-          291,  291,  291,  291,  219,  219,  291,  291,  291,  219,
-          219,  219,  219,  219,  219,  219,  219,  219,  219,    0,
-          291,  291,  291,  291,  291,  291,  291,  291,  809,  442,
-          442,  442,  442,  219,  219,  219,  219,  219,  -88,  -88,
-          219,  809,  219,  219,  442,  442,  219,  219,  219,  219,
-          219,  219,  219,  219,  219,  219,  219,    0,    0,  286,
-           88,  219,  765,  765,  765,  765,  219,  219,  219,  219,
-           88,   88,  219,  219,  219,    0,    0,    0,    0,    0,
-            0,    0,    0,  286,   88,    0,  286,    0,  765,  765,
-          219,    0,  809,  314,  219,    0,    0,    0,    0,  286,
-          765,  286,  415,  761,   88,  761,  415,  415,  204,   12,
-          314,  527,  527,  527,  527,    0,    0,  524,  809,  809,
-          809,  809,  809,  809,  809,  809,  809,  809,  809,  765,
-            0,  809,    0,  765,  765,  765,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,  765,    0,    0,  957,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,  973,    0,    0,    0,    0,
-            0,    0,  765,    0,    0,    0,    0,    0,    0,    0,
-            0,  771,  778,    0,  778,    0,  771,  771,  771,    0,
-            0,    0,    0,  785,  683
+            0,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,  291,   66,   66,  291,
+          291,  291,   66,   66,   66,   66,   66,   66,   66,   66,
+           66,   66,    0,  291,  291,  291,  291,  291,  291,  291,
+          291,   66,  823,   66,   -1,   -1,   -1,   -1,   66,   66,
+           66,  -88,  -88,   66,  384,   66,   66,   -1,   -1,   66,
+           66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
+            0,    0,  423,  548,   66,  769,  769,  769,  769,   66,
+           66,   66,   66,  548,  548,   66,   66,   66,    0,    0,
+            0,    0,    0,    0,    0,    0,  423,  548,    0,  423,
+            0,    0,  769,  769,   66,  384,  823,  643,   66,    0,
+            0,    0,    0,  423,  769,  423,  336,  779,  548,  779,
+          336,  336,   78,  348,  643,  611,  611,  611,  611,    0,
+            0,  609,  823,  823,  823,  823,  823,  823,  823,  823,
+          823,  823,  823,  769,    0,  823,    0,  769,  769,  769,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,  769,    0,    0,  969,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  975,
+            0,    0,    0,    0,    0,    0,  769,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,  777,  788,    0,  788,
+            0,  777,  777,  777,    0,    0,    0,    0,  797,  771
     );
 
     protected $actionDefault = array(
             3,32767,  103,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,  101,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  593,  593,  593,
-          593,32767,32767,  253,  103,32767,32767,  467,  385,  385,
-          385,32767,32767,  537,  537,  537,  537,  537,  537,32767,
-        32767,32767,32767,32767,32767,  467,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,  101,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  596,  596,
+          596,  596,32767,32767,  254,  103,32767,32767,  469,  387,
+          387,  387,32767,32767,  540,  540,  540,  540,  540,  540,
+        32767,32767,32767,32767,32767,32767,  469,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,  101,32767,
-        32767,32767,   37,    7,    8,   10,   11,   50,   17,  323,
-        32767,32767,32767,32767,  103,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  101,
+        32767,32767,32767,   37,    7,    8,   10,   11,   50,   17,
+          324,32767,32767,32767,32767,  103,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,  586,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,  589,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  471,  450,  451,  453,
-          454,  384,  538,  592,  326,  589,  383,  146,  338,  328,
-          241,  329,  257,  472,  258,  473,  476,  477,  214,  286,
-          380,  150,  414,  468,  416,  466,  470,  415,  390,  395,
-          396,  397,  398,  399,  400,  401,  402,  403,  404,  405,
-          406,  407,  388,  389,  469,  447,  446,  445,32767,32767,
-          412,  413,  417,32767,32767,32767,32767,32767,32767,32767,
-        32767,  103,32767,  387,  420,  418,  419,  436,  437,  434,
-          435,  438,32767,  439,  440,  441,  442,32767,  315,32767,
-        32767,32767,  364,  362,  315,  112,32767,32767,  427,  428,
+        32767,32767,32767,32767,32767,32767,32767,32767,  473,  452,
+          453,  455,  456,  386,  541,  595,  327,  592,  385,  146,
+          339,  329,  242,  330,  258,  474,  259,  475,  478,  479,
+          215,  287,  382,  150,  151,  416,  470,  418,  468,  472,
+          417,  392,  397,  398,  399,  400,  401,  402,  403,  404,
+          405,  406,  407,  408,  409,  390,  391,  471,  449,  448,
+          447,32767,32767,  414,  415,  419,32767,32767,32767,32767,
+        32767,32767,32767,32767,  103,32767,  389,  422,  420,  421,
+          438,  439,  436,  437,  440,32767,32767,32767,  441,  442,
+          443,  444,  316,32767,32767,  366,  364,  316,  112,32767,
+        32767,  429,  430,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,  534,  446,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  103,
+        32767,  101,  536,  411,  413,  503,  424,  425,  423,  393,
+        32767,  510,32767,  103,32767,  512,32767,32767,32767,32767,
+        32767,32767,32767,  535,32767,  542,  542,32767,  496,  101,
+          195,32767,32767,32767,  195,  195,32767,32767,32767,32767,
+        32767,32767,32767,32767,  603,  496,  111,  111,  111,  111,
+          111,  111,  111,  111,  111,  111,  111,32767,  195,  111,
+        32767,32767,32767,  101,  195,  195,  195,  195,  195,  195,
+          195,  195,  195,  195,  190,32767,  268,  270,  103,  557,
+          195,32767,  515,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,  508,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  496,
+          434,  139,32767,  139,  542,  426,  427,  428,  498,  542,
+          542,  542,  312,  289,32767,32767,32767,32767,  513,  513,
+          101,  101,  101,  101,  508,32767,32767,32767,32767,  112,
+          100,  100,  100,  100,  100,  104,  102,32767,32767,32767,
+        32767,  223,  100,32767,  102,  102,32767,32767,  223,  225,
+          212,  102,  227,32767,  561,  562,  223,  102,  227,  227,
+          227,  247,  247,  485,  318,  102,  100,  102,  102,  197,
+          318,  318,32767,  102,  485,  318,  485,  318,  199,  318,
+          318,  318,  485,  318,32767,  102,  318,  214,  100,  100,
+          318,32767,32767,32767,  498,32767,32767,32767,32767,32767,
+        32767,32767,  222,32767,32767,32767,32767,32767,32767,32767,
+          529,32767,  546,  559,  432,  433,  435,  544,  457,  458,
+          459,  460,  461,  462,  463,  465,  591,32767,  502,32767,
+        32767,32767,  338,  601,32767,  601,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,  531,  444,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  103,32767,  101,  533,
-          409,  411,  501,  422,  423,  421,  391,32767,  508,32767,
-          103,  510,32767,32767,32767,32767,32767,32767,32767,  532,
-        32767,  539,  539,32767,  494,  101,  194,32767,32767,32767,
-          194,  194,32767,32767,32767,32767,32767,32767,32767,32767,
-          600,  494,  111,  111,  111,  111,  111,  111,  111,  111,
-          111,  111,  111,32767,  194,  111,32767,32767,32767,  101,
-          194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
-          189,32767,  267,  269,  103,  554,  194,32767,  513,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,  506,
+        32767,  602,32767,  542,32767,32767,32767,32767,  431,    9,
+           76,  491,   43,   44,   52,   58,  519,  520,  521,  522,
+          516,  517,  523,  518,32767,32767,  524,  567,32767,32767,
+          543,  594,32767,32767,32767,32767,32767,32767,  139,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  494,  432,  139,32767,  139,  539,
-          424,  425,  426,  496,  539,  539,  539,  311,  288,32767,
-        32767,32767,32767,  511,  511,  101,  101,  101,  101,  506,
-        32767,32767,32767,32767,  112,  100,  100,  100,  100,  100,
-          104,  102,32767,32767,32767,32767,  222,  100,32767,  102,
-          102,32767,32767,  222,  224,  211,  102,  226,32767,  558,
-          559,  222,  102,  226,  226,  226,  246,  246,  483,  317,
-          102,  100,  102,  102,  196,  317,  317,32767,  102,  483,
-          317,  483,  317,  198,  317,  317,  317,  483,  317,32767,
-          102,  317,  213,  100,  100,  317,32767,32767,32767,  496,
-        32767,32767,32767,32767,32767,32767,32767,  221,32767,32767,
-        32767,32767,32767,32767,32767,  526,32767,  543,  556,  430,
-          431,  433,  541,  455,  456,  457,  458,  459,  460,  461,
-          463,  588,32767,  500,32767,32767,32767,32767,  337,  598,
-        32767,  598,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  599,32767,  539,
-        32767,32767,32767,32767,  429,    9,   76,  489,   43,   44,
-           52,   58,  517,  518,  519,  520,  514,  515,  521,  516,
-        32767,32767,  522,  564,32767,32767,  540,  591,32767,32767,
-        32767,32767,32767,32767,  139,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  526,32767,  137,32767,
+          529,32767,  137,32767,32767,32767,32767,32767,32767,32767,
+        32767,  525,32767,32767,32767,  542,32767,32767,32767,32767,
+          314,  311,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  542,32767,
+        32767,32767,32767,32767,  291,32767,  308,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-          539,32767,32767,32767,32767,  313,  310,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,  539,32767,32767,32767,32767,32767,  290,
-        32767,  307,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,  285,32767,
-        32767,  379,32767,32767,32767,32767,  358,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  152,  152,    3,
-            3,  340,  152,  152,  152,  340,  340,  152,  340,  340,
-          340,  152,  152,  152,  152,  152,  152,  279,  184,  261,
-          264,  246,  246,  152,  350,  152
+        32767,32767,32767,  286,32767,32767,  381,  498,  294,  296,
+          297,32767,32767,32767,32767,  360,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,  153,  153,    3,
+            3,  341,  153,  153,  153,  341,  341,  153,  341,  341,
+          341,  153,  153,  153,  153,  153,  153,  280,  185,  262,
+          265,  247,  247,  153,  352,  153
     );
 
     protected $goto = array(
-          194,  194,  685,  425,  653,  346,  614,  650,  419,  310,
-          311,  331,  569,  316,  424,  332,  426,  630, 1200,  930,
-          693, 1051, 1201, 1204,  931, 1205,  165,  165,  165,  165,
-          218,  195,  191,  191,  175,  177,  213,  191,  191,  191,
-          191,  191,  192,  192,  192,  192,  192,  192,  186,  187,
-          188,  189,  190,  215,  213,  216,  529,  530,  415,  531,
-          533,  534,  535,  536,  537,  538,  539,  540, 1120,  166,
-          167,  168,  193,  169,  170,  171,  164,  172,  173,  174,
-          176,  212,  214,  217,  235,  240,  241,  242,  254,  255,
-          256,  257,  258,  259,  260,  261,  263,  264,  265,  266,
-          278,  279,  313,  314,  315,  420,  421,  422,  574,  219,
-          220,  221,  222,  223,  224,  225,  226,  227,  228,  229,
-          230,  231,  232,  233,  178,  234,  179,  196,  197,  198,
-          236,  186,  187,  188,  189,  190,  215, 1120,  199,  180,
-          181,  182,  200,  196,  183,  237,  201,  199,  163,  202,
-          203,  184,  204,  205,  206,  185,  207,  208,  209,  210,
-          211,  275,  275,  275,  275,  843,  593,  646,  647,  560,
-          664,  665,  666,  720,  629,  631,  840,  418,  651,  604,
-          841,  350,  675,  679,  996,  683,  691,  992,  616,  616,
-          817,  350,  350, 1252, 1252, 1252, 1252, 1252, 1252, 1252,
-         1252, 1252, 1252, 1092, 1093,  350,  350,  874,  350,  848,
-         1337,  896,  891,  892,  905,  849,  893,  846,  894,  895,
-          847,  548,  900,  899,  901,  350,  391,  394,  554,  594,
-          598, 1270, 1270, 1072, 1068, 1069, 1270, 1270, 1270, 1270,
-         1270, 1270, 1270, 1270, 1270, 1270, 1268, 1268,  815,  347,
-          348, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268,
-         1268, 1221, 1020, 1221, 1020, 1221,  836,    5, 1020,    6,
-         1020, 1020, 1281,  961, 1020, 1020, 1020, 1020, 1020, 1020,
-         1020, 1020, 1020, 1020, 1020,  349,  349,  349,  349, 1221,
-          460,  460,  566,  678, 1221, 1221, 1221, 1221,  344,  460,
-         1221, 1221, 1221, 1302, 1302, 1302, 1302,  602,  617,  620,
-          621,  622,  623,  643,  644,  645,  695,  836,  912,  553,
-          546, 1310,  913,  548,  532,  532,  821,  856,  982,  532,
-          532,  532,  532,  532,  532,  532,  532,  532,  532,  543,
-          473,  543,  868,  543,  928,  855,  928,  389,  475,  337,
-          546,  553,  562,  563,  339,  572,  595,  609,  610, 1320,
-         1320,  249,  249, 1026, 1025,   15,  821,  450,  821,  494,
-          565,  495,  955,  955,  955,  955, 1320,  501,  450,  949,
-          956,  839,  652, 1321, 1321, 1169, 1214,  246,  246,  246,
-          246,  248,  250, 1323,  985,  959,  959,  957,  959,  719,
-         1321,  545,  994,  989,  470, 1295, 1296,  953,  405,  692,
-          917, 1108,  432,  541,  541,  541,  541,  612,  597,  452,
-          444, 1029, 1030, 1001,  658,  444, 1292,  444, 1292,  674,
-         1292,  860,  833,  656,  980,  836,  861,  547,  557,  854,
-          321,  305,  547,  333,  557, 1297, 1298,  392,  456,  570,
-          607, 1211,  944,  398,  858, 1304, 1304, 1304, 1304,  463,
-          573,  464,  465,  608, 1004,  866,  403,  404, 1328, 1329,
-         1057,  662, 1212,  663,  471,  407,  408,  409,  723,  676,
-          870, 1288,  410,  624,  626,  627,  342,  427, 1216,  869,
-          857, 1056, 1060,  427,  864, 1061, 1103,  966,    0,    0,
-          964, 1027, 1027,    0,    0,    0,  657, 1038, 1034, 1035,
-          444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-          444,    0, 1059,  444,  954,    0, 1290, 1290, 1059,  592,
-         1085,    0,  696,  682,  682,    0,  502,  688, 1083,    0,
-            0,    0, 1217, 1218,  272,  428, 1101,  873,    0,  544,
-          831,  544,    0,    0,    0,  673,  938,    0,    0, 1015,
-         1031, 1032,    0,    0,    0,    0,    0,    0, 1219, 1278,
-         1279,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,  252,  252,
+          196,  196, 1031,  703,  694,  430,  658, 1062, 1334, 1334,
+          424,  313,  314,  335,  573,  319,  429,  336,  431,  635,
+          651,  652,  850,  669,  670,  671, 1334,  167,  167,  167,
+          167,  221,  197,  193,  193,  177,  179,  216,  193,  193,
+          193,  193,  193,  194,  194,  194,  194,  194,  194,  188,
+          189,  190,  191,  192,  218,  216,  219,  534,  535,  420,
+          536,  538,  539,  540,  541,  542,  543,  544,  545, 1132,
+          168,  169,  170,  195,  171,  172,  173,  166,  174,  175,
+          176,  178,  215,  217,  220,  238,  243,  244,  245,  257,
+          258,  259,  260,  261,  262,  263,  264,  268,  269,  270,
+          271,  281,  282,  316,  317,  318,  425,  426,  427,  578,
+          222,  223,  224,  225,  226,  227,  228,  229,  230,  231,
+          232,  233,  234,  235,  236,  180,  237,  181,  198,  199,
+          200,  239,  188,  189,  190,  191,  192,  218, 1132,  201,
+          182,  183,  184,  202,  198,  185,  240,  203,  201,  165,
+          204,  205,  186,  206,  207,  208,  187,  209,  210,  211,
+          212,  213,  214,  853,  851,  278,  278,  278,  278,  418,
+          620,  620,  350,  570,  597, 1265, 1265, 1265, 1265, 1265,
+         1265, 1265, 1265, 1265, 1265, 1283, 1283,  831,  618,  655,
+         1283, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 1283,
+          353,  353,  353,  353,  866,  557,  550,  858,  825,  907,
+          902,  903,  916,  859,  904,  856,  905,  906,  857,  878,
+          457,  910,  865,  884,  546,  546,  546,  546,  831,  601,
+          831, 1084, 1079, 1080, 1081,  341,  550,  557,  566,  567,
+          343,  576,  599,  613,  614,  407,  408,  972,  465,  465,
+          667,   15,  668, 1323,  411,  412,  413,  465,  681,  348,
+         1233,  414, 1233,  478,  569,  346,  439, 1031, 1031, 1233,
+          993,  480, 1031,  393, 1031, 1031, 1104, 1105, 1031, 1031,
+         1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1031, 1315,
+         1315, 1315, 1315, 1233,  657, 1333, 1333, 1055, 1233, 1233,
+         1233, 1233, 1037, 1036, 1233, 1233, 1233, 1034, 1034, 1181,
+          354,  678,  949, 1333,  437, 1026, 1042, 1043,  337,  691,
+          354,  354,  827,  923,  691, 1040, 1041,  924,  691,  663,
+         1336,  939,  871,  939,  354,  354, 1281, 1281,  354,  679,
+         1350, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281,
+         1281,  552,  537,  537,  911,  354,  912,  537,  537,  537,
+          537,  537,  537,  537,  537,  537,  537,  548,  564,  548,
+          574,  611,  730,  634,  636,  849,  548,  656,  475, 1308,
+         1309,  680,  684, 1007,  692,  701, 1003,  252,  252,  996,
+          970,  970,  968,  970,  729,  843,  549, 1005, 1000,  423,
+          455,  608, 1294,  846,  955,  966,  966,  966,  966,  325,
+          308,  455,  960,  967,  249,  249,  249,  249,  251,  253,
+          402,  351,  352,  683,  868,  551,  561,  449,  449,  449,
+          551, 1305,  561, 1305,  612,  396,  461, 1010, 1010, 1224,
+         1305,  395,  398,  558,  598,  602, 1015,  468,  577,  469,
+          470, 1310, 1311,  876,  552,  846, 1341, 1342,  964,  409,
+          702,  733,  324,  275,  324, 1317, 1317, 1317, 1317,  606,
+          621,  624,  625,  626,  627,  648,  649,  650,  705, 1068,
+          596, 1097,  874,  706,  476, 1228,  507,  697,  880, 1095,
+         1115,  432, 1301,  628,  630,  632,  432,  879,  867, 1067,
+         1071,    5, 1072,    6, 1038, 1038,  977,    0,  975,  662,
+         1049, 1045, 1046,    0,    0,    0,    0, 1226,  449,  449,
+          449,  449,  449,  449,  449,  449,  449,  449,  449,  928,
+         1120,  449,  965, 1070,    0,    0,  616, 1303, 1303, 1070,
+         1229, 1230, 1012,  499,    0,  500,    0,    0,  841,    0,
+          870,  506,  661,  991, 1113,  883, 1212,  941,  864,    0,
+         1213, 1216,  942, 1217,    0,    0, 1231, 1291, 1292,    0,
+         1223,    0,    0,    0,  846,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  999,  999
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,  255,  255
     );
 
     protected $gotoCheck = array(
-           42,   42,   72,   65,   65,   96,   55,   55,   65,   65,
-           65,   65,   65,   65,   65,   65,   65,   65,   78,   78,
-            9,  126,   78,   78,   78,   78,   42,   42,   42,   42,
+           42,   42,   72,    9,   72,   65,   65,  126,  181,  181,
+           65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+           85,   85,   26,   85,   85,   85,  181,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
@@ -773,97 +779,97 @@ class Php7 extends \PhpParser\ParserAbstract
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-           42,   23,   23,   23,   23,   15,  129,   85,   85,   48,
-           85,   85,   85,   48,   48,   48,   26,   13,   48,   13,
-           27,   14,   48,   48,   48,   48,   48,   48,  107,  107,
-            7,   14,   14,  107,  107,  107,  107,  107,  107,  107,
-          107,  107,  107,  143,  143,   14,   14,   45,   14,   15,
-           14,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-           15,   14,   64,   15,   64,   14,   58,   58,   58,   58,
-           58,  168,  168,   15,   15,   15,  168,  168,  168,  168,
-          168,  168,  168,  168,  168,  168,  169,  169,    6,   96,
-           96,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-          169,   72,   72,   72,   72,   72,   22,   46,   72,   46,
-           72,   72,   14,   49,   72,   72,   72,   72,   72,   72,
-           72,   72,   72,   72,   72,   24,   24,   24,   24,   72,
-          148,  148,  170,   14,   72,   72,   72,   72,  177,  148,
-           72,   72,   72,    9,    9,    9,    9,   80,   80,   80,
-           80,   80,   80,   80,   80,   80,   80,   22,   72,   75,
-           75,  179,   72,   14,  171,  171,   12,   35,  102,  171,
-          171,  171,  171,  171,  171,  171,  171,  171,  171,   19,
-           83,   19,   35,   19,    9,   35,    9,   61,   83,   75,
-           75,   75,   75,   75,   75,   75,   75,   75,   75,  180,
-          180,    5,    5,  117,  117,   75,   12,   19,   12,  154,
-          103,  154,   19,   19,   19,   19,  180,  154,   19,   19,
-           19,   25,   63,  181,  181,  150,   14,    5,    5,    5,
-            5,    5,    5,  180,   25,   25,   25,   25,   25,   25,
-          181,   25,   25,   25,  174,  174,  174,   92,   92,   92,
-           17,   17,  112,  106,  106,  106,  106,   17,  106,   82,
-           23,  118,  118,   17,  119,   23,  129,   23,  129,  115,
-          129,   17,   18,   17,   17,   22,   39,    9,    9,   17,
-          167,  167,    9,   29,    9,  176,  176,    9,    9,    2,
-            2,   17,   91,   28,   37,  129,  129,  129,  129,    9,
-            9,    9,    9,   79,  109,    9,   81,   81,    9,    9,
-          128,   81,  159,   81,  156,   81,   81,   81,   98,   81,
-           41,  129,   81,   84,   84,   84,   81,  116,   20,   16,
-           16,   16,   16,  116,    9,  131,  146,   95,   -1,   -1,
-           16,  116,  116,   -1,   -1,   -1,  116,  116,  116,  116,
-           23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-           23,   -1,  129,   23,   16,   -1,  129,  129,  129,    8,
-            8,   -1,    8,    8,    8,   -1,    8,    8,    8,   -1,
-           -1,   -1,   20,   20,   24,   88,   16,   16,   -1,   24,
-           20,   24,   -1,   -1,   -1,   88,   88,   -1,   -1,   88,
-           88,   88,   -1,   -1,   -1,   -1,   -1,   -1,   20,   20,
-           20,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    5,    5,
+           42,   42,   42,   15,   27,   23,   23,   23,   23,   43,
+          107,  107,   96,  170,  129,  107,  107,  107,  107,  107,
+          107,  107,  107,  107,  107,  168,  168,   12,   55,   55,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+           24,   24,   24,   24,   35,   75,   75,   15,    6,   15,
+           15,   15,   15,   15,   15,   15,   15,   15,   15,   35,
+           82,   15,   35,   45,  106,  106,  106,  106,   12,  106,
+           12,   15,   15,   15,   15,   75,   75,   75,   75,   75,
+           75,   75,   75,   75,   75,   81,   81,   49,  148,  148,
+           81,   75,   81,  179,   81,   81,   81,  148,   81,  177,
+           72,   81,   72,   83,  103,   81,   82,   72,   72,   72,
+          102,   83,   72,   61,   72,   72,  143,  143,   72,   72,
+           72,   72,   72,   72,   72,   72,   72,   72,   72,    9,
+            9,    9,    9,   72,   63,  180,  180,  113,   72,   72,
+           72,   72,  117,  117,   72,   72,   72,   88,   88,  150,
+           14,   88,   88,  180,  112,   88,   88,   88,   29,    7,
+           14,   14,    7,   72,    7,  118,  118,   72,    7,  119,
+          180,    9,   39,    9,   14,   14,  169,  169,   14,  115,
+           14,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+          169,   14,  171,  171,   64,   14,   64,  171,  171,  171,
+          171,  171,  171,  171,  171,  171,  171,   19,   48,   19,
+            2,    2,   48,   48,   48,   25,   19,   48,  174,  174,
+          174,   48,   48,   48,   48,   48,   48,    5,    5,   25,
+           25,   25,   25,   25,   25,   18,   25,   25,   25,   13,
+           19,   13,   14,   22,   91,   19,   19,   19,   19,  167,
+          167,   19,   19,   19,    5,    5,    5,    5,    5,    5,
+           28,   96,   96,   14,   37,    9,    9,   23,   23,   23,
+            9,  129,    9,  129,   79,    9,    9,  106,  106,  159,
+          129,   58,   58,   58,   58,   58,  109,    9,    9,    9,
+            9,  176,  176,    9,   14,   22,    9,    9,   92,   92,
+           92,   98,   24,   24,   24,  129,  129,  129,  129,   80,
+           80,   80,   80,   80,   80,   80,   80,   80,   80,  128,
+            8,    8,    9,    8,  156,   20,    8,    8,   41,    8,
+          146,  116,  129,   84,   84,   84,  116,   16,   16,   16,
+           16,   46,  131,   46,  116,  116,   95,   -1,   16,  116,
+          116,  116,  116,   -1,   -1,   -1,   -1,   14,   23,   23,
+           23,   23,   23,   23,   23,   23,   23,   23,   23,   17,
+           17,   23,   16,  129,   -1,   -1,   17,  129,  129,  129,
+           20,   20,   17,  154,   -1,  154,   -1,   -1,   20,   -1,
+           17,  154,   17,   17,   16,   16,   78,   78,   17,   -1,
+           78,   78,   78,   78,   -1,   -1,   20,   20,   20,   -1,
+           17,   -1,   -1,   -1,   22,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,  106,  106
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,    5,    5
     );
 
     protected $gotoBase = array(
-            0,    0, -250,    0,    0,  360,  235,  181,  522,    7,
-            0,    0,   33, -156, -113, -178,   43,  -49,  126,   72,
-          100,    0,   -9,  158,  282,  377,  172,  176,  120,  150,
-            0,    0,    0,    0,    0,  -39,    0,  119,    0,  116,
-            0,   45,   -1,    0,    0,  195, -456,    0, -529,  250,
-            0,    0,    0,    0,    0,  -33,    0,    0,  182,    0,
-            0,  306,    0,  143,  203, -235,    0,    0,    0,    0,
-            0,    0,   -6,    0,    0,  -21,    0,    0, -385,  124,
-          -46,  -19,  144, -123,   10, -538,    0,    0,  275,    0,
-            0,  127,  106,    0,    0,   60, -472,    0,   76,    0,
-            0,    0,  294,  328,    0,    0,  386,  -50,    0,   99,
-            0,    0,  138,    0,    0,  149,  219,   87,  139,  137,
-            0,    0,    0,    0,    0,    0,   19,    0,  101,  159,
-            0,   59,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,  -69,    0,    0,   58,    0,  257,    0,
-          114,    0,    0,    0, -120,    0,   40,    0,    0,  108,
-            0,    0,    0,    0,    0,    0,    0,  122,   -7,    8,
-          264,   86,    0,    0,  107,    0,   78,  269,    0,  291,
-           55,   79,    0,    0
+            0,    0, -339,    0,    0,  386,  195,  312,  472,  -10,
+            0,    0, -109,   62,   13, -184,   46,   65,   86,  102,
+           93,    0,  125,  162,  197,  371,   18,  160,   83,   22,
+            0,    0,    0,    0,    0, -166,    0,   85,    0,    9,
+            0,   48,   -1,  157,    0,  207, -232,    0, -340,  223,
+            0,    0,    0,    0,    0,  148,    0,    0,  396,    0,
+            0,  231,    0,   52,  334, -236,    0,    0,    0,    0,
+            0,    0,   -5,    0,    0, -139,    0,    0,  149,   91,
+          112, -245,  -58, -205,   15, -695,    0,    0,   28,    0,
+            0,   75,  154,    0,    0,   64, -310,    0,   55,    0,
+            0,    0,  235,  221,    0,    0,  196,  -71,    0,   77,
+            0,    0,   37,   24,    0,   56,  219,   23,   40,   39,
+            0,    0,    0,    0,    0,    0,    5,    0,  106,  166,
+            0,   61,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    1,    0,    0,   47,    0,  214,    0,
+           35,    0,    0,    0,   49,    0,   45,    0,    0,   71,
+            0,    0,    0,    0,    0,    0,    0,   88,  -56,   95,
+          144,  111,    0,    0,   78,    0,   80,  229,    0,  222,
+          -12, -299,    0,    0
     );
 
     protected $gotoDefault = array(
-        -32768,  506,  727,    4,  728,  921,  804,  813,  590,  523,
-          694,  343,  618,  416, 1286,  898, 1107,  571,  832, 1230,
-         1238,  451,  835,  326,  717,  880,  881,  882,  395,  381,
-          387,  393,  641,  619,  488,  867,  447,  859,  480,  862,
-          446,  871,  162,  413,  504,  875,    3,  877,  550,  908,
-          382,  885,  383,  669,  887,  556,  889,  890,  390,  396,
-          397, 1112,  564,  615,  902,  253,  558,  903,  380,  904,
-          911,  385,  388,  680,  459,  499,  493,  406, 1087,  559,
-          601,  638,  441,  467,  613,  625,  611,  474, 1023,  411,
-          325,  943,  951,  481,  457,  965,  345,  973,  725, 1119,
-          632,  483,  981,  633,  988,  991,  524,  525,  472, 1003,
-          268, 1006,  484, 1044,  659, 1017, 1018,  660,  634, 1040,
-          635,  661,  636, 1042,  466,  591, 1050,  448, 1058, 1274,
-          449, 1062,  262, 1065,  274,  412,  429, 1070, 1071,    8,
-         1077,  686,  687,   10,  273,  503, 1102,  681,  445, 1118,
-          433, 1188, 1190,  552,  485, 1208, 1207,  672,  500, 1213,
-          442, 1277,  443,  526,  468,  312,  527,  304,  329,  309,
-          542,  291,  330,  528,  469, 1283, 1291,  327,   30, 1311,
-         1322,  338,  568,  606
+        -32768,  511,  737,    4,  738,  932,  814,  823,  594,  528,
+          704,  347,  622,  421, 1299,  909, 1119,  575,  842, 1242,
+         1250,  456,  845,  330,  727,  891,  892,  893,  399,  385,
+          391,  397,  646,  623,  493,  877,  452,  869,  485,  872,
+          451,  881,  164,  417,  509,  885,    3,  888,  554,  919,
+          386,  896,  387,  674,  898,  560,  900,  901,  394,  400,
+          401, 1124,  568,  619,  913,  256,  562,  914,  384,  915,
+          922,  389,  392,  685,  464,  504,  498,  410, 1099,  563,
+          605,  643,  446,  472,  617,  629,  615,  479,  433,  415,
+          329,  954,  962,  486,  462,  976,  349,  984,  735, 1131,
+          637,  488,  992,  638,  999, 1002,  529,  530,  477, 1014,
+          272, 1017,  489,   12,  664, 1028, 1029,  665,  639, 1051,
+          640,  666,  641, 1053,  471,  595, 1061,  453, 1069, 1287,
+          454, 1073,  266, 1076,  277,  416,  434, 1082, 1083,    9,
+         1089,  695,  696,   11,  276,  508, 1114,  686,  450, 1130,
+          438, 1200, 1202,  556,  490, 1220, 1219,  677,  505, 1225,
+          447, 1290,  448,  531,  473,  315,  532,  307,  333,  312,
+          547,  294,  334,  533,  474, 1296, 1304,  331,   31, 1324,
+         1335,  342,  572,  610
     );
 
     protected $ruleToNonTerminal = array(
@@ -882,30 +888,30 @@ class Php7 extends \PhpParser\ParserAbstract
             4,    4,    4,    4,   29,   29,   30,   30,   32,   34,
            34,   28,   36,   36,   33,   38,   38,   35,   35,   37,
            37,   39,   39,   31,   40,   40,   41,   43,   44,   44,
-           45,   46,   46,   48,   47,   47,   47,   47,   49,   49,
+           45,   45,   46,   46,   48,   47,   47,   47,   47,   49,
            49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
            49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-           49,   49,   25,   25,   68,   68,   71,   71,   70,   69,
-           69,   62,   74,   74,   75,   75,   76,   76,   77,   77,
-           78,   78,   79,   79,   26,   26,   27,   27,   27,   27,
-           27,   87,   87,   89,   89,   82,   82,   90,   90,   91,
-           91,   91,   83,   83,   86,   86,   84,   84,   92,   93,
-           93,   56,   56,   64,   64,   67,   67,   67,   66,   94,
-           94,   95,   57,   57,   57,   57,   96,   96,   97,   97,
-           98,   98,   99,  100,  100,  101,  101,  102,  102,   54,
-           54,   50,   50,  104,   52,   52,  105,   51,   51,   53,
-           53,   63,   63,   63,   63,   80,   80,  108,  108,  110,
-          110,  111,  111,  111,  111,  109,  109,  109,  113,  113,
-          113,  113,   88,   88,  116,  116,  116,  117,  117,  114,
-          114,  118,  118,  120,  120,  121,  121,  115,  122,  122,
-          119,  123,  123,  123,  123,  112,  112,   81,   81,   81,
-           20,   20,   20,  125,  124,  124,  126,  126,  126,  126,
-           59,  127,  127,  128,   60,  130,  130,  131,  131,  132,
-          132,   85,  133,  133,  133,  133,  133,  133,  138,  138,
-          139,  139,  140,  140,  140,  140,  140,  141,  142,  142,
-          137,  137,  134,  134,  136,  136,  144,  144,  143,  143,
-          143,  143,  143,  143,  143,  135,  145,  145,  147,  146,
-          146,   61,  103,  148,  148,   55,   55,   42,   42,   42,
+           49,   49,   49,   25,   25,   68,   68,   71,   71,   70,
+           69,   69,   62,   74,   74,   75,   75,   76,   76,   77,
+           77,   78,   78,   79,   79,   26,   26,   27,   27,   27,
+           27,   27,   87,   87,   89,   89,   82,   82,   90,   90,
+           91,   91,   91,   83,   83,   86,   86,   84,   84,   92,
+           93,   93,   56,   56,   64,   64,   67,   67,   67,   66,
+           94,   94,   95,   57,   57,   57,   57,   96,   96,   97,
+           97,   98,   98,   99,  100,  100,  101,  101,  102,  102,
+           54,   54,   50,   50,  104,   52,   52,  105,   51,   51,
+           53,   53,   63,   63,   63,   63,   80,   80,  108,  108,
+          110,  110,  111,  111,  111,  111,  109,  109,  109,  113,
+          113,  113,  113,   88,   88,  116,  116,  116,  117,  117,
+          114,  114,  118,  118,  120,  120,  121,  121,  115,  122,
+          122,  119,  123,  123,  123,  123,  112,  112,   81,   81,
+           81,   20,   20,   20,  125,  124,  124,  126,  126,  126,
+          126,   59,  127,  127,  128,   60,  130,  130,  131,  131,
+          132,  132,   85,  133,  133,  133,  133,  133,  133,  133,
+          138,  138,  139,  139,  140,  140,  140,  140,  140,  141,
+          142,  142,  137,  137,  134,  134,  136,  136,  144,  144,
+          143,  143,  143,  143,  143,  143,  143,  135,  145,  145,
+          147,  146,  146,   61,  103,  148,  148,   55,   55,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
@@ -915,20 +921,20 @@ class Php7 extends \PhpParser\ParserAbstract
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-          155,  149,  149,  154,  154,  157,  158,  158,  159,  160,
-          161,  161,  161,  161,   19,   19,   72,   72,   72,   72,
-          150,  150,  150,  150,  163,  163,  151,  151,  153,  153,
-          153,  156,  156,  168,  168,  168,  168,  168,  168,  168,
-          168,  168,  169,  169,  107,  171,  171,  171,  171,  152,
-          152,  152,  152,  152,  152,  152,  152,   58,   58,  166,
-          166,  166,  166,  172,  172,  162,  162,  162,  173,  173,
-          173,  173,  173,  173,   73,   73,   65,   65,   65,   65,
-          129,  129,  129,  129,  176,  175,  165,  165,  165,  165,
-          165,  165,  165,  164,  164,  164,  174,  174,  174,  174,
-          106,  170,  178,  178,  177,  177,  179,  179,  179,  179,
-          179,  179,  179,  179,  167,  167,  167,  167,  181,  182,
-          180,  180,  180,  180,  180,  180,  180,  180,  183,  183,
-          183,  183
+           42,   42,  155,  149,  149,  154,  154,  157,  158,  158,
+          159,  160,  161,  161,  161,  161,   19,   19,   72,   72,
+           72,   72,  150,  150,  150,  150,  163,  163,  151,  151,
+          153,  153,  153,  156,  156,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  169,  169,  169,  107,  171,  171,
+          171,  171,  152,  152,  152,  152,  152,  152,  152,  152,
+           58,   58,  166,  166,  166,  166,  172,  172,  162,  162,
+          162,  173,  173,  173,  173,  173,  173,   73,   73,   65,
+           65,   65,   65,  129,  129,  129,  129,  176,  175,  165,
+          165,  165,  165,  165,  165,  165,  164,  164,  164,  174,
+          174,  174,  174,  106,  170,  178,  178,  177,  177,  179,
+          179,  179,  179,  179,  179,  179,  179,  167,  167,  167,
+          167,  181,  182,  180,  180,  180,  180,  180,  180,  180,
+          180,  183,  183,  183,  183
     );
 
     protected $ruleToLength = array(
@@ -947,53 +953,53 @@ class Php7 extends \PhpParser\ParserAbstract
             3,    4,    2,    3,    1,    1,    7,    6,    2,    3,
             1,    2,    3,    1,    2,    3,    1,    1,    3,    1,
             3,    1,    2,    2,    3,    1,    3,    2,    3,    1,
-            3,    2,    0,    1,    1,    1,    1,    1,    3,    7,
-           10,    5,    7,    9,    5,    3,    3,    3,    3,    3,
-            3,    1,    2,    5,    7,    9,    6,    5,    6,    3,
-            2,    1,    1,    1,    0,    2,    1,    3,    8,    0,
-            4,    2,    1,    3,    0,    1,    0,    1,    0,    1,
-            3,    1,    1,    1,    8,    9,    7,    8,    7,    6,
-            8,    0,    2,    0,    2,    1,    2,    1,    2,    1,
-            1,    1,    0,    2,    0,    2,    0,    2,    2,    1,
-            3,    1,    4,    1,    4,    1,    1,    4,    2,    1,
-            3,    3,    3,    4,    4,    5,    0,    2,    4,    3,
-            1,    1,    7,    0,    2,    1,    3,    3,    4,    1,
-            4,    0,    2,    5,    0,    2,    6,    0,    2,    0,
-            3,    1,    2,    1,    1,    2,    0,    1,    3,    0,
-            2,    1,    1,    1,    1,    6,    8,    6,    1,    2,
-            1,    1,    1,    1,    1,    1,    1,    1,    3,    3,
-            3,    1,    3,    3,    3,    3,    3,    1,    3,    3,
-            1,    1,    2,    1,    1,    0,    1,    0,    2,    2,
-            2,    4,    3,    1,    1,    3,    1,    2,    2,    3,
-            2,    3,    1,    1,    2,    3,    1,    1,    3,    2,
-            0,    1,    5,    5,   10,    3,    5,    1,    1,    3,
-            0,    2,    4,    5,    4,    4,    4,    3,    1,    1,
-            1,    1,    1,    1,    0,    1,    1,    2,    1,    1,
-            1,    1,    1,    1,    1,    2,    1,    3,    1,    1,
-            3,    2,    2,    3,    1,    0,    1,    1,    3,    3,
-            3,    4,    1,    1,    2,    3,    3,    3,    3,    3,
-            3,    3,    3,    3,    3,    3,    3,    3,    2,    2,
-            2,    2,    3,    3,    3,    3,    3,    3,    3,    3,
+            3,    3,    2,    0,    1,    1,    1,    1,    1,    3,
+            7,   10,    5,    7,    9,    5,    3,    3,    3,    3,
+            3,    3,    1,    2,    5,    7,    9,    6,    5,    6,
+            3,    2,    1,    1,    1,    0,    2,    1,    3,    8,
+            0,    4,    2,    1,    3,    0,    1,    0,    1,    0,
+            1,    3,    1,    1,    1,    8,    9,    7,    8,    7,
+            6,    8,    0,    2,    0,    2,    1,    2,    1,    2,
+            1,    1,    1,    0,    2,    0,    2,    0,    2,    2,
+            1,    3,    1,    4,    1,    4,    1,    1,    4,    2,
+            1,    3,    3,    3,    4,    4,    5,    0,    2,    4,
+            3,    1,    1,    7,    0,    2,    1,    3,    3,    4,
+            1,    4,    0,    2,    5,    0,    2,    6,    0,    2,
+            0,    3,    1,    2,    1,    1,    2,    0,    1,    3,
+            0,    2,    1,    1,    1,    1,    6,    8,    6,    1,
+            2,    1,    1,    1,    1,    1,    1,    1,    1,    3,
+            3,    3,    1,    3,    3,    3,    3,    3,    1,    3,
+            3,    1,    1,    2,    1,    1,    0,    1,    0,    2,
+            2,    2,    4,    3,    1,    1,    3,    1,    2,    2,
+            3,    2,    3,    1,    1,    2,    3,    1,    1,    3,
+            2,    0,    1,    5,    5,    6,   10,    3,    5,    1,
+            1,    3,    0,    2,    4,    5,    4,    4,    4,    3,
+            1,    1,    1,    1,    1,    1,    0,    1,    1,    2,
+            1,    1,    1,    1,    1,    1,    1,    2,    1,    3,
+            1,    1,    3,    2,    2,    3,    1,    0,    1,    1,
+            3,    3,    3,    4,    1,    1,    2,    3,    3,    3,
             3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
             2,    2,    2,    2,    3,    3,    3,    3,    3,    3,
-            3,    3,    3,    3,    3,    5,    4,    3,    4,    4,
-            2,    2,    4,    2,    2,    2,    2,    2,    2,    2,
-            2,    2,    2,    2,    1,    3,    2,    1,    2,    4,
-            2,    2,    8,    9,    8,    9,    9,   10,    9,   10,
-            8,    3,    2,    0,    4,    2,    1,    3,    2,    1,
-            2,    2,    2,    4,    1,    1,    1,    1,    1,    1,
-            1,    1,    3,    1,    1,    1,    0,    3,    0,    1,
-            1,    0,    1,    1,    1,    1,    1,    1,    1,    1,
-            1,    1,    3,    3,    3,    4,    1,    1,    3,    1,
-            1,    1,    1,    1,    3,    2,    3,    0,    1,    1,
-            3,    1,    1,    1,    1,    1,    3,    1,    1,    4,
-            4,    1,    4,    4,    0,    1,    1,    1,    3,    3,
-            1,    4,    2,    2,    1,    3,    1,    4,    4,    3,
-            3,    3,    3,    1,    3,    1,    1,    3,    1,    1,
-            4,    1,    1,    1,    3,    1,    1,    2,    1,    3,
-            4,    3,    2,    0,    2,    2,    1,    2,    1,    1,
-            1,    4,    3,    3,    3,    3,    6,    3,    1,    1,
-            2,    1
+            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+            3,    3,    2,    2,    2,    2,    3,    3,    3,    3,
+            3,    3,    3,    3,    3,    3,    3,    5,    4,    3,
+            4,    4,    2,    2,    4,    2,    2,    2,    2,    2,
+            2,    2,    2,    2,    2,    2,    1,    3,    2,    1,
+            2,    4,    2,    2,    8,    9,    8,    9,    9,   10,
+            9,   10,    8,    3,    2,    0,    4,    2,    1,    3,
+            2,    1,    2,    2,    2,    4,    1,    1,    1,    1,
+            1,    1,    1,    1,    3,    1,    1,    1,    0,    3,
+            0,    1,    1,    0,    1,    1,    1,    1,    1,    1,
+            1,    1,    1,    1,    3,    5,    3,    3,    4,    1,
+            1,    3,    1,    1,    1,    1,    1,    3,    2,    3,
+            0,    1,    1,    3,    1,    1,    1,    1,    1,    3,
+            1,    1,    4,    4,    1,    4,    4,    0,    1,    1,
+            1,    3,    3,    1,    4,    2,    2,    1,    3,    1,
+            4,    4,    3,    3,    3,    3,    1,    3,    1,    1,
+            3,    1,    1,    4,    1,    1,    1,    3,    1,    1,
+            2,    1,    3,    4,    3,    2,    0,    2,    2,    1,
+            2,    1,    1,    1,    4,    3,    3,    3,    3,    6,
+            3,    1,    1,    2,    1
     );
 
     protected function initReduceCallbacks() {
@@ -1456,20 +1462,20 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             150 => function ($stackPos) {
-                 $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Node\Const_(new Node\Identifier($this->semStack[$stackPos-(3-1)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributeStack[$stackPos-(3-1)]), $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             151 => function ($stackPos) {
-                 if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; };
+                 $this->semValue = new Node\Const_(new Node\Identifier($this->semStack[$stackPos-(3-1)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributeStack[$stackPos-(3-1)]), $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             152 => function ($stackPos) {
-                 $this->semValue = array();
+                 if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; };
             },
             153 => function ($stackPos) {
-                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
-            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array();
             },
             154 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             155 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -1478,9 +1484,12 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             157 => function ($stackPos) {
-                 throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             158 => function ($stackPos) {
+                 throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            159 => function ($stackPos) {
 
         if ($this->semStack[$stackPos-(3-2)]) {
             $this->semValue = $this->semStack[$stackPos-(3-2)]; $attrs = $this->startAttributeStack[$stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); };
@@ -1490,46 +1499,46 @@ class Php7 extends \PhpParser\ParserAbstract
         }
 
             },
-            159 => function ($stackPos) {
+            160 => function ($stackPos) {
                  $this->semValue = new Stmt\If_($this->semStack[$stackPos-(7-3)], ['stmts' => is_array($this->semStack[$stackPos-(7-5)]) ? $this->semStack[$stackPos-(7-5)] : array($this->semStack[$stackPos-(7-5)]), 'elseifs' => $this->semStack[$stackPos-(7-6)], 'else' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             },
-            160 => function ($stackPos) {
+            161 => function ($stackPos) {
                  $this->semValue = new Stmt\If_($this->semStack[$stackPos-(10-3)], ['stmts' => $this->semStack[$stackPos-(10-6)], 'elseifs' => $this->semStack[$stackPos-(10-7)], 'else' => $this->semStack[$stackPos-(10-8)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
             },
-            161 => function ($stackPos) {
+            162 => function ($stackPos) {
                  $this->semValue = new Stmt\While_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
-            162 => function ($stackPos) {
+            163 => function ($stackPos) {
                  $this->semValue = new Stmt\Do_($this->semStack[$stackPos-(7-5)], is_array($this->semStack[$stackPos-(7-2)]) ? $this->semStack[$stackPos-(7-2)] : array($this->semStack[$stackPos-(7-2)]), $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             },
-            163 => function ($stackPos) {
+            164 => function ($stackPos) {
                  $this->semValue = new Stmt\For_(['init' => $this->semStack[$stackPos-(9-3)], 'cond' => $this->semStack[$stackPos-(9-5)], 'loop' => $this->semStack[$stackPos-(9-7)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
             },
-            164 => function ($stackPos) {
+            165 => function ($stackPos) {
                  $this->semValue = new Stmt\Switch_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
-            165 => function ($stackPos) {
+            166 => function ($stackPos) {
                  $this->semValue = new Stmt\Break_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            166 => function ($stackPos) {
+            167 => function ($stackPos) {
                  $this->semValue = new Stmt\Continue_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            167 => function ($stackPos) {
+            168 => function ($stackPos) {
                  $this->semValue = new Stmt\Return_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            168 => function ($stackPos) {
+            169 => function ($stackPos) {
                  $this->semValue = new Stmt\Global_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            169 => function ($stackPos) {
+            170 => function ($stackPos) {
                  $this->semValue = new Stmt\Static_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            170 => function ($stackPos) {
+            171 => function ($stackPos) {
                  $this->semValue = new Stmt\Echo_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            171 => function ($stackPos) {
+            172 => function ($stackPos) {
                  $this->semValue = new Stmt\InlineHTML($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
-            172 => function ($stackPos) {
+            173 => function ($stackPos) {
 
         $e = $this->semStack[$stackPos-(2-1)];
         if ($e instanceof Expr\Throw_) {
@@ -1541,1128 +1550,1126 @@ class Php7 extends \PhpParser\ParserAbstract
         }
 
             },
-            173 => function ($stackPos) {
+            174 => function ($stackPos) {
                  $this->semValue = new Stmt\Unset_($this->semStack[$stackPos-(5-3)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
-            174 => function ($stackPos) {
+            175 => function ($stackPos) {
                  $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$stackPos-(7-5)][1], 'stmts' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             },
-            175 => function ($stackPos) {
+            176 => function ($stackPos) {
                  $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(9-3)], $this->semStack[$stackPos-(9-7)][0], ['keyVar' => $this->semStack[$stackPos-(9-5)], 'byRef' => $this->semStack[$stackPos-(9-7)][1], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
             },
-            176 => function ($stackPos) {
+            177 => function ($stackPos) {
                  $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(6-3)], new Expr\Error($this->startAttributeStack[$stackPos-(6-4)] + $this->endAttributeStack[$stackPos-(6-4)]), ['stmts' => $this->semStack[$stackPos-(6-6)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
-            177 => function ($stackPos) {
+            178 => function ($stackPos) {
                  $this->semValue = new Stmt\Declare_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
-            178 => function ($stackPos) {
+            179 => function ($stackPos) {
                  $this->semValue = new Stmt\TryCatch($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-5)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue);
             },
-            179 => function ($stackPos) {
+            180 => function ($stackPos) {
                  $this->semValue = new Stmt\Goto_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            180 => function ($stackPos) {
+            181 => function ($stackPos) {
                  $this->semValue = new Stmt\Label($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            181 => function ($stackPos) {
+            182 => function ($stackPos) {
                  $this->semValue = array(); /* means: no statement */
             },
-            182 => function ($stackPos) {
+            183 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            183 => function ($stackPos) {
+            184 => function ($stackPos) {
                  $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; };
             if ($this->semValue === null) $this->semValue = array(); /* means: no statement */
             },
-            184 => function ($stackPos) {
+            185 => function ($stackPos) {
                  $this->semValue = array();
             },
-            185 => function ($stackPos) {
+            186 => function ($stackPos) {
                  $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
-            186 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
             187 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             188 => function ($stackPos) {
-                 $this->semValue = new Stmt\Catch_($this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-7)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
-            },
-            189 => function ($stackPos) {
-                 $this->semValue = null;
-            },
-            190 => function ($stackPos) {
-                 $this->semValue = new Stmt\Finally_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            191 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            192 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            193 => function ($stackPos) {
                  $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
+            189 => function ($stackPos) {
+                 $this->semValue = new Stmt\Catch_($this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-7)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            },
+            190 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            191 => function ($stackPos) {
+                 $this->semValue = new Stmt\Finally_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            192 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            193 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
             194 => function ($stackPos) {
-                 $this->semValue = false;
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             195 => function ($stackPos) {
-                 $this->semValue = true;
+                 $this->semValue = false;
             },
             196 => function ($stackPos) {
-                 $this->semValue = false;
+                 $this->semValue = true;
             },
             197 => function ($stackPos) {
-                 $this->semValue = true;
-            },
-            198 => function ($stackPos) {
                  $this->semValue = false;
             },
-            199 => function ($stackPos) {
+            198 => function ($stackPos) {
                  $this->semValue = true;
             },
+            199 => function ($stackPos) {
+                 $this->semValue = false;
+            },
             200 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = true;
             },
             201 => function ($stackPos) {
-                 $this->semValue = [];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             202 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = [];
             },
             203 => function ($stackPos) {
-                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             204 => function ($stackPos) {
-                 $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(8-3)], ['byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-5)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             205 => function ($stackPos) {
-                 $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(9-4)], ['byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(8-3)], ['byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-5)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             },
             206 => function ($stackPos) {
+                 $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(9-4)], ['byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            207 => function ($stackPos) {
                  $this->semValue = new Stmt\Class_($this->semStack[$stackPos-(7-2)], ['type' => $this->semStack[$stackPos-(7-1)], 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             $this->checkClass($this->semValue, $stackPos-(7-2));
             },
-            207 => function ($stackPos) {
+            208 => function ($stackPos) {
                  $this->semValue = new Stmt\Class_($this->semStack[$stackPos-(8-3)], ['type' => $this->semStack[$stackPos-(8-2)], 'extends' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             $this->checkClass($this->semValue, $stackPos-(8-3));
             },
-            208 => function ($stackPos) {
+            209 => function ($stackPos) {
                  $this->semValue = new Stmt\Interface_($this->semStack[$stackPos-(7-3)], ['extends' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)], 'attrGroups' => $this->semStack[$stackPos-(7-1)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             $this->checkInterface($this->semValue, $stackPos-(7-3));
             },
-            209 => function ($stackPos) {
+            210 => function ($stackPos) {
                  $this->semValue = new Stmt\Trait_($this->semStack[$stackPos-(6-3)], ['stmts' => $this->semStack[$stackPos-(6-5)], 'attrGroups' => $this->semStack[$stackPos-(6-1)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
-            210 => function ($stackPos) {
+            211 => function ($stackPos) {
                  $this->semValue = new Stmt\Enum_($this->semStack[$stackPos-(8-3)], ['scalarType' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             $this->checkEnum($this->semValue, $stackPos-(8-3));
             },
-            211 => function ($stackPos) {
-                 $this->semValue = null;
-            },
             212 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+                 $this->semValue = null;
             },
             213 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
             },
             214 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+                 $this->semValue = null;
             },
             215 => function ($stackPos) {
-                 $this->semValue = 0;
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
             },
             216 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = 0;
             },
             217 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             218 => function ($stackPos) {
-                 $this->checkClassModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             219 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+                 $this->checkClassModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
             },
             220 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
             },
             221 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
             },
             222 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
             },
             223 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-2)];
-            },
-            224 => function ($stackPos) {
-                 $this->semValue = array();
-            },
-            225 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-2)];
-            },
-            226 => function ($stackPos) {
-                 $this->semValue = array();
-            },
-            227 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-2)];
-            },
-            228 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            229 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            230 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            231 => function ($stackPos) {
-                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
-            },
-            232 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-2)];
-            },
-            233 => function ($stackPos) {
-                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
-            },
-            234 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-2)];
-            },
-            235 => function ($stackPos) {
-                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
-            },
-            236 => function ($stackPos) {
                  $this->semValue = null;
             },
-            237 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            224 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
             },
-            238 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            239 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            240 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            241 => function ($stackPos) {
-                 $this->semValue = new Stmt\DeclareDeclare($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            242 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
-            },
-            243 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-3)];
-            },
-            244 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-2)];
-            },
-            245 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(5-3)];
-            },
-            246 => function ($stackPos) {
+            225 => function ($stackPos) {
                  $this->semValue = array();
             },
+            226 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            227 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            228 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            229 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            230 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            231 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            232 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            233 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            234 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            235 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            236 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            237 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            238 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            239 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            240 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            241 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            242 => function ($stackPos) {
+                 $this->semValue = new Stmt\DeclareDeclare($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            243 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            244 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+            },
+            245 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            246 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(5-3)];
+            },
             247 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = array();
             },
             248 => function ($stackPos) {
-                 $this->semValue = new Stmt\Case_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             249 => function ($stackPos) {
-                 $this->semValue = new Stmt\Case_(null, $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\Case_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             250 => function ($stackPos) {
-                $this->semValue = $this->semStack[$stackPos];
+                 $this->semValue = new Stmt\Case_(null, $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             251 => function ($stackPos) {
                 $this->semValue = $this->semStack[$stackPos];
             },
             252 => function ($stackPos) {
-                 $this->semValue = new Expr\Match_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-6)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+                $this->semValue = $this->semStack[$stackPos];
             },
             253 => function ($stackPos) {
-                 $this->semValue = [];
+                 $this->semValue = new Expr\Match_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-6)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
             },
             254 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = [];
             },
             255 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             256 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             257 => function ($stackPos) {
-                 $this->semValue = new Node\MatchArm($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             258 => function ($stackPos) {
-                 $this->semValue = new Node\MatchArm(null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Node\MatchArm($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             259 => function ($stackPos) {
-                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = new Node\MatchArm(null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             260 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
             },
             261 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
             },
             262 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            263 => function ($stackPos) {
-                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(5-3)], is_array($this->semStack[$stackPos-(5-5)]) ? $this->semStack[$stackPos-(5-5)] : array($this->semStack[$stackPos-(5-5)]), $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
-            },
-            264 => function ($stackPos) {
                  $this->semValue = array();
             },
-            265 => function ($stackPos) {
+            263 => function ($stackPos) {
                  $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
+            264 => function ($stackPos) {
+                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(5-3)], is_array($this->semStack[$stackPos-(5-5)]) ? $this->semStack[$stackPos-(5-5)] : array($this->semStack[$stackPos-(5-5)]), $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            265 => function ($stackPos) {
+                 $this->semValue = array();
+            },
             266 => function ($stackPos) {
-                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->fixupAlternativeElse($this->semValue);
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             267 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->fixupAlternativeElse($this->semValue);
             },
             268 => function ($stackPos) {
-                 $this->semValue = new Stmt\Else_(is_array($this->semStack[$stackPos-(2-2)]) ? $this->semStack[$stackPos-(2-2)] : array($this->semStack[$stackPos-(2-2)]), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
-            269 => function ($stackPos) {
                  $this->semValue = null;
             },
+            269 => function ($stackPos) {
+                 $this->semValue = new Stmt\Else_(is_array($this->semStack[$stackPos-(2-2)]) ? $this->semStack[$stackPos-(2-2)] : array($this->semStack[$stackPos-(2-2)]), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
             270 => function ($stackPos) {
-                 $this->semValue = new Stmt\Else_($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->fixupAlternativeElse($this->semValue);
+                 $this->semValue = null;
             },
             271 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
+                 $this->semValue = new Stmt\Else_($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->fixupAlternativeElse($this->semValue);
             },
             272 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(2-2)], true);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
             },
             273 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
+                 $this->semValue = array($this->semStack[$stackPos-(2-2)], true);
             },
             274 => function ($stackPos) {
                  $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
             },
             275 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
             },
             276 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             277 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = array();
             },
             278 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             279 => function ($stackPos) {
-                 $this->semValue = 0;
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             280 => function ($stackPos) {
-                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+                 $this->semValue = 0;
             },
             281 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
+                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
             },
             282 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
+                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
             },
             283 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
+                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
             },
             284 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
+                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
             },
             285 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
+            },
+            286 => function ($stackPos) {
                  $this->semValue = new Node\Param($this->semStack[$stackPos-(6-6)], null, $this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes, $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-1)]);
             $this->checkParam($this->semValue);
             },
-            286 => function ($stackPos) {
+            287 => function ($stackPos) {
                  $this->semValue = new Node\Param($this->semStack[$stackPos-(8-6)], $this->semStack[$stackPos-(8-8)], $this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-5)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes, $this->semStack[$stackPos-(8-2)], $this->semStack[$stackPos-(8-1)]);
             $this->checkParam($this->semValue);
             },
-            287 => function ($stackPos) {
+            288 => function ($stackPos) {
                  $this->semValue = new Node\Param(new Expr\Error($this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes), null, $this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes, $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-1)]);
             },
-            288 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
             289 => function ($stackPos) {
-                 $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             290 => function ($stackPos) {
-                 $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             291 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             292 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             293 => function ($stackPos) {
-                 $this->semValue = new Node\Name('static', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             294 => function ($stackPos) {
-                 $this->semValue = $this->handleBuiltinTypes($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = new Node\Name('static', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             295 => function ($stackPos) {
-                 $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->handleBuiltinTypes($this->semStack[$stackPos-(1-1)]);
             },
             296 => function ($stackPos) {
-                 $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             297 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             298 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             299 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
-            },
-            300 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            301 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            302 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
-            303 => function ($stackPos) {
+            300 => function ($stackPos) {
                  $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
             },
+            301 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            302 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            303 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
             304 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
             },
             305 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             306 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            307 => function ($stackPos) {
-                 $this->semValue = new Node\IntersectionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            308 => function ($stackPos) {
                  $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
             },
-            309 => function ($stackPos) {
+            307 => function ($stackPos) {
                  $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
-            310 => function ($stackPos) {
+            308 => function ($stackPos) {
                  $this->semValue = new Node\IntersectionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
+            309 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            310 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
             311 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Node\IntersectionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             312 => function ($stackPos) {
-                 $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             313 => function ($stackPos) {
-                 $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             314 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             315 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             316 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = null;
             },
             317 => function ($stackPos) {
-                 $this->semValue = null;
-            },
-            318 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-2)];
-            },
-            319 => function ($stackPos) {
-                 $this->semValue = null;
-            },
-            320 => function ($stackPos) {
-                 $this->semValue = array();
-            },
-            321 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-2)];
-            },
-            322 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(3-2)]);
-            },
-            323 => function ($stackPos) {
-                 $this->semValue = new Node\VariadicPlaceholder($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            324 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            325 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            326 => function ($stackPos) {
-                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            327 => function ($stackPos) {
-                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
-            328 => function ($stackPos) {
-                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
-            329 => function ($stackPos) {
-                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(3-3)], false, false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->semStack[$stackPos-(3-1)]);
-            },
-            330 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            331 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            332 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            333 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            334 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            318 => function ($stackPos) {
+                 $this->semValue = null;
             },
-            335 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            319 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
             },
-            336 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            320 => function ($stackPos) {
+                 $this->semValue = null;
             },
-            337 => function ($stackPos) {
-                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            338 => function ($stackPos) {
-                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            339 => function ($stackPos) {
-                 if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }
-            },
-            340 => function ($stackPos) {
+            321 => function ($stackPos) {
                  $this->semValue = array();
             },
+            322 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            323 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-2)]);
+            },
+            324 => function ($stackPos) {
+                 $this->semValue = new Node\VariadicPlaceholder($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            325 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            326 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            327 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            328 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            329 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            330 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(3-3)], false, false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->semStack[$stackPos-(3-1)]);
+            },
+            331 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            332 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            333 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            334 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            335 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            336 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            337 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            338 => function ($stackPos) {
+                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            339 => function ($stackPos) {
+                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            340 => function ($stackPos) {
+                 if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }
+            },
             341 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            342 => function ($stackPos) {
                  $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
             if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            342 => function ($stackPos) {
+            343 => function ($stackPos) {
                  $this->semValue = new Stmt\Property($this->semStack[$stackPos-(5-2)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes, $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-1)]);
             $this->checkProperty($this->semValue, $stackPos-(5-2));
             },
-            343 => function ($stackPos) {
+            344 => function ($stackPos) {
                  $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(5-4)], $this->semStack[$stackPos-(5-2)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes, $this->semStack[$stackPos-(5-1)]);
             $this->checkClassConst($this->semValue, $stackPos-(5-2));
             },
-            344 => function ($stackPos) {
+            345 => function ($stackPos) {
+                 $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(6-5)], $this->semStack[$stackPos-(6-2)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes, $this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-4)]);
+            $this->checkClassConst($this->semValue, $stackPos-(6-2));
+            },
+            346 => function ($stackPos) {
                  $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(10-5)], ['type' => $this->semStack[$stackPos-(10-2)], 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-7)], 'returnType' => $this->semStack[$stackPos-(10-9)], 'stmts' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
             $this->checkClassMethod($this->semValue, $stackPos-(10-2));
             },
-            345 => function ($stackPos) {
+            347 => function ($stackPos) {
                  $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            346 => function ($stackPos) {
+            348 => function ($stackPos) {
                  $this->semValue = new Stmt\EnumCase($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->semStack[$stackPos-(5-1)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
-            347 => function ($stackPos) {
-                 $this->semValue = null; /* will be skipped */
-            },
-            348 => function ($stackPos) {
-                 $this->semValue = array();
-            },
             349 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = null; /* will be skipped */
             },
             350 => function ($stackPos) {
                  $this->semValue = array();
             },
             351 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             352 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            353 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
-            },
-            354 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            355 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            356 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            357 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
-            },
-            358 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            359 => function ($stackPos) {
-                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
-            },
-            360 => function ($stackPos) {
-                 $this->semValue = null;
-            },
-            361 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            362 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            363 => function ($stackPos) {
-                 $this->semValue = 0;
-            },
-            364 => function ($stackPos) {
-                 $this->semValue = 0;
-            },
-            365 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            366 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            367 => function ($stackPos) {
-                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
-            },
-            368 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
-            },
-            369 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
-            },
-            370 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
-            },
-            371 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
-            },
-            372 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
-            },
-            373 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
-            },
-            374 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
-            },
-            375 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            376 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            377 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            378 => function ($stackPos) {
-                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            379 => function ($stackPos) {
-                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            380 => function ($stackPos) {
-                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            381 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            382 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            383 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            384 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            385 => function ($stackPos) {
                  $this->semValue = array();
             },
-            386 => function ($stackPos) {
+            353 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            354 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            355 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            356 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            357 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            358 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            359 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            360 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
+            361 => function ($stackPos) {
+                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
+            },
+            362 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            363 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            364 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            365 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            366 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            367 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            368 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            369 => function ($stackPos) {
+                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+            },
+            370 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
+            },
+            371 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
+            },
+            372 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
+            },
+            373 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
+            },
+            374 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+            },
+            375 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+            },
+            376 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
+            },
+            377 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            378 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            379 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            380 => function ($stackPos) {
+                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            381 => function ($stackPos) {
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            382 => function ($stackPos) {
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            383 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            384 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            385 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            386 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
             387 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array();
             },
             388 => function ($stackPos) {
-                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             389 => function ($stackPos) {
-                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             390 => function ($stackPos) {
                  $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             391 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             392 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             393 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             394 => function ($stackPos) {
-                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             395 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             396 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             397 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             398 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             399 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             400 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             401 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             402 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             403 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             404 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             405 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             406 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             407 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             408 => function ($stackPos) {
-                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             409 => function ($stackPos) {
-                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             410 => function ($stackPos) {
-                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             411 => function ($stackPos) {
-                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             412 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             413 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             414 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             415 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             416 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             417 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             418 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             419 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             420 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             421 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             422 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             423 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             424 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             425 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             426 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             427 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             428 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             429 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             430 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             431 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             432 => function ($stackPos) {
-                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             433 => function ($stackPos) {
-                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             434 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             435 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             436 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             437 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             438 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             439 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             440 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             441 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             442 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             443 => function ($stackPos) {
-                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             444 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             445 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             446 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             447 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
             448 => function ($stackPos) {
-                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             449 => function ($stackPos) {
-                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             450 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             451 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             452 => function ($stackPos) {
-                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             453 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             454 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             455 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             456 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            457 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            458 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
             $attrs['kind'] = $this->getFloatCastKind($this->semStack[$stackPos-(2-1)]);
             $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $attrs);
             },
-            457 => function ($stackPos) {
+            459 => function ($stackPos) {
                  $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            458 => function ($stackPos) {
+            460 => function ($stackPos) {
                  $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            459 => function ($stackPos) {
+            461 => function ($stackPos) {
                  $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            460 => function ($stackPos) {
+            462 => function ($stackPos) {
                  $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            461 => function ($stackPos) {
+            463 => function ($stackPos) {
                  $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            462 => function ($stackPos) {
+            464 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
             $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE;
             $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs);
             },
-            463 => function ($stackPos) {
+            465 => function ($stackPos) {
                  $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            464 => function ($stackPos) {
+            466 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            465 => function ($stackPos) {
+            467 => function ($stackPos) {
                  $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            466 => function ($stackPos) {
+            468 => function ($stackPos) {
                  $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            467 => function ($stackPos) {
+            469 => function ($stackPos) {
                  $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
-            468 => function ($stackPos) {
+            470 => function ($stackPos) {
                  $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            469 => function ($stackPos) {
+            471 => function ($stackPos) {
                  $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
-            470 => function ($stackPos) {
+            472 => function ($stackPos) {
                  $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            471 => function ($stackPos) {
+            473 => function ($stackPos) {
                  $this->semValue = new Expr\Throw_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            472 => function ($stackPos) {
+            474 => function ($stackPos) {
                  $this->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'returnType' => $this->semStack[$stackPos-(8-6)], 'expr' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             },
-            473 => function ($stackPos) {
+            475 => function ($stackPos) {
                  $this->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'returnType' => $this->semStack[$stackPos-(9-7)], 'expr' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
             },
-            474 => function ($stackPos) {
+            476 => function ($stackPos) {
                  $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'uses' => $this->semStack[$stackPos-(8-6)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             },
-            475 => function ($stackPos) {
+            477 => function ($stackPos) {
                  $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
             },
-            476 => function ($stackPos) {
+            478 => function ($stackPos) {
                  $this->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'returnType' => $this->semStack[$stackPos-(9-7)], 'expr' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
             },
-            477 => function ($stackPos) {
+            479 => function ($stackPos) {
                  $this->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-6)], 'returnType' => $this->semStack[$stackPos-(10-8)], 'expr' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
             },
-            478 => function ($stackPos) {
+            480 => function ($stackPos) {
                  $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
             },
-            479 => function ($stackPos) {
+            481 => function ($stackPos) {
                  $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-6)], 'uses' => $this->semStack[$stackPos-(10-8)], 'returnType' => $this->semStack[$stackPos-(10-9)], 'stmts' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
             },
-            480 => function ($stackPos) {
-                 $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes), $this->semStack[$stackPos-(8-3)]);
+            482 => function ($stackPos) {
+                 $this->semValue = array(new Stmt\Class_(null, ['type' => $this->semStack[$stackPos-(8-2)], 'extends' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes), $this->semStack[$stackPos-(8-3)]);
             $this->checkClass($this->semValue[0], -1);
             },
-            481 => function ($stackPos) {
+            483 => function ($stackPos) {
                  $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            482 => function ($stackPos) {
+            484 => function ($stackPos) {
                  list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            483 => function ($stackPos) {
+            485 => function ($stackPos) {
                  $this->semValue = array();
             },
-            484 => function ($stackPos) {
+            486 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(4-3)];
             },
-            485 => function ($stackPos) {
+            487 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
-            486 => function ($stackPos) {
+            488 => function ($stackPos) {
                  $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
-            487 => function ($stackPos) {
+            489 => function ($stackPos) {
                  $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
-            488 => function ($stackPos) {
+            490 => function ($stackPos) {
                  $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            489 => function ($stackPos) {
-                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            490 => function ($stackPos) {
-                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
             491 => function ($stackPos) {
-                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             492 => function ($stackPos) {
                  $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             493 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             494 => function ($stackPos) {
-                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             495 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             496 => function ($stackPos) {
                  $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             497 => function ($stackPos) {
-                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             498 => function ($stackPos) {
-                 $this->semValue = new Name\FullyQualified(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             499 => function ($stackPos) {
-                 $this->semValue = new Name\Relative(substr($this->semStack[$stackPos-(1-1)], 10), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             500 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Name\FullyQualified(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             501 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Name\Relative(substr($this->semStack[$stackPos-(1-1)], 10), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             502 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             503 => function ($stackPos) {
-                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             504 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            505 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            506 => function ($stackPos) {
-                 $this->semValue = null;
-            },
-            507 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
-            508 => function ($stackPos) {
-                 $this->semValue = array();
+            505 => function ($stackPos) {
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
             },
-            509 => function ($stackPos) {
-                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
-            },
-            510 => function ($stackPos) {
-                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            511 => function ($stackPos) {
-                 $this->semValue = array();
-            },
-            512 => function ($stackPos) {
+            506 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
+            507 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            508 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            509 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            510 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            511 => function ($stackPos) {
+                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
+            },
+            512 => function ($stackPos) {
+                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
             513 => function ($stackPos) {
-                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = array();
             },
             514 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             515 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             516 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             517 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             518 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             519 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             520 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             521 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             522 => function ($stackPos) {
-                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             523 => function ($stackPos) {
-                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2;
+                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             524 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            525 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            526 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            527 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT;
             $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs);
             },
-            525 => function ($stackPos) {
+            528 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG;
             $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs);
             },
-            526 => function ($stackPos) {
+            529 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            527 => function ($stackPos) {
+            530 => function ($stackPos) {
                  $this->semValue = Scalar\String_::fromString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
-            528 => function ($stackPos) {
+            531 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
             foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
             },
-            529 => function ($stackPos) {
+            532 => function ($stackPos) {
                  $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
-            530 => function ($stackPos) {
+            533 => function ($stackPos) {
                  $this->semValue = Scalar\DNumber::fromString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
-            531 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            532 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            533 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
             534 => function ($stackPos) {
-                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             535 => function ($stackPos) {
-                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], true);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             536 => function ($stackPos) {
-                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             537 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
             },
             538 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], true);
             },
             539 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
             },
             540 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = null;
             },
             541 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -2671,7 +2678,7 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             543 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             544 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -2680,7 +2687,7 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             546 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             547 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -2689,85 +2696,85 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             549 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             550 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             551 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             552 => function ($stackPos) {
-                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             553 => function ($stackPos) {
-                 $this->semValue = new Expr\NullsafeMethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             554 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             555 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             556 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\NullsafeMethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             557 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = null;
             },
             558 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             559 => function ($stackPos) {
-                 $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             560 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             561 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            562 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
-            563 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable(new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2;
-            },
-            564 => function ($stackPos) {
-                 $var = $this->semStack[$stackPos-(1-1)]->name; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
-            },
-            565 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            566 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
-            },
-            567 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            568 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            569 => function ($stackPos) {
                  $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            570 => function ($stackPos) {
+            562 => function ($stackPos) {
                  $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            571 => function ($stackPos) {
+            563 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            564 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            565 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            566 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable(new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            567 => function ($stackPos) {
+                 $var = $this->semStack[$stackPos-(1-1)]->name; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
+            },
+            568 => function ($stackPos) {
                  $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
+            569 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            570 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            571 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
             572 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             573 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             574 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             575 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             576 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -2779,102 +2786,111 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             579 => function ($stackPos) {
-                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
-            },
-            580 => function ($stackPos) {
-                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            581 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue);
-            },
-            582 => function ($stackPos) {
-                $this->semValue = $this->semStack[$stackPos];
-            },
-            583 => function ($stackPos) {
-                 /* do nothing -- prevent default action of $$=$this->semStack[$1]. See $551. */
-            },
-            584 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
-            },
-            585 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            586 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            587 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
-            588 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            589 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            590 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            591 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            592 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
-            593 => function ($stackPos) {
-                 $this->semValue = null;
-            },
-            594 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            595 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
-            },
-            596 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
-            },
-            597 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
-            },
-            598 => function ($stackPos) {
-                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            599 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
-            600 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            601 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
-            602 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            603 => function ($stackPos) {
-                 $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            604 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            605 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
-            606 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
-            },
-            607 => function ($stackPos) {
+            580 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
+            581 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            582 => function ($stackPos) {
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            583 => function ($stackPos) {
+                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            584 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue);
+            },
+            585 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            586 => function ($stackPos) {
+                 /* do nothing -- prevent default action of $$=$this->semStack[$1]. See $551. */
+            },
+            587 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            588 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            589 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            590 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            591 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            592 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            593 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            594 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            595 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true);
+            },
+            596 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            597 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            598 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            599 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            600 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
+            },
+            601 => function ($stackPos) {
+                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            602 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            603 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            604 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            605 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            606 => function ($stackPos) {
+                 $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            607 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
             608 => function ($stackPos) {
-                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             609 => function ($stackPos) {
-                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
             610 => function ($stackPos) {
-                 $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             611 => function ($stackPos) {
+                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            612 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            613 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            614 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
         ];
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php b/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
index c256e897..7c32e5a3 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
@@ -529,7 +529,7 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pExpr_StaticCall(Expr\StaticCall $node) {
-        return $this->pDereferenceLhs($node->class) . '::'
+        return $this->pStaticDereferenceLhs($node->class) . '::'
              . ($node->name instanceof Expr
                 ? ($node->name instanceof Expr\Variable
                    ? $this->p($node->name)
@@ -606,7 +606,7 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) {
-        return $this->pDereferenceLhs($node->class) . '::' . $this->p($node->name);
+        return $this->pStaticDereferenceLhs($node->class) . '::' . $this->pObjectProperty($node->name);
     }
 
     protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) {
@@ -618,7 +618,7 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pExpr_StaticPropertyFetch(Expr\StaticPropertyFetch $node) {
-        return $this->pDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
+        return $this->pStaticDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
     }
 
     protected function pExpr_ShellExec(Expr\ShellExec $node) {
@@ -814,7 +814,9 @@ class Standard extends PrettyPrinterAbstract
     protected function pStmt_ClassConst(Stmt\ClassConst $node) {
         return $this->pAttrGroups($node->attrGroups)
              . $this->pModifiers($node->flags)
-             . 'const ' . $this->pCommaSeparated($node->consts) . ';';
+             . 'const '
+             . (null !== $node->type ? $this->p($node->type) . ' ' : '')
+             . $this->pCommaSeparated($node->consts) . ';';
     }
 
     protected function pStmt_Function(Stmt\Function_ $node) {
@@ -1067,6 +1069,14 @@ class Standard extends PrettyPrinterAbstract
         }
     }
 
+    protected function pStaticDereferenceLhs(Node $node) {
+        if (!$this->staticDereferenceLhsRequiresParens($node)) {
+            return $this->p($node);
+        } else {
+            return '(' . $this->p($node) . ')';
+        }
+    }
+
     protected function pCallLhs(Node $node) {
         if (!$this->callLhsRequiresParens($node)) {
             return $this->p($node);
@@ -1075,9 +1085,12 @@ class Standard extends PrettyPrinterAbstract
         }
     }
 
-    protected function pNewVariable(Node $node) {
-        // TODO: This is not fully accurate.
-        return $this->pDereferenceLhs($node);
+    protected function pNewVariable(Node $node): string {
+        if (!$this->newOperandRequiresParens($node)) {
+            return $this->p($node);
+        } else {
+            return '(' . $this->p($node) . ')';
+        }
     }
 
     /**
diff --git a/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php b/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
index 6ed936fe..770d5009 100644
--- a/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
+++ b/www/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
@@ -21,6 +21,8 @@ abstract class PrettyPrinterAbstract
     const FIXUP_BRACED_NAME     = 4; // Name operand that may require bracing
     const FIXUP_VAR_BRACED_NAME = 5; // Name operand that may require ${} bracing
     const FIXUP_ENCAPSED        = 6; // Encapsed string part
+    const FIXUP_NEW             = 7; // New/instanceof operand
+    const FIXUP_STATIC_DEREF_LHS = 8; // LHS of static dereferencing operation
 
     protected $precedenceMap = [
         // [precedence, associativity]
@@ -977,6 +979,19 @@ abstract class PrettyPrinterAbstract
                     return '(' . $this->p($subNode) . ')';
                 }
                 break;
+            case self::FIXUP_STATIC_DEREF_LHS:
+                if ($this->staticDereferenceLhsRequiresParens($subNode)
+                    && !$this->origTokens->haveParens($subStartPos, $subEndPos)
+                ) {
+                    return '(' . $this->p($subNode) . ')';
+                }
+                break;
+            case self::FIXUP_NEW:
+                if ($this->newOperandRequiresParens($subNode)
+                    && !$this->origTokens->haveParens($subStartPos, $subEndPos)) {
+                    return '(' . $this->p($subNode) . ')';
+                }
+                break;
             case self::FIXUP_BRACED_NAME:
             case self::FIXUP_VAR_BRACED_NAME:
                 if ($subNode instanceof Expr
@@ -1047,13 +1062,26 @@ abstract class PrettyPrinterAbstract
     }
 
     /**
-     * Determines whether the LHS of a dereferencing operation must be wrapped in parenthesis.
+     * Determines whether the LHS of an array/object operation must be wrapped in parentheses.
      *
      * @param Node $node LHS of dereferencing operation
      *
      * @return bool Whether parentheses are required
      */
     protected function dereferenceLhsRequiresParens(Node $node) : bool {
+        // A constant can occur on the LHS of an array/object deref, but not a static deref.
+        return $this->staticDereferenceLhsRequiresParens($node)
+            && !$node instanceof Expr\ConstFetch;
+    }
+
+    /**
+     * Determines whether the LHS of a static operation must be wrapped in parentheses.
+     *
+     * @param Node $node LHS of dereferencing operation
+     *
+     * @return bool Whether parentheses are required
+     */
+    protected function staticDereferenceLhsRequiresParens(Node $node): bool {
         return !($node instanceof Expr\Variable
             || $node instanceof Node\Name
             || $node instanceof Expr\ArrayDimFetch
@@ -1066,10 +1094,31 @@ abstract class PrettyPrinterAbstract
             || $node instanceof Expr\StaticCall
             || $node instanceof Expr\Array_
             || $node instanceof Scalar\String_
-            || $node instanceof Expr\ConstFetch
             || $node instanceof Expr\ClassConstFetch);
     }
 
+    /**
+     * Determines whether an expression used in "new" or "instanceof" requires parentheses.
+     *
+     * @param Node $node New or instanceof operand
+     *
+     * @return bool Whether parentheses are required
+     */
+    protected function newOperandRequiresParens(Node $node): bool {
+        if ($node instanceof Node\Name || $node instanceof Expr\Variable) {
+            return false;
+        }
+        if ($node instanceof Expr\ArrayDimFetch || $node instanceof Expr\PropertyFetch ||
+            $node instanceof Expr\NullsafePropertyFetch
+        ) {
+            return $this->newOperandRequiresParens($node->var);
+        }
+        if ($node instanceof Expr\StaticPropertyFetch) {
+            return $this->newOperandRequiresParens($node->class);
+        }
+        return true;
+    }
+
     /**
      * Print modifiers, including trailing whitespace.
      *
@@ -1171,7 +1220,7 @@ abstract class PrettyPrinterAbstract
             Expr\PostDec::class => ['var' => self::FIXUP_PREC_LEFT],
             Expr\Instanceof_::class => [
                 'expr' => self::FIXUP_PREC_LEFT,
-                'class' => self::FIXUP_PREC_RIGHT, // TODO: FIXUP_NEW_VARIABLE
+                'class' => self::FIXUP_NEW,
             ],
             Expr\Ternary::class => [
                 'cond' => self::FIXUP_PREC_LEFT,
@@ -1179,10 +1228,13 @@ abstract class PrettyPrinterAbstract
             ],
 
             Expr\FuncCall::class => ['name' => self::FIXUP_CALL_LHS],
-            Expr\StaticCall::class => ['class' => self::FIXUP_DEREF_LHS],
+            Expr\StaticCall::class => ['class' => self::FIXUP_STATIC_DEREF_LHS],
             Expr\ArrayDimFetch::class => ['var' => self::FIXUP_DEREF_LHS],
-            Expr\ClassConstFetch::class => ['var' => self::FIXUP_DEREF_LHS],
-            Expr\New_::class => ['class' => self::FIXUP_DEREF_LHS], // TODO: FIXUP_NEW_VARIABLE
+            Expr\ClassConstFetch::class => [
+                'class' => self::FIXUP_STATIC_DEREF_LHS,
+                'name' => self::FIXUP_BRACED_NAME,
+            ],
+            Expr\New_::class => ['class' => self::FIXUP_NEW],
             Expr\MethodCall::class => [
                 'var' => self::FIXUP_DEREF_LHS,
                 'name' => self::FIXUP_BRACED_NAME,
@@ -1192,7 +1244,7 @@ abstract class PrettyPrinterAbstract
                 'name' => self::FIXUP_BRACED_NAME,
             ],
             Expr\StaticPropertyFetch::class => [
-                'class' => self::FIXUP_DEREF_LHS,
+                'class' => self::FIXUP_STATIC_DEREF_LHS,
                 'name' => self::FIXUP_VAR_BRACED_NAME,
             ],
             Expr\PropertyFetch::class => [
@@ -1278,6 +1330,7 @@ abstract class PrettyPrinterAbstract
             'Param->default' => $stripEquals,
             'Stmt_Break->num' => $stripBoth,
             'Stmt_Catch->var' => $stripLeft,
+            'Stmt_ClassConst->type' => $stripRight,
             'Stmt_ClassMethod->returnType' => $stripColon,
             'Stmt_Class->extends' => ['left' => \T_EXTENDS],
             'Stmt_Enum->scalarType' => $stripColon,
@@ -1319,6 +1372,7 @@ abstract class PrettyPrinterAbstract
             'Stmt_Break->num' => [\T_BREAK, false, ' ', null],
             'Stmt_Catch->var' => [null, false, ' ', null],
             'Stmt_ClassMethod->returnType' => [')', false, ' : ', null],
+            'Stmt_ClassConst->type' => [\T_CONST, false, ' ', null],
             'Stmt_Class->extends' => [null, false, ' extends ', null],
             'Stmt_Enum->scalarType' => [null, false, ' : ', null],
             'Stmt_EnumCase->expr' => [null, false, ' = ', null],
@@ -1508,6 +1562,7 @@ abstract class PrettyPrinterAbstract
             'Stmt_ClassMethod->flags' => \T_FUNCTION,
             'Stmt_Class->flags' => \T_CLASS,
             'Stmt_Property->flags' => \T_VARIABLE,
+            'Expr_PrintableNewAnonClass->flags' => \T_CLASS,
             'Param->flags' => \T_VARIABLE,
             //'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO
         ];
diff --git a/www/vendor/phpunit/php-code-coverage/ChangeLog-9.2.md b/www/vendor/phpunit/php-code-coverage/ChangeLog-9.2.md
index 34587c05..880be3be 100644
--- a/www/vendor/phpunit/php-code-coverage/ChangeLog-9.2.md
+++ b/www/vendor/phpunit/php-code-coverage/ChangeLog-9.2.md
@@ -2,6 +2,17 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [9.2.27] - 2023-07-26
+
+### Changed
+
+* The result of `CodeCoverage::getReport()` is now cached
+
+### Fixed
+
+* Static analysis cache keys do not include configuration settings that affect source code parsing
+* The Clover, Cobertura, Crap4j, and PHP report writers no longer create a `php:` directory when they should write to `php://stdout`, for instance
+
 ## [9.2.26] - 2023-03-06
 
 ### Changed
@@ -476,6 +487,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 * This component is no longer supported on PHP 7.1
 
+[9.2.27]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.26...9.2.27
 [9.2.26]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.25...9.2.26
 [9.2.25]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.24...9.2.25
 [9.2.24]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.23...9.2.24
diff --git a/www/vendor/phpunit/php-code-coverage/composer.json b/www/vendor/phpunit/php-code-coverage/composer.json
index d6f10795..0f18174c 100644
--- a/www/vendor/phpunit/php-code-coverage/composer.json
+++ b/www/vendor/phpunit/php-code-coverage/composer.json
@@ -17,7 +17,8 @@
         }
     ],
     "support": {
-        "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues"
+        "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+        "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy"
     },
     "config": {
         "platform": {
diff --git a/www/vendor/phpunit/php-code-coverage/src/CodeCoverage.php b/www/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
index c35f27c8..bdf9c64c 100644
--- a/www/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
+++ b/www/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
@@ -114,6 +114,11 @@ final class CodeCoverage
      */
     private $cacheDirectory;
 
+    /**
+     * @var ?Directory
+     */
+    private $cachedReport;
+
     public function __construct(Driver $driver, Filter $filter)
     {
         $this->driver = $driver;
@@ -127,7 +132,11 @@ final class CodeCoverage
      */
     public function getReport(): Directory
     {
-        return (new Builder($this->analyser()))->build($this);
+        if ($this->cachedReport === null) {
+            $this->cachedReport = (new Builder($this->analyser()))->build($this);
+        }
+
+        return $this->cachedReport;
     }
 
     /**
@@ -135,9 +144,10 @@ final class CodeCoverage
      */
     public function clear(): void
     {
-        $this->currentId = null;
-        $this->data      = new ProcessedCodeCoverageData;
-        $this->tests     = [];
+        $this->currentId    = null;
+        $this->data         = new ProcessedCodeCoverageData;
+        $this->tests        = [];
+        $this->cachedReport = null;
     }
 
     /**
@@ -202,6 +212,8 @@ final class CodeCoverage
         $this->currentId = $id;
 
         $this->driver->start();
+
+        $this->cachedReport = null;
     }
 
     /**
@@ -220,7 +232,8 @@ final class CodeCoverage
         $data = $this->driver->stop();
         $this->append($data, null, $append, $linesToBeCovered, $linesToBeUsed);
 
-        $this->currentId = null;
+        $this->currentId    = null;
+        $this->cachedReport = null;
 
         return $data;
     }
@@ -245,6 +258,8 @@ final class CodeCoverage
             throw new TestIdMissingException;
         }
 
+        $this->cachedReport = null;
+
         $this->applyFilter($rawData);
 
         $this->applyExecutableLinesFilter($rawData);
@@ -312,6 +327,8 @@ final class CodeCoverage
         $this->data->merge($that->data);
 
         $this->tests = array_merge($this->tests, $that->getTests());
+
+        $this->cachedReport = null;
     }
 
     public function enableCheckForUnintentionallyCoveredCode(): void
@@ -673,7 +690,9 @@ final class CodeCoverage
         if ($this->cachesStaticAnalysis()) {
             $this->analyser = new CachingFileAnalyser(
                 $this->cacheDirectory,
-                $this->analyser
+                $this->analyser,
+                $this->useAnnotationsForIgnoringCode,
+                $this->ignoreDeprecatedCode
             );
         }
 
diff --git a/www/vendor/phpunit/php-code-coverage/src/Report/Clover.php b/www/vendor/phpunit/php-code-coverage/src/Report/Clover.php
index 75c731bb..d80ab4de 100644
--- a/www/vendor/phpunit/php-code-coverage/src/Report/Clover.php
+++ b/www/vendor/phpunit/php-code-coverage/src/Report/Clover.php
@@ -16,6 +16,7 @@ use function is_string;
 use function ksort;
 use function max;
 use function range;
+use function strpos;
 use function time;
 use DOMDocument;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
@@ -243,7 +244,9 @@ final class Clover
         $buffer = $xmlDocument->saveXML();
 
         if ($target !== null) {
-            Filesystem::createDirectory(dirname($target));
+            if (!strpos($target, '://') !== false) {
+                Filesystem::createDirectory(dirname($target));
+            }
 
             if (@file_put_contents($target, $buffer) === false) {
                 throw new WriteOperationFailedException($target);
diff --git a/www/vendor/phpunit/php-code-coverage/src/Report/Cobertura.php b/www/vendor/phpunit/php-code-coverage/src/Report/Cobertura.php
index 0d1dde76..ead31b46 100644
--- a/www/vendor/phpunit/php-code-coverage/src/Report/Cobertura.php
+++ b/www/vendor/phpunit/php-code-coverage/src/Report/Cobertura.php
@@ -16,6 +16,7 @@ use function file_put_contents;
 use function preg_match;
 use function range;
 use function str_replace;
+use function strpos;
 use function time;
 use DOMImplementation;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
@@ -294,7 +295,9 @@ final class Cobertura
         $buffer = $document->saveXML();
 
         if ($target !== null) {
-            Filesystem::createDirectory(dirname($target));
+            if (!strpos($target, '://') !== false) {
+                Filesystem::createDirectory(dirname($target));
+            }
 
             if (@file_put_contents($target, $buffer) === false) {
                 throw new WriteOperationFailedException($target);
diff --git a/www/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php b/www/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php
index 91f8ed59..2d91567a 100644
--- a/www/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php
+++ b/www/vendor/phpunit/php-code-coverage/src/Report/Crap4j.php
@@ -15,6 +15,7 @@ use function file_put_contents;
 use function htmlspecialchars;
 use function is_string;
 use function round;
+use function strpos;
 use DOMDocument;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
@@ -124,7 +125,9 @@ final class Crap4j
         $buffer = $document->saveXML();
 
         if ($target !== null) {
-            Filesystem::createDirectory(dirname($target));
+            if (!strpos($target, '://') !== false) {
+                Filesystem::createDirectory(dirname($target));
+            }
 
             if (@file_put_contents($target, $buffer) === false) {
                 throw new WriteOperationFailedException($target);
diff --git a/www/vendor/phpunit/php-code-coverage/src/Report/PHP.php b/www/vendor/phpunit/php-code-coverage/src/Report/PHP.php
index ccb104ce..2058fb39 100644
--- a/www/vendor/phpunit/php-code-coverage/src/Report/PHP.php
+++ b/www/vendor/phpunit/php-code-coverage/src/Report/PHP.php
@@ -12,6 +12,7 @@ namespace SebastianBergmann\CodeCoverage\Report;
 use function dirname;
 use function file_put_contents;
 use function serialize;
+use function strpos;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
 use SebastianBergmann\CodeCoverage\Util\Filesystem;
@@ -24,7 +25,9 @@ final class PHP
 return \unserialize(<<<'END_OF_COVERAGE_SERIALIZATION'" . PHP_EOL . serialize($coverage) . PHP_EOL . 'END_OF_COVERAGE_SERIALIZATION' . PHP_EOL . ');';
 
         if ($target !== null) {
-            Filesystem::createDirectory(dirname($target));
+            if (!strpos($target, '://') !== false) {
+                Filesystem::createDirectory(dirname($target));
+            }
 
             if (@file_put_contents($target, $buffer) === false) {
                 throw new WriteOperationFailedException($target);
diff --git a/www/vendor/phpunit/php-code-coverage/src/Report/Xml/Tests.php b/www/vendor/phpunit/php-code-coverage/src/Report/Xml/Tests.php
index c2e56268..c6da4145 100644
--- a/www/vendor/phpunit/php-code-coverage/src/Report/Xml/Tests.php
+++ b/www/vendor/phpunit/php-code-coverage/src/Report/Xml/Tests.php
@@ -17,7 +17,6 @@ use DOMElement;
 final class Tests
 {
     private $contextNode;
-
     private $codeMap = [
         -1 => 'UNKNOWN',    // PHPUnit_Runner_BaseTestRunner::STATUS_UNKNOWN
         0  => 'PASSED',     // PHPUnit_Runner_BaseTestRunner::STATUS_PASSED
diff --git a/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php b/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php
index 00a6d8df..6f8a0449 100644
--- a/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php
+++ b/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php
@@ -20,7 +20,9 @@ final class CacheWarmer
             new ParsingFileAnalyser(
                 $useAnnotationsForIgnoringCode,
                 $ignoreDeprecatedCode
-            )
+            ),
+            $useAnnotationsForIgnoringCode,
+            $ignoreDeprecatedCode,
         );
 
         foreach ($filter->files() as $file) {
diff --git a/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php b/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php
index f53da078..63e6e22b 100644
--- a/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php
+++ b/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php
@@ -29,27 +29,39 @@ final class CachingFileAnalyser implements FileAnalyser
      */
     private static $cacheVersion;
 
+    /**
+     * @var string
+     */
+    private $directory;
+
     /**
      * @var FileAnalyser
      */
     private $analyser;
 
+    /**
+     * @var bool
+     */
+    private $useAnnotationsForIgnoringCode;
+
+    /**
+     * @var bool
+     */
+    private $ignoreDeprecatedCode;
+
     /**
      * @var array
      */
     private $cache = [];
 
-    /**
-     * @var string
-     */
-    private $directory;
-
-    public function __construct(string $directory, FileAnalyser $analyser)
+    public function __construct(string $directory, FileAnalyser $analyser, bool $useAnnotationsForIgnoringCode, bool $ignoreDeprecatedCode)
     {
         Filesystem::createDirectory($directory);
 
-        $this->analyser  = $analyser;
-        $this->directory = $directory;
+        $this->analyser                      = $analyser;
+        $this->directory                     = $directory;
+        $this->useAnnotationsForIgnoringCode = $useAnnotationsForIgnoringCode;
+        $this->ignoreDeprecatedCode          = $ignoreDeprecatedCode;
     }
 
     public function classesIn(string $filename): array
@@ -161,7 +173,20 @@ final class CachingFileAnalyser implements FileAnalyser
 
     private function cacheFile(string $filename): string
     {
-        return $this->directory . DIRECTORY_SEPARATOR . md5($filename . "\0" . file_get_contents($filename) . "\0" . self::cacheVersion());
+        $cacheKey = md5(
+            implode(
+                "\0",
+                [
+                    $filename,
+                    file_get_contents($filename),
+                    self::cacheVersion(),
+                    $this->useAnnotationsForIgnoringCode,
+                    $this->ignoreDeprecatedCode,
+                ]
+            )
+        );
+
+        return $this->directory . DIRECTORY_SEPARATOR . $cacheKey;
     }
 
     private static function cacheVersion(): string
diff --git a/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php b/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php
index 794084ff..eadff1cf 100644
--- a/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php
+++ b/www/vendor/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php
@@ -101,6 +101,7 @@ final class ExecutableLinesFindingVisitor extends NodeVisitorAbstract
             $node instanceof Node\Stmt\Else_ ||
             $node instanceof Node\Stmt\EnumCase ||
             $node instanceof Node\Stmt\Finally_ ||
+            $node instanceof Node\Stmt\GroupUse ||
             $node instanceof Node\Stmt\Label ||
             $node instanceof Node\Stmt\Namespace_ ||
             $node instanceof Node\Stmt\Nop ||
diff --git a/www/vendor/phpunit/php-code-coverage/src/Version.php b/www/vendor/phpunit/php-code-coverage/src/Version.php
index 20e8e550..3084a2c6 100644
--- a/www/vendor/phpunit/php-code-coverage/src/Version.php
+++ b/www/vendor/phpunit/php-code-coverage/src/Version.php
@@ -22,7 +22,7 @@ final class Version
     public static function id(): string
     {
         if (self::$version === null) {
-            self::$version = (new VersionId('9.2.26', dirname(__DIR__)))->getVersion();
+            self::$version = (new VersionId('9.2.27', dirname(__DIR__)))->getVersion();
         }
 
         return self::$version;
diff --git a/www/vendor/phpunit/phpunit/ChangeLog-9.6.md b/www/vendor/phpunit/phpunit/ChangeLog-9.6.md
index 5995d581..fa17d8e2 100644
--- a/www/vendor/phpunit/phpunit/ChangeLog-9.6.md
+++ b/www/vendor/phpunit/phpunit/ChangeLog-9.6.md
@@ -2,6 +2,25 @@
 
 All notable changes of the PHPUnit 9.6 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.6.11] - 2023-08-19
+
+### Added
+
+* [#5478](https://github.com/sebastianbergmann/phpunit/pull/5478):  `assertObjectHasProperty()` and `assertObjectNotHasProperty()`
+
+## [9.6.10] - 2023-07-10
+
+### Changed
+
+* [#5419](https://github.com/sebastianbergmann/phpunit/pull/5419): Allow empty `<extensions>` element in XML configuration
+
+## [9.6.9] - 2023-06-11
+
+### Fixed
+
+* [#5405](https://github.com/sebastianbergmann/phpunit/issues/5405): XML configuration migration does not migrate `whitelist/file` elements
+* Always use `X.Y.Z` version number (and not just `X.Y`) of PHPUnit's version when checking whether a PHAR-distributed extension is compatible
+
 ## [9.6.8] - 2023-05-11
 
 ### Fixed
@@ -64,6 +83,9 @@ All notable changes of the PHPUnit 9.6 release series are documented in this fil
 * [#5064](https://github.com/sebastianbergmann/phpunit/issues/5064): Deprecate `PHPUnit\Framework\TestCase::getMockClass()`
 * [#5132](https://github.com/sebastianbergmann/phpunit/issues/5132): Deprecate `Test` suffix for abstract test case classes
 
+[9.6.11]: https://github.com/sebastianbergmann/phpunit/compare/9.6.10...9.6.11
+[9.6.10]: https://github.com/sebastianbergmann/phpunit/compare/9.6.9...9.6.10
+[9.6.9]: https://github.com/sebastianbergmann/phpunit/compare/9.6.8...9.6.9
 [9.6.8]: https://github.com/sebastianbergmann/phpunit/compare/9.6.7...9.6.8
 [9.6.7]: https://github.com/sebastianbergmann/phpunit/compare/9.6.6...9.6.7
 [9.6.6]: https://github.com/sebastianbergmann/phpunit/compare/9.6.5...9.6.6
diff --git a/www/vendor/phpunit/phpunit/DEPRECATIONS.md b/www/vendor/phpunit/phpunit/DEPRECATIONS.md
new file mode 100644
index 00000000..6796b58f
--- /dev/null
+++ b/www/vendor/phpunit/phpunit/DEPRECATIONS.md
@@ -0,0 +1,79 @@
+# Deprecations
+
+## Soft Deprecations
+
+This functionality is currently [soft-deprecated](https://phpunit.de/backward-compatibility.html#soft-deprecation):
+
+### Writing Tests
+
+#### Test Double API
+
+* [#3687](https://github.com/sebastianbergmann/phpunit/issues/3687): `MockBuilder::setMethods()` (since PHPUnit 8.3.0)
+* [#3687](https://github.com/sebastianbergmann/phpunit/issues/3687): `MockBuilder::setMethodsExcept()` (since PHPUnit 9.6.0)
+
+## Hard Deprecations
+
+This functionality is currently [hard-deprecated](https://phpunit.de/backward-compatibility.html#hard-deprecation):
+
+### Writing Tests
+
+#### Assertions, Constraints, and Expectations
+
+* [#4062](https://github.com/sebastianbergmann/phpunit/issues/4062): `TestCase::assertNotIsReadable()` (since PHPUnit 9.1.0)
+* [#4065](https://github.com/sebastianbergmann/phpunit/issues/4065): `TestCase::assertNotIsWritable()` (since PHPUnit 9.1.0)
+* [#4068](https://github.com/sebastianbergmann/phpunit/issues/4068): `TestCase::assertDirectoryNotExists()` (since PHPUnit 9.1.0)
+* [#4071](https://github.com/sebastianbergmann/phpunit/issues/4071): `TestCase::assertDirectoryNotIsReadable()` (since PHPUnit 9.1.0)
+* [#4074](https://github.com/sebastianbergmann/phpunit/issues/4074): `TestCase::assertDirectoryNotIsWritable()` (since PHPUnit 9.1.0)
+* [#4077](https://github.com/sebastianbergmann/phpunit/issues/4077): `TestCase::assertFileNotExists()` (since PHPUnit 9.1.0)
+* [#4080](https://github.com/sebastianbergmann/phpunit/issues/4080): `TestCase::assertFileNotIsReadable()` (since PHPUnit 9.1.0)
+* [#4083](https://github.com/sebastianbergmann/phpunit/issues/4083): `TestCase::assertFileNotIsWritable()` (since PHPUnit 9.1.0)
+* [#4086](https://github.com/sebastianbergmann/phpunit/issues/4086): `TestCase::assertRegExp()` (since PHPUnit 9.1.0)
+* [#4089](https://github.com/sebastianbergmann/phpunit/issues/4089): `TestCase::assertNotRegExp()` (since PHPUnit 9.1.0)
+* [#4091](https://github.com/sebastianbergmann/phpunit/issues/4091): `TestCase::assertEqualXMLStructure()` (since PHPUnit 9.1.0)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::assertClassHasAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::assertClassNotHasAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::assertClassHasStaticAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::assertClassNotHasStaticAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::assertObjectHasAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::assertObjectNotHasAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::classHasAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::classHasStaticAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `TestCase::objectHasAttribute()` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `ClassHasAttribute` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `ClassHasStaticAttribute` (since PHPUnit 9.6.1)
+* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): `ObjectHasAttribute` (since PHPUnit 9.6.1)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectDeprecation()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectDeprecationMessage()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectDeprecationMessageMatches()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectError()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectErrorMessage()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectErrorMessageMatches()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectNotice()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectNoticeMessage()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectNoticeMessageMatches()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectWarning()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectWarningMessage()` (since PHPUnit 9.6.0)
+* [#5062](https://github.com/sebastianbergmann/phpunit/issues/5062): `TestCase::expectWarningMessageMatches()` (since PHPUnit 9.6.0)
+
+#### Test Double API
+
+* [#4141](https://github.com/sebastianbergmann/phpunit/issues/4141): `TestCase::prophesize()` (since PHPUnit 9.1.0)
+* [#4297](https://github.com/sebastianbergmann/phpunit/issues/4297): `TestCase::at()` (since PHPUnit 9.3.0)
+* [#4297](https://github.com/sebastianbergmann/phpunit/issues/4297): `InvokedAtIndex` (since PHPUnit 9.3.0)
+* [#5063](https://github.com/sebastianbergmann/phpunit/issues/5063): `InvocationMocker::withConsecutive()` (since PHPUnit 9.6.0)
+* [#5063](https://github.com/sebastianbergmann/phpunit/issues/5063): `ConsecutiveParameters` (since PHPUnit 9.6.0)
+* [#5064](https://github.com/sebastianbergmann/phpunit/issues/5064): `TestCase::getMockClass()` (since PHPUnit 9.6.0)
+
+#### Miscellaneous
+
+* [#5132](https://github.com/sebastianbergmann/phpunit/issues/5132): `Test` suffix for abstract test case classes
+* `TestCase::$backupGlobalsBlacklist` (since PHPUnit 9.3.0)
+* `TestCase::$backupStaticAttributesBlacklist` (since PHPUnit 9.3.0)
+
+### Extending PHPUnit
+
+* [#4039](https://github.com/sebastianbergmann/phpunit/issues/4039): `Command::handleLoader()` (since PHPUnit 9.1.0)
+* [#4039](https://github.com/sebastianbergmann/phpunit/issues/4039): `TestSuiteLoader` (since PHPUnit 9.1.0)
+* [#4039](https://github.com/sebastianbergmann/phpunit/issues/4039): `StandardTestSuiteLoader` (since PHPUnit 9.1.0)
+* [#4676](https://github.com/sebastianbergmann/phpunit/issues/4676): `TestListener` (since PHPUnit 8.0.0)
+* [#4676](https://github.com/sebastianbergmann/phpunit/issues/4676): `TestListenerDefaultImplementation` (since PHPUnit 8.2.4)
diff --git a/www/vendor/phpunit/phpunit/README.md b/www/vendor/phpunit/phpunit/README.md
index ffc8bf32..c561c594 100644
--- a/www/vendor/phpunit/phpunit/README.md
+++ b/www/vendor/phpunit/phpunit/README.md
@@ -25,7 +25,7 @@ Alternatively, you may use [Composer](https://getcomposer.org/) to download and
 
 ## Contribute
 
-Please refer to [CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/.github/CONTRIBUTING.md) for information on how to contribute to PHPUnit and its related projects.
+Please refer to [CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/main/.github/CONTRIBUTING.md) for information on how to contribute to PHPUnit and its related projects.
 
 ## List of Contributors
 
diff --git a/www/vendor/phpunit/phpunit/phpunit.xsd b/www/vendor/phpunit/phpunit/phpunit.xsd
index 7fa2f6b6..619434ef 100644
--- a/www/vendor/phpunit/phpunit/phpunit.xsd
+++ b/www/vendor/phpunit/phpunit/phpunit.xsd
@@ -57,7 +57,7 @@
     </xs:complexType>
     <xs:complexType name="extensionsType">
         <xs:sequence>
-            <xs:element name="extension" type="objectType" maxOccurs="unbounded"/>
+            <xs:element name="extension" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="listenersType">
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Assert.php b/www/vendor/phpunit/phpunit/src/Framework/Assert.php
index 9872b25c..8724fae7 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Assert.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Assert.php
@@ -73,6 +73,7 @@ use PHPUnit\Framework\Constraint\LogicalOr;
 use PHPUnit\Framework\Constraint\LogicalXor;
 use PHPUnit\Framework\Constraint\ObjectEquals;
 use PHPUnit\Framework\Constraint\ObjectHasAttribute;
+use PHPUnit\Framework\Constraint\ObjectHasProperty;
 use PHPUnit\Framework\Constraint\RegularExpression;
 use PHPUnit\Framework\Constraint\SameSize;
 use PHPUnit\Framework\Constraint\StringContains;
@@ -111,14 +112,14 @@ abstract class Assert
         if (!(is_int($key) || is_string($key))) {
             throw InvalidArgumentException::create(
                 1,
-                'integer or string'
+                'integer or string',
             );
         }
 
         if (!(is_array($array) || $array instanceof ArrayAccess)) {
             throw InvalidArgumentException::create(
                 2,
-                'array or ArrayAccess'
+                'array or ArrayAccess',
             );
         }
 
@@ -142,19 +143,19 @@ abstract class Assert
         if (!(is_int($key) || is_string($key))) {
             throw InvalidArgumentException::create(
                 1,
-                'integer or string'
+                'integer or string',
             );
         }
 
         if (!(is_array($array) || $array instanceof ArrayAccess)) {
             throw InvalidArgumentException::create(
                 2,
-                'array or ArrayAccess'
+                'array or ArrayAccess',
             );
         }
 
         $constraint = new LogicalNot(
-            new ArrayHasKey($key)
+            new ArrayHasKey($key),
         );
 
         static::assertThat($array, $constraint, $message);
@@ -191,7 +192,7 @@ abstract class Assert
     public static function assertNotContains($needle, iterable $haystack, string $message = ''): void
     {
         $constraint = new LogicalNot(
-            new TraversableContainsIdentical($needle)
+            new TraversableContainsIdentical($needle),
         );
 
         static::assertThat($haystack, $constraint, $message);
@@ -220,9 +221,9 @@ abstract class Assert
             $haystack,
             new TraversableContainsOnly(
                 $type,
-                $isNativeType
+                $isNativeType,
             ),
-            $message
+            $message,
         );
     }
 
@@ -238,9 +239,9 @@ abstract class Assert
             $haystack,
             new TraversableContainsOnly(
                 $className,
-                false
+                false,
             ),
-            $message
+            $message,
         );
     }
 
@@ -261,10 +262,10 @@ abstract class Assert
             new LogicalNot(
                 new TraversableContainsOnly(
                     $type,
-                    $isNativeType
-                )
+                    $isNativeType,
+                ),
             ),
-            $message
+            $message,
         );
     }
 
@@ -290,7 +291,7 @@ abstract class Assert
         static::assertThat(
             $haystack,
             new Count($expectedCount),
-            $message
+            $message,
         );
     }
 
@@ -314,7 +315,7 @@ abstract class Assert
         }
 
         $constraint = new LogicalNot(
-            new Count($expectedCount)
+            new Count($expectedCount),
         );
 
         static::assertThat($haystack, $constraint, $message);
@@ -369,7 +370,7 @@ abstract class Assert
     {
         $constraint = new IsEqualWithDelta(
             $expected,
-            $delta
+            $delta,
         );
 
         static::assertThat($actual, $constraint, $message);
@@ -384,7 +385,7 @@ abstract class Assert
     public static function assertNotEquals($expected, $actual, string $message = ''): void
     {
         $constraint = new LogicalNot(
-            new IsEqual($expected)
+            new IsEqual($expected),
         );
 
         static::assertThat($actual, $constraint, $message);
@@ -399,7 +400,7 @@ abstract class Assert
     public static function assertNotEqualsCanonicalizing($expected, $actual, string $message = ''): void
     {
         $constraint = new LogicalNot(
-            new IsEqualCanonicalizing($expected)
+            new IsEqualCanonicalizing($expected),
         );
 
         static::assertThat($actual, $constraint, $message);
@@ -414,7 +415,7 @@ abstract class Assert
     public static function assertNotEqualsIgnoringCase($expected, $actual, string $message = ''): void
     {
         $constraint = new LogicalNot(
-            new IsEqualIgnoringCase($expected)
+            new IsEqualIgnoringCase($expected),
         );
 
         static::assertThat($actual, $constraint, $message);
@@ -431,8 +432,8 @@ abstract class Assert
         $constraint = new LogicalNot(
             new IsEqualWithDelta(
                 $expected,
-                $delta
-            )
+                $delta,
+            ),
         );
 
         static::assertThat($actual, $constraint, $message);
@@ -446,7 +447,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             static::objectEquals($expected, $method),
-            $message
+            $message,
         );
     }
 
@@ -506,7 +507,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             static::greaterThanOrEqual($expected),
-            $message
+            $message,
         );
     }
 
@@ -562,7 +563,7 @@ abstract class Assert
         static::assertFileExists($actual, $message);
 
         $constraint = new IsEqualCanonicalizing(
-            file_get_contents($expected)
+            file_get_contents($expected),
         );
 
         static::assertThat(file_get_contents($actual), $constraint, $message);
@@ -598,7 +599,7 @@ abstract class Assert
         static::assertFileExists($actual, $message);
 
         $constraint = new LogicalNot(
-            new IsEqual(file_get_contents($expected))
+            new IsEqual(file_get_contents($expected)),
         );
 
         static::assertThat(file_get_contents($actual), $constraint, $message);
@@ -617,7 +618,7 @@ abstract class Assert
         static::assertFileExists($actual, $message);
 
         $constraint = new LogicalNot(
-            new IsEqualCanonicalizing(file_get_contents($expected))
+            new IsEqualCanonicalizing(file_get_contents($expected)),
         );
 
         static::assertThat(file_get_contents($actual), $constraint, $message);
@@ -636,7 +637,7 @@ abstract class Assert
         static::assertFileExists($actual, $message);
 
         $constraint = new LogicalNot(
-            new IsEqualIgnoringCase(file_get_contents($expected))
+            new IsEqualIgnoringCase(file_get_contents($expected)),
         );
 
         static::assertThat(file_get_contents($actual), $constraint, $message);
@@ -702,7 +703,7 @@ abstract class Assert
         static::assertFileExists($expectedFile, $message);
 
         $constraint = new LogicalNot(
-            new IsEqual(file_get_contents($expectedFile))
+            new IsEqual(file_get_contents($expectedFile)),
         );
 
         static::assertThat($actualString, $constraint, $message);
@@ -720,7 +721,7 @@ abstract class Assert
         static::assertFileExists($expectedFile, $message);
 
         $constraint = new LogicalNot(
-            new IsEqualCanonicalizing(file_get_contents($expectedFile))
+            new IsEqualCanonicalizing(file_get_contents($expectedFile)),
         );
 
         static::assertThat($actualString, $constraint, $message);
@@ -738,7 +739,7 @@ abstract class Assert
         static::assertFileExists($expectedFile, $message);
 
         $constraint = new LogicalNot(
-            new IsEqualIgnoringCase(file_get_contents($expectedFile))
+            new IsEqualIgnoringCase(file_get_contents($expectedFile)),
         );
 
         static::assertThat($actualString, $constraint, $message);
@@ -1227,9 +1228,9 @@ abstract class Assert
         static::assertThat(
             $className,
             new LogicalNot(
-                new ClassHasAttribute($attributeName)
+                new ClassHasAttribute($attributeName),
             ),
-            $message
+            $message,
         );
     }
 
@@ -1257,7 +1258,7 @@ abstract class Assert
         static::assertThat(
             $className,
             new ClassHasStaticAttribute($attributeName),
-            $message
+            $message,
         );
     }
 
@@ -1285,9 +1286,9 @@ abstract class Assert
         static::assertThat(
             $className,
             new LogicalNot(
-                new ClassHasStaticAttribute($attributeName)
+                new ClassHasStaticAttribute($attributeName),
             ),
-            $message
+            $message,
         );
     }
 
@@ -1304,7 +1305,7 @@ abstract class Assert
      */
     public static function assertObjectHasAttribute(string $attributeName, $object, string $message = ''): void
     {
-        self::createWarning('assertObjectHasAttribute() is deprecated and will be removed in PHPUnit 10. Refactor your test to use assertObjectHasProperty() (PHPUnit 10.1.0+) instead.');
+        self::createWarning('assertObjectHasAttribute() is deprecated and will be removed in PHPUnit 10. Refactor your test to use assertObjectHasProperty() instead.');
 
         if (!self::isValidObjectAttributeName($attributeName)) {
             throw InvalidArgumentException::create(1, 'valid attribute name');
@@ -1317,7 +1318,7 @@ abstract class Assert
         static::assertThat(
             $object,
             new ObjectHasAttribute($attributeName),
-            $message
+            $message,
         );
     }
 
@@ -1334,7 +1335,7 @@ abstract class Assert
      */
     public static function assertObjectNotHasAttribute(string $attributeName, $object, string $message = ''): void
     {
-        self::createWarning('assertObjectNotHasAttribute() is deprecated and will be removed in PHPUnit 10. Refactor your test to use assertObjectNotHasProperty() (PHPUnit 10.1.0+) instead.');
+        self::createWarning('assertObjectNotHasAttribute() is deprecated and will be removed in PHPUnit 10. Refactor your test to use assertObjectNotHasProperty() instead.');
 
         if (!self::isValidObjectAttributeName($attributeName)) {
             throw InvalidArgumentException::create(1, 'valid attribute name');
@@ -1347,9 +1348,39 @@ abstract class Assert
         static::assertThat(
             $object,
             new LogicalNot(
-                new ObjectHasAttribute($attributeName)
+                new ObjectHasAttribute($attributeName),
             ),
-            $message
+            $message,
+        );
+    }
+
+    /**
+     * Asserts that an object has a specified property.
+     *
+     * @throws ExpectationFailedException
+     */
+    final public static function assertObjectHasProperty(string $propertyName, object $object, string $message = ''): void
+    {
+        static::assertThat(
+            $object,
+            new ObjectHasProperty($propertyName),
+            $message,
+        );
+    }
+
+    /**
+     * Asserts that an object does not have a specified property.
+     *
+     * @throws ExpectationFailedException
+     */
+    final public static function assertObjectNotHasProperty(string $propertyName, object $object, string $message = ''): void
+    {
+        static::assertThat(
+            $object,
+            new LogicalNot(
+                new ObjectHasProperty($propertyName),
+            ),
+            $message,
         );
     }
 
@@ -1372,7 +1403,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsIdentical($expected),
-            $message
+            $message,
         );
     }
 
@@ -1393,9 +1424,9 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(
-                new IsIdentical($expected)
+                new IsIdentical($expected),
             ),
-            $message
+            $message,
         );
     }
 
@@ -1421,7 +1452,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsInstanceOf($expected),
-            $message
+            $message,
         );
     }
 
@@ -1447,9 +1478,9 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(
-                new IsInstanceOf($expected)
+                new IsInstanceOf($expected),
             ),
-            $message
+            $message,
         );
     }
 
@@ -1466,7 +1497,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_ARRAY),
-            $message
+            $message,
         );
     }
 
@@ -1483,7 +1514,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_BOOL),
-            $message
+            $message,
         );
     }
 
@@ -1500,7 +1531,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_FLOAT),
-            $message
+            $message,
         );
     }
 
@@ -1517,7 +1548,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_INT),
-            $message
+            $message,
         );
     }
 
@@ -1534,7 +1565,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_NUMERIC),
-            $message
+            $message,
         );
     }
 
@@ -1551,7 +1582,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_OBJECT),
-            $message
+            $message,
         );
     }
 
@@ -1568,7 +1599,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_RESOURCE),
-            $message
+            $message,
         );
     }
 
@@ -1585,7 +1616,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_CLOSED_RESOURCE),
-            $message
+            $message,
         );
     }
 
@@ -1602,7 +1633,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_STRING),
-            $message
+            $message,
         );
     }
 
@@ -1619,7 +1650,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_SCALAR),
-            $message
+            $message,
         );
     }
 
@@ -1636,7 +1667,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_CALLABLE),
-            $message
+            $message,
         );
     }
 
@@ -1653,7 +1684,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new IsType(IsType::TYPE_ITERABLE),
-            $message
+            $message,
         );
     }
 
@@ -1670,7 +1701,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_ARRAY)),
-            $message
+            $message,
         );
     }
 
@@ -1687,7 +1718,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_BOOL)),
-            $message
+            $message,
         );
     }
 
@@ -1704,7 +1735,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_FLOAT)),
-            $message
+            $message,
         );
     }
 
@@ -1721,7 +1752,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_INT)),
-            $message
+            $message,
         );
     }
 
@@ -1738,7 +1769,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_NUMERIC)),
-            $message
+            $message,
         );
     }
 
@@ -1755,7 +1786,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_OBJECT)),
-            $message
+            $message,
         );
     }
 
@@ -1772,7 +1803,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_RESOURCE)),
-            $message
+            $message,
         );
     }
 
@@ -1789,7 +1820,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_CLOSED_RESOURCE)),
-            $message
+            $message,
         );
     }
 
@@ -1806,7 +1837,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_STRING)),
-            $message
+            $message,
         );
     }
 
@@ -1823,7 +1854,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_SCALAR)),
-            $message
+            $message,
         );
     }
 
@@ -1840,7 +1871,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_CALLABLE)),
-            $message
+            $message,
         );
     }
 
@@ -1857,7 +1888,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(new IsType(IsType::TYPE_ITERABLE)),
-            $message
+            $message,
         );
     }
 
@@ -1900,9 +1931,9 @@ abstract class Assert
         static::assertThat(
             $string,
             new LogicalNot(
-                new RegularExpression($pattern)
+                new RegularExpression($pattern),
             ),
-            $message
+            $message,
         );
     }
 
@@ -1923,9 +1954,9 @@ abstract class Assert
         static::assertThat(
             $string,
             new LogicalNot(
-                new RegularExpression($pattern)
+                new RegularExpression($pattern),
             ),
-            $message
+            $message,
         );
     }
 
@@ -1961,7 +1992,7 @@ abstract class Assert
         static::assertThat(
             $actual,
             new SameSize($expected),
-            $message
+            $message,
         );
     }
 
@@ -1997,9 +2028,9 @@ abstract class Assert
         static::assertThat(
             $actual,
             new LogicalNot(
-                new SameSize($expected)
+                new SameSize($expected),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2025,9 +2056,9 @@ abstract class Assert
         static::assertThat(
             $string,
             new LogicalNot(
-                new StringMatchesFormatDescription($format)
+                new StringMatchesFormatDescription($format),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2044,9 +2075,9 @@ abstract class Assert
         static::assertThat(
             $string,
             new StringMatchesFormatDescription(
-                file_get_contents($formatFile)
+                file_get_contents($formatFile),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2064,10 +2095,10 @@ abstract class Assert
             $string,
             new LogicalNot(
                 new StringMatchesFormatDescription(
-                    file_get_contents($formatFile)
-                )
+                    file_get_contents($formatFile),
+                ),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2096,9 +2127,9 @@ abstract class Assert
         static::assertThat(
             $string,
             new LogicalNot(
-                new StringStartsWith($prefix)
+                new StringStartsWith($prefix),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2168,9 +2199,9 @@ abstract class Assert
         static::assertThat(
             $string,
             new LogicalNot(
-                new StringEndsWith($suffix)
+                new StringEndsWith($suffix),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2335,7 +2366,7 @@ abstract class Assert
         static::assertSame(
             $expectedElement->tagName,
             $actualElement->tagName,
-            $message
+            $message,
         );
 
         if ($checkAttributes) {
@@ -2346,8 +2377,8 @@ abstract class Assert
                     '%s%sNumber of attributes on node "%s" does not match',
                     $message,
                     !empty($message) ? "\n" : '',
-                    $expectedElement->tagName
-                )
+                    $expectedElement->tagName,
+                ),
             );
 
             for ($i = 0; $i < $expectedElement->attributes->length; $i++) {
@@ -2363,8 +2394,8 @@ abstract class Assert
                             $message,
                             !empty($message) ? "\n" : '',
                             $expectedAttribute->name,
-                            $expectedElement->tagName
-                        )
+                            $expectedElement->tagName,
+                        ),
                     );
                 }
             }
@@ -2380,8 +2411,8 @@ abstract class Assert
                 '%s%sNumber of child nodes of "%s" differs',
                 $message,
                 !empty($message) ? "\n" : '',
-                $expectedElement->tagName
-            )
+                $expectedElement->tagName,
+            ),
         );
 
         for ($i = 0; $i < $expectedElement->childNodes->length; $i++) {
@@ -2389,7 +2420,7 @@ abstract class Assert
                 $expectedElement->childNodes->item($i),
                 $actualElement->childNodes->item($i),
                 $checkAttributes,
-                $message
+                $message,
             );
         }
     }
@@ -2449,9 +2480,9 @@ abstract class Assert
         static::assertThat(
             $actualJson,
             new LogicalNot(
-                new JsonMatches($expectedJson)
+                new JsonMatches($expectedJson),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2489,9 +2520,9 @@ abstract class Assert
         static::assertThat(
             $actualJson,
             new LogicalNot(
-                new JsonMatches($expectedJson)
+                new JsonMatches($expectedJson),
             ),
-            $message
+            $message,
         );
     }
 
@@ -2513,7 +2544,7 @@ abstract class Assert
         static::assertJson($actualJson, $message);
 
         $constraintExpected = new JsonMatches(
-            $expectedJson
+            $expectedJson,
         );
 
         $constraintActual = new JsonMatches($actualJson);
@@ -2540,7 +2571,7 @@ abstract class Assert
         static::assertJson($actualJson, $message);
 
         $constraintExpected = new JsonMatches(
-            $expectedJson
+            $expectedJson,
         );
 
         $constraintActual = new JsonMatches($actualJson);
@@ -2721,7 +2752,7 @@ abstract class Assert
     {
         return static::logicalOr(
             new IsEqual($value),
-            new GreaterThan($value)
+            new GreaterThan($value),
         );
     }
 
@@ -2779,7 +2810,7 @@ abstract class Assert
     {
         return static::logicalOr(
             new IsEqual($value),
-            new LessThan($value)
+            new LessThan($value),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php b/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
index 5b8c50ed..2005cfde 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
@@ -1444,6 +1444,42 @@ if (!function_exists('PHPUnit\Framework\assertObjectNotHasAttribute')) {
     }
 }
 
+if (!function_exists('PHPUnit\Framework\assertObjectHasProperty')) {
+    /**
+     * Asserts that an object has a specified property.
+     *
+     * @throws ExpectationFailedException
+     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @throws Exception
+     *
+     * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+     *
+     * @see Assert::assertObjectHasProperty
+     */
+    function assertObjectHasProperty(string $attributeName, object $object, string $message = ''): void
+    {
+        Assert::assertObjectHasProperty(...func_get_args());
+    }
+}
+
+if (!function_exists('PHPUnit\Framework\assertObjectNotHasProperty')) {
+    /**
+     * Asserts that an object does not have a specified property.
+     *
+     * @throws ExpectationFailedException
+     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
+     * @throws Exception
+     *
+     * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+     *
+     * @see Assert::assertObjectNotHasProperty
+     */
+    function assertObjectNotHasProperty(string $attributeName, object $object, string $message = ''): void
+    {
+        Assert::assertObjectNotHasProperty(...func_get_args());
+    }
+}
+
 if (!function_exists('PHPUnit\Framework\assertSame')) {
     /**
      * Asserts that two variables have the same type and value.
@@ -2927,7 +2963,7 @@ if (!function_exists('PHPUnit\Framework\atLeast')) {
     function atLeast(int $requiredInvocations): InvokedAtLeastCountMatcher
     {
         return new InvokedAtLeastCountMatcher(
-            $requiredInvocations
+            $requiredInvocations,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/Count.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/Count.php
index 8e27fbfd..ff04a698 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/Count.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/Count.php
@@ -40,7 +40,7 @@ class Count extends Constraint
     {
         return sprintf(
             'count matches %d',
-            $this->expectedCount
+            $this->expectedCount,
         );
     }
 
@@ -76,7 +76,7 @@ class Count extends Constraint
                     throw new Exception(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
             }
@@ -136,7 +136,7 @@ class Count extends Constraint
         return sprintf(
             'actual size %d matches expected size %d',
             (int) $this->getCountOf($other),
-            $this->expectedCount
+            $this->expectedCount,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/IsEmpty.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/IsEmpty.php
index e6371d53..ee01e93d 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/IsEmpty.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Cardinality/IsEmpty.php
@@ -64,7 +64,7 @@ final class IsEmpty extends Constraint
             '%s %s %s',
             strpos($type, 'a') === 0 || strpos($type, 'o') === 0 ? 'an' : 'a',
             $type,
-            $this->toString()
+            $this->toString(),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php
index 5f772b4d..260985aa 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php
@@ -106,7 +106,7 @@ abstract class Constraint implements Countable, SelfDescribing
     {
         $failureDescription = sprintf(
             'Failed asserting that %s.',
-            $this->failureDescription($other)
+            $this->failureDescription($other),
         );
 
         $additionalFailureDescription = $this->additionalFailureDescription($other);
@@ -121,7 +121,7 @@ abstract class Constraint implements Countable, SelfDescribing
 
         throw new ExpectationFailedException(
             $failureDescription,
-            $comparisonFailure
+            $comparisonFailure,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqual.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqual.php
index 6a61ebfb..5896efa4 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqual.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqual.php
@@ -78,7 +78,7 @@ final class IsEqual extends Constraint
         try {
             $comparator = $comparatorFactory->getComparatorFor(
                 $this->value,
-                $other
+                $other,
             );
 
             $comparator->assertEquals(
@@ -86,7 +86,7 @@ final class IsEqual extends Constraint
                 $other,
                 $this->delta,
                 $this->canonicalize,
-                $this->ignoreCase
+                $this->ignoreCase,
             );
         } catch (ComparisonFailure $f) {
             if ($returnResult) {
@@ -95,7 +95,7 @@ final class IsEqual extends Constraint
 
             throw new ExpectationFailedException(
                 trim($description . "\n" . $f->getMessage()),
-                $f
+                $f,
             );
         }
 
@@ -118,21 +118,21 @@ final class IsEqual extends Constraint
 
             return sprintf(
                 "is equal to '%s'",
-                $this->value
+                $this->value,
             );
         }
 
         if ($this->delta != 0) {
             $delta = sprintf(
                 ' with delta <%F>',
-                $this->delta
+                $this->delta,
             );
         }
 
         return sprintf(
             'is equal to %s%s',
             $this->exporter()->export($this->value),
-            $delta
+            $delta,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualCanonicalizing.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualCanonicalizing.php
index 57bb91ca..b87dadad 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualCanonicalizing.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualCanonicalizing.php
@@ -58,7 +58,7 @@ final class IsEqualCanonicalizing extends Constraint
         try {
             $comparator = $comparatorFactory->getComparatorFor(
                 $this->value,
-                $other
+                $other,
             );
 
             $comparator->assertEquals(
@@ -66,7 +66,7 @@ final class IsEqualCanonicalizing extends Constraint
                 $other,
                 0.0,
                 true,
-                false
+                false,
             );
         } catch (ComparisonFailure $f) {
             if ($returnResult) {
@@ -75,7 +75,7 @@ final class IsEqualCanonicalizing extends Constraint
 
             throw new ExpectationFailedException(
                 trim($description . "\n" . $f->getMessage()),
-                $f
+                $f,
             );
         }
 
@@ -96,13 +96,13 @@ final class IsEqualCanonicalizing extends Constraint
 
             return sprintf(
                 "is equal to '%s'",
-                $this->value
+                $this->value,
             );
         }
 
         return sprintf(
             'is equal to %s',
-            $this->exporter()->export($this->value)
+            $this->exporter()->export($this->value),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualIgnoringCase.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualIgnoringCase.php
index d657e96a..3642da21 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualIgnoringCase.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualIgnoringCase.php
@@ -58,7 +58,7 @@ final class IsEqualIgnoringCase extends Constraint
         try {
             $comparator = $comparatorFactory->getComparatorFor(
                 $this->value,
-                $other
+                $other,
             );
 
             $comparator->assertEquals(
@@ -66,7 +66,7 @@ final class IsEqualIgnoringCase extends Constraint
                 $other,
                 0.0,
                 false,
-                true
+                true,
             );
         } catch (ComparisonFailure $f) {
             if ($returnResult) {
@@ -75,7 +75,7 @@ final class IsEqualIgnoringCase extends Constraint
 
             throw new ExpectationFailedException(
                 trim($description . "\n" . $f->getMessage()),
-                $f
+                $f,
             );
         }
 
@@ -96,13 +96,13 @@ final class IsEqualIgnoringCase extends Constraint
 
             return sprintf(
                 "is equal to '%s'",
-                $this->value
+                $this->value,
             );
         }
 
         return sprintf(
             'is equal to %s',
-            $this->exporter()->export($this->value)
+            $this->exporter()->export($this->value),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualWithDelta.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualWithDelta.php
index 4f106b1e..f7d8aced 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualWithDelta.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqualWithDelta.php
@@ -62,13 +62,13 @@ final class IsEqualWithDelta extends Constraint
         try {
             $comparator = $comparatorFactory->getComparatorFor(
                 $this->value,
-                $other
+                $other,
             );
 
             $comparator->assertEquals(
                 $this->value,
                 $other,
-                $this->delta
+                $this->delta,
             );
         } catch (ComparisonFailure $f) {
             if ($returnResult) {
@@ -77,7 +77,7 @@ final class IsEqualWithDelta extends Constraint
 
             throw new ExpectationFailedException(
                 trim($description . "\n" . $f->getMessage()),
-                $f
+                $f,
             );
         }
 
@@ -94,7 +94,7 @@ final class IsEqualWithDelta extends Constraint
         return sprintf(
             'is equal to %s with delta <%F>',
             $this->exporter()->export($this->value),
-            $this->delta
+            $this->delta,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php
index 860c0030..bbaab4af 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/Exception.php
@@ -36,7 +36,7 @@ final class Exception extends Constraint
     {
         return sprintf(
             'exception of type "%s"',
-            $this->className
+            $this->className,
         );
     }
 
@@ -73,13 +73,13 @@ final class Exception extends Constraint
                 'exception of type "%s" matches expected exception "%s"%s',
                 get_class($other),
                 $this->className,
-                $message
+                $message,
             );
         }
 
         return sprintf(
             'exception of type "%s" is thrown',
-            $this->className
+            $this->className,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php
index b8054a94..a6fad4c7 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionCode.php
@@ -61,7 +61,7 @@ final class ExceptionCode extends Constraint
         return sprintf(
             '%s is equal to expected exception code %s',
             $this->exporter()->export($other->getCode()),
-            $this->exporter()->export($this->expectedCode)
+            $this->exporter()->export($this->expectedCode),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessage.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessage.php
index 030beff9..5139e720 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessage.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessage.php
@@ -65,14 +65,14 @@ final class ExceptionMessage extends Constraint
         if ($this->expectedMessage === '') {
             return sprintf(
                 "exception message is empty but is '%s'",
-                $other->getMessage()
+                $other->getMessage(),
             );
         }
 
         return sprintf(
             "exception message '%s' contains '%s'",
             $other->getMessage(),
-            $this->expectedMessage
+            $this->expectedMessage,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageRegularExpression.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageRegularExpression.php
index fd0db1c8..bc737709 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageRegularExpression.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Exception/ExceptionMessageRegularExpression.php
@@ -48,7 +48,7 @@ final class ExceptionMessageRegularExpression extends Constraint
 
         if ($match === false) {
             throw new \PHPUnit\Framework\Exception(
-                "Invalid expected exception message regex given: '{$this->expectedMessageRegExp}'"
+                "Invalid expected exception message regex given: '{$this->expectedMessageRegExp}'",
             );
         }
 
@@ -68,7 +68,7 @@ final class ExceptionMessageRegularExpression extends Constraint
         return sprintf(
             "exception message '%s' matches '%s'",
             $other->getMessage(),
-            $this->expectedMessageRegExp
+            $this->expectedMessageRegExp,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/DirectoryExists.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/DirectoryExists.php
index ef4b2baf..24268c7d 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/DirectoryExists.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/DirectoryExists.php
@@ -48,7 +48,7 @@ final class DirectoryExists extends Constraint
     {
         return sprintf(
             'directory "%s" exists',
-            $other
+            $other,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/FileExists.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/FileExists.php
index 41b3136e..6cae9502 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/FileExists.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/FileExists.php
@@ -48,7 +48,7 @@ final class FileExists extends Constraint
     {
         return sprintf(
             'file "%s" exists',
-            $other
+            $other,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsReadable.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsReadable.php
index e33d7e04..12436938 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsReadable.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsReadable.php
@@ -48,7 +48,7 @@ final class IsReadable extends Constraint
     {
         return sprintf(
             '"%s" is readable',
-            $other
+            $other,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsWritable.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsWritable.php
index 93981224..8da02076 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsWritable.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Filesystem/IsWritable.php
@@ -48,7 +48,7 @@ final class IsWritable extends Constraint
     {
         return sprintf(
             '"%s" is writable',
-            $other
+            $other,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
index fde43d9e..f36d44e7 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
@@ -62,7 +62,7 @@ final class IsIdentical extends Constraint
                     $this->value,
                     $other,
                     sprintf("'%s'", $this->value),
-                    sprintf("'%s'", $other)
+                    sprintf("'%s'", $other),
                 );
             }
 
@@ -72,7 +72,7 @@ final class IsIdentical extends Constraint
                     $this->value,
                     $other,
                     $this->exporter()->export($this->value),
-                    $this->exporter()->export($other)
+                    $this->exporter()->export($other),
                 );
             }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
index 23a4de7e..af791a11 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
@@ -37,7 +37,7 @@ final class JsonMatches extends Constraint
     {
         return sprintf(
             'matches JSON string "%s"',
-            $this->value
+            $this->value,
         );
     }
 
@@ -100,7 +100,7 @@ final class JsonMatches extends Constraint
                 Json::prettify($recodedValue),
                 Json::prettify($recodedOther),
                 false,
-                'Failed asserting that two json values are equal.'
+                'Failed asserting that two json values are equal.',
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasAttribute.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasAttribute.php
index a873ceae..40e1d614 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasAttribute.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasAttribute.php
@@ -40,7 +40,7 @@ class ClassHasAttribute extends Constraint
     {
         return sprintf(
             'has attribute "%s"',
-            $this->attributeName
+            $this->attributeName,
         );
     }
 
@@ -59,7 +59,7 @@ class ClassHasAttribute extends Constraint
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -79,7 +79,7 @@ class ClassHasAttribute extends Constraint
             '%sclass "%s" %s',
             is_object($other) ? 'object of ' : '',
             is_object($other) ? get_class($other) : $other,
-            $this->toString()
+            $this->toString(),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasStaticAttribute.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasStaticAttribute.php
index 538cbf08..bd5eefe4 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasStaticAttribute.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ClassHasStaticAttribute.php
@@ -28,7 +28,7 @@ final class ClassHasStaticAttribute extends ClassHasAttribute
     {
         return sprintf(
             'has static attribute "%s"',
-            $this->attributeName()
+            $this->attributeName(),
         );
     }
 
@@ -51,7 +51,7 @@ final class ClassHasStaticAttribute extends ClassHasAttribute
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectEquals.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectEquals.php
index 30f3a330..b837b4cd 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectEquals.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectEquals.php
@@ -65,7 +65,7 @@ final class ObjectEquals extends Constraint
         if (!$object->hasMethod($this->method)) {
             throw new ComparisonMethodDoesNotExistException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
@@ -75,7 +75,7 @@ final class ObjectEquals extends Constraint
         if (!$method->hasReturnType()) {
             throw new ComparisonMethodDoesNotDeclareBoolReturnTypeException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
@@ -84,28 +84,28 @@ final class ObjectEquals extends Constraint
         if (!$returnType instanceof ReflectionNamedType) {
             throw new ComparisonMethodDoesNotDeclareBoolReturnTypeException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
         if ($returnType->allowsNull()) {
             throw new ComparisonMethodDoesNotDeclareBoolReturnTypeException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
         if ($returnType->getName() !== 'bool') {
             throw new ComparisonMethodDoesNotDeclareBoolReturnTypeException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
         if ($method->getNumberOfParameters() !== 1 || $method->getNumberOfRequiredParameters() !== 1) {
             throw new ComparisonMethodDoesNotDeclareExactlyOneParameterException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
@@ -114,7 +114,7 @@ final class ObjectEquals extends Constraint
         if (!$parameter->hasType()) {
             throw new ComparisonMethodDoesNotDeclareParameterTypeException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
@@ -123,7 +123,7 @@ final class ObjectEquals extends Constraint
         if (!$type instanceof ReflectionNamedType) {
             throw new ComparisonMethodDoesNotDeclareParameterTypeException(
                 get_class($other),
-                $this->method
+                $this->method,
             );
         }
 
@@ -137,7 +137,7 @@ final class ObjectEquals extends Constraint
             throw new ComparisonMethodDoesNotAcceptParameterTypeException(
                 get_class($other),
                 $this->method,
-                get_class($this->expected)
+                get_class($this->expected),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasProperty.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasProperty.php
new file mode 100644
index 00000000..c41d21a1
--- /dev/null
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Object/ObjectHasProperty.php
@@ -0,0 +1,84 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Framework\Constraint;
+
+use function get_class;
+use function gettype;
+use function is_object;
+use function sprintf;
+use ReflectionObject;
+
+/**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ */
+final class ObjectHasProperty extends Constraint
+{
+    /**
+     * @var string
+     */
+    private $propertyName;
+
+    public function __construct(string $propertyName)
+    {
+        $this->propertyName = $propertyName;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     */
+    public function toString(): string
+    {
+        return sprintf(
+            'has property "%s"',
+            $this->propertyName,
+        );
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param mixed $other value or object to evaluate
+     */
+    protected function matches($other): bool
+    {
+        if (!is_object($other)) {
+            return false;
+        }
+
+        return (new ReflectionObject($other))->hasProperty($this->propertyName);
+    }
+
+    /**
+     * Returns the description of the failure.
+     *
+     * The beginning of failure messages is "Failed asserting that" in most
+     * cases. This method should return the second part of that sentence.
+     *
+     * @param mixed $other evaluated value or object
+     */
+    protected function failureDescription($other): string
+    {
+        if (is_object($other)) {
+            return sprintf(
+                'object of class "%s" %s',
+                get_class($other),
+                $this->toString(),
+            );
+        }
+
+        return sprintf(
+            '"%s" (%s) %s',
+            $other,
+            gettype($other),
+            $this->toString(),
+        );
+    }
+}
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalNot.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalNot.php
index 7560ce2a..327f85bf 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalNot.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalNot.php
@@ -63,15 +63,15 @@ final class LogicalNot extends UnaryOperator
                 preg_replace(
                     $positives,
                     $negatives,
-                    $nonInput
+                    $nonInput,
                 ),
-                $string
+                $string,
             );
         } else {
             $negatedString = preg_replace(
                 $positives,
                 $negatives,
-                $string
+                $string,
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalXor.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalXor.php
index fbdb479b..ee1b1c29 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalXor.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Operator/LogicalXor.php
@@ -57,7 +57,7 @@ final class LogicalXor extends BinaryOperator
             {
                 return $matches xor $constraint->evaluate($other, '', true);
             },
-            $initial->evaluate($other, '', true)
+            $initial->evaluate($other, '', true),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php
index 97b29461..f90704f0 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/IsJson.php
@@ -65,13 +65,13 @@ final class IsJson extends Constraint
 
         json_decode($other);
         $error = (string) JsonMatchesErrorMessageProvider::determineJsonError(
-            (string) json_last_error()
+            (string) json_last_error(),
         );
 
         return sprintf(
             '%s is valid JSON (%s)',
             $this->exporter()->shortenedExport($other),
-            $error
+            $error,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/RegularExpression.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/RegularExpression.php
index 8e609e79..9ccfb9bd 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/RegularExpression.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/RegularExpression.php
@@ -34,7 +34,7 @@ class RegularExpression extends Constraint
     {
         return sprintf(
             'matches PCRE pattern "%s"',
-            $this->pattern
+            $this->pattern,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringContains.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringContains.php
index 6279f37b..5aa2c8e5 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringContains.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringContains.php
@@ -48,7 +48,7 @@ final class StringContains extends Constraint
 
         return sprintf(
             'contains "%s"',
-            $string
+            $string,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php
index c4f7324e..9c01ecb9 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringMatchesFormatDescription.php
@@ -33,8 +33,8 @@ final class StringMatchesFormatDescription extends RegularExpression
     {
         parent::__construct(
             $this->createPatternFromFormat(
-                $this->convertNewlines($string)
-            )
+                $this->convertNewlines($string),
+            ),
         );
 
         $this->string = $string;
@@ -49,7 +49,7 @@ final class StringMatchesFormatDescription extends RegularExpression
     protected function matches($other): bool
     {
         return parent::matches(
-            $this->convertNewlines($other)
+            $this->convertNewlines($other),
         );
     }
 
@@ -96,7 +96,7 @@ final class StringMatchesFormatDescription extends RegularExpression
                 '%x' => '[0-9a-fA-F]+',
                 '%f' => '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?',
                 '%c' => '.',
-            ]
+            ],
         );
 
         return '/^' . $string . '$/s';
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringStartsWith.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringStartsWith.php
index 089545c1..8683e272 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringStartsWith.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/String/StringStartsWith.php
@@ -9,7 +9,6 @@
  */
 namespace PHPUnit\Framework\Constraint;
 
-use function strlen;
 use function strpos;
 use PHPUnit\Framework\InvalidArgumentException;
 
@@ -25,7 +24,7 @@ final class StringStartsWith extends Constraint
 
     public function __construct(string $prefix)
     {
-        if (strlen($prefix) === 0) {
+        if ($prefix === '') {
             throw InvalidArgumentException::create(1, 'non-empty string');
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContains.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContains.php
index 39660a98..d0f61f46 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContains.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContains.php
@@ -52,7 +52,7 @@ abstract class TraversableContains extends Constraint
         return sprintf(
             '%s %s',
             is_array($other) ? 'an array' : 'a traversable',
-            $this->toString()
+            $this->toString(),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContainsOnly.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContainsOnly.php
index cf4a46b4..e5c68890 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContainsOnly.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Traversable/TraversableContainsOnly.php
@@ -36,7 +36,7 @@ final class TraversableContainsOnly extends Constraint
             $this->constraint = new IsType($type);
         } else {
             $this->constraint = new IsInstanceOf(
-                $type
+                $type,
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsInstanceOf.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsInstanceOf.php
index f0fa02b9..ef26813f 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsInstanceOf.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsInstanceOf.php
@@ -36,7 +36,7 @@ final class IsInstanceOf extends Constraint
         return sprintf(
             'is instance of %s "%s"',
             $this->getType(),
-            $this->className
+            $this->className,
         );
     }
 
@@ -67,7 +67,7 @@ final class IsInstanceOf extends Constraint
             '%s is an instance of %s "%s"',
             $this->exporter()->shortenedExport($other),
             $this->getType(),
-            $this->className
+            $this->className,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsType.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsType.php
index 5bc691d7..6edcc2b9 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsType.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Type/IsType.php
@@ -130,8 +130,8 @@ final class IsType extends Constraint
                 sprintf(
                     'Type specified for PHPUnit\Framework\Constraint\IsType <%s> ' .
                     'is not a valid type.',
-                    $type
-                )
+                    $type,
+                ),
             );
         }
 
@@ -145,7 +145,7 @@ final class IsType extends Constraint
     {
         return sprintf(
             'is of type "%s"',
-            $this->type
+            $this->type,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/ErrorTestCase.php b/www/vendor/phpunit/phpunit/src/Framework/ErrorTestCase.php
index 841247d7..245f0336 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/ErrorTestCase.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/ErrorTestCase.php
@@ -15,17 +15,17 @@ namespace PHPUnit\Framework;
 final class ErrorTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Exception/ActualValueIsNotAnObjectException.php b/www/vendor/phpunit/phpunit/src/Framework/Exception/ActualValueIsNotAnObjectException.php
index adae2829..4364788c 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Exception/ActualValueIsNotAnObjectException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Exception/ActualValueIsNotAnObjectException.php
@@ -21,7 +21,7 @@ final class ActualValueIsNotAnObjectException extends Exception
         parent::__construct(
             'Actual value is not an object',
             0,
-            null
+            null,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotAcceptParameterTypeException.php b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotAcceptParameterTypeException.php
index ebd68f34..0c2c1afe 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotAcceptParameterTypeException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotAcceptParameterTypeException.php
@@ -24,10 +24,10 @@ final class ComparisonMethodDoesNotAcceptParameterTypeException extends Exceptio
                 '%s is not an accepted argument type for comparison method %s::%s().',
                 $type,
                 $className,
-                $methodName
+                $methodName,
             ),
             0,
-            null
+            null,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php
index 20189cde..4eb9a2fd 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareBoolReturnTypeException.php
@@ -23,10 +23,10 @@ final class ComparisonMethodDoesNotDeclareBoolReturnTypeException extends Except
             sprintf(
                 'Comparison method %s::%s() does not declare bool return type.',
                 $className,
-                $methodName
+                $methodName,
             ),
             0,
-            null
+            null,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php
index bd09d87c..e8cd9787 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareExactlyOneParameterException.php
@@ -23,10 +23,10 @@ final class ComparisonMethodDoesNotDeclareExactlyOneParameterException extends E
             sprintf(
                 'Comparison method %s::%s() does not declare exactly one parameter.',
                 $className,
-                $methodName
+                $methodName,
             ),
             0,
-            null
+            null,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareParameterTypeException.php b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareParameterTypeException.php
index 9bbb112e..68616ba1 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareParameterTypeException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotDeclareParameterTypeException.php
@@ -23,10 +23,10 @@ final class ComparisonMethodDoesNotDeclareParameterTypeException extends Excepti
             sprintf(
                 'Parameter of comparison method %s::%s() does not have a declared type.',
                 $className,
-                $methodName
+                $methodName,
             ),
             0,
-            null
+            null,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotExistException.php b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotExistException.php
index ad0e2d08..0f1adcbc 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotExistException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Exception/ComparisonMethodDoesNotExistException.php
@@ -23,10 +23,10 @@ final class ComparisonMethodDoesNotExistException extends Exception
             sprintf(
                 'Comparison method %s::%s() does not exist.',
                 $className,
-                $methodName
+                $methodName,
             ),
             0,
-            null
+            null,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php b/www/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php
index 77f58079..888e9300 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/Exception/InvalidArgumentException.php
@@ -34,8 +34,8 @@ final class InvalidArgumentException extends Exception
                 $argument,
                 $function,
                 in_array(lcfirst($type)[0], ['a', 'e', 'i', 'o', 'u'], true) ? 'an' : 'a',
-                $type
-            )
+                $type,
+            ),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php b/www/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php
index 09c343c1..89ecc5e2 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/ExecutionOrderDependency.php
@@ -77,8 +77,8 @@ final class ExecutionOrderDependency
                 static function (self $d)
                 {
                     return $d->isValid();
-                }
-            )
+                },
+            ),
         );
     }
 
@@ -95,7 +95,7 @@ final class ExecutionOrderDependency
             {
                 return $dependency->getTarget();
             },
-            $existing
+            $existing,
         );
 
         foreach ($additional as $dependency) {
@@ -132,7 +132,7 @@ final class ExecutionOrderDependency
             {
                 return $dependency->getTarget();
             },
-            $right
+            $right,
         );
 
         foreach ($left as $dependency) {
diff --git a/www/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php b/www/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php
index ee1e3e9f..53e031a2 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php
@@ -15,17 +15,17 @@ namespace PHPUnit\Framework;
 final class IncompleteTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Api.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Api.php
index e2f0a280..56e6b69b 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Api.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Api.php
@@ -42,7 +42,7 @@ trait Api
     {
         if (isset(static::$__phpunit_configurableMethods)) {
             throw new ConfigurableMethodsAlreadyInitializedException(
-                'Configurable methods is already initialized and can not be reinitialized'
+                'Configurable methods is already initialized and can not be reinitialized',
             );
         }
 
@@ -67,7 +67,7 @@ trait Api
         if ($this->__phpunit_invocationMocker === null) {
             $this->__phpunit_invocationMocker = new InvocationHandler(
                 static::$__phpunit_configurableMethods,
-                $this->__phpunit_returnValueGeneration
+                $this->__phpunit_returnValueGeneration,
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Method.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Method.php
index f6df7533..f8be3808 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Method.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Api/Method.php
@@ -24,7 +24,7 @@ trait Method
 
         return call_user_func_array(
             [$expects, 'method'],
-            func_get_args()
+            func_get_args(),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php
index bc3c9236..626c33a7 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php
@@ -241,7 +241,7 @@ final class InvocationMocker implements InvocationStubber, MethodNameMatch
             {
                 return strtolower($configurable->getName());
             },
-            $this->configurableMethods
+            $this->configurableMethods,
         );
 
         if (is_string($constraint) && !in_array(strtolower($constraint), $configurableMethodNames, true)) {
@@ -300,7 +300,7 @@ final class InvocationMocker implements InvocationStubber, MethodNameMatch
             if (!$configuredMethod->mayReturn($value)) {
                 throw new IncompatibleReturnValueException(
                     $configuredMethod,
-                    $value
+                    $value,
                 );
             }
         }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationStubber.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationStubber.php
index f32ff0e7..1756cfc0 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationStubber.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationStubber.php
@@ -20,46 +20,46 @@ interface InvocationStubber
     public function will(Stub $stub): Identity;
 
     /** @return self */
-    public function willReturn($value, ...$nextValues)/*: self */;
+    public function willReturn($value, ...$nextValues)/* : self */;
 
     /**
      * @param mixed $reference
      *
      * @return self
      */
-    public function willReturnReference(&$reference)/*: self */;
+    public function willReturnReference(&$reference)/* : self */;
 
     /**
      * @param array<int, array<int, mixed>> $valueMap
      *
      * @return self
      */
-    public function willReturnMap(array $valueMap)/*: self */;
+    public function willReturnMap(array $valueMap)/* : self */;
 
     /**
      * @param int $argumentIndex
      *
      * @return self
      */
-    public function willReturnArgument($argumentIndex)/*: self */;
+    public function willReturnArgument($argumentIndex)/* : self */;
 
     /**
      * @param callable $callback
      *
      * @return self
      */
-    public function willReturnCallback($callback)/*: self */;
+    public function willReturnCallback($callback)/* : self */;
 
     /** @return self */
-    public function willReturnSelf()/*: self */;
+    public function willReturnSelf()/* : self */;
 
     /**
      * @param mixed $values
      *
      * @return self
      */
-    public function willReturnOnConsecutiveCalls(...$values)/*: self */;
+    public function willReturnOnConsecutiveCalls(...$values)/* : self */;
 
     /** @return self */
-    public function willThrowException(Throwable $exception)/*: self */;
+    public function willThrowException(Throwable $exception)/* : self */;
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php
index 0698870b..848746b5 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseAddMethodsException.php
@@ -22,8 +22,8 @@ final class CannotUseAddMethodsException extends \PHPUnit\Framework\Exception im
             sprintf(
                 'Trying to configure method "%s" with addMethods(), but it exists in class "%s". Use onlyMethods() for methods that exist in the class',
                 $methodName,
-                $type
-            )
+                $type,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php
index 35a29b73..0efcd02a 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/CannotUseOnlyMethodsException.php
@@ -22,8 +22,8 @@ final class CannotUseOnlyMethodsException extends \PHPUnit\Framework\Exception i
             sprintf(
                 'Trying to configure method "%s" with onlyMethods(), but it does not exist in class "%s". Use addMethods() for methods that do not exist in the class',
                 $methodName,
-                $type
-            )
+                $type,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassAlreadyExistsException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassAlreadyExistsException.php
index 0ba9a187..8c9c0a52 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassAlreadyExistsException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassAlreadyExistsException.php
@@ -21,8 +21,8 @@ final class ClassAlreadyExistsException extends \PHPUnit\Framework\Exception imp
         parent::__construct(
             sprintf(
                 'Class "%s" already exists',
-                $className
-            )
+                $className,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsFinalException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsFinalException.php
index e648f026..2bce2d88 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsFinalException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsFinalException.php
@@ -21,8 +21,8 @@ final class ClassIsFinalException extends \PHPUnit\Framework\Exception implement
         parent::__construct(
             sprintf(
                 'Class "%s" is declared "final" and cannot be doubled',
-                $className
-            )
+                $className,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsReadonlyException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsReadonlyException.php
index aa1a7451..f73570e1 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsReadonlyException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ClassIsReadonlyException.php
@@ -21,8 +21,8 @@ final class ClassIsReadonlyException extends \PHPUnit\Framework\Exception implem
         parent::__construct(
             sprintf(
                 'Class "%s" is declared "readonly" and cannot be doubled',
-                $className
-            )
+                $className,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php
index 1216b45d..f96a04ac 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php
@@ -28,8 +28,8 @@ final class DuplicateMethodException extends \PHPUnit\Framework\Exception implem
             sprintf(
                 'Cannot double using a method list that contains duplicates: "%s" (duplicate: "%s")',
                 implode(', ', $methods),
-                implode(', ', array_unique(array_diff_assoc($methods, array_unique($methods))))
-            )
+                implode(', ', array_unique(array_diff_assoc($methods, array_unique($methods)))),
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php
index eec79213..1ca8e9c9 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php
@@ -29,8 +29,8 @@ final class IncompatibleReturnValueException extends \PHPUnit\Framework\Exceptio
                 'Method %s may not return value of type %s, its declared return type is "%s"',
                 $method->getName(),
                 is_object($value) ? get_class($value) : gettype($value),
-                $method->getReturnTypeDeclaration()
-            )
+                $method->getReturnTypeDeclaration(),
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/InvalidMethodNameException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/InvalidMethodNameException.php
index d2444cf1..0ab74cbb 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/InvalidMethodNameException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/InvalidMethodNameException.php
@@ -21,8 +21,8 @@ final class InvalidMethodNameException extends \PHPUnit\Framework\Exception impl
         parent::__construct(
             sprintf(
                 'Cannot double method with invalid name "%s"',
-                $method
-            )
+                $method,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php
index c05b2bce..f2e1a31e 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatchBuilderNotFoundException.php
@@ -21,8 +21,8 @@ final class MatchBuilderNotFoundException extends \PHPUnit\Framework\Exception i
         parent::__construct(
             sprintf(
                 'No builder found for match builder identification <%s>',
-                $id
-            )
+                $id,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php
index efcc13ed..0972ffaf 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MatcherAlreadyRegisteredException.php
@@ -21,8 +21,8 @@ final class MatcherAlreadyRegisteredException extends \PHPUnit\Framework\Excepti
         parent::__construct(
             sprintf(
                 'Matcher with id <%s> is already registered',
-                $id
-            )
+                $id,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php
index 70729043..2f0bb5a6 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/MethodCannotBeConfiguredException.php
@@ -21,8 +21,8 @@ final class MethodCannotBeConfiguredException extends \PHPUnit\Framework\Excepti
         parent::__construct(
             sprintf(
                 'Trying to configure method "%s" which cannot be configured because it does not exist, has not been specified, is final, or is static',
-                $method
-            )
+                $method,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php
index 2c16c1dc..2bc4e882 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php
@@ -22,8 +22,8 @@ final class ReturnValueNotConfiguredException extends \PHPUnit\Framework\Excepti
             sprintf(
                 'Return value inference disabled and no expectation set up for %s::%s()',
                 $invocation->getClassName(),
-                $invocation->getMethodName()
-            )
+                $invocation->getMethodName(),
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/SoapExtensionNotAvailableException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/SoapExtensionNotAvailableException.php
index 98837c95..6ec5057a 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/SoapExtensionNotAvailableException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/SoapExtensionNotAvailableException.php
@@ -17,7 +17,7 @@ final class SoapExtensionNotAvailableException extends \PHPUnit\Framework\Except
     public function __construct()
     {
         parent::__construct(
-            'The SOAP extension is required to generate a test double from WSDL'
+            'The SOAP extension is required to generate a test double from WSDL',
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownClassException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownClassException.php
index e124f9b1..b08dead0 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownClassException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownClassException.php
@@ -21,8 +21,8 @@ final class UnknownClassException extends \PHPUnit\Framework\Exception implement
         parent::__construct(
             sprintf(
                 'Class "%s" does not exist',
-                $className
-            )
+                $className,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTraitException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTraitException.php
index 90fc8d84..c689dae9 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTraitException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTraitException.php
@@ -21,8 +21,8 @@ final class UnknownTraitException extends \PHPUnit\Framework\Exception implement
         parent::__construct(
             sprintf(
                 'Trait "%s" does not exist',
-                $traitName
-            )
+                $traitName,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTypeException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTypeException.php
index b1a70edd..c50b6911 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTypeException.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/UnknownTypeException.php
@@ -21,8 +21,8 @@ final class UnknownTypeException extends \PHPUnit\Framework\Exception implements
         parent::__construct(
             sprintf(
                 'Class or interface "%s" does not exist',
-                $type
-            )
+                $type,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php
index 4810ecae..d61725b1 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php
@@ -186,7 +186,7 @@ EOT;
                 throw new ReflectionException(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -207,7 +207,7 @@ EOT;
             $callOriginalClone,
             $callAutoload,
             $cloneArguments,
-            $callOriginalMethods
+            $callOriginalMethods,
         );
 
         return $this->getObject(
@@ -218,7 +218,7 @@ EOT;
             $arguments,
             $callOriginalMethods,
             $proxyTarget,
-            $returnValueGeneration
+            $returnValueGeneration,
         );
     }
 
@@ -265,7 +265,7 @@ EOT;
             $intersectionName = sprintf(
                 'Intersection_%s_%s',
                 implode('_', $unqualifiedNames),
-                substr(md5((string) mt_rand()), 0, 8)
+                substr(md5((string) mt_rand()), 0, 8),
             );
         } while (interface_exists($intersectionName, false));
 
@@ -275,7 +275,7 @@ EOT;
             [
                 'intersection' => $intersectionName,
                 'interfaces'   => implode(', ', $interfaces),
-            ]
+            ],
         );
 
         eval($template->render());
@@ -318,7 +318,7 @@ EOT;
                 throw new ReflectionException(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -343,7 +343,7 @@ EOT;
                 $callOriginalConstructor,
                 $callOriginalClone,
                 $callAutoload,
-                $cloneArguments
+                $cloneArguments,
             );
         }
 
@@ -379,7 +379,7 @@ EOT;
         $className = $this->generateClassName(
             $traitName,
             '',
-            'Trait_'
+            'Trait_',
         );
 
         $classTemplate = $this->getTemplate('trait_class.tpl');
@@ -389,7 +389,7 @@ EOT;
                 'prologue'   => 'abstract ',
                 'class_name' => $className['className'],
                 'trait_name' => $traitName,
-            ]
+            ],
         );
 
         $mockTrait = new MockTrait($classTemplate->render(), $className['className']);
@@ -416,7 +416,7 @@ EOT;
         $className = $this->generateClassName(
             $traitName,
             $traitClassName,
-            'Trait_'
+            'Trait_',
         );
 
         $classTemplate = $this->getTemplate('trait_class.tpl');
@@ -426,18 +426,18 @@ EOT;
                 'prologue'   => '',
                 'class_name' => $className['className'],
                 'trait_name' => $traitName,
-            ]
+            ],
         );
 
         return $this->getObject(
             new MockTrait(
                 $classTemplate->render(),
-                $className['className']
+                $className['className'],
             ),
             '',
             $callOriginalConstructor,
             $callAutoload,
-            $arguments
+            $arguments,
         );
     }
 
@@ -457,7 +457,7 @@ EOT;
                 $callOriginalClone,
                 $callAutoload,
                 $cloneArguments,
-                $callOriginalMethods
+                $callOriginalMethods,
             );
         }
 
@@ -466,7 +466,7 @@ EOT;
             serialize($methods) .
             serialize($callOriginalClone) .
             serialize($cloneArguments) .
-            serialize($callOriginalMethods)
+            serialize($callOriginalMethods),
         );
 
         if (!isset(self::$cache[$key])) {
@@ -477,7 +477,7 @@ EOT;
                 $callOriginalClone,
                 $callAutoload,
                 $cloneArguments,
-                $callOriginalMethods
+                $callOriginalMethods,
             );
         }
 
@@ -504,7 +504,7 @@ EOT;
             throw new RuntimeException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
 
@@ -523,7 +523,7 @@ EOT;
             if (empty($methods) || in_array($name, $methods, true)) {
                 $args = explode(
                     ',',
-                    str_replace(')', '', substr($method, $nameEnd + 1))
+                    str_replace(')', '', substr($method, $nameEnd + 1)),
                 );
 
                 foreach (range(0, count($args) - 1) as $i) {
@@ -540,7 +540,7 @@ EOT;
                     [
                         'method_name' => $name,
                         'arguments'   => implode(', ', $args),
-                    ]
+                    ],
                 );
 
                 $methodsBuffer .= $methodTemplate->render();
@@ -571,7 +571,7 @@ EOT;
                 'wsdl'       => $wsdlFile,
                 'options'    => $optionsBuffer,
                 'methods'    => $methodsBuffer,
-            ]
+            ],
         );
 
         return $classTemplate->render();
@@ -591,7 +591,7 @@ EOT;
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -621,7 +621,7 @@ EOT;
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -651,7 +651,7 @@ EOT;
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -681,7 +681,7 @@ EOT;
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -718,7 +718,7 @@ EOT;
                     throw new ReflectionException(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
@@ -745,7 +745,7 @@ EOT;
                         throw new ReflectionException(
                             $e->getMessage(),
                             $e->getCode(),
-                            $e
+                            $e,
                         );
                     }
                     // @codeCoverageIgnoreEnd
@@ -784,7 +784,7 @@ EOT;
         $_mockClassName = $this->generateClassName(
             $type,
             $mockClassName,
-            'Mock_'
+            'Mock_',
         );
 
         if (class_exists($_mockClassName['fullClassName'], $callAutoload)) {
@@ -813,7 +813,7 @@ EOT;
                 throw new ReflectionException(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -839,7 +839,7 @@ EOT;
                     throw new ReflectionException(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
@@ -855,7 +855,7 @@ EOT;
                             throw new ReflectionException(
                                 $e->getMessage(),
                                 $e->getCode(),
-                                $e
+                                $e,
                             );
                         }
                         // @codeCoverageIgnoreEnd
@@ -866,14 +866,14 @@ EOT;
                     }
 
                     $mockMethods->addMethods(
-                        MockMethod::fromReflection($method, $callOriginalMethods, $cloneArguments)
+                        MockMethod::fromReflection($method, $callOriginalMethods, $cloneArguments),
                     );
                 }
 
                 $_mockClassName = $this->generateClassName(
                     $actualClassName,
                     $_mockClassName['className'],
-                    'Mock_'
+                    'Mock_',
                 );
             }
 
@@ -884,7 +884,7 @@ EOT;
                 $additionalInterfaces[] = Iterator::class;
 
                 $mockMethods->addMethods(
-                    ...$this->mockClassMethods(Iterator::class, $callOriginalMethods, $cloneArguments)
+                    ...$this->mockClassMethods(Iterator::class, $callOriginalMethods, $cloneArguments),
                 );
             }
 
@@ -896,7 +896,7 @@ EOT;
                     throw new ReflectionException(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
@@ -915,13 +915,13 @@ EOT;
 
         if ($isClass && $explicitMethods === []) {
             $mockMethods->addMethods(
-                ...$this->mockClassMethods($_mockClassName['fullClassName'], $callOriginalMethods, $cloneArguments)
+                ...$this->mockClassMethods($_mockClassName['fullClassName'], $callOriginalMethods, $cloneArguments),
             );
         }
 
         if ($isInterface && ($explicitMethods === [] || $explicitMethods === null)) {
             $mockMethods->addMethods(
-                ...$this->mockInterfaceMethods($_mockClassName['fullClassName'], $cloneArguments)
+                ...$this->mockInterfaceMethods($_mockClassName['fullClassName'], $cloneArguments),
             );
         }
 
@@ -935,14 +935,14 @@ EOT;
                         throw new ReflectionException(
                             $e->getMessage(),
                             $e->getCode(),
-                            $e
+                            $e,
                         );
                     }
                     // @codeCoverageIgnoreEnd
 
                     if ($this->canMockMethod($method)) {
                         $mockMethods->addMethods(
-                            MockMethod::fromReflection($method, $callOriginalMethods, $cloneArguments)
+                            MockMethod::fromReflection($method, $callOriginalMethods, $cloneArguments),
                         );
                     }
                 } else {
@@ -950,8 +950,8 @@ EOT;
                         MockMethod::fromName(
                             $_mockClassName['fullClassName'],
                             $methodName,
-                            $cloneArguments
-                        )
+                            $cloneArguments,
+                        ),
                     );
                 }
             }
@@ -988,19 +988,19 @@ EOT;
                 'class_declaration' => $this->generateMockClassDeclaration(
                     $_mockClassName,
                     $isInterface,
-                    $additionalInterfaces
+                    $additionalInterfaces,
                 ),
                 'clone'           => $cloneTrait,
                 'mock_class_name' => $_mockClassName['className'],
                 'mocked_methods'  => $mockedMethods,
                 'method'          => $method,
-            ]
+            ],
         );
 
         return new MockClass(
             $classTemplate->render(),
             $_mockClassName['className'],
-            $configurable
+            $configurable,
         );
     }
 
@@ -1047,7 +1047,7 @@ EOT;
             $buffer .= sprintf(
                 '%s implements %s',
                 $mockClassName['className'],
-                $interfaces
+                $interfaces,
             );
 
             if (!in_array($mockClassName['originalClassName'], $additionalInterfaces, true)) {
@@ -1065,7 +1065,7 @@ EOT;
                 $mockClassName['className'],
                 !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
                 $mockClassName['originalClassName'],
-                $interfaces
+                $interfaces,
             );
         }
 
@@ -1096,7 +1096,7 @@ EOT;
                 throw new RuntimeException(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
         }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php
index 418d6a07..ed8c4e92 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php
@@ -183,7 +183,7 @@ final class Invocation implements SelfDescribing
                     throw new RuntimeException(
                         $t->getMessage(),
                         (int) $t->getCode(),
-                        $t
+                        $t,
                     );
                 }
             }
@@ -221,7 +221,7 @@ final class Invocation implements SelfDescribing
                     throw new RuntimeException(
                         $t->getMessage(),
                         (int) $t->getCode(),
-                        $t
+                        $t,
                     );
                 }
             }
@@ -256,8 +256,8 @@ final class Invocation implements SelfDescribing
                 'Return value for %s::%s() cannot be generated%s, please configure a return value for this method',
                 $this->className,
                 $this->methodName,
-                $reason
-            )
+                $reason,
+            ),
         );
     }
 
@@ -273,10 +273,10 @@ final class Invocation implements SelfDescribing
                 ', ',
                 array_map(
                     [$exporter, 'shortenedExport'],
-                    $this->parameters
-                )
+                    $this->parameters,
+                ),
             ),
-            $this->returnType ? sprintf(': %s', $this->returnType) : ''
+            $this->returnType ? sprintf(': %s', $this->returnType) : '',
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/InvocationHandler.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/InvocationHandler.php
index b9d62610..f8ee16e0 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/InvocationHandler.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/InvocationHandler.php
@@ -102,7 +102,7 @@ final class InvocationHandler
         return new InvocationMocker(
             $this,
             $matcher,
-            ...$this->configurableMethods
+            ...$this->configurableMethods,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Matcher.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Matcher.php
index 7c81a0ea..a8ebe14f 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Matcher.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Matcher.php
@@ -117,8 +117,8 @@ final class Matcher
 
         if ($this->afterMatchBuilderId !== null) {
             $matcher = $invocation->getObject()
-                                  ->__phpunit_getInvocationHandler()
-                                  ->lookupMatcher($this->afterMatchBuilderId);
+                ->__phpunit_getInvocationHandler()
+                ->lookupMatcher($this->afterMatchBuilderId);
 
             if (!$matcher) {
                 throw new MatchBuilderNotFoundException($this->afterMatchBuilderId);
@@ -143,9 +143,9 @@ final class Matcher
                     "Expectation failed for %s when %s\n%s",
                     $this->methodNameRule->toString(),
                     $this->invocationRule->toString(),
-                    $e->getMessage()
+                    $e->getMessage(),
                 ),
-                $e->getComparisonFailure()
+                $e->getComparisonFailure(),
             );
         }
 
@@ -167,8 +167,8 @@ final class Matcher
     {
         if ($this->afterMatchBuilderId !== null) {
             $matcher = $invocation->getObject()
-                                  ->__phpunit_getInvocationHandler()
-                                  ->lookupMatcher($this->afterMatchBuilderId);
+                ->__phpunit_getInvocationHandler()
+                ->lookupMatcher($this->afterMatchBuilderId);
 
             if (!$matcher) {
                 throw new MatchBuilderNotFoundException($this->afterMatchBuilderId);
@@ -199,9 +199,9 @@ final class Matcher
                     "Expectation failed for %s when %s\n%s",
                     $this->methodNameRule->toString(),
                     $this->invocationRule->toString(),
-                    $e->getMessage()
+                    $e->getMessage(),
                 ),
-                $e->getComparisonFailure()
+                $e->getComparisonFailure(),
             );
         }
 
@@ -239,8 +239,8 @@ final class Matcher
                     "Expectation failed for %s when %s.\n%s",
                     $this->methodNameRule->toString(),
                     $this->invocationRule->toString(),
-                    TestFailure::exceptionToString($e)
-                )
+                    TestFailure::exceptionToString($e),
+                ),
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MethodNameConstraint.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MethodNameConstraint.php
index 3082ab38..e5c955d3 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MethodNameConstraint.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MethodNameConstraint.php
@@ -33,7 +33,7 @@ final class MethodNameConstraint extends Constraint
     {
         return sprintf(
             'is "%s"',
-            $this->methodName
+            $this->methodName,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php
index 4007a9f1..69ec2502 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php
@@ -138,7 +138,7 @@ final class MockBuilder
             $this->callOriginalMethods,
             $this->proxyTarget,
             $this->allowMockingUnknownTypes,
-            $this->returnValueGeneration
+            $this->returnValueGeneration,
         );
 
         $this->testCase->registerMockObject($object);
@@ -165,7 +165,7 @@ final class MockBuilder
             $this->originalClone,
             $this->autoload,
             $this->methods,
-            $this->cloneArguments
+            $this->cloneArguments,
         );
 
         $this->testCase->registerMockObject($object);
@@ -192,7 +192,7 @@ final class MockBuilder
             $this->originalClone,
             $this->autoload,
             $this->methods,
-            $this->cloneArguments
+            $this->cloneArguments,
         );
 
         $this->testCase->registerMockObject($object);
@@ -243,7 +243,7 @@ final class MockBuilder
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -285,7 +285,7 @@ final class MockBuilder
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -313,8 +313,8 @@ final class MockBuilder
         return $this->setMethods(
             array_diff(
                 $this->generator->getClassMethods($this->type),
-                $methods
-            )
+                $methods,
+            ),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockClass.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockClass.php
index 253d7846..8f5c276d 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockClass.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockClass.php
@@ -55,7 +55,7 @@ final class MockClass implements MockType
                     $this->mockName,
                     '__phpunit_initConfigurableMethods',
                 ],
-                ...$this->configurableMethods
+                ...$this->configurableMethods,
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php
index 2cf149ad..88462dfe 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php
@@ -140,7 +140,7 @@ final class MockMethod
             $reference,
             $callOriginalMethod,
             $method->isStatic(),
-            $deprecation
+            $deprecation,
         );
     }
 
@@ -157,7 +157,7 @@ final class MockMethod
             '',
             false,
             false,
-            null
+            null,
         );
     }
 
@@ -191,12 +191,12 @@ final class MockMethod
         } elseif ($this->returnType->isNever() || $this->returnType->isVoid()) {
             $templateFile = sprintf(
                 '%s_method_never_or_void.tpl',
-                $this->callOriginalMethod ? 'proxied' : 'mocked'
+                $this->callOriginalMethod ? 'proxied' : 'mocked',
             );
         } else {
             $templateFile = sprintf(
                 '%s_method.tpl',
-                $this->callOriginalMethod ? 'proxied' : 'mocked'
+                $this->callOriginalMethod ? 'proxied' : 'mocked',
             );
         }
 
@@ -209,7 +209,7 @@ final class MockMethod
             $deprecationTemplate->setVar(
                 [
                     'deprecation' => var_export($deprecation, true),
-                ]
+                ],
             );
 
             $deprecation = $deprecationTemplate->render();
@@ -230,7 +230,7 @@ final class MockMethod
                 'reference'          => $this->reference,
                 'clone_arguments'    => $this->cloneArguments ? 'true' : 'false',
                 'deprecation'        => $deprecation,
-            ]
+            ],
         );
 
         return $template->render();
@@ -255,7 +255,7 @@ final class MockMethod
                 throw new RuntimeException(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
         }
@@ -361,18 +361,18 @@ final class MockMethod
                 substr(
                     substr(
                         $parameterAsString,
-                        strpos($parameterAsString, '<optional> ') + strlen('<optional> ')
+                        strpos($parameterAsString, '<optional> ') + strlen('<optional> '),
                     ),
                     0,
-                    -2
-                )
+                    -2,
+                ),
             )[1];
             // @codeCoverageIgnoreStart
         } catch (\ReflectionException $e) {
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/ConsecutiveParameters.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/ConsecutiveParameters.php
index 2188ea0f..703c1434 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/ConsecutiveParameters.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/ConsecutiveParameters.php
@@ -47,8 +47,8 @@ final class ConsecutiveParameters implements ParametersRule
                     sprintf(
                         'Parameter group #%d must be an array or Traversable, got %s',
                         $index,
-                        gettype($parameters)
-                    )
+                        gettype($parameters),
+                    ),
                 );
             }
 
@@ -111,8 +111,8 @@ final class ConsecutiveParameters implements ParametersRule
             throw new ExpectationFailedException(
                 sprintf(
                     'Parameter count for invocation %s is too low.',
-                    $invocation->toString()
-                )
+                    $invocation->toString(),
+                ),
             );
         }
 
@@ -124,8 +124,8 @@ final class ConsecutiveParameters implements ParametersRule
                     'value.',
                     $i,
                     $callIndex,
-                    $invocation->toString()
-                )
+                    $invocation->toString(),
+                ),
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php
index 9b51f4ef..d56618cb 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php
@@ -64,8 +64,8 @@ final class InvokedAtIndex extends InvocationOrder
             throw new ExpectationFailedException(
                 sprintf(
                     'The expected invocation at index %s was never reached.',
-                    $this->sequenceIndex
-                )
+                    $this->sequenceIndex,
+                ),
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastCount.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastCount.php
index a84aa655..afc880e1 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastCount.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastCount.php
@@ -48,7 +48,7 @@ final class InvokedAtLeastCount extends InvocationOrder
         if ($count < $this->requiredInvocations) {
             throw new ExpectationFailedException(
                 'Expected invocation at least ' . $this->requiredInvocations .
-                ' times but it occurred ' . $count . ' time(s).'
+                ' times but it occurred ' . $count . ' time(s).',
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastOnce.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastOnce.php
index d0ad1f80..645ed309 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastOnce.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtLeastOnce.php
@@ -34,7 +34,7 @@ final class InvokedAtLeastOnce extends InvocationOrder
 
         if ($count < 1) {
             throw new ExpectationFailedException(
-                'Expected invocation at least once but it never occurred.'
+                'Expected invocation at least once but it never occurred.',
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtMostCount.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtMostCount.php
index c3b815aa..df81a613 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtMostCount.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtMostCount.php
@@ -48,7 +48,7 @@ final class InvokedAtMostCount extends InvocationOrder
         if ($count > $this->allowedInvocations) {
             throw new ExpectationFailedException(
                 'Expected invocation at most ' . $this->allowedInvocations .
-                ' times but it occurred ' . $count . ' time(s).'
+                ' times but it occurred ' . $count . ' time(s).',
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedCount.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedCount.php
index 188326c9..a962118e 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedCount.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedCount.php
@@ -62,8 +62,8 @@ final class InvokedCount extends InvocationOrder
                     'Method was expected to be called %d times, ' .
                     'actually called %d times.',
                     $this->expectedCount,
-                    $count
-                )
+                    $count,
+                ),
             );
         }
     }
@@ -92,7 +92,7 @@ final class InvokedCount extends InvocationOrder
                 default:
                     $message .= sprintf(
                         'was not expected to be called more than %d times.',
-                        $this->expectedCount
+                        $this->expectedCount,
                     );
             }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/Parameters.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/Parameters.php
index 3f1cc53a..cb71b271 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/Parameters.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/Parameters.php
@@ -47,7 +47,7 @@ final class Parameters implements ParametersRule
         foreach ($parameters as $parameter) {
             if (!($parameter instanceof Constraint)) {
                 $parameter = new IsEqual(
-                    $parameter
+                    $parameter,
                 );
             }
 
@@ -127,7 +127,7 @@ final class Parameters implements ParametersRule
             }
 
             throw new ExpectationFailedException(
-                sprintf($message, $this->invocation->toString())
+                sprintf($message, $this->invocation->toString()),
             );
         }
 
@@ -138,8 +138,8 @@ final class Parameters implements ParametersRule
                     'Parameter %s for invocation %s does not match expected ' .
                     'value.',
                     $i,
-                    $this->invocation->toString()
-                )
+                    $this->invocation->toString(),
+                ),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php
index 0dcf386b..8b01656f 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php
@@ -51,7 +51,7 @@ final class ConsecutiveCalls implements Stub
 
         return sprintf(
             'return user-specified value %s',
-            $exporter->export($this->value)
+            $exporter->export($this->value),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php
index 5d64c96a..aa9074eb 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php
@@ -40,7 +40,7 @@ final class Exception implements Stub
 
         return sprintf(
             'raise user-specified exception %s',
-            $exporter->export($this->exception)
+            $exporter->export($this->exception),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php
index e02181e9..0f24aafc 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php
@@ -49,7 +49,7 @@ final class ReturnCallback implements Stub
                 'passed arguments',
                 $class,
                 $type,
-                $this->callback[1]
+                $this->callback[1],
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php
index 0d288ceb..ea2bb735 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php
@@ -39,7 +39,7 @@ final class ReturnReference implements Stub
 
         return sprintf(
             'return user-specified reference %s',
-            $exporter->export($this->reference)
+            $exporter->export($this->reference),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php
index fbcd0a07..4ecbc3b9 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php
@@ -39,7 +39,7 @@ final class ReturnStub implements Stub
 
         return sprintf(
             'return user-specified value %s',
-            $exporter->export($this->value)
+            $exporter->export($this->value),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php b/www/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php
index 51c00619..6f8a267c 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php
@@ -15,17 +15,17 @@ namespace PHPUnit\Framework;
 final class SkippedTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestBuilder.php b/www/vendor/phpunit/phpunit/src/Framework/TestBuilder.php
index 5dd91e21..77404df0 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/TestBuilder.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/TestBuilder.php
@@ -31,28 +31,28 @@ final class TestBuilder
 
         if (!$theClass->isInstantiable()) {
             return new ErrorTestCase(
-                sprintf('Cannot instantiate class "%s".', $className)
+                sprintf('Cannot instantiate class "%s".', $className),
             );
         }
 
         $backupSettings = TestUtil::getBackupSettings(
             $className,
-            $methodName
+            $methodName,
         );
 
         $preserveGlobalState = TestUtil::getPreserveGlobalStateSettings(
             $className,
-            $methodName
+            $methodName,
         );
 
         $runTestInSeparateProcess = TestUtil::getProcessIsolationSettings(
             $className,
-            $methodName
+            $methodName,
         );
 
         $runClassInSeparateProcess = TestUtil::getClassProcessIsolationSettings(
             $className,
-            $methodName
+            $methodName,
         );
 
         $constructor = $theClass->getConstructor();
@@ -71,14 +71,14 @@ final class TestBuilder
             try {
                 $data = TestUtil::getProvidedData(
                     $className,
-                    $methodName
+                    $methodName,
                 );
             } catch (IncompleteTestError $e) {
                 $message = sprintf(
                     "Test for %s::%s marked incomplete by data provider\n%s",
                     $className,
                     $methodName,
-                    $this->throwableToString($e)
+                    $this->throwableToString($e),
                 );
 
                 $data = new IncompleteTestCase($className, $methodName, $message);
@@ -87,7 +87,7 @@ final class TestBuilder
                     "Test for %s::%s skipped by data provider\n%s",
                     $className,
                     $methodName,
-                    $this->throwableToString($e)
+                    $this->throwableToString($e),
                 );
 
                 $data = new SkippedTestCase($className, $methodName, $message);
@@ -96,7 +96,7 @@ final class TestBuilder
                     "The data provider specified for %s::%s is invalid.\n%s",
                     $className,
                     $methodName,
-                    $this->throwableToString($t)
+                    $this->throwableToString($t),
                 );
 
                 $data = new ErrorTestCase($message);
@@ -111,7 +111,7 @@ final class TestBuilder
                     $runTestInSeparateProcess,
                     $preserveGlobalState,
                     $runClassInSeparateProcess,
-                    $backupSettings
+                    $backupSettings,
                 );
             } else {
                 $test = $this->buildTestWithoutData($className);
@@ -125,7 +125,7 @@ final class TestBuilder
                 $runTestInSeparateProcess,
                 $preserveGlobalState,
                 $runClassInSeparateProcess,
-                $backupSettings
+                $backupSettings,
             );
         }
 
@@ -149,7 +149,7 @@ final class TestBuilder
         array $backupSettings
     ): DataProviderTestSuite {
         $dataProviderTestSuite = new DataProviderTestSuite(
-            $className . '::' . $methodName
+            $className . '::' . $methodName,
         );
 
         $groups = TestUtil::getGroups($className, $methodName);
@@ -169,7 +169,7 @@ final class TestBuilder
                     $runTestInSeparateProcess,
                     $preserveGlobalState,
                     $runClassInSeparateProcess,
-                    $backupSettings
+                    $backupSettings,
                 );
 
                 $dataProviderTestSuite->addTest($_test, $groups);
@@ -208,7 +208,7 @@ final class TestBuilder
 
         if ($backupSettings['backupStaticAttributes'] !== null) {
             $test->setBackupStaticAttributes(
-                $backupSettings['backupStaticAttributes']
+                $backupSettings['backupStaticAttributes'],
             );
         }
     }
@@ -225,7 +225,7 @@ final class TestBuilder
             return sprintf(
                 "%s\n%s",
                 $message,
-                Filter::getFilteredStacktrace($t)
+                Filter::getFilteredStacktrace($t),
             );
         }
 
@@ -233,7 +233,7 @@ final class TestBuilder
             "%s: %s\n%s",
             get_class($t),
             $message,
-            Filter::getFilteredStacktrace($t)
+            Filter::getFilteredStacktrace($t),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestCase.php b/www/vendor/phpunit/phpunit/src/Framework/TestCase.php
index 2d83fe01..380759b6 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/TestCase.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/TestCase.php
@@ -139,7 +139,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     protected $backupGlobalsBlacklist = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes;
 
@@ -156,7 +156,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     protected $backupStaticAttributesBlacklist = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess;
 
@@ -171,7 +171,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     protected $providedTests = [];
 
     /**
-     * @var bool
+     * @var ?bool
      */
     private $runClassInSeparateProcess;
 
@@ -374,7 +374,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     public static function atLeast(int $requiredInvocations): InvokedAtLeastCountMatcher
     {
         return new InvokedAtLeastCountMatcher(
-            $requiredInvocations
+            $requiredInvocations,
         );
     }
 
@@ -429,7 +429,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
 
             if (isset($frame['object']) && $frame['object'] instanceof self) {
                 $frame['object']->addWarning(
-                    'The at() matcher has been deprecated. It will be removed in PHPUnit 10. Please refactor your test to not rely on the order in which methods are invoked.'
+                    'The at() matcher has been deprecated. It will be removed in PHPUnit 10. Please refactor your test to not rely on the order in which methods are invoked.',
                 );
 
                 break;
@@ -555,7 +555,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -563,7 +563,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
         $buffer = sprintf(
             '%s::%s',
             $class->name,
-            $this->getName(false)
+            $this->getName(false),
         );
 
         return $buffer . $this->getDataSetAsString();
@@ -837,18 +837,18 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
 
             if ($runEntireClass) {
                 $template = new Template(
-                    __DIR__ . '/../Util/PHP/Template/TestCaseClass.tpl'
+                    __DIR__ . '/../Util/PHP/Template/TestCaseClass.tpl',
                 );
             } else {
                 $template = new Template(
-                    __DIR__ . '/../Util/PHP/Template/TestCaseMethod.tpl'
+                    __DIR__ . '/../Util/PHP/Template/TestCaseMethod.tpl',
                 );
             }
 
@@ -1043,7 +1043,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     {
         return TestUtil::getSize(
             static::class,
-            $this->getName(false)
+            $this->getName(false),
         );
     }
 
@@ -1222,8 +1222,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 throw new Warning(
                     implode(
                         "\n",
-                        array_unique($this->warnings)
-                    )
+                        array_unique($this->warnings),
+                    ),
                 );
             }
 
@@ -1596,7 +1596,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     {
         if (trim($this->name) === '') {
             throw new Exception(
-                'PHPUnit\Framework\TestCase::$name must be a non-blank string.'
+                'PHPUnit\Framework\TestCase::$name must be a non-blank string.',
             );
         }
 
@@ -1617,15 +1617,15 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                         $exception,
                         LogicalOr::fromConstraints(
                             new ExceptionConstraint(Error::class),
-                            new ExceptionConstraint(\Error::class)
-                        )
+                            new ExceptionConstraint(\Error::class),
+                        ),
                     );
                 } else {
                     $this->assertThat(
                         $exception,
                         new ExceptionConstraint(
-                            $this->expectedException
-                        )
+                            $this->expectedException,
+                        ),
                     );
                 }
             }
@@ -1634,8 +1634,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 $this->assertThat(
                     $exception,
                     new ExceptionMessage(
-                        $this->expectedExceptionMessage
-                    )
+                        $this->expectedExceptionMessage,
+                    ),
                 );
             }
 
@@ -1643,8 +1643,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 $this->assertThat(
                     $exception,
                     new ExceptionMessageRegularExpression(
-                        $this->expectedExceptionMessageRegExp
-                    )
+                        $this->expectedExceptionMessageRegExp,
+                    ),
                 );
             }
 
@@ -1652,8 +1652,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 $this->assertThat(
                     $exception,
                     new ExceptionCode(
-                        $this->expectedExceptionCode
-                    )
+                        $this->expectedExceptionCode,
+                    ),
                 );
             }
 
@@ -1664,8 +1664,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $this->assertThat(
                 null,
                 new ExceptionConstraint(
-                    $this->expectedException
-                )
+                    $this->expectedException,
+                ),
             );
         } elseif ($this->expectedExceptionMessage !== null) {
             $this->numAssertions++;
@@ -1673,8 +1673,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             throw new AssertionFailedError(
                 sprintf(
                     'Failed asserting that exception with message "%s" is thrown',
-                    $this->expectedExceptionMessage
-                )
+                    $this->expectedExceptionMessage,
+                ),
             );
         } elseif ($this->expectedExceptionMessageRegExp !== null) {
             $this->numAssertions++;
@@ -1682,8 +1682,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             throw new AssertionFailedError(
                 sprintf(
                     'Failed asserting that exception with message matching "%s" is thrown',
-                    $this->expectedExceptionMessageRegExp
-                )
+                    $this->expectedExceptionMessageRegExp,
+                ),
             );
         } elseif ($this->expectedExceptionCode !== null) {
             $this->numAssertions++;
@@ -1691,8 +1691,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             throw new AssertionFailedError(
                 sprintf(
                     'Failed asserting that exception with code "%s" is thrown',
-                    $this->expectedExceptionCode
-                )
+                    $this->expectedExceptionCode,
+                ),
             );
         }
 
@@ -1717,8 +1717,8 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 sprintf(
                     'INI setting "%s" could not be set to "%s".',
                     $varName,
-                    $newValue
-                )
+                    $newValue,
+                ),
             );
         }
     }
@@ -1753,7 +1753,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             throw new Exception(
                 'The locale functionality is not implemented on your platform, ' .
                 'the specified locale does not exist or the category name is ' .
-                'invalid.'
+                'invalid.',
             );
         }
     }
@@ -1826,7 +1826,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -1836,7 +1836,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             static function (string $method) use ($reflector)
             {
                 return !$reflector->hasMethod($method);
-            }
+            },
         );
 
         if ($mockedMethodsThatDontExist) {
@@ -1844,18 +1844,18 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 sprintf(
                     'createPartialMock() called with method(s) %s that do not exist in %s. This will not be allowed in future versions of PHPUnit.',
                     implode(', ', $mockedMethodsThatDontExist),
-                    $originalClassName
-                )
+                    $originalClassName,
+                ),
             );
         }
 
         return $this->getMockBuilder($originalClassName)
-                    ->disableOriginalConstructor()
-                    ->disableOriginalClone()
-                    ->disableArgumentCloning()
-                    ->disallowMockingUnknownTypes()
-                    ->setMethods(empty($methods) ? null : $methods)
-                    ->getMock();
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->setMethods(empty($methods) ? null : $methods)
+            ->getMock();
     }
 
     /**
@@ -1870,9 +1870,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     protected function createTestProxy(string $originalClassName, array $constructorArguments = []): MockObject
     {
         return $this->getMockBuilder($originalClassName)
-                    ->setConstructorArgs($constructorArguments)
-                    ->enableProxyingToOriginalMethods()
-                    ->getMock();
+            ->setConstructorArgs($constructorArguments)
+            ->enableProxyingToOriginalMethods()
+            ->getMock();
     }
 
     /**
@@ -1902,7 +1902,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $callOriginalConstructor,
             $callOriginalClone,
             $callAutoload,
-            $cloneArguments
+            $cloneArguments,
         );
 
         return get_class($mock);
@@ -1931,7 +1931,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $callOriginalClone,
             $callAutoload,
             $mockedMethods,
-            $cloneArguments
+            $cloneArguments,
         );
 
         $this->registerMockObject($mockObject);
@@ -1963,7 +1963,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                     $wsdlFile,
                     $originalClassName,
                     $methods,
-                    $options
+                    $options,
                 )
             );
         }
@@ -1975,7 +1975,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $mockClassName,
             $callOriginalConstructor,
             false,
-            false
+            false,
         );
 
         $this->registerMockObject($mockObject);
@@ -2002,7 +2002,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $callOriginalClone,
             $callAutoload,
             $mockedMethods,
-            $cloneArguments
+            $cloneArguments,
         );
 
         $this->registerMockObject($mockObject);
@@ -2024,7 +2024,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $traitClassName,
             $callAutoload,
             $callOriginalConstructor,
-            $arguments
+            $arguments,
         );
     }
 
@@ -2088,7 +2088,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             }
 
             $mockObject->__phpunit_verify(
-                $this->shouldInvocationMockerBeReset($mockObject)
+                $this->shouldInvocationMockerBeReset($mockObject),
             );
         }
 
@@ -2121,7 +2121,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
 
         $missingRequirements = TestUtil::getMissingRequirements(
             static::class,
-            $this->name
+            $this->name,
         );
 
         if (!empty($missingRequirements)) {
@@ -2187,9 +2187,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                     $this->result->addError(
                         $this,
                         new SkippedTestError(
-                            'This test depends on a test that is larger than itself.'
+                            'This test depends on a test that is larger than itself.',
                         ),
-                        0
+                        0,
                     );
 
                     return false;
@@ -2222,9 +2222,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
         $this->result->addError(
             $this,
             new SkippedTestError(
-                'This method has an invalid @depends annotation.'
+                'This method has an invalid @depends annotation.',
             ),
-            0
+            0,
         );
 
         $this->result->endTest($this, 0);
@@ -2241,10 +2241,10 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             new SkippedTestError(
                 sprintf(
                     'This test depends on "%s" to pass.',
-                    $dependency->getTarget()
-                )
+                    $dependency->getTarget(),
+                ),
             ),
-            0
+            0,
         );
 
         $this->result->endTest($this, 0);
@@ -2261,10 +2261,10 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             new Warning(
                 sprintf(
                     'This test depends on "%s" which does not exist.',
-                    $dependency->getTarget()
-                )
+                    $dependency->getTarget(),
+                ),
             ),
-            0
+            0,
         );
 
         $this->result->endTest($this, 0);
@@ -2301,7 +2301,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             }
 
             throw new RiskyTestError(
-                'Test code or tested code did not (only) close its own output buffers'
+                'Test code or tested code did not (only) close its own output buffers',
             );
         }
 
@@ -2341,7 +2341,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             try {
                 $this->compareGlobalStateSnapshots(
                     $this->snapshot,
-                    $this->createGlobalStateSnapshot($this->backupGlobals === true)
+                    $this->createGlobalStateSnapshot($this->backupGlobals === true),
                 );
             } catch (RiskyTestError $rte) {
                 // Intentionally left empty
@@ -2419,7 +2419,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             false,
             false,
             false,
-            false
+            false,
         );
     }
 
@@ -2435,13 +2435,13 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $this->compareGlobalStateSnapshotPart(
                 $before->globalVariables(),
                 $after->globalVariables(),
-                "--- Global variables before the test\n+++ Global variables after the test\n"
+                "--- Global variables before the test\n+++ Global variables after the test\n",
             );
 
             $this->compareGlobalStateSnapshotPart(
                 $before->superGlobalVariables(),
                 $after->superGlobalVariables(),
-                "--- Super-global variables before the test\n+++ Super-global variables after the test\n"
+                "--- Super-global variables before the test\n+++ Super-global variables after the test\n",
             );
         }
 
@@ -2449,7 +2449,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
             $this->compareGlobalStateSnapshotPart(
                 $before->staticAttributes(),
                 $after->staticAttributes(),
-                "--- Static attributes before the test\n+++ Static attributes after the test\n"
+                "--- Static attributes before the test\n+++ Static attributes after the test\n",
             );
         }
     }
@@ -2465,11 +2465,11 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
 
             $diff = $differ->diff(
                 $exporter->export($before),
-                $exporter->export($after)
+                $exporter->export($after),
             );
 
             throw new RiskyTestError(
-                $diff
+                $diff,
             );
         }
     }
@@ -2527,7 +2527,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
 
                     $this->registerMockObjectsFromTestArguments(
                         $testArgument,
-                        $visited
+                        $visited,
                     );
                 }
             }
@@ -2538,7 +2538,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     {
         $annotations = TestUtil::parseTestMethodAnnotations(
             static::class,
-            $this->name
+            $this->name,
         );
 
         if (isset($annotations['method']['doesNotPerformAssertions'])) {
@@ -2598,7 +2598,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -2660,10 +2660,10 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T
     private function createMockObject(string $originalClassName): MockObject
     {
         return $this->getMockBuilder($originalClassName)
-                    ->disableOriginalConstructor()
-                    ->disableOriginalClone()
-                    ->disableArgumentCloning()
-                    ->disallowMockingUnknownTypes()
-                    ->getMock();
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->getMock();
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestFailure.php b/www/vendor/phpunit/phpunit/src/Framework/TestFailure.php
index 0764bc78..f49dfc35 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/TestFailure.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/TestFailure.php
@@ -95,7 +95,7 @@ final class TestFailure
         return sprintf(
             '%s: %s',
             $this->testName,
-            $this->thrownException->getMessage()
+            $this->thrownException->getMessage(),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestResult.php b/www/vendor/phpunit/phpunit/src/Framework/TestResult.php
index 22150a5a..2c487255 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/TestResult.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/TestResult.php
@@ -460,7 +460,7 @@ final class TestResult implements Countable
                 'result' => $test->getResult(),
                 'size'   => TestUtil::getSize(
                     $class,
-                    $test->getName(false)
+                    $test->getName(false),
                 ),
             ];
 
@@ -646,7 +646,7 @@ final class TestResult implements Countable
 
         if ($test instanceof TestCase) {
             $test->setRegisterMockObjectsFromTestArgumentsRecursively(
-                $this->registerMockObjectsFromTestArgumentsRecursively
+                $this->registerMockObjectsFromTestArgumentsRecursively,
             );
 
             $isAnyCoverageRequired = TestUtil::requiresCodeCoverageDataCollection($test);
@@ -667,7 +667,7 @@ final class TestResult implements Countable
                 $this->convertDeprecationsToExceptions,
                 $this->convertErrorsToExceptions,
                 $this->convertNoticesToExceptions,
-                $this->convertWarningsToExceptions
+                $this->convertWarningsToExceptions,
             );
 
             $errorHandler->register();
@@ -731,9 +731,9 @@ final class TestResult implements Countable
             $this->addFailure(
                 $test,
                 new RiskyTestError(
-                    $e->getMessage()
+                    $e->getMessage(),
                 ),
-                $_timeout
+                $_timeout,
             );
 
             $risky = true;
@@ -758,10 +758,10 @@ final class TestResult implements Countable
                     '%s in %s:%s',
                     $e->getMessage(),
                     $frame['file'] ?? $e->getFile(),
-                    $frame['line'] ?? $e->getLine()
+                    $frame['line'] ?? $e->getLine(),
                 ),
                 0,
-                $e
+                $e,
             );
         } catch (Warning $e) {
             $warning = true;
@@ -794,10 +794,10 @@ final class TestResult implements Countable
                                 '%s() used in %s:%s',
                                 $function['function'],
                                 $function['filename'],
-                                $function['lineno']
-                            )
+                                $function['lineno'],
+                            ),
                         ),
-                        $time
+                        $time,
                     );
                 }
             }
@@ -812,7 +812,7 @@ final class TestResult implements Countable
         if ($this->forceCoversAnnotation && !$error && !$failure && !$warning && !$incomplete && !$skipped && !$risky) {
             $annotations = TestUtil::parseTestMethodAnnotations(
                 get_class($test),
-                $test->getName(false)
+                $test->getName(false),
             );
 
             if (!isset($annotations['class']['covers']) &&
@@ -822,9 +822,9 @@ final class TestResult implements Countable
                 $this->addFailure(
                     $test,
                     new MissingCoversAnnotationException(
-                        'This test does not have a @covers annotation but is expected to have one'
+                        'This test does not have a @covers annotation but is expected to have one',
                     ),
-                    $time
+                    $time,
                 );
 
                 $risky = true;
@@ -840,20 +840,20 @@ final class TestResult implements Countable
                 try {
                     $linesToBeCovered = TestUtil::getLinesToBeCovered(
                         get_class($test),
-                        $test->getName(false)
+                        $test->getName(false),
                     );
 
                     $linesToBeUsed = TestUtil::getLinesToBeUsed(
                         get_class($test),
-                        $test->getName(false)
+                        $test->getName(false),
                     );
                 } catch (InvalidCoversTargetException $cce) {
                     $this->addWarning(
                         $test,
                         new Warning(
-                            $cce->getMessage()
+                            $cce->getMessage(),
                         ),
-                        $time
+                        $time,
                     );
                 }
             }
@@ -862,12 +862,12 @@ final class TestResult implements Countable
                 $this->codeCoverage->stop(
                     $append,
                     $linesToBeCovered,
-                    $linesToBeUsed
+                    $linesToBeUsed,
                 );
             } catch (UnintentionallyCoveredCodeException $cce) {
                 $unintentionallyCoveredCodeError = new UnintentionallyCoveredCodeError(
                     'This test executed code that is not listed as code to be covered or used:' .
-                    PHP_EOL . $cce->getMessage()
+                    PHP_EOL . $cce->getMessage(),
                 );
             } catch (OriginalCodeCoverageException $cce) {
                 $error = true;
@@ -892,7 +892,7 @@ final class TestResult implements Countable
             $this->addFailure(
                 $test,
                 $unintentionallyCoveredCodeError,
-                $time
+                $time,
             );
         } elseif ($this->beStrictAboutTestsThatDoNotTestAnything &&
             !$test->doesNotPerformAssertions() &&
@@ -904,7 +904,7 @@ final class TestResult implements Countable
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -919,7 +919,7 @@ final class TestResult implements Countable
                     throw new Exception(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
@@ -931,10 +931,10 @@ final class TestResult implements Countable
                     sprintf(
                         "This test did not perform any assertions\n\n%s:%d",
                         $reflected->getFileName(),
-                        $reflected->getStartLine()
-                    )
+                        $reflected->getStartLine(),
+                    ),
                 ),
-                $time
+                $time,
             );
         } elseif ($this->beStrictAboutTestsThatDoNotTestAnything &&
             $test->doesNotPerformAssertions() &&
@@ -944,10 +944,10 @@ final class TestResult implements Countable
                 new RiskyTestError(
                     sprintf(
                         'This test is annotated with "@doesNotPerformAssertions" but performed %d assertions',
-                        $test->getNumAssertions()
-                    )
+                        $test->getNumAssertions(),
+                    ),
                 ),
-                $time
+                $time,
             );
         } elseif ($this->beStrictAboutOutputDuringTests && $test->hasOutput()) {
             $this->addFailure(
@@ -955,24 +955,24 @@ final class TestResult implements Countable
                 new OutputError(
                     sprintf(
                         'This test printed output: %s',
-                        $test->getActualOutput()
-                    )
+                        $test->getActualOutput(),
+                    ),
                 ),
-                $time
+                $time,
             );
         } elseif ($this->beStrictAboutTodoAnnotatedTests && $test instanceof TestCase) {
             $annotations = TestUtil::parseTestMethodAnnotations(
                 get_class($test),
-                $test->getName(false)
+                $test->getName(false),
             );
 
             if (isset($annotations['method']['todo'])) {
                 $this->addFailure(
                     $test,
                     new RiskyTestError(
-                        'Test method is annotated with @todo'
+                        'Test method is annotated with @todo',
                     ),
-                    $time
+                    $time,
                 );
             }
         }
diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php b/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php
index e7cef62e..f537eb93 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php
@@ -166,7 +166,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
         if (!is_string($theClass) && !$theClass instanceof ReflectionClass) {
             throw InvalidArgumentException::create(
                 1,
-                'ReflectionClass object or string'
+                'ReflectionClass object or string',
             );
         }
 
@@ -184,7 +184,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                     throw new Exception(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
@@ -215,9 +215,9 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                 new WarningTestCase(
                     sprintf(
                         'Class "%s" has no public constructor.',
-                        $theClass->getName()
-                    )
-                )
+                        $theClass->getName(),
+                    ),
+                ),
             );
 
             return;
@@ -236,9 +236,9 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                 new WarningTestCase(
                     sprintf(
                         'No tests found in class "%s".',
-                        $theClass->getName()
-                    )
-                )
+                        $theClass->getName(),
+                    ),
+                ),
             );
         }
 
@@ -267,7 +267,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -310,7 +310,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
         if (!(is_object($testClass) || (is_string($testClass) && class_exists($testClass)))) {
             throw InvalidArgumentException::create(
                 1,
-                'class name or object'
+                'class name or object',
             );
         }
 
@@ -322,7 +322,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -336,21 +336,21 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
             if (!$testClass->isAbstract() && $testClass->hasMethod(BaseTestRunner::SUITE_METHODNAME)) {
                 try {
                     $method = $testClass->getMethod(
-                        BaseTestRunner::SUITE_METHODNAME
+                        BaseTestRunner::SUITE_METHODNAME,
                     );
                     // @codeCoverageIgnoreStart
                 } catch (ReflectionException $e) {
                     throw new Exception(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
 
                 if ($method->isStatic()) {
                     $this->addTest(
-                        $method->invoke(null, $testClass->getName())
+                        $method->invoke(null, $testClass->getName()),
                     );
 
                     $suiteMethod = true;
@@ -425,7 +425,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                     throw new Exception(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
@@ -447,7 +447,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -460,8 +460,8 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                 $this->addWarning(
                     sprintf(
                         'Abstract test case classes with "Test" suffix are deprecated (%s)',
-                        $class->getName()
-                    )
+                        $class->getName(),
+                    ),
                 );
             }
 
@@ -469,14 +469,14 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                 if ($class->hasMethod(BaseTestRunner::SUITE_METHODNAME)) {
                     try {
                         $method = $class->getMethod(
-                            BaseTestRunner::SUITE_METHODNAME
+                            BaseTestRunner::SUITE_METHODNAME,
                         );
                         // @codeCoverageIgnoreStart
                     } catch (ReflectionException $e) {
                         throw new Exception(
                             $e->getMessage(),
                             $e->getCode(),
-                            $e
+                            $e,
                         );
                     }
                     // @codeCoverageIgnoreEnd
@@ -493,7 +493,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                         $expectedClassName = substr(
                             $expectedClassName,
                             0,
-                            $pos
+                            $pos,
                         );
                     }
 
@@ -503,8 +503,8 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                                 "Test case class not matching filename is deprecated\n               in %s\n               Class name was '%s', expected '%s'",
                                 $filename,
                                 $class->getShortName(),
-                                $expectedClassName
-                            )
+                                $expectedClassName,
+                            ),
                         );
                     }
 
@@ -517,8 +517,8 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
             $this->addWarning(
                 sprintf(
                     "Multiple test case classes per file is deprecated\n               in %s",
-                    $filename
-                )
+                    $filename,
+                ),
             );
         }
 
@@ -573,7 +573,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
             {
                 return (string) $key;
             },
-            array_keys($this->groups)
+            array_keys($this->groups),
         );
     }
 
@@ -628,7 +628,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                         call_user_func([$this->name, $beforeClassMethod]);
                     }
                 }
-            } catch (SkippedTestSuiteError|SkippedTestError $error) {
+            } catch (SkippedTestError|SkippedTestSuiteError $error) {
                 foreach ($this->tests() as $test) {
                     $result->startTest($test);
                     $result->addFailure($test, $error, 0);
@@ -656,7 +656,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                         $result->addFailure(
                             $test,
                             new SkippedTestError('Test skipped because of an error in hook method'),
-                            0
+                            0,
                         );
                     }
 
@@ -857,7 +857,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
                 }
                 $this->requiredTests = ExecutionOrderDependency::mergeUnique(
                     ExecutionOrderDependency::filterInvalid($this->requiredTests),
-                    $test->requires()
+                    $test->requires(),
                 );
             }
 
@@ -891,13 +891,13 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
 
         if ($test instanceof TestCase || $test instanceof DataProviderTestSuite) {
             $test->setDependencies(
-                TestUtil::getDependencies($class->getName(), $methodName)
+                TestUtil::getDependencies($class->getName(), $methodName),
             );
         }
 
         $this->addTest(
             $test,
-            TestUtil::getGroups($class->getName(), $methodName)
+            TestUtil::getGroups($class->getName(), $methodName),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php b/www/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php
index 76b12fcf..27c9d8b4 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php
@@ -67,7 +67,7 @@ final class TestSuiteIterator implements RecursiveIterator
     {
         if (!$this->hasChildren()) {
             throw new NoChildTestSuiteException(
-                'The current item is not a TestSuite instance and therefore does not have any children.'
+                'The current item is not a TestSuite instance and therefore does not have any children.',
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Framework/WarningTestCase.php b/www/vendor/phpunit/phpunit/src/Framework/WarningTestCase.php
index e1e41bc4..d27c6b57 100644
--- a/www/vendor/phpunit/phpunit/src/Framework/WarningTestCase.php
+++ b/www/vendor/phpunit/phpunit/src/Framework/WarningTestCase.php
@@ -15,17 +15,17 @@ namespace PHPUnit\Framework;
 final class WarningTestCase extends TestCase
 {
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupGlobals = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $backupStaticAttributes = false;
 
     /**
-     * @var bool
+     * @var ?bool
      */
     protected $runTestInSeparateProcess = false;
 
diff --git a/www/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php b/www/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
index 75a70ca5..bbef329f 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
@@ -91,7 +91,7 @@ abstract class BaseTestRunner
             /** @var string[] $files */
             $files = (new FileIteratorFacade)->getFilesAsArray(
                 $suiteClassFile,
-                $suffixes
+                $suffixes,
             );
 
             $suite = new TestSuite($suiteClassFile);
@@ -109,7 +109,7 @@ abstract class BaseTestRunner
 
         try {
             $testClass = $this->loadSuiteClass(
-                $suiteClassFile
+                $suiteClassFile,
             );
         } catch (\PHPUnit\Exception $e) {
             $this->runFailed($e->getMessage());
@@ -122,7 +122,7 @@ abstract class BaseTestRunner
 
             if (!$suiteMethod->isStatic()) {
                 $this->runFailed(
-                    'suite() method must be static.'
+                    'suite() method must be static.',
                 );
 
                 return null;
diff --git a/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php b/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php
index cc22b250..f9d8a90d 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php
@@ -107,7 +107,7 @@ final class DefaultTestResultCache implements TestResultCache
 
         $data = json_decode(
             file_get_contents($this->cacheFilename),
-            true
+            true,
         );
 
         if ($data === null) {
@@ -138,8 +138,8 @@ final class DefaultTestResultCache implements TestResultCache
             throw new Exception(
                 sprintf(
                     'Cannot create directory "%s" for result cache file',
-                    $this->cacheFilename
-                )
+                    $this->cacheFilename,
+                ),
             );
         }
 
@@ -150,9 +150,9 @@ final class DefaultTestResultCache implements TestResultCache
                     'version' => self::VERSION,
                     'defects' => $this->defects,
                     'times'   => $this->times,
-                ]
+                ],
             ),
-            LOCK_EX
+            LOCK_EX,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php b/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php
index 88f7ccad..c57e70e7 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php
@@ -35,8 +35,8 @@ final class ExtensionHandler
             throw new Exception(
                 sprintf(
                     'Class "%s" does not implement a PHPUnit\Runner\Hook interface',
-                    $extensionConfiguration->className()
-                )
+                    $extensionConfiguration->className(),
+                ),
             );
         }
 
@@ -56,8 +56,8 @@ final class ExtensionHandler
             throw new Exception(
                 sprintf(
                     'Class "%s" does not implement the PHPUnit\Framework\TestListener interface',
-                    $listenerConfiguration->className()
-                )
+                    $listenerConfiguration->className(),
+                ),
             );
         }
 
@@ -77,7 +77,7 @@ final class ExtensionHandler
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
 
@@ -110,8 +110,8 @@ final class ExtensionHandler
             throw new Exception(
                 sprintf(
                     'Class "%s" does not exist',
-                    $extensionConfiguration->className()
-                )
+                    $extensionConfiguration->className(),
+                ),
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php b/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php
index e76e12ce..c65b1948 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php
@@ -9,7 +9,11 @@
  */
 namespace PHPUnit\Runner\Extension;
 
+use function count;
+use function explode;
+use function implode;
 use function is_file;
+use function strpos;
 use PharIo\Manifest\ApplicationName;
 use PharIo\Manifest\Exception as ManifestException;
 use PharIo\Manifest\ManifestLoader;
@@ -39,7 +43,7 @@ final class PharLoader
 
             try {
                 $applicationName = new ApplicationName('phpunit/phpunit');
-                $version         = new PharIoVersion(Version::series());
+                $version         = new PharIoVersion($this->phpunitVersion());
                 $manifest        = ManifestLoader::fromFile('phar://' . $file . '/manifest.xml');
 
                 if (!$manifest->isExtensionFor($applicationName)) {
@@ -74,4 +78,21 @@ final class PharLoader
             'notLoadedExtensions' => $notLoadedExtensions,
         ];
     }
+
+    private function phpunitVersion(): string
+    {
+        $version = Version::id();
+
+        if (strpos($version, '-') === false) {
+            return $version;
+        }
+
+        $parts = explode('.', explode('-', $version)[0]);
+
+        if (count($parts) === 2) {
+            $parts[] = 0;
+        }
+
+        return implode('.', $parts);
+    }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php b/www/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
index 3f79da54..b7d83b9f 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
@@ -39,8 +39,8 @@ final class Factory
             throw new Exception(
                 sprintf(
                     'Class "%s" does not extend RecursiveFilterIterator',
-                    $filter->name
-                )
+                    $filter->name,
+                ),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php b/www/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php
index 42ca77a3..b203c196 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php
@@ -35,7 +35,7 @@ abstract class GroupFilterIterator extends RecursiveFilterIterator
             if (in_array((string) $group, $groups, true)) {
                 $testHashes = array_map(
                     'spl_object_hash',
-                    $tests
+                    $tests,
                 );
 
                 $this->groupTests = array_merge($this->groupTests, $testHashes);
diff --git a/www/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php b/www/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php
index 7057e1c4..45c62f05 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php
@@ -96,7 +96,7 @@ final class NameFilterIterator extends RecursiveFilterIterator
                 if (isset($matches[3]) && $matches[2] < $matches[3]) {
                     $filter = sprintf(
                         '%s.*with data set #(\d+)$',
-                        $matches[1]
+                        $matches[1],
                     );
 
                     $this->filterMin = (int) $matches[2];
@@ -105,7 +105,7 @@ final class NameFilterIterator extends RecursiveFilterIterator
                     $filter = sprintf(
                         '%s.*with data set #%s$',
                         $matches[1],
-                        $matches[2]
+                        $matches[2],
                     );
                 }
             } // Handles:
@@ -115,7 +115,7 @@ final class NameFilterIterator extends RecursiveFilterIterator
                 $filter = sprintf(
                     '%s.*with data set "%s"$',
                     $matches[1],
-                    $matches[2]
+                    $matches[2],
                 );
             }
 
@@ -126,8 +126,8 @@ final class NameFilterIterator extends RecursiveFilterIterator
                 str_replace(
                     '/',
                     '\\/',
-                    $filter
-                )
+                    $filter,
+                ),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php b/www/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php
index 6590102d..988b0ece 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/PhptTestCase.php
@@ -91,8 +91,8 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
             throw new Exception(
                 sprintf(
                     'File "%s" does not exist.',
-                    $filename
-                )
+                    $filename,
+                ),
             );
         }
 
@@ -223,7 +223,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
                     $trace[0]['file'],
                     $trace[0]['line'],
                     $trace,
-                    $comparisonFailure ? $diff : ''
+                    $comparisonFailure ? $diff : '',
                 );
             }
 
@@ -408,7 +408,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
             $result->addFailure(
                 $this,
                 new SyntheticSkippedError($message, 0, $trace[0]['file'], $trace[0]['line'], $trace),
-                0
+                0,
             );
             $result->endTest($this, 0);
 
@@ -489,7 +489,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
         foreach ($unsupportedSections as $section) {
             if (isset($sections[$section])) {
                 throw new Exception(
-                    "PHPUnit does not support PHPT {$section} sections"
+                    "PHPUnit does not support PHPT {$section} sections",
                 );
             }
         }
@@ -520,8 +520,8 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
                         sprintf(
                             'Could not load --%s-- %s for PHPT file',
                             $section . '_EXTERNAL',
-                            $testDirectory . $externalFilename
-                        )
+                            $testDirectory . $externalFilename,
+                        ),
                     );
                 }
 
@@ -579,7 +579,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
                 "'" . dirname($this->filename) . "'",
                 "'" . $this->filename . "'",
             ],
-            $code
+            $code,
         );
     }
 
@@ -599,7 +599,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
         $files = $this->getCoverageFiles();
 
         $template = new Template(
-            __DIR__ . '/../Util/PHP/Template/PhptTestCase.tpl'
+            __DIR__ . '/../Util/PHP/Template/PhptTestCase.tpl',
         );
 
         $composerAutoload = '\'\'';
@@ -619,7 +619,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
         if (!empty($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
             $globals = '$GLOBALS[\'__PHPUNIT_BOOTSTRAP\'] = ' . var_export(
                 $GLOBALS['__PHPUNIT_BOOTSTRAP'],
-                true
+                true,
             ) . ";\n";
         }
 
@@ -638,7 +638,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
                 'coverageFile'               => $files['coverage'],
                 'driverMethod'               => $pathCoverage ? 'forLineAndPathCoverage' : 'forLineCoverage',
                 'codeCoverageCacheDirectory' => $codeCoverageCacheDirectory,
-            ]
+            ],
         );
 
         file_put_contents($files['job'], $job);
diff --git a/www/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php b/www/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
index 0ed8330e..f957e81a 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
@@ -43,7 +43,7 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
             FileLoader::checkAndLoad($suiteClassFile);
 
             $loadedClasses = array_values(
-                array_diff(get_declared_classes(), $loadedClasses)
+                array_diff(get_declared_classes(), $loadedClasses),
             );
 
             if (empty($loadedClasses)) {
@@ -51,8 +51,8 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
                     sprintf(
                         'Class %s could not be found in %s',
                         $suiteClassName,
-                        $suiteClassFile
-                    )
+                        $suiteClassFile,
+                    ),
                 );
             }
         }
@@ -76,8 +76,8 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
                 sprintf(
                     'Class %s could not be found in %s',
                     $suiteClassName,
-                    $suiteClassFile
-                )
+                    $suiteClassFile,
+                ),
             );
         }
 
@@ -88,7 +88,7 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -99,8 +99,8 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
                     sprintf(
                         'Class %s declared in %s is abstract',
                         $suiteClassName,
-                        $suiteClassFile
-                    )
+                        $suiteClassFile,
+                    ),
                 );
             }
 
@@ -116,8 +116,8 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
                     sprintf(
                         'Method %s::suite() declared in %s is abstract',
                         $suiteClassName,
-                        $suiteClassFile
-                    )
+                        $suiteClassFile,
+                    ),
                 );
             }
 
@@ -126,8 +126,8 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
                     sprintf(
                         'Method %s::suite() declared in %s is not public',
                         $suiteClassName,
-                        $suiteClassFile
-                    )
+                        $suiteClassFile,
+                    ),
                 );
             }
 
@@ -136,8 +136,8 @@ final class StandardTestSuiteLoader implements TestSuiteLoader
                     sprintf(
                         'Method %s::suite() declared in %s is not static',
                         $suiteClassName,
-                        $suiteClassFile
-                    )
+                        $suiteClassFile,
+                    ),
                 );
             }
         }
diff --git a/www/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php b/www/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php
index 64ad845c..9ec82b60 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php
@@ -123,7 +123,7 @@ final class TestSuiteSorter
 
         if (!in_array($order, $allowedOrders, true)) {
             throw new Exception(
-                '$order must be one of TestSuiteSorter::ORDER_[DEFAULT|REVERSED|RANDOMIZED|DURATION|SIZE]'
+                '$order must be one of TestSuiteSorter::ORDER_[DEFAULT|REVERSED|RANDOMIZED|DURATION|SIZE]',
             );
         }
 
@@ -134,7 +134,7 @@ final class TestSuiteSorter
 
         if (!in_array($orderDefects, $allowedOrderDefects, true)) {
             throw new Exception(
-                '$orderDefects must be one of TestSuiteSorter::ORDER_DEFAULT, TestSuiteSorter::ORDER_DEFECTS_FIRST'
+                '$orderDefects must be one of TestSuiteSorter::ORDER_DEFAULT, TestSuiteSorter::ORDER_DEFECTS_FIRST',
             );
         }
 
@@ -240,7 +240,7 @@ final class TestSuiteSorter
             function ($left, $right)
             {
                 return $this->cmpDefectPriorityAndTime($left, $right);
-            }
+            },
         );
 
         return $tests;
@@ -256,7 +256,7 @@ final class TestSuiteSorter
             function ($left, $right)
             {
                 return $this->cmpDuration($left, $right);
-            }
+            },
         );
 
         return $tests;
@@ -272,7 +272,7 @@ final class TestSuiteSorter
             function ($left, $right)
             {
                 return $this->cmpSize($left, $right);
-            }
+            },
         );
 
         return $tests;
diff --git a/www/vendor/phpunit/phpunit/src/Runner/Version.php b/www/vendor/phpunit/phpunit/src/Runner/Version.php
index 268045a4..788c6f0b 100644
--- a/www/vendor/phpunit/phpunit/src/Runner/Version.php
+++ b/www/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -41,7 +41,7 @@ final class Version
         }
 
         if (self::$version === '') {
-            self::$version = (new VersionId('9.6.8', dirname(__DIR__, 2)))->getVersion();
+            self::$version = (new VersionId('9.6.11', dirname(__DIR__, 2)))->getVersion();
         }
 
         return self::$version;
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Builder.php b/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Builder.php
index da488082..51f0a513 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Builder.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Builder.php
@@ -129,13 +129,13 @@ final class Builder
             $options = (new CliParser)->parse(
                 $parameters,
                 self::SHORT_OPTIONS,
-                array_merge(self::LONG_OPTIONS, $additionalLongOptions)
+                array_merge(self::LONG_OPTIONS, $additionalLongOptions),
             );
         } catch (CliParserException $e) {
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
 
@@ -880,7 +880,7 @@ final class Builder
             $verbose,
             $version,
             $coverageFilter,
-            $xdebugFilterFile
+            $xdebugFilterFile,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/Command.php b/www/vendor/phpunit/phpunit/src/TextUI/Command.php
index 0bebad6a..31f71795 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/Command.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/Command.php
@@ -99,7 +99,7 @@ class Command
             throw new RuntimeException(
                 $t->getMessage(),
                 (int) $t->getCode(),
-                $t
+                $t,
             );
         }
     }
@@ -118,7 +118,7 @@ class Command
         } else {
             $suite = $runner->getTest(
                 $this->arguments['test'],
-                $this->arguments['testSuffixes']
+                $this->arguments['testSuffixes'],
             );
         }
 
@@ -256,8 +256,8 @@ class Command
             $this->exitWithErrorMessage(
                 sprintf(
                     'unrecognized --order-by option: %s',
-                    $arguments->unrecognizedOrderBy()
-                )
+                    $arguments->unrecognizedOrderBy(),
+                ),
             );
         }
 
@@ -270,7 +270,7 @@ class Command
         if ($arguments->hasIncludePath()) {
             ini_set(
                 'include_path',
-                $arguments->includePath() . PATH_SEPARATOR . ini_get('include_path')
+                $arguments->includePath() . PATH_SEPARATOR . ini_get('include_path'),
             );
         }
 
@@ -290,8 +290,8 @@ class Command
                 $this->exitWithErrorMessage(
                     sprintf(
                         'Cannot open file "%s".',
-                        $arguments->argument()
-                    )
+                        $arguments->argument(),
+                    ),
                 );
             }
         }
@@ -367,7 +367,7 @@ class Command
 
                 $this->arguments['printer'] = $this->handlePrinter(
                     $phpunitConfiguration->printerClass(),
-                    $file
+                    $file,
                 );
             }
 
@@ -376,7 +376,7 @@ class Command
 
                 $this->arguments['loader'] = $this->handleLoader(
                     $phpunitConfiguration->testSuiteLoaderClass(),
-                    $file
+                    $file,
                 );
             }
 
@@ -388,7 +388,7 @@ class Command
                 try {
                     $this->arguments['test'] = (new TestSuiteMapper)->map(
                         $this->arguments['configurationObject']->testSuite(),
-                        $this->arguments['testsuite'] ?? ''
+                        $this->arguments['testsuite'] ?? '',
                     );
                 } catch (Exception $e) {
                     $this->printVersionString();
@@ -429,7 +429,7 @@ class Command
         if (!class_exists($loaderClass, false)) {
             if ($loaderFile == '') {
                 $loaderFile = Filesystem::classNameToFilename(
-                    $loaderClass
+                    $loaderClass,
                 );
             }
 
@@ -453,7 +453,7 @@ class Command
                 throw new ReflectionException(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -474,8 +474,8 @@ class Command
         $this->exitWithErrorMessage(
             sprintf(
                 'Could not use "%s" as loader.',
-                $loaderClass
-            )
+                $loaderClass,
+            ),
         );
 
         return null;
@@ -491,7 +491,7 @@ class Command
         if (!class_exists($printerClass, false)) {
             if ($printerFile === '') {
                 $printerFile = Filesystem::classNameToFilename(
-                    $printerClass
+                    $printerClass,
                 );
             }
 
@@ -511,8 +511,8 @@ class Command
             $this->exitWithErrorMessage(
                 sprintf(
                     'Could not use "%s" as printer: class does not exist',
-                    $printerClass
-                )
+                    $printerClass,
+                ),
             );
         }
 
@@ -523,7 +523,7 @@ class Command
             throw new ReflectionException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
             // @codeCoverageIgnoreEnd
         }
@@ -533,8 +533,8 @@ class Command
                 sprintf(
                     'Could not use "%s" as printer: class does not implement %s',
                     $printerClass,
-                    ResultPrinter::class
-                )
+                    ResultPrinter::class,
+                ),
             );
         }
 
@@ -542,8 +542,8 @@ class Command
             $this->exitWithErrorMessage(
                 sprintf(
                     'Could not use "%s" as printer: class cannot be instantiated',
-                    $printerClass
-                )
+                    $printerClass,
+                ),
             );
         }
 
@@ -574,7 +574,7 @@ class Command
                 PHP_EOL,
                 $t->getMessage(),
                 PHP_EOL,
-                $t->getTraceAsString()
+                $t->getTraceAsString(),
             );
 
             while ($t = $t->getPrevious()) {
@@ -605,7 +605,7 @@ class Command
             printf(
                 'You are not using the latest version of PHPUnit.' . PHP_EOL .
                 'The latest version is PHPUnit %s.' . PHP_EOL,
-                $latestVersion
+                $latestVersion,
             );
         } else {
             print 'You are using the latest version of PHPUnit.' . PHP_EOL;
@@ -661,7 +661,7 @@ class Command
                 'groups',
                 'excludeGroups',
                 'testsuite',
-            ]
+            ],
         );
 
         print 'Available test group(s):' . PHP_EOL;
@@ -676,7 +676,7 @@ class Command
 
             printf(
                 ' - %s' . PHP_EOL,
-                $group
+                $group,
             );
         }
 
@@ -702,7 +702,7 @@ class Command
                 'groups',
                 'excludeGroups',
                 'testsuite',
-            ]
+            ],
         );
 
         print 'Available test suite(s):' . PHP_EOL;
@@ -710,7 +710,7 @@ class Command
         foreach ($this->arguments['configurationObject']->testSuite() as $testSuite) {
             printf(
                 ' - %s' . PHP_EOL,
-                $testSuite->name()
+                $testSuite->name(),
             );
         }
 
@@ -734,7 +734,7 @@ class Command
                 'filter',
                 'groups',
                 'excludeGroups',
-            ]
+            ],
         );
 
         $renderer = new TextTestListRenderer;
@@ -761,7 +761,7 @@ class Command
                 'filter',
                 'groups',
                 'excludeGroups',
-            ]
+            ],
         );
 
         $renderer = new XmlTestListRenderer;
@@ -770,7 +770,7 @@ class Command
 
         printf(
             'Wrote list of tests that would have been run to %s' . PHP_EOL,
-            $target
+            $target,
         );
 
         if ($exit) {
@@ -826,8 +826,8 @@ class Command
                 $bootstrapScript,
                 $testsDirectory,
                 $src,
-                $cacheDirectory
-            )
+                $cacheDirectory,
+            ),
         );
 
         print PHP_EOL . 'Generated phpunit.xml in ' . getcwd() . '.' . PHP_EOL;
@@ -853,7 +853,7 @@ class Command
         try {
             file_put_contents(
                 $filename,
-                (new Migrator)->migrate($filename)
+                (new Migrator)->migrate($filename),
             );
 
             print 'Migrated configuration: ' . $filename . PHP_EOL;
@@ -906,7 +906,7 @@ class Command
         if ($configuration->codeCoverage()->hasNonEmptyListOfFilesToBeIncludedInCodeCoverageReport()) {
             (new FilterMapper)->map(
                 $filter,
-                $configuration->codeCoverage()
+                $configuration->codeCoverage(),
             );
         } elseif (isset($this->arguments['coverageFilter'])) {
             if (!is_array($this->arguments['coverageFilter'])) {
@@ -933,7 +933,7 @@ class Command
             $cacheDirectory,
             !$configuration->codeCoverage()->disableCodeCoverageIgnore(),
             $configuration->codeCoverage()->ignoreDeprecatedCodeUnits(),
-            $filter
+            $filter,
         );
 
         print 'done [' . $timer->stop()->asString() . ']' . PHP_EOL;
@@ -971,7 +971,7 @@ class Command
                     'The %s and %s options cannot be combined, %s is ignored' . PHP_EOL,
                     $this->mapKeyToOptionForWarning($_key),
                     $this->mapKeyToOptionForWarning($key),
-                    $this->mapKeyToOptionForWarning($_key)
+                    $this->mapKeyToOptionForWarning($_key),
                 );
 
                 $warningPrinted = true;
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/DefaultResultPrinter.php b/www/vendor/phpunit/phpunit/src/TextUI/DefaultResultPrinter.php
index 408fa133..09de8588 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/DefaultResultPrinter.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/DefaultResultPrinter.php
@@ -142,7 +142,7 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
         if (!in_array($colors, self::AVAILABLE_COLORS, true)) {
             throw InvalidArgumentException::create(
                 3,
-                vsprintf('value from "%s", "%s" or "%s"', self::AVAILABLE_COLORS)
+                vsprintf('value from "%s", "%s" or "%s"', self::AVAILABLE_COLORS),
             );
         }
 
@@ -271,8 +271,8 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
             $this->write(
                 sprintf(
                     "Test '%s' started\n",
-                    \PHPUnit\Util\Test::describeAsString($test)
-                )
+                    \PHPUnit\Util\Test::describeAsString($test),
+                ),
             );
         }
     }
@@ -286,8 +286,8 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
             $this->write(
                 sprintf(
                     "Test '%s' ended\n",
-                    \PHPUnit\Util\Test::describeAsString($test)
-                )
+                    \PHPUnit\Util\Test::describeAsString($test),
+                ),
             );
         }
 
@@ -326,8 +326,8 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
                 ($count == 1) ? 'was' : 'were',
                 $count,
                 $type,
-                ($count == 1) ? '' : 's'
-            )
+                ($count == 1) ? '' : 's',
+            ),
         );
 
         $i = 1;
@@ -355,8 +355,8 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
             sprintf(
                 "\n%d) %s\n",
                 $count,
-                $defect->getTestName()
-            )
+                $defect->getTestName(),
+            ),
         );
     }
 
@@ -413,7 +413,7 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
         if (count($result) === 0) {
             $this->writeWithColor(
                 'fg-black, bg-yellow',
-                'No tests executed!'
+                'No tests executed!',
             );
 
             return;
@@ -427,8 +427,8 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
                     count($result),
                     (count($result) === 1) ? '' : 's',
                     $this->numAssertions,
-                    ($this->numAssertions === 1) ? '' : 's'
-                )
+                    ($this->numAssertions === 1) ? '' : 's',
+                ),
             );
 
             return;
@@ -443,7 +443,7 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
 
             $this->writeWithColor(
                 $color,
-                'OK, but incomplete, skipped, or risky tests!'
+                'OK, but incomplete, skipped, or risky tests!',
             );
         } else {
             $this->write("\n");
@@ -453,21 +453,21 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
 
                 $this->writeWithColor(
                     $color,
-                    'ERRORS!'
+                    'ERRORS!',
                 );
             } elseif ($result->failureCount()) {
                 $color = 'fg-white, bg-red';
 
                 $this->writeWithColor(
                     $color,
-                    'FAILURES!'
+                    'FAILURES!',
                 );
             } elseif ($result->warningCount()) {
                 $color = 'fg-black, bg-yellow';
 
                 $this->writeWithColor(
                     $color,
-                    'WARNINGS!'
+                    'WARNINGS!',
                 );
             }
         }
@@ -504,8 +504,8 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
                     $this->numTestsWidth . 'd (%3s%%)',
                     $this->numTestsRun,
                     $this->numTests,
-                    floor(($this->numTestsRun / $this->numTests) * 100)
-                )
+                    floor(($this->numTestsRun / $this->numTests) * 100),
+                ),
             );
 
             if ($this->column == $this->maxColumn) {
@@ -574,9 +574,9 @@ class DefaultResultPrinter extends Printer implements ResultPrinter
                     '%s%s: %d',
                     !$first ? ', ' : '',
                     $name,
-                    $count
+                    $count,
                 ),
-                false
+                false,
             );
 
             $first = false;
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php b/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php
index 770ad874..af387bea 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestDirectoryNotFoundException.php
@@ -22,8 +22,8 @@ final class TestDirectoryNotFoundException extends RuntimeException implements E
         parent::__construct(
             sprintf(
                 'Test directory "%s" not found',
-                $path
-            )
+                $path,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php b/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php
index 7ffd2c78..3b534f7e 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/Exception/TestFileNotFoundException.php
@@ -22,8 +22,8 @@ final class TestFileNotFoundException extends RuntimeException implements Except
         parent::__construct(
             sprintf(
                 'Test file "%s" not found',
-                $path
-            )
+                $path,
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/Help.php b/www/vendor/phpunit/phpunit/src/TextUI/Help.php
index 82f305dd..7df19ba5 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/Help.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/Help.php
@@ -246,7 +246,7 @@ final class Help
                         {
                             return Color::colorize('fg-cyan', $matches[0]);
                         },
-                        $arg
+                        $arg,
                     );
                     $desc = explode(PHP_EOL, wordwrap($option['desc'], $this->maxDescLength, PHP_EOL));
 
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/TestRunner.php b/www/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
index 3ba298e8..4f9d280c 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
@@ -307,7 +307,7 @@ final class TestRunner extends BaseTestRunner
                         throw new Exception(
                             $e->getMessage(),
                             $e->getCode(),
-                            $e
+                            $e,
                         );
                     }
                     // @codeCoverageIgnoreEnd
@@ -341,8 +341,8 @@ final class TestRunner extends BaseTestRunner
                 new HtmlResultPrinter(
                     $arguments['testdoxHTMLFile'],
                     $arguments['testdoxGroups'],
-                    $arguments['testdoxExcludeGroups']
-                )
+                    $arguments['testdoxExcludeGroups'],
+                ),
             );
         }
 
@@ -351,22 +351,22 @@ final class TestRunner extends BaseTestRunner
                 new TextResultPrinter(
                     $arguments['testdoxTextFile'],
                     $arguments['testdoxGroups'],
-                    $arguments['testdoxExcludeGroups']
-                )
+                    $arguments['testdoxExcludeGroups'],
+                ),
             );
         }
 
         if (isset($arguments['testdoxXMLFile'])) {
             $result->addListener(
                 new XmlResultPrinter(
-                    $arguments['testdoxXMLFile']
-                )
+                    $arguments['testdoxXMLFile'],
+                ),
             );
         }
 
         if (isset($arguments['teamcityLogfile'])) {
             $result->addListener(
-                new TeamCity($arguments['teamcityLogfile'])
+                new TeamCity($arguments['teamcityLogfile']),
             );
         }
 
@@ -374,8 +374,8 @@ final class TestRunner extends BaseTestRunner
             $result->addListener(
                 new JUnit(
                     $arguments['junitLogfile'],
-                    $arguments['reportUselessTests']
-                )
+                    $arguments['reportUselessTests'],
+                ),
             );
         }
 
@@ -432,7 +432,7 @@ final class TestRunner extends BaseTestRunner
 
                     (new FilterMapper)->map(
                         $this->codeCoverageFilter,
-                        $codeCoverageConfiguration
+                        $codeCoverageConfiguration,
                     );
                 }
             }
@@ -449,7 +449,7 @@ final class TestRunner extends BaseTestRunner
 
                 $codeCoverage = new CodeCoverage(
                     $codeCoverageDriver,
-                    $this->codeCoverageFilter
+                    $this->codeCoverageFilter,
                 );
 
                 if (isset($codeCoverageConfiguration) && $codeCoverageConfiguration->hasCacheDirectory()) {
@@ -532,21 +532,21 @@ final class TestRunner extends BaseTestRunner
 
                 $this->writeMessage(
                     'Configuration',
-                    $arguments['configurationObject']->filename()
+                    $arguments['configurationObject']->filename(),
                 );
             }
 
             foreach ($arguments['loadedExtensions'] as $extension) {
                 $this->writeMessage(
                     'Extension',
-                    $extension
+                    $extension,
                 );
             }
 
             foreach ($arguments['notLoadedExtensions'] as $extension) {
                 $this->writeMessage(
                     'Extension',
-                    $extension
+                    $extension,
                 );
             }
         }
@@ -554,7 +554,7 @@ final class TestRunner extends BaseTestRunner
         if ($arguments['executionOrder'] === TestSuiteSorter::ORDER_RANDOMIZED) {
             $this->writeMessage(
                 'Random Seed',
-                (string) $arguments['randomOrderSeed']
+                (string) $arguments['randomOrderSeed'],
             );
         }
 
@@ -586,7 +586,7 @@ final class TestRunner extends BaseTestRunner
                     $this->writeMessage('Suggestion', 'Migrate your XML configuration using "--migrate-configuration"!');
                 } else {
                     $this->write(
-                        "\n  Warning - The configuration file did not pass validation!\n  The following problems have been detected:\n"
+                        "\n  Warning - The configuration file did not pass validation!\n  The following problems have been detected:\n",
                     );
 
                     $this->write($arguments['configurationObject']->validationErrors());
@@ -714,8 +714,8 @@ final class TestRunner extends BaseTestRunner
                         $arguments['reportHighLowerBound'],
                         sprintf(
                             ' and <a href="https://phpunit.de/">PHPUnit %s</a>',
-                            Version::id()
-                        )
+                            Version::id(),
+                        ),
                     );
 
                     $writer->process($codeCoverage, $arguments['coverageHtml']);
@@ -756,11 +756,11 @@ final class TestRunner extends BaseTestRunner
                     $arguments['reportLowUpperBound'],
                     $arguments['reportHighLowerBound'],
                     $arguments['coverageTextShowUncoveredFiles'],
-                    $arguments['coverageTextShowOnlySummary']
+                    $arguments['coverageTextShowOnlySummary'],
                 );
 
                 $outputStream->write(
-                    $processor->process($codeCoverage, $colors)
+                    $processor->process($codeCoverage, $colors),
                 );
             }
 
@@ -1023,7 +1023,7 @@ final class TestRunner extends BaseTestRunner
             foreach ($arguments['unavailableExtensions'] as $extension) {
                 $arguments['warnings'][] = sprintf(
                     'Extension "%s" is not available',
-                    $extension
+                    $extension,
                 );
             }
 
@@ -1033,7 +1033,7 @@ final class TestRunner extends BaseTestRunner
                 if ($loggingConfiguration->hasText()) {
                     $arguments['listeners'][] = new DefaultResultPrinter(
                         $loggingConfiguration->text()->target()->path(),
-                        true
+                        true,
                     );
                 }
 
@@ -1147,14 +1147,14 @@ final class TestRunner extends BaseTestRunner
         if (!empty($arguments['excludeGroups'])) {
             $filterFactory->addFilter(
                 new ReflectionClass(ExcludeGroupFilterIterator::class),
-                $arguments['excludeGroups']
+                $arguments['excludeGroups'],
             );
         }
 
         if (!empty($arguments['groups'])) {
             $filterFactory->addFilter(
                 new ReflectionClass(IncludeGroupFilterIterator::class),
-                $arguments['groups']
+                $arguments['groups'],
             );
         }
 
@@ -1166,8 +1166,8 @@ final class TestRunner extends BaseTestRunner
                     {
                         return '__phpunit_covers_' . $name;
                     },
-                    $arguments['testsCovering']
-                )
+                    $arguments['testsCovering'],
+                ),
             );
         }
 
@@ -1179,15 +1179,15 @@ final class TestRunner extends BaseTestRunner
                     {
                         return '__phpunit_uses_' . $name;
                     },
-                    $arguments['testsUsing']
-                )
+                    $arguments['testsUsing'],
+                ),
             );
         }
 
         if ($arguments['filter']) {
             $filterFactory->addFilter(
                 new ReflectionClass(NameFilterIterator::class),
-                $arguments['filter']
+                $arguments['filter'],
             );
         }
 
@@ -1204,8 +1204,8 @@ final class TestRunner extends BaseTestRunner
             sprintf(
                 "%-15s%s\n",
                 $type . ':',
-                $message
-            )
+                $message,
+            ),
         );
 
         $this->messagePrinted = true;
@@ -1219,7 +1219,7 @@ final class TestRunner extends BaseTestRunner
             $arguments['colors'],
             $arguments['debug'],
             $arguments['columns'],
-            $arguments['reverseList']
+            $arguments['reverseList'],
         );
 
         assert($object instanceof ResultPrinter);
@@ -1232,8 +1232,8 @@ final class TestRunner extends BaseTestRunner
         $this->write(
             sprintf(
                 "\nGenerating code coverage report in %s format ... ",
-                $format
-            )
+                $format,
+            ),
         );
 
         $this->timer->start();
@@ -1244,8 +1244,8 @@ final class TestRunner extends BaseTestRunner
         $this->write(
             sprintf(
                 "done [%s]\n",
-                $this->timer->stop()->asString()
-            )
+                $this->timer->stop()->asString(),
+            ),
         );
     }
 
@@ -1255,8 +1255,8 @@ final class TestRunner extends BaseTestRunner
             sprintf(
                 "failed [%s]\n%s\n",
                 $this->timer->stop()->asString(),
-                $e->getMessage()
-            )
+                $e->getMessage(),
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/TestSuiteMapper.php b/www/vendor/phpunit/phpunit/src/TextUI/TestSuiteMapper.php
index 170e6602..a0ea593a 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/TestSuiteMapper.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/TestSuiteMapper.php
@@ -60,7 +60,7 @@ final class TestSuiteMapper
                         $directory->path(),
                         $directory->suffix(),
                         $directory->prefix(),
-                        $exclude
+                        $exclude,
                     );
 
                     if (!empty($files)) {
@@ -96,7 +96,7 @@ final class TestSuiteMapper
             throw new RuntimeException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php
index 80abfac7..191113c6 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php
@@ -150,7 +150,7 @@ final class CodeCoverage
     {
         if (!$this->hasCacheDirectory()) {
             throw new Exception(
-                'No cache directory has been configured'
+                'No cache directory has been configured',
             );
         }
 
@@ -222,7 +222,7 @@ final class CodeCoverage
     {
         if (!$this->hasClover()) {
             throw new Exception(
-                'Code Coverage report "Clover XML" has not been configured'
+                'Code Coverage report "Clover XML" has not been configured',
             );
         }
 
@@ -244,7 +244,7 @@ final class CodeCoverage
     {
         if (!$this->hasCobertura()) {
             throw new Exception(
-                'Code Coverage report "Cobertura XML" has not been configured'
+                'Code Coverage report "Cobertura XML" has not been configured',
             );
         }
 
@@ -266,7 +266,7 @@ final class CodeCoverage
     {
         if (!$this->hasCrap4j()) {
             throw new Exception(
-                'Code Coverage report "Crap4J" has not been configured'
+                'Code Coverage report "Crap4J" has not been configured',
             );
         }
 
@@ -288,7 +288,7 @@ final class CodeCoverage
     {
         if (!$this->hasHtml()) {
             throw new Exception(
-                'Code Coverage report "HTML" has not been configured'
+                'Code Coverage report "HTML" has not been configured',
             );
         }
 
@@ -310,7 +310,7 @@ final class CodeCoverage
     {
         if (!$this->hasPhp()) {
             throw new Exception(
-                'Code Coverage report "PHP" has not been configured'
+                'Code Coverage report "PHP" has not been configured',
             );
         }
 
@@ -332,7 +332,7 @@ final class CodeCoverage
     {
         if (!$this->hasText()) {
             throw new Exception(
-                'Code Coverage report "Text" has not been configured'
+                'Code Coverage report "Text" has not been configured',
             );
         }
 
@@ -354,7 +354,7 @@ final class CodeCoverage
     {
         if (!$this->hasXml()) {
             throw new Exception(
-                'Code Coverage report "XML" has not been configured'
+                'Code Coverage report "XML" has not been configured',
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/FilterMapper.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/FilterMapper.php
index 102c96eb..82be6032 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/FilterMapper.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/FilterMapper.php
@@ -22,7 +22,7 @@ final class FilterMapper
             $filter->includeDirectory(
                 $directory->path(),
                 $directory->suffix(),
-                $directory->prefix()
+                $directory->prefix(),
             );
         }
 
@@ -34,7 +34,7 @@ final class FilterMapper
             $filter->excludeDirectory(
                 $directory->path(),
                 $directory->suffix(),
-                $directory->prefix()
+                $directory->prefix(),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Generator.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Generator.php
index cc77b1a3..9f6a812a 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Generator.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Generator.php
@@ -67,7 +67,7 @@ EOT;
                 $srcDirectory,
                 $cacheDirectory,
             ],
-            self::TEMPLATE
+            self::TEMPLATE,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Loader.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Loader.php
index c1877317..adf7dce0 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Loader.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Loader.php
@@ -73,7 +73,7 @@ final class Loader
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
 
@@ -85,7 +85,7 @@ final class Loader
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
 
@@ -100,7 +100,7 @@ final class Loader
             $this->logging($filename, $xpath),
             $this->php($filename, $xpath),
             $this->phpunit($filename, $document),
-            $this->testSuite($filename, $xpath)
+            $this->testSuite($filename, $xpath),
         );
     }
 
@@ -118,9 +118,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -132,9 +132,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -146,9 +146,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -160,9 +160,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -174,9 +174,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -188,9 +188,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -200,7 +200,7 @@ final class Loader
             $teamCity,
             $testDoxHtml,
             $testDoxText,
-            $testDoxXml
+            $testDoxXml,
         );
     }
 
@@ -228,42 +228,42 @@ final class Loader
             switch ($type) {
                 case 'plain':
                     $text = new Text(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
 
                 case 'junit':
                     $junit = new Junit(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
 
                 case 'teamcity':
                     $teamCity = new TeamCity(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
 
                 case 'testdox-html':
                     $testDoxHtml = new TestDoxHtml(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
 
                 case 'testdox-text':
                     $testDoxText = new TestDoxText(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
 
                 case 'testdox-xml':
                     $testDoxXml = new TestDoxXml(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
@@ -276,7 +276,7 @@ final class Loader
             $teamCity,
             $testDoxHtml,
             $testDoxText,
-            $testDoxXml
+            $testDoxXml,
         );
     }
 
@@ -304,7 +304,7 @@ final class Loader
             $file = $this->toAbsolutePath(
                 $filename,
                 (string) $element->getAttribute('file'),
-                true
+                true,
             );
         }
 
@@ -402,38 +402,38 @@ final class Loader
 
             if ($cacheDirectory !== null) {
                 $cacheDirectory = new Directory(
-                    $this->toAbsolutePath($filename, $cacheDirectory)
+                    $this->toAbsolutePath($filename, $cacheDirectory),
                 );
             }
 
             $pathCoverage = $this->getBooleanAttribute(
                 $element,
                 'pathCoverage',
-                false
+                false,
             );
 
             $includeUncoveredFiles = $this->getBooleanAttribute(
                 $element,
                 'includeUncoveredFiles',
-                true
+                true,
             );
 
             $processUncoveredFiles = $this->getBooleanAttribute(
                 $element,
                 'processUncoveredFiles',
-                false
+                false,
             );
 
             $ignoreDeprecatedCodeUnits = $this->getBooleanAttribute(
                 $element,
                 'ignoreDeprecatedCodeUnits',
-                false
+                false,
             );
 
             $disableCodeCoverageIgnore = $this->getBooleanAttribute(
                 $element,
                 'disableCodeCoverageIgnore',
-                false
+                false,
             );
         }
 
@@ -445,9 +445,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -459,9 +459,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -473,10 +473,10 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
                 ),
-                $this->getIntegerAttribute($element, 'threshold', 30)
+                $this->getIntegerAttribute($element, 'threshold', 30),
             );
         }
 
@@ -488,11 +488,11 @@ final class Loader
                 new Directory(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputDirectory')
-                    )
+                        (string) $this->getStringAttribute($element, 'outputDirectory'),
+                    ),
                 ),
                 $this->getIntegerAttribute($element, 'lowUpperBound', 50),
-                $this->getIntegerAttribute($element, 'highLowerBound', 90)
+                $this->getIntegerAttribute($element, 'highLowerBound', 90),
             );
         }
 
@@ -504,9 +504,9 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
+                ),
             );
         }
 
@@ -518,11 +518,11 @@ final class Loader
                 new File(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputFile')
-                    )
+                        (string) $this->getStringAttribute($element, 'outputFile'),
+                    ),
                 ),
                 $this->getBooleanAttribute($element, 'showUncoveredFiles', false),
-                $this->getBooleanAttribute($element, 'showOnlySummary', false)
+                $this->getBooleanAttribute($element, 'showOnlySummary', false),
             );
         }
 
@@ -534,9 +534,9 @@ final class Loader
                 new Directory(
                     $this->toAbsolutePath(
                         $filename,
-                        (string) $this->getStringAttribute($element, 'outputDirectory')
-                    )
-                )
+                        (string) $this->getStringAttribute($element, 'outputDirectory'),
+                    ),
+                ),
             );
         }
 
@@ -557,7 +557,7 @@ final class Loader
             $html,
             $php,
             $text,
-            $xml
+            $xml,
         );
     }
 
@@ -569,13 +569,13 @@ final class Loader
         $ignoreDeprecatedCodeUnits = $this->getBooleanAttribute(
             $document->documentElement,
             'ignoreDeprecatedCodeUnitsFromCodeCoverage',
-            false
+            false,
         );
 
         $disableCodeCoverageIgnore = $this->getBooleanAttribute(
             $document->documentElement,
             'disableCodeCoverageIgnore',
-            false
+            false,
         );
 
         $includeUncoveredFiles = true;
@@ -587,14 +587,14 @@ final class Loader
             if ($element->hasAttribute('addUncoveredFilesFromWhitelist')) {
                 $includeUncoveredFiles = (bool) $this->getBoolean(
                     (string) $element->getAttribute('addUncoveredFilesFromWhitelist'),
-                    true
+                    true,
                 );
             }
 
             if ($element->hasAttribute('processUncoveredFilesFromWhitelist')) {
                 $processUncoveredFiles = (bool) $this->getBoolean(
                     (string) $element->getAttribute('processUncoveredFilesFromWhitelist'),
-                    false
+                    false,
                 );
             }
         }
@@ -622,14 +622,14 @@ final class Loader
             switch ($type) {
                 case 'coverage-clover':
                     $clover = new Clover(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
 
                 case 'coverage-cobertura':
                     $cobertura = new Cobertura(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
@@ -637,7 +637,7 @@ final class Loader
                 case 'coverage-crap4j':
                     $crap4j = new Crap4j(
                         new File($target),
-                        $this->getIntegerAttribute($log, 'threshold', 30)
+                        $this->getIntegerAttribute($log, 'threshold', 30),
                     );
 
                     break;
@@ -646,14 +646,14 @@ final class Loader
                     $html = new CodeCoverageHtml(
                         new Directory($target),
                         $this->getIntegerAttribute($log, 'lowUpperBound', 50),
-                        $this->getIntegerAttribute($log, 'highLowerBound', 90)
+                        $this->getIntegerAttribute($log, 'highLowerBound', 90),
                     );
 
                     break;
 
                 case 'coverage-php':
                     $php = new CodeCoveragePhp(
-                        new File($target)
+                        new File($target),
                     );
 
                     break;
@@ -662,14 +662,14 @@ final class Loader
                     $text = new CodeCoverageText(
                         new File($target),
                         $this->getBooleanAttribute($log, 'showUncoveredFiles', false),
-                        $this->getBooleanAttribute($log, 'showOnlySummary', false)
+                        $this->getBooleanAttribute($log, 'showOnlySummary', false),
                     );
 
                     break;
 
                 case 'coverage-xml':
                     $xml = new CodeCoverageXml(
-                        new Directory($target)
+                        new Directory($target),
                     );
 
                     break;
@@ -693,7 +693,7 @@ final class Loader
             $html,
             $php,
             $text,
-            $xml
+            $xml,
         );
     }
 
@@ -737,7 +737,7 @@ final class Loader
                 $this->toAbsolutePath($filename, $directoryPath),
                 $directoryNode->hasAttribute('prefix') ? (string) $directoryNode->getAttribute('prefix') : '',
                 $directoryNode->hasAttribute('suffix') ? (string) $directoryNode->getAttribute('suffix') : '.php',
-                $directoryNode->hasAttribute('group') ? (string) $directoryNode->getAttribute('group') : 'DEFAULT'
+                $directoryNode->hasAttribute('group') ? (string) $directoryNode->getAttribute('group') : 'DEFAULT',
             );
         }
 
@@ -784,7 +784,7 @@ final class Loader
 
         return new Groups(
             GroupCollection::fromArray($include),
-            GroupCollection::fromArray($exclude)
+            GroupCollection::fromArray($exclude),
         );
     }
 
@@ -809,7 +809,7 @@ final class Loader
 
         return (bool) $this->getBoolean(
             (string) $element->getAttribute($attribute),
-            false
+            false,
         );
     }
 
@@ -821,7 +821,7 @@ final class Loader
 
         return $this->getInteger(
             (string) $element->getAttribute($attribute),
-            $default
+            $default,
         );
     }
 
@@ -862,7 +862,7 @@ final class Loader
 
             $iniSettings[] = new IniSetting(
                 (string) $ini->getAttribute('name'),
-                (string) $ini->getAttribute('value')
+                (string) $ini->getAttribute('value'),
             );
         }
 
@@ -875,7 +875,7 @@ final class Loader
 
             $constants[] = new Constant(
                 (string) $const->getAttribute('name'),
-                $this->getBoolean($value, $value)
+                $this->getBoolean($value, $value),
             );
         }
 
@@ -1077,7 +1077,7 @@ final class Loader
             $this->getBooleanAttribute($document->documentElement, 'backupGlobals', false),
             $this->getBooleanAttribute($document->documentElement, 'backupStaticAttributes', false),
             $this->getBooleanAttribute($document->documentElement, 'registerMockObjectsFromTestArgumentsRecursively', false),
-            $conflictBetweenPrinterClassAndTestdox
+            $conflictBetweenPrinterClassAndTestdox,
         );
     }
 
@@ -1171,7 +1171,7 @@ final class Loader
                     $prefix,
                     $suffix,
                     $phpVersion,
-                    $phpVersionOperator
+                    $phpVersionOperator,
                 );
             }
 
@@ -1201,7 +1201,7 @@ final class Loader
                 $files[] = new TestFile(
                     $this->toAbsolutePath($filename, $file),
                     $phpVersion,
-                    $phpVersionOperator
+                    $phpVersionOperator,
                 );
             }
 
@@ -1209,7 +1209,7 @@ final class Loader
                 (string) $element->getAttribute('name'),
                 TestDirectoryCollection::fromArray($directories),
                 TestFileCollection::fromArray($files),
-                FileCollection::fromArray($exclude)
+                FileCollection::fromArray($exclude),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/MigrationBuilder.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/MigrationBuilder.php
index abef49f1..2bb66381 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/MigrationBuilder.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/MigrationBuilder.php
@@ -28,7 +28,7 @@ final class MigrationBuilder
             IntroduceCoverageElement::class,
             MoveAttributesFromRootToCoverage::class,
             MoveAttributesFromFilterWhitelistToCoverage::class,
-            MoveWhitelistDirectoriesToCoverage::class,
+            MoveWhitelistIncludesToCoverage::class,
             MoveWhitelistExcludesToCoverage::class,
             RemoveEmptyFilter::class,
             CoverageCloverToReport::class,
@@ -51,8 +51,8 @@ final class MigrationBuilder
             throw new MigrationBuilderException(
                 sprintf(
                     'Migration from schema version %s is not supported',
-                    $fromVersion
-                )
+                    $fromVersion,
+                ),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/IntroduceCoverageElement.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/IntroduceCoverageElement.php
index 867a8441..de52857e 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/IntroduceCoverageElement.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/IntroduceCoverageElement.php
@@ -22,7 +22,7 @@ final class IntroduceCoverageElement implements Migration
 
         $document->documentElement->insertBefore(
             $coverage,
-            $document->documentElement->firstChild
+            $document->documentElement->firstChild,
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/LogToReportMigration.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/LogToReportMigration.php
index e987308b..c07de0ec 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/LogToReportMigration.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/LogToReportMigration.php
@@ -67,7 +67,7 @@ abstract class LogToReportMigration implements Migration
     private function findLogNode(DOMDocument $document): ?DOMElement
     {
         $logNode = (new DOMXPath($document))->query(
-            sprintf('//logging/log[@type="%s"]', $this->forType())
+            sprintf('//logging/log[@type="%s"]', $this->forType()),
         )->item(0);
 
         if (!$logNode instanceof DOMElement) {
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php
index c55315fa..17d5f4db 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php
@@ -47,7 +47,7 @@ final class MoveWhitelistExcludesToCoverage implements Migration
 
         if ($targetExclude === null) {
             $targetExclude = $coverage->appendChild(
-                $document->createElement('exclude')
+                $document->createElement('exclude'),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistDirectoriesToCoverage.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistIncludesToCoverage.php
similarity index 83%
rename from www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistDirectoriesToCoverage.php
rename to www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistIncludesToCoverage.php
index 14e6cec8..c75a6d84 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistDirectoriesToCoverage.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistIncludesToCoverage.php
@@ -16,7 +16,7 @@ use PHPUnit\Util\Xml\SnapshotNodeList;
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class MoveWhitelistDirectoriesToCoverage implements Migration
+final class MoveWhitelistIncludesToCoverage implements Migration
 {
     /**
      * @throws MigrationException
@@ -39,7 +39,11 @@ final class MoveWhitelistDirectoriesToCoverage implements Migration
         $coverage->appendChild($include);
 
         foreach (SnapshotNodeList::fromNodeList($whitelist->childNodes) as $child) {
-            if (!$child instanceof DOMElement || $child->nodeName !== 'directory') {
+            if (!$child instanceof DOMElement) {
+                continue;
+            }
+
+            if (!($child->nodeName === 'directory' || $child->nodeName === 'file')) {
                 continue;
             }
 
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/UpdateSchemaLocationTo93.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/UpdateSchemaLocationTo93.php
index 2e86ab6e..ddcfcf07 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/UpdateSchemaLocationTo93.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/UpdateSchemaLocationTo93.php
@@ -21,7 +21,7 @@ final class UpdateSchemaLocationTo93 implements Migration
         $document->documentElement->setAttributeNS(
             'http://www.w3.org/2001/XMLSchema-instance',
             'xsi:noNamespaceSchemaLocation',
-            'https://schema.phpunit.de/9.3/phpunit.xsd'
+            'https://schema.phpunit.de/9.3/phpunit.xsd',
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrator.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrator.php
index d173e7af..57bc9f2e 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrator.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrator.php
@@ -34,7 +34,7 @@ final class Migrator
                 sprintf(
                     '"%s" is not a valid PHPUnit XML configuration file that can be migrated',
                     $filename,
-                )
+                ),
             );
         }
 
@@ -42,7 +42,7 @@ final class Migrator
             $filename,
             false,
             true,
-            true
+            true,
         );
 
         foreach ((new MigrationBuilder)->build($origin->version()) as $migration) {
diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/PhpHandler.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/PhpHandler.php
index 5fb0c72b..f5969945 100644
--- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/PhpHandler.php
+++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/PhpHandler.php
@@ -52,7 +52,7 @@ final class PhpHandler
                 'include_path',
                 implode(PATH_SEPARATOR, $includePathsAsStrings) .
                 PATH_SEPARATOR .
-                ini_get('include_path')
+                ini_get('include_path'),
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Util/Annotation/DocBlock.php b/www/vendor/phpunit/phpunit/src/Util/Annotation/DocBlock.php
index 5066c4bb..764bbbfb 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Annotation/DocBlock.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Annotation/DocBlock.php
@@ -128,7 +128,7 @@ final class DocBlock
             $class->getEndLine(),
             $class->getFileName(),
             $className,
-            $className
+            $className,
         );
     }
 
@@ -145,7 +145,7 @@ final class DocBlock
             $method->getEndLine(),
             $method->getFileName(),
             $method->getName(),
-            $classNameInHierarchy
+            $classNameInHierarchy,
         );
     }
 
@@ -263,7 +263,7 @@ final class DocBlock
             array_filter([
                 'setting'            => $recordedSettings,
                 'extension_versions' => $extensionVersions,
-            ])
+            ]),
         );
     }
 
@@ -290,8 +290,8 @@ final class DocBlock
                 throw new InvalidDataSetException(
                     sprintf(
                         'Data set %s is invalid.',
-                        is_int($key) ? '#' . $key : '"' . $key . '"'
-                    )
+                        is_int($key) ? '#' . $key : '"' . $key . '"',
+                    ),
                 );
             }
         }
@@ -399,14 +399,14 @@ final class DocBlock
                 $dataProviderClass = new ReflectionClass($dataProviderClassName);
 
                 $dataProviderMethod = $dataProviderClass->getMethod(
-                    $dataProviderMethodName
+                    $dataProviderMethodName,
                 );
                 // @codeCoverageIgnoreStart
             } catch (ReflectionException $e) {
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
                 // @codeCoverageIgnoreEnd
             }
@@ -435,8 +435,8 @@ final class DocBlock
                             sprintf(
                                 'The key "%s" has already been defined in the data provider "%s".',
                                 $key,
-                                $match
-                            )
+                                $match,
+                            ),
                         );
                     } else {
                         $data[$key] = $value;
@@ -478,7 +478,7 @@ final class DocBlock
 
             if (json_last_error() !== JSON_ERROR_NONE) {
                 throw new Exception(
-                    'The data set for the @testWith annotation cannot be parsed: ' . json_last_error_msg()
+                    'The data set for the @testWith annotation cannot be parsed: ' . json_last_error_msg(),
                 );
             }
 
@@ -494,9 +494,9 @@ final class DocBlock
 
     private function cleanUpMultiLineAnnotation(string $docComment): string
     {
-        //removing initial '   * ' for docComment
+        // removing initial '   * ' for docComment
         $docComment = str_replace("\r\n", "\n", $docComment);
-        $docComment = preg_replace('/' . '\n' . '\s*' . '\*' . '\s?' . '/', "\n", $docComment);
+        $docComment = preg_replace('/\n\s*\*\s?/', "\n", $docComment);
         $docComment = (string) substr($docComment, 0, -1);
 
         return rtrim($docComment, "\n");
@@ -533,14 +533,14 @@ final class DocBlock
                     {
                         return self::parseDocBlock((string) $trait->getDocComment());
                     },
-                    array_values($reflector->getTraits())
-                )
+                    array_values($reflector->getTraits()),
+                ),
             );
         }
 
         return array_merge(
             $annotations,
-            self::parseDocBlock((string) $reflector->getDocComment())
+            self::parseDocBlock((string) $reflector->getDocComment()),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php b/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php
index 8ee6c839..a34cb9ad 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php
@@ -59,7 +59,7 @@ final class Registry
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -85,7 +85,7 @@ final class Registry
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
diff --git a/www/vendor/phpunit/phpunit/src/Util/Color.php b/www/vendor/phpunit/phpunit/src/Util/Color.php
index b96eb474..ee0f412d 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Color.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Color.php
@@ -120,7 +120,7 @@ final class Color
                 {
                     return self::dim($matches[0]);
                 },
-                $path[$last]
+                $path[$last],
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/ErrorHandler.php b/www/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
index f8566347..3bdf9bf1 100644
--- a/www/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
+++ b/www/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
@@ -64,7 +64,7 @@ final class ErrorHandler
                 }
 
                 return false;
-            }
+            },
         );
 
         $result = $callable();
diff --git a/www/vendor/phpunit/phpunit/src/Util/ExcludeList.php b/www/vendor/phpunit/phpunit/src/Util/ExcludeList.php
index 778eb309..a00bfff0 100644
--- a/www/vendor/phpunit/phpunit/src/Util/ExcludeList.php
+++ b/www/vendor/phpunit/phpunit/src/Util/ExcludeList.php
@@ -161,8 +161,8 @@ final class ExcludeList
             throw new Exception(
                 sprintf(
                     '"%s" is not a directory',
-                    $directory
-                )
+                    $directory,
+                ),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/FileLoader.php b/www/vendor/phpunit/phpunit/src/Util/FileLoader.php
index 8abdc91c..e0a66506 100644
--- a/www/vendor/phpunit/phpunit/src/Util/FileLoader.php
+++ b/www/vendor/phpunit/phpunit/src/Util/FileLoader.php
@@ -42,7 +42,7 @@ final class FileLoader
             $includePathFilename === $localFile ||
             !self::isReadable($includePathFilename)) {
             throw new Exception(
-                sprintf('Cannot open file "%s".' . "\n", $filename)
+                sprintf('Cannot open file "%s".' . "\n", $filename),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/Filesystem.php b/www/vendor/phpunit/phpunit/src/Util/Filesystem.php
index 35b2690b..886829d2 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Filesystem.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Filesystem.php
@@ -30,7 +30,7 @@ final class Filesystem
         return str_replace(
             ['_', '\\'],
             DIRECTORY_SEPARATOR,
-            $className
+            $className,
         ) . '.php';
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/Filter.php b/www/vendor/phpunit/phpunit/src/Util/Filter.php
index 42563937..94b7e77d 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Filter.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Filter.php
@@ -53,7 +53,7 @@ final class Filter
         if (!self::frameExists($eTrace, $eFile, $eLine)) {
             array_unshift(
                 $eTrace,
-                ['file' => $eFile, 'line' => $eLine]
+                ['file' => $eFile, 'line' => $eLine],
             );
         }
 
@@ -65,7 +65,7 @@ final class Filter
                 $filteredStacktrace .= sprintf(
                     "%s:%s\n",
                     $frame['file'],
-                    $frame['line'] ?? '?'
+                    $frame['line'] ?? '?',
                 );
             }
         }
diff --git a/www/vendor/phpunit/phpunit/src/Util/GlobalState.php b/www/vendor/phpunit/phpunit/src/Util/GlobalState.php
index 5cf16bcd..18b5a646 100644
--- a/www/vendor/phpunit/phpunit/src/Util/GlobalState.php
+++ b/www/vendor/phpunit/phpunit/src/Util/GlobalState.php
@@ -188,7 +188,7 @@ final class GlobalState
             $result .= sprintf(
                 '@ini_set(%s, %s);' . "\n",
                 self::exportVariable($key),
-                self::exportVariable((string) $value)
+                self::exportVariable((string) $value),
             );
         }
 
@@ -206,7 +206,7 @@ final class GlobalState
                     'if (!defined(\'%s\')) define(\'%s\', %s);' . "\n",
                     $name,
                     $name,
-                    self::exportVariable($value)
+                    self::exportVariable($value),
                 );
             }
         }
@@ -229,7 +229,7 @@ final class GlobalState
                         '$GLOBALS[\'%s\'][\'%s\'] = %s;' . "\n",
                         $superGlobalArray,
                         $key,
-                        self::exportVariable($GLOBALS[$superGlobalArray][$key])
+                        self::exportVariable($GLOBALS[$superGlobalArray][$key]),
                     );
                 }
             }
@@ -243,7 +243,7 @@ final class GlobalState
                 $result .= sprintf(
                     '$GLOBALS[\'%s\'] = %s;' . "\n",
                     $key,
-                    self::exportVariable($GLOBALS[$key])
+                    self::exportVariable($GLOBALS[$key]),
                 );
             }
         }
diff --git a/www/vendor/phpunit/phpunit/src/Util/Json.php b/www/vendor/phpunit/phpunit/src/Util/Json.php
index 752c1fd6..e200071b 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Json.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Json.php
@@ -37,7 +37,7 @@ final class Json
 
         if (json_last_error()) {
             throw new Exception(
-                'Cannot prettify invalid json'
+                'Cannot prettify invalid json',
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/Log/JUnit.php b/www/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
index 3ceb5e84..c7ba4fc5 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
@@ -226,37 +226,37 @@ final class JUnit extends Printer implements TestListener
     {
         $this->testSuites[$this->testSuiteLevel]->setAttribute(
             'tests',
-            (string) $this->testSuiteTests[$this->testSuiteLevel]
+            (string) $this->testSuiteTests[$this->testSuiteLevel],
         );
 
         $this->testSuites[$this->testSuiteLevel]->setAttribute(
             'assertions',
-            (string) $this->testSuiteAssertions[$this->testSuiteLevel]
+            (string) $this->testSuiteAssertions[$this->testSuiteLevel],
         );
 
         $this->testSuites[$this->testSuiteLevel]->setAttribute(
             'errors',
-            (string) $this->testSuiteErrors[$this->testSuiteLevel]
+            (string) $this->testSuiteErrors[$this->testSuiteLevel],
         );
 
         $this->testSuites[$this->testSuiteLevel]->setAttribute(
             'warnings',
-            (string) $this->testSuiteWarnings[$this->testSuiteLevel]
+            (string) $this->testSuiteWarnings[$this->testSuiteLevel],
         );
 
         $this->testSuites[$this->testSuiteLevel]->setAttribute(
             'failures',
-            (string) $this->testSuiteFailures[$this->testSuiteLevel]
+            (string) $this->testSuiteFailures[$this->testSuiteLevel],
         );
 
         $this->testSuites[$this->testSuiteLevel]->setAttribute(
             'skipped',
-            (string) $this->testSuiteSkipped[$this->testSuiteLevel]
+            (string) $this->testSuiteSkipped[$this->testSuiteLevel],
         );
 
         $this->testSuites[$this->testSuiteLevel]->setAttribute(
             'time',
-            sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel])
+            sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel]),
         );
 
         if ($this->testSuiteLevel > 1) {
@@ -293,7 +293,7 @@ final class JUnit extends Printer implements TestListener
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -308,7 +308,7 @@ final class JUnit extends Printer implements TestListener
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
@@ -337,16 +337,16 @@ final class JUnit extends Printer implements TestListener
 
         $this->currentTestCase->setAttribute(
             'assertions',
-            (string) $numAssertions
+            (string) $numAssertions,
         );
 
         $this->currentTestCase->setAttribute(
             'time',
-            sprintf('%F', $time)
+            sprintf('%F', $time),
         );
 
         $this->testSuites[$this->testSuiteLevel]->appendChild(
-            $this->currentTestCase
+            $this->currentTestCase,
         );
 
         $this->testSuiteTests[$this->testSuiteLevel]++;
@@ -361,7 +361,7 @@ final class JUnit extends Printer implements TestListener
         if (!empty($testOutput)) {
             $systemOut = $this->document->createElement(
                 'system-out',
-                Xml::prepareString($testOutput)
+                Xml::prepareString($testOutput),
             );
 
             $this->currentTestCase->appendChild($systemOut);
@@ -392,12 +392,12 @@ final class JUnit extends Printer implements TestListener
 
         $buffer .= trim(
             TestFailure::exceptionToString($t) . "\n" .
-            Filter::getFilteredStacktrace($t)
+            Filter::getFilteredStacktrace($t),
         );
 
         $fault = $this->document->createElement(
             $type,
-            Xml::prepareString($buffer)
+            Xml::prepareString($buffer),
         );
 
         if ($t instanceof ExceptionWrapper) {
diff --git a/www/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php b/www/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php
index 0efe3438..30375bd3 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php
@@ -77,7 +77,7 @@ final class TeamCity extends DefaultResultPrinter
                 'message'  => self::getMessage($t),
                 'details'  => self::getDetails($t),
                 'duration' => self::toMilliseconds($time),
-            ]
+            ],
         );
     }
 
@@ -169,7 +169,7 @@ final class TeamCity extends DefaultResultPrinter
                 'message'  => self::getMessage($t),
                 'details'  => self::getDetails($t),
                 'duration' => self::toMilliseconds($time),
-            ]
+            ],
         );
     }
 
@@ -189,7 +189,7 @@ final class TeamCity extends DefaultResultPrinter
 
             $this->printEvent(
                 'testCount',
-                ['count' => count($suite)]
+                ['count' => count($suite)],
             );
         }
 
@@ -271,7 +271,7 @@ final class TeamCity extends DefaultResultPrinter
             [
                 'name'     => $test->getName(),
                 'duration' => self::toMilliseconds($time),
-            ]
+            ],
         );
     }
 
@@ -351,7 +351,7 @@ final class TeamCity extends DefaultResultPrinter
         return str_replace(
             ['|', "'", "\n", "\r", ']', '['],
             ['||', "|'", '|n', '|r', '|]', '|['],
-            $text
+            $text,
         );
     }
 
@@ -367,7 +367,7 @@ final class TeamCity extends DefaultResultPrinter
             throw new Exception(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
diff --git a/www/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php b/www/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php
index 8706ae1a..5b34055a 100644
--- a/www/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php
+++ b/www/vendor/phpunit/phpunit/src/Util/PHP/AbstractPhpProcess.php
@@ -184,7 +184,7 @@ abstract class AbstractPhpProcess
             $test,
             $result,
             $_result['stdout'],
-            $_result['stderr']
+            $_result['stderr'],
         );
     }
 
@@ -199,15 +199,15 @@ abstract class AbstractPhpProcess
             $settings = array_merge(
                 $settings,
                 $this->runtime->getCurrentSettings(
-                    array_keys(ini_get_all('pcov'))
-                )
+                    array_keys(ini_get_all('pcov')),
+                ),
             );
         } elseif ($this->runtime->hasXdebug()) {
             $settings = array_merge(
                 $settings,
                 $this->runtime->getCurrentSettings(
-                    array_keys(ini_get_all('xdebug'))
-                )
+                    array_keys(ini_get_all('xdebug')),
+                ),
             );
         }
 
@@ -268,7 +268,7 @@ abstract class AbstractPhpProcess
             $result->addError(
                 $test,
                 new Exception(trim($stderr)),
-                $time
+                $time,
             );
         } else {
             set_error_handler(
@@ -278,7 +278,7 @@ abstract class AbstractPhpProcess
                 static function ($errno, $errstr, $errfile, $errline): void
                 {
                     throw new ErrorException($errstr, $errno, $errno, $errfile, $errline);
-                }
+                },
             );
 
             try {
@@ -293,7 +293,7 @@ abstract class AbstractPhpProcess
                     $result->addFailure(
                         $test,
                         new AssertionFailedError('Test was run in child process and ended unexpectedly'),
-                        $time
+                        $time,
                     );
                 }
             } catch (ErrorException $e) {
@@ -303,7 +303,7 @@ abstract class AbstractPhpProcess
                 $result->addError(
                     $test,
                     new Exception(trim($stdout), 0, $e),
-                    $time
+                    $time,
                 );
             }
 
@@ -322,7 +322,7 @@ abstract class AbstractPhpProcess
 
                 if ($result->getCollectCodeCoverageInformation()) {
                     $result->getCodeCoverage()->merge(
-                        $childResult->getCodeCoverage()
+                        $childResult->getCodeCoverage(),
                     );
                 }
 
@@ -338,37 +338,37 @@ abstract class AbstractPhpProcess
                     $result->addError(
                         $test,
                         $this->getException($notImplemented[0]),
-                        $time
+                        $time,
                     );
                 } elseif (!empty($risky)) {
                     $result->addError(
                         $test,
                         $this->getException($risky[0]),
-                        $time
+                        $time,
                     );
                 } elseif (!empty($skipped)) {
                     $result->addError(
                         $test,
                         $this->getException($skipped[0]),
-                        $time
+                        $time,
                     );
                 } elseif (!empty($errors)) {
                     $result->addError(
                         $test,
                         $this->getException($errors[0]),
-                        $time
+                        $time,
                     );
                 } elseif (!empty($warnings)) {
                     $result->addWarning(
                         $test,
                         $this->getException($warnings[0]),
-                        $time
+                        $time,
                     );
                 } elseif (!empty($failures)) {
                     $result->addFailure(
                         $test,
                         $this->getException($failures[0]),
-                        $time
+                        $time,
                     );
                 }
             }
@@ -402,12 +402,12 @@ abstract class AbstractPhpProcess
                 sprintf(
                     '%s: %s',
                     $exceptionArray['_PHP_Incomplete_Class_Name'],
-                    $exceptionArray['message']
+                    $exceptionArray['message'],
                 ),
                 $exceptionArray['code'],
                 $exceptionArray['file'],
                 $exceptionArray['line'],
-                $exceptionArray['trace']
+                $exceptionArray['trace'],
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php b/www/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php
index c4dc1114..64974f1d 100644
--- a/www/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php
+++ b/www/vendor/phpunit/phpunit/src/Util/PHP/DefaultPhpProcess.php
@@ -49,7 +49,7 @@ class DefaultPhpProcess extends AbstractPhpProcess
             if (!($this->tempFile = tempnam(sys_get_temp_dir(), 'PHPUnit')) ||
                 file_put_contents($this->tempFile, $job) === false) {
                 throw new Exception(
-                    'Unable to write temporary file'
+                    'Unable to write temporary file',
                 );
             }
 
@@ -101,12 +101,12 @@ class DefaultPhpProcess extends AbstractPhpProcess
             $pipeSpec,
             $pipes,
             null,
-            $env
+            $env,
         );
 
         if (!is_resource($process)) {
             throw new Exception(
-                'Unable to spawn worker process'
+                'Unable to spawn worker process',
             );
         }
 
@@ -138,8 +138,8 @@ class DefaultPhpProcess extends AbstractPhpProcess
                     throw new Exception(
                         sprintf(
                             'Job execution aborted after %d seconds',
-                            $this->timeout
-                        )
+                            $this->timeout,
+                        ),
                     );
                 }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/PHP/WindowsPhpProcess.php b/www/vendor/phpunit/phpunit/src/Util/PHP/WindowsPhpProcess.php
index 9ef92555..2480bc8c 100644
--- a/www/vendor/phpunit/phpunit/src/Util/PHP/WindowsPhpProcess.php
+++ b/www/vendor/phpunit/phpunit/src/Util/PHP/WindowsPhpProcess.php
@@ -36,7 +36,7 @@ final class WindowsPhpProcess extends DefaultPhpProcess
     {
         if (false === $stdout_handle = tmpfile()) {
             throw new Exception(
-                'A temporary file could not be created; verify that your TEMP environment variable is writable'
+                'A temporary file could not be created; verify that your TEMP environment variable is writable',
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/Printer.php b/www/vendor/phpunit/phpunit/src/Util/Printer.php
index 77b5745a..311d4943 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Printer.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Printer.php
@@ -67,8 +67,8 @@ class Printer
                 throw new Exception(
                     sprintf(
                         '"%s" does not match "socket://hostname:port" format',
-                        $out
-                    )
+                        $out,
+                    ),
                 );
             }
 
@@ -81,8 +81,8 @@ class Printer
             throw new Exception(
                 sprintf(
                     'Directory "%s" was not created',
-                    dirname($out)
-                )
+                    dirname($out),
+                ),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/RegularExpression.php b/www/vendor/phpunit/phpunit/src/Util/RegularExpression.php
index db1dae92..1e97d6c2 100644
--- a/www/vendor/phpunit/phpunit/src/Util/RegularExpression.php
+++ b/www/vendor/phpunit/phpunit/src/Util/RegularExpression.php
@@ -25,7 +25,7 @@ final class RegularExpression
             static function () use ($pattern, $subject)
             {
                 return preg_match($pattern, $subject);
-            }
+            },
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Util/Test.php b/www/vendor/phpunit/phpunit/src/Util/Test.php
index d04a7683..12c6bf16 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Test.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Test.php
@@ -119,7 +119,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             $className,
-            $methodName
+            $methodName,
         );
 
         if (!self::shouldCoversAnnotationBeUsed($annotations)) {
@@ -145,7 +145,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             get_class($test),
-            $test->getName(false)
+            $test->getName(false),
         );
 
         // If there is no @covers annotation but a @coversNothing annotation on
@@ -182,7 +182,7 @@ final class Test
     {
         return self::mergeArraysRecursively(
             Registry::getInstance()->forClassName($className)->requirements(),
-            Registry::getInstance()->forMethod($className, $methodName)->requirements()
+            Registry::getInstance()->forMethod($className, $methodName)->requirements(),
         );
     }
 
@@ -213,7 +213,7 @@ final class Test
             if (!$required['PHP_constraint']['constraint']->complies($version)) {
                 $missing[] = sprintf(
                     'PHP version does not match the required constraint %s.',
-                    $required['PHP_constraint']['constraint']->asString()
+                    $required['PHP_constraint']['constraint']->asString(),
                 );
 
                 $hint = 'PHP_constraint';
@@ -235,7 +235,7 @@ final class Test
             if (!$required['PHPUnit_constraint']['constraint']->complies($phpunitVersion)) {
                 $missing[] = sprintf(
                     'PHPUnit version does not match the required constraint %s.',
-                    $required['PHPUnit_constraint']['constraint']->asString()
+                    $required['PHPUnit_constraint']['constraint']->asString(),
                 );
 
                 $hint = $hint ?? 'PHPUnit_constraint';
@@ -367,12 +367,12 @@ final class Test
             'backupGlobals' => self::getBooleanAnnotationSetting(
                 $className,
                 $methodName,
-                'backupGlobals'
+                'backupGlobals',
             ),
             'backupStaticAttributes' => self::getBooleanAnnotationSetting(
                 $className,
                 $methodName,
-                'backupStaticAttributes'
+                'backupStaticAttributes',
             ),
         ];
     }
@@ -386,7 +386,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             $className,
-            $methodName
+            $methodName,
         );
 
         $dependsAnnotations = $annotations['class']['depends'] ?? [];
@@ -394,7 +394,7 @@ final class Test
         if (isset($annotations['method']['depends'])) {
             $dependsAnnotations = array_merge(
                 $dependsAnnotations,
-                $annotations['method']['depends']
+                $annotations['method']['depends'],
             );
         }
 
@@ -413,7 +413,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             $className,
-            $methodName
+            $methodName,
         );
 
         $groups = [];
@@ -492,7 +492,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             $className,
-            $methodName
+            $methodName,
         );
 
         return isset($annotations['class']['runTestsInSeparateProcesses']) || isset($annotations['method']['runInSeparateProcess']);
@@ -503,7 +503,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             $className,
-            $methodName
+            $methodName,
         );
 
         return isset($annotations['class']['runClassInSeparateProcess']);
@@ -515,7 +515,7 @@ final class Test
         return self::getBooleanAnnotationSetting(
             $className,
             $methodName,
-            'preserveGlobalState'
+            'preserveGlobalState',
         );
     }
 
@@ -537,7 +537,7 @@ final class Test
                         if ($docBlock->isHookToBeExecutedBeforeClass()) {
                             array_unshift(
                                 self::$hookMethods[$className]['beforeClass'],
-                                $method->getName()
+                                $method->getName(),
                             );
                         }
 
@@ -549,14 +549,14 @@ final class Test
                     if ($docBlock->isToBeExecutedBeforeTest()) {
                         array_unshift(
                             self::$hookMethods[$className]['before'],
-                            $method->getName()
+                            $method->getName(),
                         );
                     }
 
                     if ($docBlock->isToBeExecutedAsPreCondition()) {
                         array_unshift(
                             self::$hookMethods[$className]['preCondition'],
-                            $method->getName()
+                            $method->getName(),
                         );
                     }
 
@@ -589,9 +589,9 @@ final class Test
             'test',
             Registry::getInstance()->forMethod(
                 $method->getDeclaringClass()->getName(),
-                $method->getName()
+                $method->getName(),
             )
-            ->symbolAnnotations()
+                ->symbolAnnotations(),
         );
     }
 
@@ -604,7 +604,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             $className,
-            $methodName
+            $methodName,
         );
 
         $classShortcut = null;
@@ -615,8 +615,8 @@ final class Test
                     sprintf(
                         'More than one @%sClass annotation in class or interface "%s".',
                         $mode,
-                        $className
-                    )
+                        $className,
+                    ),
                 );
             }
 
@@ -645,8 +645,8 @@ final class Test
                 throw new InvalidCoversTargetException(
                     sprintf(
                         'Trying to @cover interface "%s".',
-                        $element
-                    )
+                        $element,
+                    ),
                 );
             }
 
@@ -657,10 +657,10 @@ final class Test
                     sprintf(
                         '"@%s %s" is invalid',
                         $mode,
-                        $element
+                        $element,
                     ),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
         }
@@ -685,7 +685,7 @@ final class Test
     {
         $annotations = self::parseTestMethodAnnotations(
             $className,
-            $methodName
+            $methodName,
         );
 
         if (isset($annotations['method'][$settingName])) {
@@ -720,7 +720,7 @@ final class Test
         return preg_replace(
             '/^(\d+\.\d+(?:.\d+)?).*$/',
             '$1',
-            $version
+            $version,
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/TestDox/CliTestDoxPrinter.php b/www/vendor/phpunit/phpunit/src/Util/TestDox/CliTestDoxPrinter.php
index b66eb8b9..031c7ed6 100644
--- a/www/vendor/phpunit/phpunit/src/Util/TestDox/CliTestDoxPrinter.php
+++ b/www/vendor/phpunit/phpunit/src/Util/TestDox/CliTestDoxPrinter.php
@@ -205,7 +205,7 @@ class CliTestDoxPrinter extends TestDoxPrinter
             ' %s %s%s' . PHP_EOL,
             $this->colorizeTextBox($style['color'], $style['symbol']),
             $testName,
-            $this->verbose ? ' ' . $this->formatRuntime($result['time'], $style['color']) : ''
+            $this->verbose ? ' ' . $this->formatRuntime($result['time'], $style['color']) : '',
         );
 
         $this->write($line);
diff --git a/www/vendor/phpunit/phpunit/src/Util/TestDox/HtmlResultPrinter.php b/www/vendor/phpunit/phpunit/src/Util/TestDox/HtmlResultPrinter.php
index 776a83bd..d08bfad4 100644
--- a/www/vendor/phpunit/phpunit/src/Util/TestDox/HtmlResultPrinter.php
+++ b/www/vendor/phpunit/phpunit/src/Util/TestDox/HtmlResultPrinter.php
@@ -122,8 +122,8 @@ EOT;
         $this->write(
             sprintf(
                 self::CLASS_HEADER,
-                $this->currentTestClassPrettified
-            )
+                $this->currentTestClassPrettified,
+            ),
         );
     }
 
@@ -136,8 +136,8 @@ EOT;
             sprintf(
                 "            <li class=\"%s\">%s</li>\n",
                 $success ? 'success' : 'defect',
-                $name
-            )
+                $name,
+            ),
         );
     }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php b/www/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
index 74207149..ee0a41b1 100644
--- a/www/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
+++ b/www/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
@@ -124,7 +124,7 @@ final class NamePrettifier
     {
         $annotations = Test::parseTestMethodAnnotations(
             get_class($test),
-            $test->getName(false)
+            $test->getName(false),
         );
 
         $annotationWithPlaceholders = false;
@@ -243,7 +243,7 @@ final class NamePrettifier
             throw new UtilException(
                 $e->getMessage(),
                 $e->getCode(),
-                $e
+                $e,
             );
         }
         // @codeCoverageIgnoreEnd
@@ -263,7 +263,7 @@ final class NamePrettifier
                     throw new UtilException(
                         $e->getMessage(),
                         $e->getCode(),
-                        $e
+                        $e,
                     );
                 }
                 // @codeCoverageIgnoreEnd
diff --git a/www/vendor/phpunit/phpunit/src/Util/TestDox/TestDoxPrinter.php b/www/vendor/phpunit/phpunit/src/Util/TestDox/TestDoxPrinter.php
index bd64785c..5a418998 100644
--- a/www/vendor/phpunit/phpunit/src/Util/TestDox/TestDoxPrinter.php
+++ b/www/vendor/phpunit/phpunit/src/Util/TestDox/TestDoxPrinter.php
@@ -381,8 +381,8 @@ class TestDoxPrinter extends DefaultResultPrinter
                 {
                     return '   ' . $prefix . ($text ? ' ' . $text : '');
                 },
-                preg_split('/\r\n|\r|\n/', $message)
-            )
+                preg_split('/\r\n|\r|\n/', $message),
+            ),
         );
     }
 }
diff --git a/www/vendor/phpunit/phpunit/src/Util/TestDox/XmlResultPrinter.php b/www/vendor/phpunit/phpunit/src/Util/TestDox/XmlResultPrinter.php
index 265fe41f..544c83e7 100644
--- a/www/vendor/phpunit/phpunit/src/Util/TestDox/XmlResultPrinter.php
+++ b/www/vendor/phpunit/phpunit/src/Util/TestDox/XmlResultPrinter.php
@@ -164,7 +164,7 @@ final class XmlResultPrinter extends Printer implements TestListener
             static function ($group)
             {
                 return !($group === 'small' || $group === 'medium' || $group === 'large' || strpos($group, '__phpunit_') === 0);
-            }
+            },
         );
 
         $testNode = $this->document->createElement('test');
@@ -188,7 +188,7 @@ final class XmlResultPrinter extends Printer implements TestListener
 
         $annotations = TestUtil::parseTestMethodAnnotations(
             get_class($test),
-            $test->getName(false)
+            $test->getName(false),
         );
 
         foreach (['class', 'method'] as $type) {
@@ -240,7 +240,7 @@ final class XmlResultPrinter extends Printer implements TestListener
                 throw new Exception(
                     $e->getMessage(),
                     $e->getCode(),
-                    $e
+                    $e,
                 );
             }
             // @codeCoverageIgnoreEnd
diff --git a/www/vendor/phpunit/phpunit/src/Util/TextTestListRenderer.php b/www/vendor/phpunit/phpunit/src/Util/TextTestListRenderer.php
index 67168a67..beb0e4b0 100644
--- a/www/vendor/phpunit/phpunit/src/Util/TextTestListRenderer.php
+++ b/www/vendor/phpunit/phpunit/src/Util/TextTestListRenderer.php
@@ -35,7 +35,7 @@ final class TextTestListRenderer
                 $name = sprintf(
                     '%s::%s',
                     get_class($test),
-                    str_replace(' with data set ', '', $test->getName())
+                    str_replace(' with data set ', '', $test->getName()),
                 );
             } elseif ($test instanceof PhptTestCase) {
                 $name = $test->getName();
@@ -45,7 +45,7 @@ final class TextTestListRenderer
 
             $buffer .= sprintf(
                 ' - %s' . PHP_EOL,
-                $name
+                $name,
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php b/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php
index 77e67470..57ca7c32 100644
--- a/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php
+++ b/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php
@@ -50,8 +50,8 @@ final class VersionComparisonOperator
             throw new Exception(
                 sprintf(
                     '"%s" is not a valid version_compare() operator',
-                    $operator
-                )
+                    $operator,
+                ),
             );
         }
     }
diff --git a/www/vendor/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php b/www/vendor/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php
index 8b10d415..d6366eaa 100644
--- a/www/vendor/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php
+++ b/www/vendor/phpunit/phpunit/src/Util/XdebugFilterScriptGenerator.php
@@ -32,10 +32,10 @@ final class XdebugFilterScriptGenerator
             {
                 return sprintf(
                     "        '%s'",
-                    $item
+                    $item,
                 );
             },
-            $this->getItems($filter)
+            $this->getItems($filter),
         );
 
         $files = implode(",\n", $files);
@@ -67,7 +67,7 @@ EOF;
             if (is_string($path)) {
                 $files[] = sprintf(
                     addslashes('%s' . DIRECTORY_SEPARATOR),
-                    $path
+                    $path,
                 );
             }
         }
diff --git a/www/vendor/phpunit/phpunit/src/Util/Xml.php b/www/vendor/phpunit/phpunit/src/Util/Xml.php
index 54d72156..efdd56ef 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Xml.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Xml.php
@@ -68,8 +68,8 @@ final class Xml
             '',
             htmlspecialchars(
                 self::convertToUtf8($string),
-                ENT_QUOTES
-            )
+                ENT_QUOTES,
+            ),
         );
     }
 
@@ -127,7 +127,7 @@ final class Xml
                         throw new Exception(
                             $e->getMessage(),
                             $e->getCode(),
-                            $e
+                            $e,
                         );
                     }
                     // @codeCoverageIgnoreEnd
diff --git a/www/vendor/phpunit/phpunit/src/Util/Xml/Loader.php b/www/vendor/phpunit/phpunit/src/Util/Xml/Loader.php
index 8d43d327..2ba5ace3 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Xml/Loader.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Xml/Loader.php
@@ -38,8 +38,8 @@ final class Loader
             throw new Exception(
                 sprintf(
                     'Could not read "%s".',
-                    $filename
-                )
+                    $filename,
+                ),
             );
         }
 
@@ -100,8 +100,8 @@ final class Loader
                     sprintf(
                         'Could not load "%s".%s',
                         $filename,
-                        $message !== '' ? "\n" . $message : ''
-                    )
+                        $message !== '' ? "\n" . $message : '',
+                    ),
                 );
             }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaDetector.php b/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaDetector.php
index 5864695b..46f2b947 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaDetector.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaDetector.php
@@ -23,7 +23,7 @@ final class SchemaDetector
             $filename,
             false,
             true,
-            true
+            true,
         );
 
         foreach (['9.2', '8.5'] as $candidate) {
diff --git a/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaFinder.php b/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaFinder.php
index 1e7b73c5..af17dfe9 100644
--- a/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaFinder.php
+++ b/www/vendor/phpunit/phpunit/src/Util/Xml/SchemaFinder.php
@@ -34,8 +34,8 @@ final class SchemaFinder
             throw new Exception(
                 sprintf(
                     'Schema for PHPUnit %s is not available',
-                    $version
-                )
+                    $version,
+                ),
             );
         }
 
diff --git a/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php b/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php
index b16ef0b7..7a63b10d 100644
--- a/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php
+++ b/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php
@@ -60,8 +60,8 @@ final class XmlTestListRenderer
                         str_replace(
                             ' with data set ',
                             '',
-                            $test->getDataSetAsString(false)
-                        )
+                            $test->getDataSetAsString(false),
+                        ),
                     );
                 }
 
diff --git a/www/vendor/sebastian/global-state/ChangeLog.md b/www/vendor/sebastian/global-state/ChangeLog.md
index a27a5cf1..47726664 100644
--- a/www/vendor/sebastian/global-state/ChangeLog.md
+++ b/www/vendor/sebastian/global-state/ChangeLog.md
@@ -2,6 +2,12 @@
 
 All notable changes in `sebastian/global-state` are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [5.0.6] - 2023-08-02
+
+### Changed
+
+* Changed usage of `ReflectionProperty::setValue()` to be compatible with PHP 8.3
+
 ## [5.0.5] - 2022-02-14
 
 ### Fixed
@@ -66,6 +72,7 @@ All notable changes in `sebastian/global-state` are documented in this file usin
 
 * This component is no longer supported on PHP 7.0 and PHP 7.1
 
+[5.0.6]: https://github.com/sebastianbergmann/global-state/compare/5.0.5...5.0.6
 [5.0.5]: https://github.com/sebastianbergmann/global-state/compare/5.0.4...5.0.5
 [5.0.4]: https://github.com/sebastianbergmann/global-state/compare/5.0.3...5.0.4
 [5.0.3]: https://github.com/sebastianbergmann/global-state/compare/5.0.2...5.0.3
diff --git a/www/vendor/sebastian/global-state/src/Restorer.php b/www/vendor/sebastian/global-state/src/Restorer.php
index 1633fcc1..ab145ce2 100644
--- a/www/vendor/sebastian/global-state/src/Restorer.php
+++ b/www/vendor/sebastian/global-state/src/Restorer.php
@@ -85,7 +85,7 @@ class Restorer
             foreach ($staticAttributes as $name => $value) {
                 $reflector = new ReflectionProperty($className, $name);
                 $reflector->setAccessible(true);
-                $reflector->setValue($value);
+                $reflector->setValue(null, $value);
             }
         }
 
@@ -109,7 +109,7 @@ class Restorer
                 }
 
                 $attribute->setAccessible(true);
-                $attribute->setValue($defaults[$name]);
+                $attribute->setValue(null, $defaults[$name]);
             }
         }
     }