[Notifier][PropertyInfo][VarDumper] Remove unused code

alamirault · fabpot · commit c25ec99e5472 · 2024-01-06T15:28:46.000+01:00
diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php
@@ -49,7 +49,7 @@ public function __construct(
 
     public function __toString(): string
     {
-        return sprintf('mercure://%s%s', $this->hubId, null !== $this->topics ? '?'.http_build_query(['topic' => $this->topics], '', '&') : '');
+        return sprintf('mercure://%s%s', $this->hubId, '?'.http_build_query(['topic' => $this->topics], '', '&'));
     }
 
     public function supports(MessageInterface $message): bool
diff --git a/src/Symfony/Component/Notifier/Bridge/Telnyx/TelnyxTransport.php b/src/Symfony/Component/Notifier/Bridge/Telnyx/TelnyxTransport.php
@@ -65,7 +65,7 @@ protected function doSend(MessageInterface $message): SentMessage
         if (!preg_match('/^[+]+[1-9][0-9]{9,14}$/', $from)) {
             if ('' === $from) {
                 throw new IncompleteDsnException('This phone number is invalid.');
-            } elseif ('' !== $from && null === $this->messagingProfileId) {
+            } elseif (null === $this->messagingProfileId) {
                 throw new IncompleteDsnException('The sending messaging profile must be specified.');
             }
 
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -688,7 +688,7 @@ private function getPropertyName(string $methodName, array $reflectionProperties
      */
     private function findAdderAndRemover(\ReflectionClass $reflClass, array $singulars): array
     {
-        if (!\is_array($this->arrayMutatorPrefixes) && 2 !== \count($this->arrayMutatorPrefixes)) {
+        if (2 !== \count($this->arrayMutatorPrefixes)) {
             return [null, null, []];
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/PhpStan/NameScope.php b/src/Symfony/Component/PropertyInfo/PhpStan/NameScope.php
@@ -51,11 +51,7 @@ public function resolveStringName(string $name): string
             return sprintf('%s\\%s', $this->uses[$firstNamePart], implode('\\', $nameParts));
         }
 
-        if (null !== $this->namespace) {
-            return sprintf('%s\\%s', $this->namespace, $name);
-        }
-
-        return $name;
+        return sprintf('%s\\%s', $this->namespace, $name);
     }
 
     public function resolveRootClass(): string
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -98,7 +98,7 @@ public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $
 
         if ($c instanceof \ReflectionNamedType) {
             $a += [
-                $prefix.'name' => $c instanceof \ReflectionNamedType ? $c->getName() : (string) $c,
+                $prefix.'name' => $c->getName(),
                 $prefix.'allowsNull' => $c->allowsNull(),
                 $prefix.'isBuiltin' => $c->isBuiltin(),
             ];
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -42,7 +42,6 @@ protected function doClone(mixed $var): array
 
         $arrayStub = new Stub();
         $arrayStub->type = Stub::TYPE_ARRAY;
-        $fromObjCast = false;
 
         for ($i = 0; $i < $len; ++$i) {
             // Detect when we move on to the next tree depth
@@ -213,24 +212,6 @@ protected function doClone(mixed $var): array
                 }
             }
 
-            if ($fromObjCast) {
-                $fromObjCast = false;
-                $refs = $vals;
-                $vals = [];
-                $j = -1;
-                foreach ($queue[$i] as $k => $v) {
-                    foreach ([$k => true] as $gk => $gv) {
-                    }
-                    if ($gk !== $k) {
-                        $vals = (object) $vals;
-                        $vals->{$k} = $refs[++$j];
-                        $vals = (array) $vals;
-                    } else {
-                        $vals[$k] = $refs[++$j];
-                    }
-                }
-            }
-
             $queue[$i] = $vals;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function __construct(`
`49`	`49`
`50`	`50`	`public function __toString(): string`
`51`	`51`	`{`
`52`		`- return sprintf('mercure://%s%s', $this->hubId, null !== $this->topics ? '?'.http_build_query(['topic' => $this->topics], '', '&') : '');`
	`52`	`+ return sprintf('mercure://%s%s', $this->hubId, '?'.http_build_query(['topic' => $this->topics], '', '&'));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public function supports(MessageInterface $message): bool`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function doSend(MessageInterface $message): SentMessage`
`65`	`65`	`if (!preg_match('/^[+]+[1-9][0-9]{9,14}$/', $from)) {`
`66`	`66`	`if ('' === $from) {`
`67`	`67`	`throw new IncompleteDsnException('This phone number is invalid.');`
`68`		`- } elseif ('' !== $from && null === $this->messagingProfileId) {`
	`68`	`+ } elseif (null === $this->messagingProfileId) {`
`69`	`69`	`throw new IncompleteDsnException('The sending messaging profile must be specified.');`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ private function getPropertyName(string $methodName, array $reflectionProperties`
`688`	`688`	`*/`
`689`	`689`	`private function findAdderAndRemover(\ReflectionClass $reflClass, array $singulars): array`
`690`	`690`	`{`
`691`		`- if (!\is_array($this->arrayMutatorPrefixes) && 2 !== \count($this->arrayMutatorPrefixes)) {`
	`691`	`+ if (2 !== \count($this->arrayMutatorPrefixes)) {`
`692`	`692`	`return [null, null, []];`
`693`	`693`	`}`
`694`	`694`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,7 @@ public function resolveStringName(string $name): string`
`51`	`51`	`return sprintf('%s\\%s', $this->uses[$firstNamePart], implode('\\', $nameParts));`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (null !== $this->namespace) {`
`55`		`- return sprintf('%s\\%s', $this->namespace, $name);`
`56`		`- }`
`57`		`-`
`58`		`- return $name;`
	`54`	`+ return sprintf('%s\\%s', $this->namespace, $name);`
`59`	`55`	`}`
`60`	`56`
`61`	`57`	`public function resolveRootClass(): string`