From 6d2c599b598d99daa2d3ca3dabf28b0b729257fc Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 8 Sep 2021 13:42:22 +0200 Subject: [PATCH] [VarDumper] Add types to private properties --- .../Component/VarDumper/Caster/ArgsStub.php | 2 +- .../Component/VarDumper/Caster/ExceptionCaster.php | 2 +- .../Component/VarDumper/Caster/LinkStub.php | 6 +++--- .../Component/VarDumper/Caster/MemcachedCaster.php | 4 ++-- .../Component/VarDumper/Cloner/AbstractCloner.php | 6 +++--- src/Symfony/Component/VarDumper/Cloner/Data.php | 14 +++++++------- src/Symfony/Component/VarDumper/Cloner/Stub.php | 2 +- .../Component/VarDumper/Cloner/VarCloner.php | 8 +++----- .../VarDumper/Command/Descriptor/CliDescriptor.php | 4 ++-- .../Command/Descriptor/HtmlDescriptor.php | 4 ++-- .../VarDumper/Command/ServerDumpCommand.php | 4 ++-- .../Component/VarDumper/Dumper/AbstractDumper.php | 2 +- .../Component/VarDumper/Dumper/CliDumper.php | 10 ++++------ .../ContextProvider/RequestContextProvider.php | 4 ++-- .../ContextProvider/SourceContextProvider.php | 8 ++++---- .../VarDumper/Dumper/ContextualizedDumper.php | 4 ++-- .../Component/VarDumper/Dumper/HtmlDumper.php | 4 ++-- .../Component/VarDumper/Dumper/ServerDumper.php | 4 ++-- .../Component/VarDumper/Server/Connection.php | 4 ++-- .../Component/VarDumper/Server/DumpServer.php | 4 ++-- .../VarDumper/Test/VarDumperTestTrait.php | 2 +- 21 files changed, 49 insertions(+), 53 deletions(-) diff --git a/src/Symfony/Component/VarDumper/Caster/ArgsStub.php b/src/Symfony/Component/VarDumper/Caster/ArgsStub.php index f8b485bd40c3f..a89a71b1fa010 100644 --- a/src/Symfony/Component/VarDumper/Caster/ArgsStub.php +++ b/src/Symfony/Component/VarDumper/Caster/ArgsStub.php @@ -20,7 +20,7 @@ */ class ArgsStub extends EnumStub { - private static $parameters = []; + private static array $parameters = []; public function __construct(array $args, string $function, ?string $class) { diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php index baa7a180b0597..2671e4082371d 100644 --- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php @@ -44,7 +44,7 @@ class ExceptionCaster \E_STRICT => 'E_STRICT', ]; - private static $framesCache = []; + private static array $framesCache = []; public static function castError(\Error $e, array $a, Stub $stub, bool $isNested, int $filter = 0) { diff --git a/src/Symfony/Component/VarDumper/Caster/LinkStub.php b/src/Symfony/Component/VarDumper/Caster/LinkStub.php index 7e0780339a9f0..36e0d3cb99578 100644 --- a/src/Symfony/Component/VarDumper/Caster/LinkStub.php +++ b/src/Symfony/Component/VarDumper/Caster/LinkStub.php @@ -20,8 +20,8 @@ class LinkStub extends ConstStub { public $inVendor = false; - private static $vendorRoots; - private static $composerRoots; + private static array $vendorRoots; + private static array $composerRoots = []; public function __construct(string $label, int $line = 0, string $href = null) { @@ -65,7 +65,7 @@ public function __construct(string $label, int $line = 0, string $href = null) private function getComposerRoot(string $file, bool &$inVendor) { - if (null === self::$vendorRoots) { + if (!isset(self::$vendorRoots)) { self::$vendorRoots = []; foreach (get_declared_classes() as $class) { diff --git a/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php b/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php index cfef19acc3f43..d6baa2514b61c 100644 --- a/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php @@ -20,8 +20,8 @@ */ class MemcachedCaster { - private static $optionConstants; - private static $defaultOptions; + private static array $optionConstants; + private static array $defaultOptions; public static function castMemcached(\Memcached $c, array $a, Stub $stub, bool $isNested) { diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php index 634af5f4e1373..636573f9ddc6c 100644 --- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php @@ -196,15 +196,15 @@ abstract class AbstractCloner implements ClonerInterface /** * @var array> */ - private $casters = []; + private array $casters = []; /** * @var callable|null */ private $prevErrorHandler; - private $classInfo = []; - private $filter = 0; + private array $classInfo = []; + private int $filter = 0; /** * @param callable[]|null $casters A map of casters diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php index c12876dd95584..9e14967efeabd 100644 --- a/src/Symfony/Component/VarDumper/Cloner/Data.php +++ b/src/Symfony/Component/VarDumper/Cloner/Data.php @@ -19,13 +19,13 @@ */ class Data implements \ArrayAccess, \Countable, \IteratorAggregate { - private $data; - private $position = 0; - private $key = 0; - private $maxDepth = 20; - private $maxItemsPerDepth = -1; - private $useRefHandles = -1; - private $context = []; + private array $data; + private int $position = 0; + private int|string $key = 0; + private int $maxDepth = 20; + private int $maxItemsPerDepth = -1; + private int $useRefHandles = -1; + private array $context = []; /** * @param array $data An array as returned by ClonerInterface::cloneVar() diff --git a/src/Symfony/Component/VarDumper/Cloner/Stub.php b/src/Symfony/Component/VarDumper/Cloner/Stub.php index 073c56efbd4c3..1c5b887120f53 100644 --- a/src/Symfony/Component/VarDumper/Cloner/Stub.php +++ b/src/Symfony/Component/VarDumper/Cloner/Stub.php @@ -39,7 +39,7 @@ class Stub public $position = 0; public $attr = []; - private static $defaultProperties = []; + private static array $defaultProperties = []; /** * @internal diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php index 800bc9566ede8..e1a317174876b 100644 --- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php @@ -16,8 +16,8 @@ */ class VarCloner extends AbstractCloner { - private static $gid; - private static $arrayCache = []; + private static string $gid; + private static array $arrayCache = []; /** * {@inheritdoc} @@ -44,9 +44,7 @@ protected function doClone(mixed $var): array $stub = null; // Stub capturing the main properties of an original item value // or null if the original value is used directly - if (!$gid = self::$gid) { - $gid = self::$gid = md5(random_bytes(6)); // Unique string used to detect the special $GLOBALS variable - } + $gid = self::$gid ??= md5(random_bytes(6)); // Unique string used to detect the special $GLOBALS variable $arrayStub = new Stub(); $arrayStub->type = Stub::TYPE_ARRAY; $fromObjCast = false; diff --git a/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php b/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php index 2afaa7bf399e7..4450fe986cb74 100644 --- a/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php +++ b/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php @@ -26,8 +26,8 @@ */ class CliDescriptor implements DumpDescriptorInterface { - private $dumper; - private $lastIdentifier; + private CliDumper $dumper; + private mixed $lastIdentifier = null; public function __construct(CliDumper $dumper) { diff --git a/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php b/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php index 636b61828d140..98f150a5ea5f3 100644 --- a/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php +++ b/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php @@ -24,8 +24,8 @@ */ class HtmlDescriptor implements DumpDescriptorInterface { - private $dumper; - private $initialized = false; + private HtmlDumper $dumper; + private bool $initialized = false; public function __construct(HtmlDumper $dumper) { diff --git a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php index ead9d5bd05b4a..a5906555bb4c3 100644 --- a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php +++ b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php @@ -37,10 +37,10 @@ class ServerDumpCommand extends Command protected static $defaultName = 'server:dump'; protected static $defaultDescription = 'Start a dump server that collects and displays dumps in a single place'; - private $server; + private DumpServer $server; /** @var DumpDescriptorInterface[] */ - private $descriptors; + private array $descriptors; public function __construct(DumpServer $server, array $descriptors = []) { diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php index 6d31b7e831bb2..6ac3808367d14 100644 --- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php @@ -35,7 +35,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface protected $indentPad = ' '; protected $flags; - private $charset = ''; + private string $charset = ''; /** * @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path, defaults to static::$defaultOutput diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php index 8b25931101ed4..f6e290ca43957 100644 --- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php @@ -55,11 +55,11 @@ class CliDumper extends AbstractDumper protected $collapseNextHash = false; protected $expandNextHash = false; - private $displayOptions = [ + private array $displayOptions = [ 'fileLinkFormat' => null, ]; - private $handlesHrefGracefully; + private bool $handlesHrefGracefully; /** * {@inheritdoc} @@ -441,10 +441,8 @@ protected function style(string $style, string $value, array $attr = []): string $this->colors = $this->supportsColors(); } - if (null === $this->handlesHrefGracefully) { - $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') - && (!getenv('KONSOLE_VERSION') || (int) getenv('KONSOLE_VERSION') > 201100); - } + $this->handlesHrefGracefully ??= 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') + && (!getenv('KONSOLE_VERSION') || (int) getenv('KONSOLE_VERSION') > 201100); if (isset($attr['ellipsis'], $attr['ellipsis-type'])) { $prefix = substr($value, 0, -$attr['ellipsis']); diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php index 3684a47535cfc..69dff067bb6db 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php +++ b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php @@ -22,8 +22,8 @@ */ final class RequestContextProvider implements ContextProviderInterface { - private $requestStack; - private $cloner; + private RequestStack $requestStack; + private VarCloner $cloner; public function __construct(RequestStack $requestStack) { diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php index 2e2c8181616a1..d36e8bcf6f3d5 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php +++ b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php @@ -25,10 +25,10 @@ */ final class SourceContextProvider implements ContextProviderInterface { - private $limit; - private $charset; - private $projectDir; - private $fileLinkFormatter; + private int $limit; + private ?string $charset; + private ?string $projectDir; + private ?FileLinkFormatter $fileLinkFormatter; public function __construct(string $charset = null, string $projectDir = null, FileLinkFormatter $fileLinkFormatter = null, int $limit = 9) { diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php index 76384176ef026..cd2b28f0c40d7 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php @@ -19,8 +19,8 @@ */ class ContextualizedDumper implements DataDumperInterface { - private $wrappedDumper; - private $contextProviders; + private DataDumperInterface $wrappedDumper; + private array $contextProviders; /** * @param ContextProviderInterface[] $contextProviders diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php index f432507806d90..40e97a534cb91 100644 --- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php @@ -67,12 +67,12 @@ class HtmlDumper extends CliDumper protected $lastDepth = -1; protected $styles; - private $displayOptions = [ + private array $displayOptions = [ 'maxDepth' => 1, 'maxStringLength' => 160, 'fileLinkFormat' => null, ]; - private $extraDisplayOptions = []; + private array $extraDisplayOptions = []; /** * {@inheritdoc} diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php index 94795bf6d69dd..2baca3187723d 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php @@ -22,8 +22,8 @@ */ class ServerDumper implements DataDumperInterface { - private $connection; - private $wrappedDumper; + private Connection $connection; + private ?DataDumperInterface $wrappedDumper; /** * @param string $host The server host diff --git a/src/Symfony/Component/VarDumper/Server/Connection.php b/src/Symfony/Component/VarDumper/Server/Connection.php index d0611a1f6cdb1..97b5b94f3cf7b 100644 --- a/src/Symfony/Component/VarDumper/Server/Connection.php +++ b/src/Symfony/Component/VarDumper/Server/Connection.php @@ -21,8 +21,8 @@ */ class Connection { - private $host; - private $contextProviders; + private string $host; + private array $contextProviders; /** * @var resource|null diff --git a/src/Symfony/Component/VarDumper/Server/DumpServer.php b/src/Symfony/Component/VarDumper/Server/DumpServer.php index f9735db785caa..1a4ea646a3d32 100644 --- a/src/Symfony/Component/VarDumper/Server/DumpServer.php +++ b/src/Symfony/Component/VarDumper/Server/DumpServer.php @@ -24,8 +24,8 @@ */ class DumpServer { - private $host; - private $logger; + private string $host; + private ?LoggerInterface $logger; /** * @var resource|null diff --git a/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php b/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php index 83773327f1643..a202185e586be 100644 --- a/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php +++ b/src/Symfony/Component/VarDumper/Test/VarDumperTestTrait.php @@ -22,7 +22,7 @@ trait VarDumperTestTrait /** * @internal */ - private $varDumperConfig = [ + private array $varDumperConfig = [ 'casters' => [], 'flags' => null, ]; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy