Merge pull request #952 from msmakouz/fix-psalm-issues

spiral · Jul 18, 2023 · 7d5e0e6 · 7d5e0e6
1 parent de0abb0
commit 7d5e0e6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/src/AbstractLocator.php b/src/AbstractLocator.php
@@ -109,8 +109,6 @@ protected function classReflection(string $class): \ReflectionClass
  *
  * @param class-string $enum
  *
- * @return \ReflectionEnum
- *
  * @throws LocatorException
  */
  protected function enumReflection(string $enum): \ReflectionEnum

diff --git a/src/Bootloader/TokenizerBootloader.php b/src/Bootloader/TokenizerBootloader.php
@@ -49,13 +49,9 @@ public function __construct(
 
  public function init(BinderInterface $binder, DirectoriesInterface $dirs): void
  {
- /** @psalm-suppress InvalidCast https://github.com/vimeo/psalm/issues/8810 */
  $binder->bindInjector(ClassLocator::class, ClassLocatorInjector::class);
- /** @psalm-suppress InvalidCast https://github.com/vimeo/psalm/issues/8810 */
  $binder->bindInjector(EnumLocator::class, EnumLocatorInjector::class);
- /** @psalm-suppress InvalidCast https://github.com/vimeo/psalm/issues/8810 */
  $binder->bindInjector(InterfaceLocator::class, InterfaceLocatorInjector::class);
- /** @psalm-suppress InvalidCast https://github.com/vimeo/psalm/issues/8810 */
  $binder->bindInjector(InvocationLocator::class, InvocationLocatorInjector::class);
 
  $this->config->setDefaults(

diff --git a/src/Bootloader/TokenizerListenerBootloader.php b/src/Bootloader/TokenizerListenerBootloader.php
@@ -154,7 +154,6 @@ private function loadInterfaces(
  }
 
  /**
- * @param ListenerInvoker $invoker
  * @param callable(): array<class-string, \ReflectionClass> $reflections
  * @param callable(TokenizationListenerInterface): bool $loader
  */

diff --git a/src/EnumLocator.php b/src/EnumLocator.php
@@ -65,12 +65,13 @@ protected function availableEnums(): array
  */
  protected function isTargeted(\ReflectionEnum $enum, \ReflectionClass $target = null): bool
  {
- if (empty($target)) {
+ if ($target === null) {
  return true;
  }
 
  if (!$target->isTrait()) {
  //Target is interface or class
+ /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
  return $enum->isSubclassOf($target) || $enum->getName() === $target->getName();
  }