Move Arr::find to Arr helper

Author: cicnavi

src/Factories/Grant/AuthCodeGrantFactory.php

@@ -18,6 +18,7 @@
 
 use SimpleSAML\Module\oidc\Factories\Entities\AccessTokenEntityFactory;
 use SimpleSAML\Module\oidc\Factories\Entities\AuthCodeEntityFactory;
+use SimpleSAML\Module\oidc\Helpers;
 use SimpleSAML\Module\oidc\ModuleConfig;
 use SimpleSAML\Module\oidc\Repositories\AccessTokenRepository;
 use SimpleSAML\Module\oidc\Repositories\AuthCodeRepository;
@@ -39,6 +40,7 @@ public function __construct(
         private readonly AccessTokenEntityFactory $accessTokenEntityFactory,
         private readonly AuthCodeEntityFactory $authCodeEntityFactory,
         private readonly RefreshTokenIssuer $refreshTokenIssuer,
+        private readonly Helpers $helpers,
     ) {
     }
 
@@ -57,6 +59,7 @@ public function build(): AuthCodeGrant
             $this->accessTokenEntityFactory,
             $this->authCodeEntityFactory,
             $this->refreshTokenIssuer,
+            $this->helpers,
         );
         $authCodeGrant->setRefreshTokenTTL($this->moduleConfig->getRefreshTokenDuration());
 

src/Helpers/Arr.php

@@ -6,6 +6,23 @@
 
 class Arr
 {
+    /**
+     * Find item in array using the given callable.
+     *
+     * @return mixed|null
+     */
+    public function findByCallback(array $arr, callable $fn): mixed
+    {
+        /** @psalm-suppress MixedAssignment */
+        foreach ($arr as $x) {
+            if (call_user_func($fn, $x) === true) {
+                return $x;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @param array $values
      * @return string[]

src/Server/Grants/AuthCodeGrant.php

@@ -27,6 +27,7 @@
 use SimpleSAML\Module\oidc\Entities\UserEntity;
 use SimpleSAML\Module\oidc\Factories\Entities\AccessTokenEntityFactory;
 use SimpleSAML\Module\oidc\Factories\Entities\AuthCodeEntityFactory;
+use SimpleSAML\Module\oidc\Helpers;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\AccessTokenRepositoryInterface;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\AuthCodeRepositoryInterface;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\RefreshTokenRepositoryInterface;
@@ -58,7 +59,6 @@
 use SimpleSAML\Module\oidc\Server\ResponseTypes\Interfaces\NonceResponseTypeInterface;
 use SimpleSAML\Module\oidc\Server\ResponseTypes\Interfaces\SessionIdResponseTypeInterface;
 use SimpleSAML\Module\oidc\Server\TokenIssuers\RefreshTokenIssuer;
-use SimpleSAML\Module\oidc\Utils\Arr;
 use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
 use SimpleSAML\Module\oidc\Utils\ScopeHelper;
 use SimpleSAML\OpenID\Codebooks\HttpMethodsEnum;
@@ -165,6 +165,7 @@ public function __construct(
         AccessTokenEntityFactory $accessTokenEntityFactory,
         protected AuthCodeEntityFactory $authCodeEntityFactory,
         protected RefreshTokenIssuer $refreshTokenIssuer,
+        protected Helpers $helpers,
     ) {
         parent::__construct($authCodeRepository, $refreshTokenRepository, $authCodeTTL);
 
@@ -211,7 +212,7 @@ public function isOidcCandidate(
         OAuth2AuthorizationRequest $authorizationRequest,
     ): bool {
         // Check if the scopes contain 'oidc' scope
-        return (bool) Arr::find(
+        return (bool) $this->helpers->arr()->findByCallback(
             $authorizationRequest->getScopes(),
             fn(ScopeEntityInterface $scope) => $scope->getIdentifier() === 'openid',
         );

src/Services/Container.php

@@ -441,6 +441,7 @@ public function __construct()
             $accessTokenEntityFactory,
             $authCodeEntityFactory,
             $refreshTokenIssuer,
+            $helpers,
         );
         $this->services[AuthCodeGrant::class] = $authCodeGrantFactory->build();
 

src/Utils/Arr.php

@@ -16,6 +16,22 @@ protected function sut(): Arr
         return new Arr();
     }
 
+    public function testCanFindByCallback(): void
+    {
+        $this->assertSame(
+            'a',
+            $this->sut()->findByCallback(
+                ['a', 'b', 'c'],
+                fn($item): bool => $item === 'a'
+            ),
+        );
+
+        $this->assertNull($this->sut()->findByCallback(
+            ['a', 'b', 'c'],
+            fn($item): bool => $item === 'd'
+        ));
+    }
+
     public function testEnsureStringValues(): void
     {
         $this->assertSame(

tests/unit/src/Helpers/ArrTest.php

@@ -9,6 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Module\oidc\Factories\Entities\AccessTokenEntityFactory;
 use SimpleSAML\Module\oidc\Factories\Entities\AuthCodeEntityFactory;
+use SimpleSAML\Module\oidc\Helpers;
 use SimpleSAML\Module\oidc\ModuleConfig;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\AccessTokenRepositoryInterface;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\AuthCodeRepositoryInterface;
@@ -33,6 +34,7 @@ class AuthCodeGrantTest extends TestCase
     protected Stub $accessTokenEntityFactoryStub;
     protected Stub $authCodeEntityFactoryStub;
     protected Stub $refreshTokenIssuerStub;
+    protected Stub $helpersStub;
 
     /**
      * @throws \Exception
@@ -49,6 +51,7 @@ protected function setUp(): void
         $this->accessTokenEntityFactoryStub = $this->createStub(AccessTokenEntityFactory::class);
         $this->authCodeEntityFactoryStub = $this->createStub(AuthcodeEntityFactory::class);
         $this->refreshTokenIssuerStub = $this->createStub(RefreshTokenIssuer::class);
+        $this->helpersStub = $this->createStub(Helpers::class);
     }
 
     /**
@@ -68,6 +71,7 @@ public function testCanCreateInstance(): void
                 $this->accessTokenEntityFactoryStub,
                 $this->authCodeEntityFactoryStub,
                 $this->refreshTokenIssuerStub,
+                $this->helpersStub,
             ),
         );
     }