add psalm

Author: ddrv

.gitattributes

@@ -0,0 +1,10 @@
+*.md     text eol=lf
+*.json   text eol=lf
+*.php    text eol=lf
+*.yml    text eol=lf
+*.dist   text eol=lf
+LICENCE  text eol=lf
+.github/ export-ignore
+tests/   export-ignore
+stuff/   export-ignore
+*.dist   export-ignore

.github/workflows/ci.yml

@@ -1,6 +1,14 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - v*
 
 jobs:
   tests:
@@ -29,5 +37,8 @@ jobs:
       - name: Check code style
         run: vendor/bin/phpcs
 
+      - name: Stat Analise
+        run: vendor/bin/psalm
+
       - name: Run test suite
         run: vendor/bin/phpunit

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Create release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get version
+        id: get-version
+        uses: mad9000/actions-find-and-replace-string@2
+        with:
+          source: ${{ github.ref }}
+          find: 'refs/tags/v'
+          replace: ''
+
+      - name: Create Release
+        id: create-release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ steps.get-version.outputs.value }}
+          draft: false
+          prerelease: false

.gitignore

@@ -2,3 +2,4 @@ vendor/
 composer.lock
 phpcs.xml
 phpunit.xml
+psalm.xml

composer.json

@@ -21,7 +21,8 @@
     "nyholm/psr7": "^1.5",
     "phpunit/phpunit": "^6.5 || ^7.5 || ^8.5 || ^9.5",
     "squizlabs/php_codesniffer": "^3.7",
-    "webclient/fake-http-client": "^2.0"
+    "webclient/fake-http-client": "^2.0",
+    "vimeo/psalm": "^4.30"
   },
   "provide": {
     "psr/http-client-implementation": "1.0"
@@ -39,5 +40,10 @@
       "Stuff\\Webclient\\Extension\\Cookie\\": "stuff/",
       "Tests\\Webclient\\Extension\\Cookie\\": "tests/"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "composer/package-versions-deprecated": true
+    }
   }
 }

psalm.xml.dist

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <directory name="stuff" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Cookie/ArrayStorage.php

@@ -6,7 +6,7 @@
 
 final class ArrayStorage extends Storage
 {
-    public function save()
+    public function save(): void
     {
     }
 }

src/Cookie/NetscapeCookieFile.php

@@ -51,24 +51,24 @@ public function __construct(string $file)
             throw new InvalidArgumentException('Can not read file ' . $file, 1, $exception);
         }
         $lines = preg_split('/\r(\n)?/ui', $contents);
-        foreach ($lines as $num => $line) {
+        foreach ($lines as $line) {
             $line = trim($line);
             if (!$line || mb_substr($line, 0, 1) === '#') {
                 continue;
             }
-            $row = array_replace([null, 'FALSE', '/', 'FALSE', 0, null, null], str_getcsv($line, "\t"));
-            $name = trim((string)$row[5]);
-            $value = trim((string)$row[6]);
+            $row = array_replace(['', 'FALSE', '/', 'FALSE', '0', '', ''], str_getcsv($line, "\t"));
+            $name = trim($row[5]);
+            $value = trim($row[6]);
             if (!$name || !$value) {
                 continue;
             }
-            $domain = trim((string)$row[0]);
+            $domain = trim($row[0]);
             $domain = ltrim($domain, '.');
-            if (mb_strtoupper(trim((string)$row[1])) === 'TRUE') {
+            if (mb_strtoupper(trim($row[1])) === 'TRUE') {
                 $domain = '.' . $domain;
             }
-            $secure = mb_strtoupper(trim((string)$row[3])) === 'TRUE';
-            $path = trim((string)$row[2]);
+            $secure = mb_strtoupper(trim($row[3])) === 'TRUE';
+            $path = trim($row[2]);
             $expired = (int)$row[4];
             if ($expired < 0) {
                 $expired = 0;
@@ -77,7 +77,7 @@ public function __construct(string $file)
         }
     }
 
-    public function save()
+    public function save(): void
     {
         $contents = '';
         foreach ($this->all() as $scheme => $domains) {

src/Cookie/Storage.php

@@ -8,8 +8,15 @@
 
 abstract class Storage
 {
+    /**
+     * @var array<string, array<string, array<string, array{value: string, expired: int, path: string}>>>
+     */
     private array $cookies = [];
 
+    /**
+     * @param UriInterface $uri
+     * @return array<string, string>
+     */
     final public function get(UriInterface $uri): array
     {
         $cookies = [];
@@ -49,9 +56,9 @@ final public function set(
         string $value,
         string $domain,
         string $path = '/',
-        $expire = 0,
-        $secure = false
-    ) {
+        int $expire = 0,
+        bool $secure = false
+    ): void {
         $scheme = 'http' . ($secure ? 's' : '');
         $name = trim($name);
         if (!$name) {
@@ -81,8 +88,11 @@ final public function set(
         ];
     }
 
-    abstract public function save();
+    abstract public function save(): void;
 
+    /**
+     * @return array<string, array<string, array<string, array{value: string, expired: int, path: string}>>>
+     */
     protected function all(): array
     {
         return $this->cookies;

src/CookieClientDecorator.php

@@ -30,14 +30,13 @@ public function sendRequest(RequestInterface $request): ResponseInterface
         if ($cookies) {
             if ($request->hasHeader('Cookie')) {
                 foreach (explode(',', $request->getHeaderLine('Cookie')) as $line) {
-                    $line = trim($line);
-                    list($name, $value) = array_replace([null, null], explode('=', $line, 2));
-                    $name = trim($name);
-                    $value = trim($value);
-                    if (!$name || !$value) {
+                    [$headerCookieName, $headerCookieValue] = array_replace(['', ''], explode('=', trim($line), 2));
+                    $headerCookieName = trim($headerCookieName);
+                    $headerCookieValue = trim($headerCookieValue);
+                    if ($headerCookieName === '' || $headerCookieValue === '') {
                         continue;
                     }
-                    $cookies[$name] = $value;
+                    $cookies[$headerCookieName] = $headerCookieValue;
                 }
             }
             foreach ($cookies as $cookie => $value) {
@@ -62,18 +61,18 @@ public function __destruct()
      * @param string $header
      * @param string $domain
      */
-    private function setCookieFromHeader(string $header, string $domain)
+    private function setCookieFromHeader(string $header, string $domain): void
     {
         $arr = explode(';', $header);
         $cookies = [];
         $path = '/';
         $expires = 0;
         $secure = false;
         foreach ($arr as $item) {
-            list($key, $value) = array_replace(['', ''], explode('=', $item, 2));
-            $key = trim($key);
-            $value = trim($value);
-            switch (strtolower($key)) {
+            $keyValue = explode('=', $item, 2);
+            $key = strtolower(trim($keyValue[0]));
+            $value = trim($keyValue[1] ?? '');
+            switch ($key) {
                 case 'domain':
                     if ($value) {
                         $domain = $value;