Merge pull request #1 from Slickdeals/fix-7.3-build

Upgrade psalm and fix errors to fix 7.3 psalm
Slickdeals · Mar 13, 2021 · e44b710 · e44b710
2 parents 75157c1 + 4166d38
commit e44b710
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9",
         "flyeralarm/php-code-validator": "^3.2",
-        "vimeo/psalm": "^3.4"
+        "vimeo/psalm": "^4.6"
     },
     "autoload": {
         "psr-4": {

diff --git a/psalm.xml b/psalm.xml
@@ -34,7 +34,6 @@
         <MissingReturnType errorLevel="info" />
         <MissingPropertyType errorLevel="info" />
         <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
 
         <PropertyNotSetInConstructor errorLevel="info" />
         <MissingConstructor errorLevel="info" />

diff --git a/src/Client.php b/src/Client.php
@@ -296,7 +296,7 @@ private function send(string $key, $value, string $type, float $sampleRate, arra
      */
     public function setNamespace(string $namespace): void
     {
-        $this->namespace = (string) $namespace;
+        $this->namespace = $namespace;
     }
 
     /**

diff --git a/src/Connection/File.php b/src/Connection/File.php
@@ -9,7 +9,8 @@
 class File implements Connection
 {
     /**
-     * @var null|resource|closed-resource
+     * @psalm-suppress PossiblyInvalidArgument
+     * @var null|resource
      */
     private $handle;
 
@@ -60,6 +61,7 @@ public function sendMessages(array $messages): void
     public function close(): void
     {
         if (is_resource($this->handle)) {
+            /** @psalm-suppress InvalidPropertyAssignmentValue */
             fclose($this->handle);
         }
 

diff --git a/src/Connection/InetSocket.php b/src/Connection/InetSocket.php
@@ -64,7 +64,7 @@ public function __construct(
         $this->host = $host;
         $this->port = $port;
         $this->persistent = $persistent;
-        $this->maxPayloadSize = (int) $mtu -
+        $this->maxPayloadSize = $mtu -
             self::IP_HEADER_SIZE -
             $this->getProtocolHeaderSize() -
             strlen(self::LINE_DELIMITER);
@@ -144,7 +144,9 @@ private function cutIntoMtuSizedPackets(array $messages): array
         if ($this->allowFragmentation()) {
             $message = join(self::LINE_DELIMITER, $messages) . self::LINE_DELIMITER;
 
-            return str_split($message, $this->maxPayloadSize);
+            $result = str_split($message, $this->maxPayloadSize);
+
+            return $result ?: [];
         }
 
         $delimiterLen = strlen(self::LINE_DELIMITER);
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function setNamespace(string $namespace): void
         {
-            $this->namespace = (string) $namespace;
+            $this->namespace = $namespace;
         }
         /**
@@ Expand Down @@