merged origin with local

Author: transistive

.github/workflows/static-analysis.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: "PHP-CS-Fixer"
-        uses: docker://oskarstark/php-cs-fixer-ga:2.19.0
+        uses: docker://oskarstark/php-cs-fixer-ga:3.0.2
         with:
           args: --dry-run
       - name: "PSalm"

README.md

@@ -296,7 +296,7 @@ $client->run('MATCH (x) WHERE x.slug in $listOrMap RETURN x', ['listOrMap' => []
 * ext-bcmath *
 * ext-sockets *
 * ext-json **
-* ext-ds ***
+* ext-ds (minimum version 1.3.0) ***
 
 (*) Needed to implement the bolt protocol
 

composer.json

@@ -30,7 +30,6 @@
         "psr/http-factory": "^1.0",
         "psr/http-client": "^1.0",
         "php-http/message": "^1.0",
-        "php-ds/php-ds": "1.*",
         "php-http/message-factory": "^1.0",
         "stefanak-michal/bolt": "^2.5.1",
         "symfony/polyfill-php80": "^1.2"
@@ -47,7 +46,7 @@
         "nyholm/psr7-server": "^1.0",
         "kriswallsmith/buzz": "^1.2",
         "vimeo/psalm": "^4.7",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "friendsofphp/php-cs-fixer": "3.0.2",
         "psalm/plugin-phpunit": "^0.15.1",
         "vlucas/phpdotenv": "^5.0"
     },

docker/Dockerfile-php-7.4

@@ -7,9 +7,7 @@ RUN apt-get update && apt-get install -y \
         libzip-dev \
         zip \
         unzip \
-    && docker-php-ext-install -j$(nproc) gd sockets bcmath \
-    && pecl install ds \
-    && docker-php-ext-enable ds
+    && docker-php-ext-install -j$(nproc) gd sockets bcmath
 
 ARG WITH_XDEBUG=false
 

docker/Dockerfile-php-8.0

@@ -7,9 +7,7 @@ RUN apt-get update && apt-get install -y \
         libzip-dev \
         zip \
         unzip \
-    && docker-php-ext-install -j$(nproc) gd sockets bcmath \
-    && pecl install ds \
-    && docker-php-ext-enable ds
+    && docker-php-ext-install -j$(nproc) gd sockets bcmath
 
 ARG WITH_XDEBUG=false
 

psalm.xml

@@ -41,6 +41,12 @@
                 <directory name="src"/>
             </errorLevel>
         </DeprecatedInterface>
+        <UnusedForeachValue>
+            <errorLevel type="suppress">
+                <directory name="tests"/>
+                <directory name="src"/>
+            </errorLevel>
+        </UnusedForeachValue>
     </issueHandlers>
     <stubs>
         <file name="./vendor/vimeo/psalm/stubs/ext-ds.phpstub"/>

src/Authentication/BasicAuth.php

@@ -46,4 +46,9 @@ public function authenticateBolt(Bolt $bolt, UriInterface $uri, string $userAgen
     {
         $bolt->init($userAgent, $this->username, $this->password);
     }
+
+    public function extractFromUri(UriInterface $uri): AuthenticateInterface
+    {
+        return $this;
+    }
 }

src/Authentication/KerberosAuth.php

@@ -38,4 +38,9 @@ public function authenticateBolt(Bolt $bolt, UriInterface $uri, string $userAgen
         $bolt->setScheme('kerberos');
         $bolt->init($userAgent, $this->token, $this->token);
     }
+
+    public function extractFromUri(UriInterface $uri): AuthenticateInterface
+    {
+        return $this;
+    }
 }

src/Authentication/NoAuth.php

@@ -30,4 +30,9 @@ public function authenticateBolt(Bolt $bolt, UriInterface $uri, string $userAgen
         $bolt->setScheme('none');
         $bolt->init($userAgent, '', '');
     }
+
+    public function extractFromUri(UriInterface $uri): AuthenticateInterface
+    {
+        return $this;
+    }
 }

src/Authentication/UrlAuth.php

@@ -35,12 +35,18 @@ public function authenticateHttp(RequestInterface $request, UriInterface $uri, s
     }
 
     public function authenticateBolt(Bolt $bolt, UriInterface $uri, string $userAgent): void
+    {
+        $this->extractFromUri($uri)->authenticateBolt($bolt, $uri, $userAgent);
+    }
+
+    public function extractFromUri(UriInterface $uri): AuthenticateInterface
     {
         if (substr_count($uri->getUserInfo(), ':') === 1) {
             [$user, $pass] = explode(':', $uri->getUserInfo());
-            Authenticate::basic($user, $pass)->authenticateBolt($bolt, $uri, $userAgent);
-        } else {
-            Authenticate::disabled()->authenticateBolt($bolt, $uri, $userAgent);
+
+            return Authenticate::basic($user, $pass);
         }
+
+        return Authenticate::disabled();
     }
 }