Merge pull request #33 from facile-it/fix-missing-return

fix missing return

Author: thomasvargiu

.github/workflows/continuous-integration.yml

@@ -67,16 +67,10 @@ jobs:
         codestyle:
           - "false"
         include:
-          - php-version: "8.1"
-            deps: ""
-            coverage: "false"
-            codestyle: "true"
-          - php-version: "8.2"
-            deps: "--prefer-lowest"
-            coverage: "false"
           - php-version: "8.2"
             deps: ""
             coverage: "true"
+            codestyle: "true"
 
     steps:
       - name: "Checkout"
@@ -99,6 +93,11 @@ jobs:
 
       - name: "Install dependencies with composer"
         run: "composer update --no-interaction --no-progress --no-suggest --prefer-dist ${{ matrix.deps }}"
+        if: "${{ matrix.codestyle == 'false' }}"
+
+      - name: "Install dependencies with composer"
+        run: "composer install --no-interaction --no-progress --no-suggest --prefer-dist ${{ matrix.deps }}"
+        if: "${{ matrix.codestyle == 'true' }}"
 
       - name: "Run PHPCS check"
         run: "composer cs-check"

src/Client/ClientBuilder.php

@@ -86,7 +86,7 @@ private function buildJwksProvider(): JwksProviderInterface
         $jwks = $this->clientMetadata->getJwks();
 
         if (null !== $jwks) {
-            new MemoryJwksProvider($jwks);
+            return new MemoryJwksProvider($jwks);
         }
 
         return new MemoryJwksProvider(['keys' => []]);

tests/Client/ClientBuilderTest.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Facile\OpenIDClientTest\Client;
+
+use Facile\JoseVerifier\JWK\MemoryJwksProvider;
+use Facile\OpenIDClient\Client\ClientBuilder;
+use Facile\OpenIDClient\Client\Metadata\ClientMetadataInterface;
+use Facile\OpenIDClient\Issuer\IssuerInterface;
+use Facile\OpenIDClientTest\TestCase;
+
+class ClientBuilderTest extends TestCase
+{
+    public function testWithoutClientJwks(): void
+    {
+        $issuer = $this->prophesize(IssuerInterface::class);
+        $metadata = $this->prophesize(ClientMetadataInterface::class);
+        $metadata->getJwks()->willReturn(null);
+        $builder = (new ClientBuilder())
+            ->setClientMetadata($metadata->reveal())
+            ->setIssuer($issuer->reveal());
+        $client = $builder->build();
+        $provider = $client->getJwksProvider();
+
+        static::assertSame($issuer->reveal(), $client->getIssuer());
+        static::assertSame($metadata->reveal(), $client->getMetadata());
+        static::assertInstanceOf(MemoryJwksProvider::class, $client->getJwksProvider());
+        static::assertSame(['keys' => []], $client->getJwksProvider()->getJwks());
+    }
+
+    public function testBuildWithClientJwks(): void
+    {
+        $jwks = [
+            'keys' => [
+                'kty' => 'RSA',
+            ],
+        ];
+        $issuer = $this->prophesize(IssuerInterface::class);
+        $metadata = $this->prophesize(ClientMetadataInterface::class);
+        $metadata->getJwks()->willReturn($jwks);
+        $builder = (new ClientBuilder())
+            ->setClientMetadata($metadata->reveal())
+            ->setIssuer($issuer->reveal());
+        $client = $builder->build();
+        $provider = $client->getJwksProvider();
+
+        static::assertSame($issuer->reveal(), $client->getIssuer());
+        static::assertSame($metadata->reveal(), $client->getMetadata());
+        static::assertInstanceOf(MemoryJwksProvider::class, $client->getJwksProvider());
+        static::assertSame($jwks, $client->getJwksProvider()->getJwks());
+    }
+}