Bump CakePHP to 4.4.12 (and related updates)

app/composer.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": ">=7.3",
-        "cakephp/cakephp": "^4.3",
+        "cakephp/cakephp": "^4.4",
         "cakephp/migrations": "^3.2",
         "cakephp/plugin-installer": "^1.3",
         "components/jquery": "~3.6.0",
@@ -76,6 +76,10 @@
     },
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "cakephp/plugin-installer": true
+        }
     }
 }

app/vendor/autoload.php

@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit8d81387c26c532d7a48feda4036c56c7::getLoader();

app/vendor/bin/composer

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/composer/composer/bin/composer');
         exit(0);
     }

app/vendor/bin/doctrine-dbal

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/doctrine/dbal/bin/doctrine-dbal');
         exit(0);
     }

app/vendor/bin/phinx

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/robmorgan/phinx/bin/phinx');
         exit(0);
     }

app/vendor/bin/php-parse

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/nikic/php-parser/bin/php-parse');
         exit(0);
     }

app/vendor/bin/phpcbf

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/squizlabs/php_codesniffer/bin/phpcbf');
         exit(0);
     }

app/vendor/bin/phpcs

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/squizlabs/php_codesniffer/bin/phpcs');
         exit(0);
     }

app/vendor/bin/phpstan

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/phpstan/phpstan/phpstan');
         exit(0);
     }

app/vendor/bin/phpstan.phar

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/phpstan/phpstan/phpstan.phar');
         exit(0);
     }

app/vendor/bin/phpunit

@@ -111,7 +111,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/phpunit/phpunit/phpunit');
         exit(0);
     }

app/vendor/bin/psysh

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/psy/psysh/bin/psysh');
         exit(0);
     }

app/vendor/bin/var-dump-server

@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
         }
     }
 
-    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
         include("phpvfscomposer://" . __DIR__ . '/..'.'/symfony/var-dumper/Resources/bin/var-dump-server');
         exit(0);
     }

app/vendor/brick/varexporter/CHANGELOG.md

@@ -0,0 +1,120 @@
+# Changelog
+
+## [0.3.8](https://github.com/brick/varexporter/releases/tag/0.3.8) - 2023-01-22
+
+✨ **New feature**
+
+- Support for PHP 8.1 `readonly` properties (#27, #28)
+
+Thanks @AnnaDamm!
+
+## [0.3.7](https://github.com/brick/varexporter/releases/tag/0.3.7) - 2022-06-30
+
+✨ **New feature**
+
+- New option: `VarExporter::INLINE_ARRAY`
+
+🗑️ **Deprecated**
+
+- The `VarExporter::INLINE_NUMERIC_SCALAR_ARRAY` is deprecated, please use `INLINE_SCALAR_LIST` instead
+
+## [0.3.6](https://github.com/brick/varexporter/releases/tag/0.3.6) - 2022-06-15
+
+✨ **New feature**
+
+Support for PHP 8.1 enums (#23).
+
+Thanks @Jacobs63!
+
+## [0.3.5](https://github.com/brick/varexporter/releases/tag/0.3.5) - 2021-02-10
+
+✨ **New feature**
+
+Support for controlling the base indentation level (#17).
+
+Thanks @ADmad!
+
+## [0.3.4](https://github.com/brick/varexporter/releases/tag/0.3.4) - 2021-02-07
+
+✨ **New feature**
+
+Support for trailing comma in non-inline arrays, with the `TRAILING_COMMA_IN_ARRAY` flag (#16).
+
+Thanks @ADmad!
+
+## [0.3.3](https://github.com/brick/varexporter/releases/tag/0.3.3) - 2020-12-24
+
+🐛 **Bug fix**
+
+- Exporting an object with numeric dynamic properties would lead to a `TypeError`
+
+## [0.3.2](https://github.com/brick/varexporter/releases/tag/0.3.2) - 2020-03-13
+
+✨ **New feature**
+
+Support for exporting internal classes implementing `__set_state()`:
+
+- `DateTime`
+- `DateTimeImmutable`
+- `DateTimeZone`
+- `DateInterval`
+- `DatePeriod`
+
+Thanks @GameplayJDK!
+
+## [0.3.1](https://github.com/brick/varexporter/releases/tag/0.3.1) - 2020-01-23
+
+✨ **New features**
+
+- Support for closures with `use()` using the `CLOSURE_SNAPSHOT_USE` option (#7)
+- Support for arrow functions in PHP 7.4 (#8)
+
+Thanks to @jasny for his awesome work!
+
+## [0.3.0](https://github.com/brick/varexporter/releases/tag/0.3.0) - 2019-12-24
+
+Minimum PHP version is now `7.2`. No breaking changes.
+
+## [0.2.1](https://github.com/brick/varexporter/releases/tag/0.2.1) - 2019-04-16
+
+✨ **New option**: `VarExporter::INLINE_NUMERIC_SCALAR_ARRAY` (#3)
+
+Formats numeric arrays containing only scalar values on a single line.
+
+## [0.2.0](https://github.com/brick/varexporter/releases/tag/0.2.0) - 2019-04-09
+
+✨ **New feature**
+
+- Experimental support for closures 🎉
+
+💥 **Minor BC break**
+
+- `export()` does not throw an exception anymore when encountering a `Closure`.  
+  To get the old behaviour back, use the `NO_CLOSURES` option.
+
+## [0.1.2](https://github.com/brick/varexporter/releases/tag/0.1.2) - 2019-04-08
+
+🐛 **Bug fixes**
+
+- Static properties in custom classes were wrongly included—`unset()`—in the output
+
+✨ **Improvements**
+
+- Circular references are now detected, and throw an `ExportException` instead of erroring.
+
+## [0.1.1](https://github.com/brick/varexporter/releases/tag/0.1.1) - 2019-04-08
+
+🐛 **Bug fixes**
+
+- Single-letter properties were wrongly exported using `->{'x'}` notation.
+
+✨ **Improvements**
+
+- Exception messages now contain the path (array keys / object properties) to the failure:
+
+    > `[foo][bar][0]` Type "resource" is not supported.
+
+## [0.1.0](https://github.com/brick/varexporter/releases/tag/0.1.0) - 2019-04-07
+
+First release.
+

app/vendor/brick/varexporter/composer.json

@@ -13,7 +13,7 @@
   "require-dev": {
     "phpunit/phpunit": "^8.5 || ^9.0",
     "php-coveralls/php-coveralls": "^2.2",
-    "vimeo/psalm": "4.4.1"
+    "vimeo/psalm": "4.23.0"
   },
   "autoload": {
     "psr-4": {

app/vendor/brick/varexporter/src/Internal/GenericExporter.php

@@ -51,7 +51,14 @@ final class GenericExporter
      *
      * @var bool
      */
-    public $inlineNumericScalarArray;
+    public $inlineArray;
+
+    /**
+     * @psalm-readonly
+     *
+     * @var bool
+     */
+    public $inlineScalarList;
 
     /**
      * @psalm-readonly
@@ -74,10 +81,6 @@ final class GenericExporter
      */
     public $indentLevel;
 
-    /**
-     * @param int $options
-     * @param int Indentation level
-     */
     public function __construct(int $options, int $indentLevel = 0)
     {
         $this->objectExporters[] = new ObjectExporter\StdClassExporter($this);
@@ -96,13 +99,18 @@ public function __construct(int $options, int $indentLevel = 0)
             $this->objectExporters[] = new ObjectExporter\SerializeExporter($this);
         }
 
+        if (! ($options & VarExporter::NO_ENUMS)) {
+            $this->objectExporters[] = new ObjectExporter\EnumExporter($this);
+        }
+
         if (! ($options & VarExporter::NOT_ANY_OBJECT)) {
             $this->objectExporters[] = new ObjectExporter\AnyObjectExporter($this);
         }
 
         $this->addTypeHints             = (bool) ($options & VarExporter::ADD_TYPE_HINTS);
         $this->skipDynamicProperties    = (bool) ($options & VarExporter::SKIP_DYNAMIC_PROPERTIES);
-        $this->inlineNumericScalarArray = (bool) ($options & VarExporter::INLINE_NUMERIC_SCALAR_ARRAY);
+        $this->inlineArray              = (bool) ($options & VarExporter::INLINE_ARRAY);
+        $this->inlineScalarList         = (bool) ($options & VarExporter::INLINE_SCALAR_LIST);
         $this->closureSnapshotUses      = (bool) ($options & VarExporter::CLOSURE_SNAPSHOT_USES);
         $this->trailingCommaInArray     = (bool) ($options & VarExporter::TRAILING_COMMA_IN_ARRAY);
 
@@ -165,11 +173,11 @@ public function exportArray(array $array, array $path, array $parentIds) : array
         $result = [];
 
         $count = count($array);
-        $isNumeric = array_keys($array) === range(0, $count - 1);
+        $isList = array_keys($array) === range(0, $count - 1);
 
         $current = 0;
 
-        $inline = ($this->inlineNumericScalarArray && $isNumeric && $this->isScalarArray($array));
+        $inline = $this->inlineArray || ($this->inlineScalarList && $isList && $this->isScalarList($array));
 
         foreach ($array as $key => $value) {
             $isLast = (++$current === $count);
@@ -180,12 +188,16 @@ public function exportArray(array $array, array $path, array $parentIds) : array
             $exported = $this->export($value, $newPath, $parentIds);
 
             if ($inline) {
-                $result[] = $exported[0];
+                if ($isList) {
+                    $result[] = $exported[0];
+                } else {
+                    $result[] = var_export($key, true) . ' => ' . $exported[0];
+                }
             } else {
                 $prepend = '';
                 $append = '';
 
-                if (! $isNumeric) {
+                if (! $isList) {
                     $prepend = var_export($key, true) . ' => ';
                 }
 
@@ -220,7 +232,7 @@ public function exportArray(array $array, array $path, array $parentIds) : array
      *
      * @return bool
      */
-    private function isScalarArray(array $array) : bool
+    private function isScalarList(array $array) : bool
     {
         foreach ($array as $value) {
             if ($value !== null && ! is_scalar($value)) {