Merge branch 'replace-whoops'

Author: lkrms

composer.json

@@ -6,7 +6,6 @@
     "require": {
         "php": ">=7.4",
         "composer-runtime-api": "^2.2",
-        "filp/whoops": "^2",
         "lkrms/dice": "^4.1.6",
         "psr/container": "^2",
         "psr/log": "^1"

lib/lk-util/Command/Generate/GenerateFacade.php

@@ -18,15 +18,10 @@
  */
 final class GenerateFacade extends GenerateCommand
 {
-    private ?string $ClassFqcn;
-    private ?string $FacadeFqcn;
-
     /**
      * Methods that shouldn't be surfaced by the Facade
-     *
-     * @var string[]
      */
-    private array $SkipMethods = [
+    private const SKIP_METHODS = [
         'getReadable',
         'getWritable',
         'setFacade',
@@ -38,6 +33,14 @@ final class GenerateFacade extends GenerateCommand
         'getInstance',
     ];
 
+    private ?string $ClassFqcn;
+    private ?string $FacadeFqcn;
+
+    /**
+     * @var string[]|null
+     */
+    private ?array $SkipMethods;
+
     public function description(): string
     {
         return 'Generate a static interface to a class';
@@ -61,12 +64,20 @@ protected function getOptionList(): array
                 ->required()
                 ->bindTo($this->FacadeFqcn),
             ...$this->getOutputOptionList('facade'),
+            CliOption::build()
+                ->long('skip')
+                ->short('k')
+                ->description('Exclude a method from the facade')
+                ->optionType(CliOptionType::VALUE)
+                ->multipleAllowed()
+                ->bindTo($this->SkipMethods),
         ];
     }
 
     protected function run(string ...$args)
     {
         $this->reset();
+        $this->SkipMethods = array_merge($this->SkipMethods, self::SKIP_METHODS);
 
         $classFqcn = $this->getRequiredFqcnOptionValue(
             'class',

phpstan-baseline.neon

@@ -305,21 +305,6 @@ parameters:
 			count: 1
 			path: src/Curler/Support/CurlerPage.php
 
-		-
-			message: "#^Class Lkrms\\\\Err\\\\Err implements generic interface Lkrms\\\\Contract\\\\IFacade but does not specify its types\\: TClass$#"
-			count: 1
-			path: src/Err/Err.php
-
-		-
-			message: "#^Method Lkrms\\\\Err\\\\Err\\:\\:__callStatic\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/Err/Err.php
-
-		-
-			message: "#^Method Lkrms\\\\Err\\\\Err\\:\\:__callStatic\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Err/Err.php
-
 		-
 			message: "#^Method Lkrms\\\\Store\\\\CacheStore\\:\\:get\\(\\) has no return type specified\\.$#"
 			count: 1

scripts/generate.php

@@ -15,6 +15,7 @@
 use Lkrms\Store\CacheStore;
 use Lkrms\Store\TrashStore;
 use Lkrms\Support\ArrayMapper;
+use Lkrms\Support\ErrorHandler;
 use Lkrms\Support\EventDispatcher;
 use Lkrms\Sync\Support\DbSyncDefinition;
 use Lkrms\Sync\Support\HttpSyncDefinition;
@@ -43,6 +44,7 @@
     ConsoleWriter::class => \Lkrms\Facade\Console::class,
     Container::class => \Lkrms\Facade\DI::class,
     Debugging::class => \Lkrms\Facade\Debug::class,
+    ErrorHandler::class => [\Lkrms\Facade\Err::class, '--skip', 'handleShutdown,handleError,handleException'],
     EventDispatcher::class => \Lkrms\Facade\Event::class,
     Filesystem::class => \Lkrms\Facade\File::class,
     Formatters::class => \Lkrms\Facade\Format::class,
@@ -83,7 +85,12 @@
 $status = 0;
 
 foreach ($facades as $class => $facade) {
-    $status |= $generateFacade(...[...$args, $class, $facade]);
+    $facadeArgs = [];
+    if (is_array($facade)) {
+        $facadeArgs = $facade;
+        $facade = array_shift($facadeArgs);
+    }
+    $status |= $generateFacade(...[...$args, ...$facadeArgs, $class, $facade]);
 }
 
 foreach ($builders as $class => $builder) {

src/Container/Application.php

@@ -7,10 +7,10 @@
 use Lkrms\Console\Target\StreamTarget;
 use Lkrms\Container\Container;
 use Lkrms\Contract\IApplication;
-use Lkrms\Err\Err;
 use Lkrms\Facade\Cache;
 use Lkrms\Facade\Composer;
 use Lkrms\Facade\Console;
+use Lkrms\Facade\Err;
 use Lkrms\Facade\File;
 use Lkrms\Facade\Format;
 use Lkrms\Facade\Sync;
@@ -286,13 +286,11 @@ public function __construct(
 
         Console::registerStdioTargets();
 
-        if (!Err::isLoaded()) {
-            Err::load();
-        }
+        Err::register();
 
         $adodb = Composer::getPackagePath('adodb/adodb-php');
         if ($adodb !== null) {
-            Err::silencePaths($adodb);
+            Err::silencePath($adodb);
         }
     }
 

src/Err/CliHandler.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+namespace Lkrms\Facade;
+
+use Lkrms\Concept\Facade;
+use Lkrms\Support\ErrorHandler;
+
+/**
+ * A facade for \Lkrms\Support\ErrorHandler
+ *
+ * @method static ErrorHandler load() Load and return an instance of the underlying ErrorHandler class
+ * @method static ErrorHandler getInstance() Get the underlying ErrorHandler instance
+ * @method static bool isLoaded() True if an underlying ErrorHandler instance has been loaded
+ * @method static void unload() Clear the underlying ErrorHandler instance
+ * @method static ErrorHandler deregister() Deregister previously registered error and exception handlers
+ * @method static ErrorHandler register() Register error, exception and shutdown handlers
+ * @method static ErrorHandler silencePath(string $path, int $levels = 26624) Silence errors in a file or directory
+ * @method static ErrorHandler silencePattern(string $pattern, int $levels = 26624) Silence errors in paths that match a regular expression
+ *
+ * @uses ErrorHandler
+ *
+ * @extends Facade<ErrorHandler>
+ */
+final class Err extends Facade
+{
+    /**
+     * @internal
+     */
+    protected static function getServiceName(): string
+    {
+        return ErrorHandler::class;
+    }
+}