[1.0.0] Increase static analysis level in tests.

phpstan.tests.neon

@@ -1,4 +1,5 @@
 parameters:
-    level: 3
+    treatPhpDocTypesAsCertain: false
+    level: 10
     paths:
         - %currentWorkingDirectory%/tests

src/FreeDSx/Ldap/Entry/Entries.php

@@ -31,38 +31,26 @@
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  *
  * @implements IteratorAggregate<Entry>
- * @template T of Entry
  */
 class Entries implements Countable, IteratorAggregate
 {
     /**
-     * @var array<T>
+     * @var array<Entry>
      */
     private array $entries;
 
-    /**
-     * @param T ...$entries
-     */
     public function __construct(Entry ...$entries)
     {
         $this->entries = $entries;
     }
 
-    /**
-     * @param T ...$entries
-     * @return $this
-     */
     public function add(Entry ...$entries): self
     {
         $this->entries = array_merge($this->entries, $entries);
 
         return $this;
     }
 
-    /**
-     * @param T ...$entries
-     * @return $this
-     */
     public function remove(Entry ...$entries): self
     {
         foreach ($entries as $entry) {

src/FreeDSx/Ldap/Entry/Entry.php

@@ -299,7 +299,7 @@ public static function create(
     /**
      * Construct an entry from an associative array.
      *
-     * @param array<string, string|array<string|Stringable>> $attributes
+     * @param array<string, scalar|array<scalar|Stringable>> $attributes
      */
     public static function fromArray(
         Dn|Stringable|string $dn,

tests/bin/ldapserver.php

@@ -83,7 +83,10 @@ private function logRequest(
 
 class LdapServerRequestHandler extends GenericRequestHandler
 {
-    private $users = [
+    /**
+     * @var array<string, string>
+     */
+    private array $users = [
         'cn=user,dc=foo,dc=bar' => '12345',
     ];
 

tests/integration/LdapClientTest.php

@@ -51,8 +51,8 @@ public function tearDown(): void
     public function testUsernamePasswordBind(): void
     {
         $response = $this->client->bind(
-            $_ENV['LDAP_USERNAME'],
-            $_ENV['LDAP_PASSWORD']
+            (string) getenv('LDAP_USERNAME'),
+            (string) getenv('LDAP_PASSWORD'),
         )->getResponse();
 
         $this->assertInstanceOf(
@@ -309,10 +309,6 @@ public function testRenameOperation(): void
             ModifyDnResponse::class,
             $result->getResponse()
         );
-        $this->assertInstanceOf(
-            Entry::class,
-            $entry
-        );
         $this->assertSame(
             ['Arleen Sevigny-Foo'],
             $entry->get('cn')?->getValues()
@@ -420,10 +416,6 @@ public function testSubSearchOperation(): void
             Filters::raw('(&(objectClass=inetOrgPerson)(cn=A*))')
         ));
 
-        $this->assertInstanceOf(
-            Entries::class,
-            $entries
-        );
         $this->assertCount(
             843,
             $entries,
@@ -561,12 +553,15 @@ public function testUseSslIgnoreCertValidation(): void
         $this->assertTrue($this->client->isConnected());
     }
 
+    /**
+     * @return array<string, string>
+     */
     protected function getSaslOptions(): array
     {
         if ($this->isActiveDirectory()) {
             return [
                 'username' => 'admin',
-                'password' => $_ENV['LDAP_PASSWORD'],
+                'password' => (string) getenv('LDAP_PASSWORD'),
                 'host' => 'ADDC3.example.com'
             ];
         } else {

tests/integration/LdapProxyTest.php

@@ -76,8 +76,8 @@ public function testItCanHandlePaging(): void
     protected function authenticate(): void
     {
         $this->ldapClient()->bind(
-            $_ENV['LDAP_USERNAME'],
-            $_ENV['LDAP_PASSWORD']
+            (string) getenv('LDAP_USERNAME'),
+            (string) getenv('LDAP_PASSWORD'),
         );
     }
 }

tests/integration/LdapServerTest.php

@@ -33,13 +33,12 @@ public function setUp(): void
 
     public function testItCanBind(): void
     {
-        $response = $this->ldapClient()->bind(
+        $this->ldapClient()->bind(
             'cn=user,dc=foo,dc=bar',
             '12345'
         );
         $output = $this->waitForServerOutput('---bind---');
 
-        $this->assertNotNull($response);
         $this->assertStringContainsString(
             'username => cn=user,dc=foo,dc=bar',
             $output
@@ -69,15 +68,14 @@ public function testItRejectsBindWithIncorrectCredentials(): void
     public function testItPerformsAnAdd(): void
     {
         $this->authenticate();
-        $response = $this->ldapClient()->create(Entry::fromArray(
+        $this->ldapClient()->create(Entry::fromArray(
             'cn=meh,dc=foo,dc=bar',
             [
                 'foo' => 'bar',
             ]
         ));
         $output = $this->waitForServerOutput('---add---');
 
-        $this->assertNotNull($response);
         $this->assertStringContainsString(
             'dn => cn=meh,dc=foo,dc=bar',
             $output
@@ -91,10 +89,9 @@ public function testItPerformsAnAdd(): void
     public function testItPerformsDelete(): void
     {
         $this->authenticate();
-        $response = $this->ldapClient()->delete('cn=meh,dc=foo,dc=bar');
+        $this->ldapClient()->delete('cn=meh,dc=foo,dc=bar');
         $output = $this->waitForServerOutput('---delete---');
 
-        $this->assertNotNull($response);
         $this->assertStringContainsString(
             'dn => cn=meh,dc=foo,dc=bar',
             $output
@@ -119,10 +116,9 @@ public function testItPerformsModify(): void
         $entry->set('surname', 'LastName');
         $entry->reset('phone');
 
-        $response = $this->ldapClient()->update($entry);
+        $this->ldapClient()->update($entry);
         $output = $this->waitForServerOutput('---modify---');
 
-        $this->assertNotNull($response);
         $this->assertStringContainsString(
             'dn => cn=meh,dc=foo,dc=bar',
             $output
@@ -155,14 +151,13 @@ public function testItCanPerformCompare(): void
     {
         $this->authenticate();
 
-        $response = $this->ldapClient()->compare(
+        $this->ldapClient()->compare(
             'cn=meh,dc=foo,dc=bar',
             'foo',
             'bar'
         );
         $output = $this->waitForServerOutput('---compare---');
 
-        $this->assertNotNull($response);
         $this->assertStringContainsString(
             'dn => cn=meh,dc=foo,dc=bar',
             $output
@@ -181,13 +176,12 @@ public function testItCanModifyDn(): void
     {
         $this->authenticate();
 
-        $response = $this->ldapClient()->move(
+        $this->ldapClient()->move(
             'cn=meh,dc=foo,dc=bar',
             'cn=bleh,dc=foo,dc=bar'
         );
         $output = $this->waitForServerOutput('---modify-dn---');
 
-        $this->assertNotNull($response);
         $this->assertStringContainsString(
             'dn => cn=meh,dc=foo,dc=bar',
             $output

tests/integration/LdapTestCase.php

@@ -25,14 +25,14 @@ class LdapTestCase extends TestCase
     protected function makeOptions(): ClientOptions
     {
         return (new ClientOptions())
-            ->setBaseDn((string) $_ENV['LDAP_BASE_DN'])
-            ->setServers([(string) $_ENV['LDAP_SERVER']])
+            ->setBaseDn((string) getenv('LDAP_BASE_DN'))
+            ->setServers([(string) getenv('LDAP_SERVER')])
             ->setSslCaCert(
                 $_ENV['LDAP_CA_CERT'] === ''
                     ? __DIR__ . '/../resources/cert/ca.crt'
-                    : (string) $_ENV['LDAP_CA_CERT']
+                    : (string) getenv('LDAP_CA_CERT')
             )
-            ->setBaseDn((string) $_ENV['LDAP_BASE_DN']);
+            ->setBaseDn((string) getenv('LDAP_BASE_DN'));
     }
 
     protected function getClient(?ClientOptions $options = null): LdapClient
@@ -43,8 +43,8 @@ protected function getClient(?ClientOptions $options = null): LdapClient
     protected function bindClient(LdapClient $client): void
     {
         $client->bind(
-            $_ENV['LDAP_USERNAME'],
-            $_ENV['LDAP_PASSWORD'],
+            (string) getenv('LDAP_USERNAME'),
+            (string) getenv('LDAP_PASSWORD'),
         );
     }
 

tests/integration/Search/RangeRetrievalTest.php

@@ -17,6 +17,7 @@
 use FreeDSx\Ldap\LdapClient;
 use FreeDSx\Ldap\Search\RangeRetrieval;
 use Tests\Integration\FreeDSx\Ldap\LdapTestCase;
+use Throwable;
 
 class RangeRetrievalTest extends LdapTestCase
 {
@@ -39,7 +40,7 @@ public function tearDown(): void
     {
         try {
             $this->client->unbind();
-        } catch (\Exception|\Throwable $e) {
+        } catch (Throwable) {
         }
     }
 

tests/resources/activedirectory/generate-ldif.php

@@ -2,7 +2,7 @@
 
 # A simple script to modify the OpenLDAP LDIF data to work with AD so we are working with the same data set.
 
-$data = file_get_contents(__DIR__ . '/../openldap/ldif/data.ldif');
+$data = (string) file_get_contents(__DIR__ . '/../openldap/ldif/data.ldif');
 $ldif = explode("\n", $data);
 foreach ($ldif as $i => $line) {
     if (preg_match('/^userPassword/', $line)) {
@@ -11,7 +11,7 @@
 }
 file_put_contents(__DIR__ . '/ldif/data.ldif', implode("\n", $ldif));
 
-$data = file_get_contents(__DIR__ . '/../openldap/ldif/data-group.ldif');
+$data = (string) file_get_contents(__DIR__ . '/../openldap/ldif/data-group.ldif');
 $ldif = explode("\n", $data);
 foreach ($ldif as $i => $line) {
     if (preg_match('/^objectClass/', $line)) {

tests/unit/ContainerTest.php

@@ -47,6 +47,9 @@ protected function setUp(): void
         ]);
     }
 
+    /**
+     * @return array<array{class-string}>
+     */
     public static function buildableDependenciesDataProvider(): array
     {
         return [

tests/unit/Entry/EntryTest.php

@@ -217,7 +217,7 @@ public function test_it_should_remove_an_attribute_using_an_attribute(): void
         self::assertNull($this->subject->get('cn', true));
     }
 
-    public function if_should_check_if_it_has_an_attribute_using_a_string()
+    public function if_should_check_if_it_has_an_attribute_using_a_string(): void
     {
         self::assertTrue($this->subject->has('Cn'));
         self::assertFalse($this->subject->has('bleh'));

tests/unit/LdapClientTest.php

@@ -155,46 +155,42 @@ public function test_it_should_bind(): void
 
     public function test_it_should_construct_a_pager_helper(): void
     {
-        self::assertInstanceOf(
-            Paging::class,
-            $this->subject->paging(Operations::search(
-                Filters::equal(
-                    'foo',
-                    'bar'
-                ))
-            ),
+        self::expectNotToPerformAssertions();
+
+        $this->subject->paging(Operations::search(
+            Filters::equal(
+                'foo',
+                'bar'
+            ))
         );
     }
 
     public function test_it_should_construct_a_vlv_helper(): void
     {
-        self::assertInstanceOf(
-            Vlv::class,
-            $this->subject->vlv(
-                Operations::search(Filters::equal(
-                    'foo',
-                    'bar'
-                )),
-                'cn',
-                100
-            ),
+        self::expectNotToPerformAssertions();
+
+        $this->subject->vlv(
+            Operations::search(Filters::equal(
+                'foo',
+                'bar'
+            )),
+            'cn',
+            100
         );
     }
 
     public function test_it_should_construct_a_dirsync_helper(): void
     {
-        self::assertInstanceOf(
-            DirSync::class,
-            $this->subject->dirSync()
-        );
+        self::expectNotToPerformAssertions();
+
+        $this->subject->dirSync();
     }
 
     public function test_it_should_construct_a_range_retrieval_helper(): void
     {
-        self::assertInstanceOf(
-            RangeRetrieval::class,
-            $this->subject->range(),
-        );
+        self::expectNotToPerformAssertions();
+
+        $this->subject->range();
     }
 
     public function test_it_should_start_tls(): void

tests/unit/Operation/Request/AbandonRequestTest.php

@@ -28,11 +28,6 @@ protected function setUp(): void
         $this->subject = new AbandonRequest(1);
     }
 
-    public function testItIsInitializable(): void
-    {
-        $this->assertInstanceOf(AbandonRequest::class, $this->subject);
-    }
-
     public function testItShouldGetTheMessageId(): void
     {
         $this->assertEquals(1, $this->subject->getMessageId());

tests/unit/Operation/Request/SearchRequestTest.php

@@ -214,6 +214,7 @@ public function test_it_should_not_allow_invalid_cancel_stragegies(): void
     {
         $this->expectException(UnexpectedValueException::class);
 
+        /** @phpstan-ignore-next-line */
         $this->subject->useCancelStrategy('foo');
     }