% apply PHPSTAN + RECTOR

EdmondDantes · Nov 14, 2024 · f80b060 · f80b060
1 parent b55274a
commit f80b060
Show file tree

Hide file tree

Showing 36 changed files with 183 additions and 201 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/BaseException.php b/src/BaseException.php
@@ -41,19 +41,17 @@ class BaseException extends \Exception implements BaseExceptionInterface
 {
     use HelperTrait;
     use TemplateHandlerTrait;
-    
+
     /**
-     * @param \Throwable|null $throwable
-     * @param int             $recursion
      *
      * @return array<string, scalar|array<string, scalar[]>>|null
      */
     public static function serializeToArray(\Throwable|null $throwable = null, int $recursion = 0): array|null
     {
-        if($throwable === null) {
+        if ($throwable === null) {
             return null;
         }
-        
+
         if ($recursion > 8) {
             return [
                 'message'           => 'Depth of exceptions is greater than 8',
@@ -64,7 +62,7 @@ public static function serializeToArray(\Throwable|null $throwable = null, int $
                 'previous'          => null,
             ];
         }
-        
+
         if ($throwable instanceof BaseExceptionInterface) {
             return $throwable->toArray();
         }
@@ -390,7 +388,7 @@ public function getDebugData(): array
     {
         return $this->debugData;
     }
-    
+
     /**
      * The method serialized object to an array.
      */
@@ -438,7 +436,7 @@ public function toArray(): array
             'tags'      => $this->getTags(),
             'code'      => $this->getCode(),
             'data'      => $this->getExceptionData(),
-            'previous'  => self::serializeToArray($this->getPrevious())
+            'previous'  => self::serializeToArray($this->getPrevious()),
         ];
     }
 

diff --git a/src/ClientException.php b/src/ClientException.php
@@ -10,7 +10,6 @@
 class ClientException extends BaseException implements ClientAvailableInterface
 {
     /**
-     * @param string $template
      * @param array<string, scalar|null|scalar[]>  $parameters
      * @param array<string, scalar|null|scalar[]>  $debugData
      */

diff --git a/src/ContractNotCorrect.php b/src/ContractNotCorrect.php
@@ -10,7 +10,7 @@
  * Traits
  * throws that exception).
  */
-class ContractNotCorrect        extends LoggableException
+class ContractNotCorrect extends LoggableException
 {
     public const string PROPERTY = 'property';
 
@@ -19,7 +19,7 @@ class ContractNotCorrect        extends LoggableException
     public const string METHOD = 'method';
 
     protected string $template  = 'Contract is not correctly for {type} in the trait {trait} which used by {object}';
-    
+
     /**
      * The Contract is not correct.
      *
@@ -29,7 +29,7 @@ class ContractNotCorrect        extends LoggableException
      * @param string|null $trait  trait name
      * @param string      $notice extended message
      */
-    public function __construct(object $object, $type = self::PROPERTY, $value = null, string $trait = null, string $notice = '')
+    public function __construct(object $object, $type = self::PROPERTY, $value = null, ?string $trait = null, string $notice = '')
     {
         parent::__construct([
             'message'       => $notice,

diff --git a/src/Errors/Error.php b/src/Errors/Error.php
@@ -12,9 +12,8 @@
  */
 class Error extends \ErrorException implements BaseExceptionInterface
 {
-
     /**
-     * Conformity between PHP-errors and BaseException
+     * Conformity between PHP-errors and BaseException.
      * @var array<int, int>
     */
     protected static array $ERRORS =
@@ -35,7 +34,7 @@ class Error extends \ErrorException implements BaseExceptionInterface
             E_DEPRECATED         => self::INFO,
             E_USER_DEPRECATED    => self::INFO,
         ];
-    
+
     /**
      * @var mixed[]|null
      */
@@ -50,11 +49,10 @@ class Error extends \ErrorException implements BaseExceptionInterface
      * Fatal error flag.
      */
     protected bool $isFatal         = false;
-    
+
     /**
      * @param array<string, scalar>|null $error
      *
-     * @return BaseExceptionInterface|null
      */
     public static function createFromLastError(?array $error = null): ?BaseExceptionInterface
     {
@@ -75,7 +73,6 @@ public static function createFromLastError(?array $error = null): ?BaseException
      * @param        string $file     File
      * @param        int    $line     Line
      *
-     * @return       BaseExceptionInterface
     */
     public static function createError(int $severity, string $message, string $file, int $line): BaseExceptionInterface
     {
@@ -117,24 +114,23 @@ public static function createError(int $severity, string $message, string $file,
                 }
         }
     }
-    
+
     public function __construct(int        $severity = \E_ERROR,
-                                string     $message = '',
-                                ?string    $filename = null,
-                                ?int       $line = null,
-                                int        $code = 0,
-                                ?\Throwable $previous = null
-    )
-    {
+        string     $message = '',
+        ?string    $filename = null,
+        ?int       $line = null,
+        int        $code = 0,
+        ?\Throwable $previous = null
+    ) {
         parent::__construct($message, $code, $severity, $filename, $line, $previous);
     }
-    
+
     #[\Override]
     public function getTags(): array
     {
         return [];
     }
-    
+
     #[\Override]
     public function isLoggable(): bool
     {
@@ -181,7 +177,7 @@ public function getLevel(): int
 
         return self::$ERRORS[$this->getSeverity()];
     }
-    
+
     /**
      * @return array{source: string, type: string, function: string}
      */

diff --git a/src/HelperTrait.php b/src/HelperTrait.php
@@ -24,7 +24,7 @@ final protected static function getSourceFor(\Throwable $e, bool $isString = fal
         [
             'source'            => $res['class'] ?? $res['file'] . ':' . $res['line'],
             'type'              => $res['type'] ?? '.',
-            'function'          => $res['function'] ?? '{}' // @phpstan-ignore-line
+            'function'          => $res['function'] ?? '{}', // @phpstan-ignore-line
         ];
     }
 

diff --git a/src/InterfaceNotImplemented.php b/src/InterfaceNotImplemented.php
@@ -7,7 +7,7 @@
 /**
  * If class not implemented required interface.
  */
-class InterfaceNotImplemented       extends LoggableException
+class InterfaceNotImplemented extends LoggableException
 {
     protected string $template      = 'Class {class} does not implement interface {interface}';
 

diff --git a/src/MonologProcessor.php b/src/MonologProcessor.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace IfCastle\Exceptions;
@@ -11,17 +12,17 @@ final class MonologProcessor implements ProcessorInterface
     #[\Override]
     public function __invoke(LogRecord $record)
     {
-        if(false === $record->context['exception'] instanceof BaseExceptionInterface) {
+        if (false === $record->context['exception'] instanceof BaseExceptionInterface) {
             return $record;
         }
-        
+
         $exception                  = $record->context['exception'];
-        
+
         $record->extra['exception_template']    = $exception->getTemplate();
         $record->extra['exception_data']        = $exception->getExceptionData();
         $record->extra['exception_debug']       = $exception->getDebugData();
-        $record->extra['tags']                  = array_merge($record->extra['tags'] ?? [], $exception->getTags());
-        
+        $record->extra['tags']                  = \array_merge($record->extra['tags'] ?? [], $exception->getTags());
+
         return $record;
     }
-}
+}
diff --git a/src/RecursionLimitExceeded.php b/src/RecursionLimitExceeded.php
@@ -21,7 +21,7 @@ public function __construct(array|string|int $limit)
         if (!\is_scalar($limit)) {
             parent::__construct($limit);
         } else {
-            parent::__construct(['limit' => (int)$limit]);
+            parent::__construct(['limit' => (int) $limit]);
         }
     }
 }
diff --git a/src/Registry.php b/src/Registry.php
@@ -4,8 +4,6 @@
 
 namespace IfCastle\Exceptions;
 
-use PHPUnit\Event\Code\Throwable;
-
 /**
  * Register of exceptions.
  *
@@ -21,7 +19,7 @@ class Registry
      * Flag for global handler.
      */
     public static bool $isActive = false;
-    
+
     /**
      * Options for logger.
      * @var array<string, scalar|scalar[]>
@@ -111,9 +109,10 @@ public static function getExceptionLog(): array
     {
         if (\is_array(self::$exceptions)) {
             return self::$exceptions;
-        } else {
-            return self::$exceptions->getStorageExceptions();
         }
+
+        return self::$exceptions->getStorageExceptions();
+
     }
 
     /**

diff --git a/src/RequiredValueEmpty.php b/src/RequiredValueEmpty.php
@@ -10,15 +10,15 @@
 class RequiredValueEmpty extends LoggableException
 {
     protected string $template      = 'The Required value {name} is empty ({expected})';
-    
+
     /**
      * If required value is empty.
      *
      * @param string|array<string|scalar|scalar[]> $name Variable name
      *                                                  or array with parameters.
      * @param string|null  $expected                    Excepted type
      */
-    public function __construct(array|string $name, string $expected = null)
+    public function __construct(array|string $name, ?string $expected = null)
     {
         if (!\is_scalar($name)) {
             parent::__construct($name);

diff --git a/src/Resource/FileSystem/FileCloseError.php b/src/Resource/FileSystem/FileCloseError.php
@@ -9,10 +9,9 @@
 class FileCloseError extends ResourceCloseError implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileLockFailed.php b/src/Resource/FileSystem/FileLockFailed.php
@@ -9,10 +9,9 @@
 class FileLockFailed extends ResourceLockFailed implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileNotExists.php b/src/Resource/FileSystem/FileNotExists.php
@@ -9,10 +9,9 @@
 class FileNotExists extends ResourceNotExists implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileNotReadable.php b/src/Resource/FileSystem/FileNotReadable.php
@@ -9,10 +9,9 @@
 class FileNotReadable extends ResourceNotReadable implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileNotWritable.php b/src/Resource/FileSystem/FileNotWritable.php
@@ -9,10 +9,9 @@
 class FileNotWritable extends ResourceNotWritable implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileOpenError.php b/src/Resource/FileSystem/FileOpenError.php
@@ -9,10 +9,9 @@
 class FileOpenError extends ResourceOpenError implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileReadError.php b/src/Resource/FileSystem/FileReadError.php
@@ -9,10 +9,9 @@
 class FileReadError extends ResourceReadError implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileUnLockFailed.php b/src/Resource/FileSystem/FileUnLockFailed.php
@@ -9,10 +9,9 @@
 class FileUnLockFailed extends ResourceUnLockFailed implements FileSystemExceptionInterface
 {
     protected string $system   = self::SYSTEM;
-    
+
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/FileSystem/FileWriteError.php b/src/Resource/FileSystem/FileWriteError.php
@@ -12,7 +12,6 @@ class FileWriteError extends ResourceWriteError implements FileSystemExceptionIn
 
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
      */
     public function __construct(mixed $resource, string $type = 'file')
     {

diff --git a/src/Resource/ResourceCloseError.php b/src/Resource/ResourceCloseError.php
@@ -8,7 +8,6 @@ class ResourceCloseError extends ResourceException
 {
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param $type
      */
     public function __construct(mixed $resource, string $type = 'resource')
     {

diff --git a/src/Resource/ResourceDataWrong.php b/src/Resource/ResourceDataWrong.php
@@ -10,8 +10,6 @@ class ResourceDataWrong extends ResourceException
 
     /**
      * @param string|object|resource|array<string, scalar|scalar[]> $resource
-     * @param string $type
-     * @param string $format
      */
     public function __construct(mixed $resource, string $type = 'resource', string $format = 'format')
     {
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * @param string|object|resource|array<string, scalar|scalar[]> $resource
-         * @param string $type
          */
         public function __construct(mixed $resource, string $type = 'file')
         {
@@ Expand Down @@