Decrease psalm error level (#85)

Author: keelerm84

composer.json

@@ -24,7 +24,7 @@
         "kevinrob/guzzle-cache-middleware": "^3",
         "phpunit/php-code-coverage": "^9",
         "phpunit/phpunit": "^9",
-        "vimeo/psalm": "4.9.2"
+        "vimeo/psalm": "^4.0"
     },
     "suggest": {
         "guzzlehttp/guzzle": "(^7) Required when using GuzzleEventPublisher or the default FeatureRequester",

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
+    errorLevel="2"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

src/LaunchDarkly/FeatureFlagsState.php

@@ -21,7 +21,7 @@ class FeatureFlagsState implements \JsonSerializable
     /** @var array */
     protected $_flagValues;
 
-    /** @var array */
+    /** @var array<string, array{debugEventsUntilDate?: int|null, reason?: EvaluationReason, trackEvents?: true, variation?: int|null, version?: int}> **/
     protected $_flagMetadata;
 
     /**

src/LaunchDarkly/FeatureRequester.php

@@ -33,7 +33,7 @@ public function getSegment(string $key): ?Segment;
     /**
      * Gets all feature flags.
      *
-     * @return array|null The decoded FeatureFlags, or null if missing
+     * @return array<string, FeatureFlag>|null The decoded FeatureFlags, or null if missing
      */
     public function getAllFeatures(): ?array;
 }

src/LaunchDarkly/Impl/Events/EventFactory.php

@@ -58,7 +58,7 @@ public function newEvalEvent(
         if ($prereqOfFlag) {
             $e['prereqOf'] = $prereqOfFlag->getKey();
         }
-        if (($addExperimentData || $this->_withReasons) && $detail->getReason()) {
+        if (($addExperimentData || $this->_withReasons)) {
             $e['reason'] = $detail->getReason()->jsonSerialize();
         }
         if ($user->getAnonymous()) {
@@ -88,7 +88,7 @@ public function newDefaultEvent(FeatureFlag $flag, LDUser $user, EvaluationDetai
         if ($flag->getDebugEventsUntilDate()) {
             $e['debugEventsUntilDate'] = $flag->getDebugEventsUntilDate();
         }
-        if ($this->_withReasons && $detail->getReason()) {
+        if ($this->_withReasons) {
             $e['reason'] = $detail->getReason()->jsonSerialize();
         }
         if ($user->getAnonymous()) {
@@ -111,7 +111,7 @@ public function newUnknownFlagEvent(string $key, LDUser $user, EvaluationDetail
             'default' => $detail->getValue()
         ];
         // the following properties are handled separately so we don't waste bandwidth on unused keys
-        if ($this->_withReasons && $detail->getReason()) {
+        if ($this->_withReasons) {
             $e['reason'] = $detail->getReason()->jsonSerialize();
         }
         if ($user->getAnonymous()) {

src/LaunchDarkly/Impl/Events/EventProcessor.php

@@ -25,11 +25,14 @@ class EventProcessor
     /** @var int */
     private $_capacity;
 
-    public function __construct(string $sdkKey, array $options = [])
+    /**
+     * @psalm-param array{capacity: int} $options
+     */
+    public function __construct(string $sdkKey, array $options)
     {
         $this->_eventPublisher = $this->getEventPublisher($sdkKey, $options);
         $this->_eventSerializer = new EventSerializer($options);
-      
+
         $this->_capacity = $options['capacity'];
     }
 

src/LaunchDarkly/Impl/Integrations/FeatureRequesterBase.php

@@ -125,7 +125,7 @@ public function getSegment(string $key): ?Segment
     /**
      * Gets all features
      *
-     * @return array|null The decoded FeatureFlags, or null if missing
+     * @return array<string, FeatureFlag>|null The decoded FeatureFlags, or null if missing
      */
     public function getAllFeatures(): ?array
     {

src/LaunchDarkly/Impl/Integrations/FileDataFeatureRequester.php

@@ -55,7 +55,7 @@ public function getSegment(string $key): ?Segment
     /**
      * Gets all feature flags
      *
-     * @return array|null The decoded FeatureFlags, or null if missing
+     * @return array<string, FeatureFlag>|null The decoded FeatureFlags, or null if missing
      */
     public function getAllFeatures(): ?array
     {

src/LaunchDarkly/Impl/Integrations/GuzzleEventPublisher.php

@@ -49,7 +49,6 @@ public function __construct(string $sdkKey, array $options = [])
     public function publish(string $payload): bool
     {
         $client = new Client(['base_uri' => $this->_eventsUri]);
-        $response = null;
 
         try {
             $options = $this->_requestOptions;

src/LaunchDarkly/Impl/Integrations/GuzzleFeatureRequester.php

@@ -111,7 +111,7 @@ public function getSegment(string $key): ?Segment
     /**
      * Gets all features from a likely cached store
      *
-     * @return array|null The decoded FeatureFlags, or null if missing
+     * @return array<string, FeatureFlag>|null The decoded FeatureFlags, or null if missing
      */
     public function getAllFeatures(): ?array
     {

src/LaunchDarkly/Impl/Model/FeatureFlag.php

@@ -183,7 +183,6 @@ private function checkPrerequisites(LDUser $user, FeatureRequester $featureReque
             foreach ($this->_prerequisites as $prereq) {
                 $prereqOk = true;
                 try {
-                    $prereqEvalResult = null;
                     $prereqFeatureFlag = $featureRequester->getFeature($prereq->getKey());
                     if ($prereqFeatureFlag == null) {
                         $prereqOk = false;
@@ -221,10 +220,9 @@ private function getOffValue(EvaluationReason $reason): EvaluationDetail
         }
         return $this->getVariation($this->_offVariation, $reason);
     }
-    
+
     private function getValueForVariationOrRollout(VariationOrRollout $r, LDUser $user, EvaluationReason $reason): EvaluationDetail
     {
-        $rollout = $r->getRollout();
         list($index, $inExperiment) = $r->variationIndexForUser($user, $this->_key, $this->_salt);
         if ($index === null) {
             return new EvaluationDetail(null, null, EvaluationReason::error(EvaluationReason::MALFORMED_FLAG_ERROR));

src/LaunchDarkly/Impl/Model/VariationOrRollout.php

@@ -86,7 +86,6 @@ public static function bucketUser(
         ?int $seed
     ): float {
         $userValue = $user->getValueForEvaluation($attr);
-        $idHash = null;
         if ($userValue != null) {
             if (is_int($userValue)) {
                 $userValue = (string) $userValue;

src/LaunchDarkly/Impl/PreloadedFeatureRequester.php

@@ -54,7 +54,7 @@ public function getSegment(string $key): ?Segment
     /**
      * Gets all features from cached values
      *
-     * @return array|null The decoded FeatureFlags, or null if missing
+     * @return array<string, FeatureFlag>|null The decoded FeatureFlags, or null if missing
      */
     public function getAllFeatures(): ?array
     {

src/LaunchDarkly/LDClient.php

@@ -40,7 +40,7 @@ class LDClient
     protected $_offline = false;
     /** @var bool */
     protected $_send_events = true;
-    /** @var array|mixed */
+    /** @var array */
     protected $_defaults = [];
     /** @var LoggerInterface */
     protected $_logger;
@@ -54,6 +54,8 @@ class LDClient
     /**
      * Creates a new client instance that connects to LaunchDarkly.
      *
+     * @psalm-param array{capacity?: int, defaults?: array<string, mixed|null>} $options
+     *
      * @param string $sdkKey The SDK key for your account
      * @param array $options Client configuration settings
      * - `base_uri`: Base URI of the LaunchDarkly service. Change this if you are connecting to a Relay Proxy instance instead of
@@ -220,7 +222,7 @@ private function variationDetailInternal(string $key, LDUser $user, $default, Ev
     {
         $default = $this->_get_default($key, $default);
 
-        $errorResult = function (string $errorKind) use ($key, $default): EvaluationDetail {
+        $errorResult = function (string $errorKind) use ($default): EvaluationDetail {
             return new EvaluationDetail($default, null, EvaluationReason::error($errorKind));
         };
         $sendEvent = function (EvaluationDetail $detail, ?FeatureFlag $flag) use ($key, $user, $default, $eventFactory): void {
@@ -368,7 +370,7 @@ public function allFlagsState(LDUser $user, array $options = []): FeatureFlagsSt
         $clientOnly = isset($options['clientSideOnly']) && $options['clientSideOnly'];
         $withReasons = isset($options['withReasons']) && $options['withReasons'];
         $detailsOnlyIfTracked = isset($options['detailsOnlyForTrackedFlags']) && $options['detailsOnlyForTrackedFlags'];
-        foreach ($flags as $key => $flag) {
+        foreach ($flags as $flag) {
             if ($clientOnly && !$flag->isClientSide()) {
                 continue;
             }