Merge branch 'add-curler-recorder'

Author: lkrms

.phive/phars.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.66" location="./tools/pretty-php" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.46.0" installed="3.62.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.70" location="./tools/pretty-php" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.46.0" installed="3.64.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="salient-labs/changelog" version="^1.0.5" installed="1.0.6" location="./tools/changelog" copy="true"/>
 </phive>

docs/App.md

@@ -7,29 +7,34 @@ Unless running from source or on Windows, [Application][Application] and
 Specification][xdg-base-spec] when creating directories for storage of
 application data.
 
-| `Application` method | `.env` override   | Default (Phar, *nix)              | Default (Phar, Windows)      | Default (running from source) |
+| `Application` method | `.env` override   | Default (Phar, \*nix)             | Default (Phar, Windows)      | Default (running from source) |
 | -------------------- | ----------------- | --------------------------------- | ---------------------------- | ----------------------------- |
 | `getBasePath()`      | app_base_path[^1] |                                   |                              |                               |
 | `getCachePath()`     | app_cache_path    | `$XDG_CACHE_HOME/<App>/cache`[^2] | `%LOCALAPPDATA%/<App>/cache` | `<BasePath>/var/cache`        |
-| `getConfigPath()`    | app_config_path   | `$XDG_CONFIG_HOME/<App>`[^3]      | `%APPDATA%/<App>/config`     | `<BasePath>/config`           |
-| `getDataPath()`      | app_data_path     | `$XDG_DATA_HOME/<App>`[^4]        | `%APPDATA%/<App>/data`       | `<BasePath>/var/lib`          |
+| `getConfigPath()`    | app_config_path   | `$XDG_CONFIG_HOME/<App>`[^3]      | `%APPDATA%/<App>/config`     | `<BasePath>/var/lib/config`   |
+| `getDataPath()`      | app_data_path     | `$XDG_DATA_HOME/<App>`[^4]        | `%APPDATA%/<App>/data`       | `<BasePath>/var/lib/data`     |
 | `getLogPath()`       | app_log_path      | `$XDG_CACHE_HOME/<App>/log`       | `%LOCALAPPDATA%/<App>/log`   | `<BasePath>/var/log`          |
 | `getTempPath()`      | app_temp_path     | `$XDG_CACHE_HOME/<App>/tmp`       | `%LOCALAPPDATA%/<App>/tmp`   | `<BasePath>/var/tmp`          |
 
-[^1]: `app_base_path` is always ignored if `$basePath` is passed to
+[^1]:
+    `app_base_path` is always ignored if `$basePath` is passed to
     [Application][Application]'s constructor.
 
-[^2]: If `XDG_CACHE_HOME` is empty or not set, `$HOME/.cache` is used as the
+[^2]:
+    If `XDG_CACHE_HOME` is empty or not set, `$HOME/.cache` is used as the
     default
 
-[^3]: If `XDG_CONFIG_HOME` is empty or not set, `$HOME/.config` is used as the
+[^3]:
+    If `XDG_CONFIG_HOME` is empty or not set, `$HOME/.config` is used as the
     default
 
-[^4]: If `XDG_DATA_HOME` is empty or not set, `$HOME/.local/share` is used as
-    the default
-
-
-[Application]: https://salient-labs.github.io/toolkit/Salient.Container.Application.html
-[CliApplication]: https://salient-labs.github.io/toolkit/Salient.Cli.CliApplication.html
-[xdg-base-spec]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+[^4]:
+    If `XDG_DATA_HOME` is empty or not set, `$HOME/.local/share` is used as the
+    default
 
+[Application]:
+  https://salient-labs.github.io/toolkit/Salient.Container.Application.html
+[CliApplication]:
+  https://salient-labs.github.io/toolkit/Salient.Cli.CliApplication.html
+[xdg-base-spec]:
+  https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

docs/Builders.md

@@ -23,6 +23,9 @@ class Option implements Buildable
     protected $ValueType;
     protected $Description;
 
+    /**
+     * @internal
+     */
     public function __construct(
         $long = null,
         $short = null,

phpstan-baseline-7.4.neon

@@ -301,7 +301,7 @@ final class CliOption implements Buildable, JsonSchemaInterface, Immutable, Read
     private bool $IsLoaded = false;
 
     /**
-     * Creates a new CliOption object
+     * @internal
      *
      * @param string|null $name The name of the option (ignored if not
      * positional; must start with a letter, number or underscore, followed by

phpstan-baseline-8.3.neon

@@ -14,6 +14,8 @@ class CliInvalidArgumentsException extends AbstractMultipleErrorException
     public function __construct(string ...$errors)
     {
         parent::__construct('Invalid arguments', ...$errors);
+
+        // Must be called after parent::__construct()
         $this->ExitStatus = 1;
     }
 }