From 6f07df7188fca31c0003549911515975ab573a26 Mon Sep 17 00:00:00 2001
From: Chad Sikorra <Chad.Sikorra@gmail.com>
Date: Sat, 6 Jun 2026 08:28:39 -0400
Subject: [PATCH 1/6] Clean up the server queue metric hooks.

---
 .../Ldap/Protocol/Queue/ServerQueue.php        | 18 ++++++------------
 .../Metrics/Snapshot/MetricsSnapshotTest.php   | 10 ++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/FreeDSx/Ldap/Protocol/Queue/ServerQueue.php b/src/FreeDSx/Ldap/Protocol/Queue/ServerQueue.php
index e3c8e50e..6d76b50e 100644
--- a/src/FreeDSx/Ldap/Protocol/Queue/ServerQueue.php
+++ b/src/FreeDSx/Ldap/Protocol/Queue/ServerQueue.php
@@ -73,28 +73,22 @@ public function __construct(
     }
 
     /**
-     * Count the LDAP bytes received for a decoded request.
-     *
-     * @throws ProtocolException
+     * Count the LDAP bytes sent for each outgoing response.
      */
-    protected function decode(string $bytes): Message
+    protected function onMessageEncoded(string $encoded): void
     {
-        $message = parent::decode($bytes);
-
         $this->metricsRecorder->trafficObserved(new TrafficObservation(
-            bytesReceived: (int) $message->getLastPosition(),
+            bytesSent: strlen($encoded),
         ));
-
-        return $message;
     }
 
     /**
-     * Count the LDAP bytes sent for each outgoing response.
+     * Count the LDAP bytes received for each decoded request.
      */
-    protected function onMessageEncoded(string $encoded): void
+    protected function onMessageDecoded(Message $message): void
     {
         $this->metricsRecorder->trafficObserved(new TrafficObservation(
-            bytesSent: strlen($encoded),
+            bytesReceived: (int) $message->getLastPosition(),
         ));
     }
 
diff --git a/tests/unit/Server/Metrics/Snapshot/MetricsSnapshotTest.php b/tests/unit/Server/Metrics/Snapshot/MetricsSnapshotTest.php
index 24e064e6..fa57a103 100644
--- a/tests/unit/Server/Metrics/Snapshot/MetricsSnapshotTest.php
+++ b/tests/unit/Server/Metrics/Snapshot/MetricsSnapshotTest.php
@@ -17,6 +17,7 @@
 use FreeDSx\Ldap\Server\Metrics\Snapshot\LifecycleMetrics;
 use FreeDSx\Ldap\Server\Metrics\Snapshot\MetricsSnapshot;
 use FreeDSx\Ldap\Server\Metrics\Snapshot\OperationMetrics;
+use FreeDSx\Ldap\Server\Metrics\Snapshot\TrafficMetrics;
 use PHPUnit\Framework\TestCase;
 
 final class MetricsSnapshotTest extends TestCase
@@ -37,12 +38,21 @@ protected function setUp(): void
                 2,
                 1,
                 0,
+                5,
             ),
             new OperationMetrics(
                 ['search' => 7],
                 ['search' => 1],
                 ['search' => 3.5],
                 [0 => 6, 32 => 1],
+                ['simple' => 5, 'anonymous' => 2],
+                ['base' => 3, 'sub' => 4],
+            ),
+            ['search' => 2, 'bind' => 1],
+            new TrafficMetrics(
+                4096,
+                512,
+                9,
             ),
         );
     }

From c9ba69cf59c19457b8cef1ba91d39f9e8b7afd46 Mon Sep 17 00:00:00 2001
From: Chad Sikorra <Chad.Sikorra@gmail.com>
Date: Sat, 6 Jun 2026 09:37:10 -0400
Subject: [PATCH 2/6] Add a dead code detector via phpstan. Mark the actual
 public api.

---
 composer.json                                 |  3 +-
 phpstan.neon                                  | 10 +++
 phpstan.tests.neon                            |  8 +++
 src/FreeDSx/Ldap/ClientOptions.php            |  3 +
 .../Ldap/Control/Ad/DirSyncRequestControl.php |  2 +
 .../Control/Ad/DirSyncResponseControl.php     |  2 +
 .../Control/Ad/ExpectedEntryCountControl.php  |  2 +
 .../Ldap/Control/Ad/ExtendedDnControl.php     |  2 +
 .../Ldap/Control/Ad/PolicyHintsControl.php    |  2 +
 .../Ldap/Control/Ad/SdFlagsControl.php        |  2 +
 .../Ldap/Control/Ad/SetOwnerControl.php       |  2 +
 src/FreeDSx/Ldap/Control/AssertionControl.php |  2 +
 src/FreeDSx/Ldap/Control/Control.php          |  2 +
 src/FreeDSx/Ldap/Control/ControlBag.php       |  2 +
 src/FreeDSx/Ldap/Control/PagingControl.php    |  2 +
 .../Control/ProxyAuthorizationControl.php     |  2 +
 .../Ldap/Control/PwdPolicyResponseControl.php |  2 +
 .../ReadEntry/ReadEntryResponseControl.php    |  2 +
 src/FreeDSx/Ldap/Control/Sorting/SortKey.php  |  2 +
 .../Ldap/Control/Sorting/SortingControl.php   |  2 +
 .../Sorting/SortingResponseControl.php        |  2 +
 .../Ldap/Control/SubentriesControl.php        |  2 +
 .../Ldap/Control/Sync/SyncDoneControl.php     |  2 +
 .../Ldap/Control/Sync/SyncRequestControl.php  |  2 +
 .../Ldap/Control/Sync/SyncStateControl.php    |  2 +
 src/FreeDSx/Ldap/Control/Vlv/VlvControl.php   |  2 +
 .../Ldap/Control/Vlv/VlvResponseControl.php   |  2 +
 src/FreeDSx/Ldap/Controls.php                 |  2 +
 src/FreeDSx/Ldap/Entry/Attribute.php          |  2 +
 src/FreeDSx/Ldap/Entry/Change.php             |  2 +
 src/FreeDSx/Ldap/Entry/Changes.php            |  2 +
 src/FreeDSx/Ldap/Entry/Entries.php            |  2 +
 src/FreeDSx/Ldap/Entry/Entry.php              |  2 +
 src/FreeDSx/Ldap/Entry/EscapeTrait.php        |  4 ++
 src/FreeDSx/Ldap/Entry/Option.php             |  2 +
 src/FreeDSx/Ldap/Entry/Options.php            |  2 +
 src/FreeDSx/Ldap/Entry/Rdn.php                |  2 +
 .../Ldap/Exception/LdifParseException.php     |  2 +
 .../Ldap/Exception/OperationException.php     |  2 +
 .../Ldap/Exception/ReferralException.php      |  2 +
 src/FreeDSx/Ldap/LdapClient.php               |  2 +
 src/FreeDSx/Ldap/LdapServer.php               |  2 +
 src/FreeDSx/Ldap/LdapUrl.php                  |  2 +
 src/FreeDSx/Ldap/LdapUrlExtension.php         |  2 +
 src/FreeDSx/Ldap/Ldif/LdifChanges.php         |  2 +
 src/FreeDSx/Ldap/Ldif/LdifOutputOptions.php   |  2 +
 src/FreeDSx/Ldap/Ldif/LdifParser.php          |  2 +
 src/FreeDSx/Ldap/Ldif/LdifWriter.php          |  2 +
 .../Ldap/Ldif/Loader/FileLdifLoader.php       |  2 +
 .../Ldap/Ldif/Output/FileLdifOutput.php       |  2 +
 .../Ldap/Ldif/Output/StringLdifOutput.php     |  2 +
 .../Ldap/Ldif/Parser/LdifLineCursor.php       |  2 +
 src/FreeDSx/Ldap/Operation/LdapResult.php     |  2 +
 .../Ldap/Operation/Request/AbandonRequest.php |  2 +
 .../Ldap/Operation/Request/AddRequest.php     |  2 +
 .../Ldap/Operation/Request/BindRequest.php    |  2 +
 .../Ldap/Operation/Request/CancelRequest.php  |  2 +
 .../Ldap/Operation/Request/CompareRequest.php |  2 +
 .../Operation/Request/ExtendedRequest.php     |  2 +
 .../Operation/Request/ModifyDnRequest.php     |  2 +
 .../Ldap/Operation/Request/ModifyRequest.php  |  2 +
 .../Request/PasswordModifyRequest.php         |  2 +
 .../Ldap/Operation/Request/SearchRequest.php  |  2 +
 .../Operation/Request/SimpleBindRequest.php   |  2 +
 .../Response/IntermediateResponse.php         |  2 +
 .../Response/PasswordModifyResponse.php       |  2 +
 .../Operation/Response/SearchResponse.php     |  2 +
 .../SyncInfo/SyncRefreshDoneTrait.php         |  3 +
 src/FreeDSx/Ldap/Operations.php               |  2 +
 .../Protocol/ProtocolElementInterface.php     |  2 +
 src/FreeDSx/Ldap/ProxyOptions.php             |  2 +
 .../Schema/Definition/AttributeTypeOid.php    |  2 +
 .../Ldap/Schema/Definition/AttributeUsage.php |  3 +
 .../Schema/Definition/MatchingRuleOid.php     |  2 +
 src/FreeDSx/Ldap/Schema/Schema.php            |  2 +
 src/FreeDSx/Ldap/Search/DirSync.php           |  2 +
 .../Filter/AttributeValueAssertionTrait.php   |  5 ++
 .../Search/Filter/FilterAttributeTrait.php    |  5 ++
 .../Filter/FilterContainerInterface.php       |  2 +
 .../Search/Filter/FilterContainerTrait.php    |  4 ++
 .../Ldap/Search/Filter/MatchingRuleFilter.php |  2 +
 src/FreeDSx/Ldap/Search/Filter/NotFilter.php  |  2 +
 .../Ldap/Search/Filter/PresentFilter.php      |  2 +
 .../Ldap/Search/Filter/SubstringFilter.php    |  2 +
 src/FreeDSx/Ldap/Search/Filters.php           |  2 +
 src/FreeDSx/Ldap/Search/LdapQuery.php         |  2 +
 src/FreeDSx/Ldap/Search/Paging.php            |  2 +
 src/FreeDSx/Ldap/Search/RangeRetrieval.php    |  2 +
 src/FreeDSx/Ldap/Search/Vlv.php               |  2 +
 .../Ldap/Server/AccessControl/AclRules.php    |  2 +
 .../AccessControl/Rule/AttributeRule.php      |  2 +
 .../Server/AccessControl/Rule/ControlRule.php |  2 +
 .../AccessControl/Rule/OperationRule.php      |  2 +
 .../Server/AccessControl/Subject/Subject.php  |  2 +
 .../Server/AccessControl/Target/Target.php    |  2 +
 .../Storage/Adapter/JsonFileStorage.php       |  2 +
 .../Backend/Storage/Adapter/MysqlStorage.php  |  2 +
 .../Pdo/PdoStorageFactoryInterface.php        |  2 +
 .../Adapter/Pdo/PdoStorageFactoryTrait.php    |  3 +
 .../Backend/Storage/Adapter/SqliteStorage.php |  2 +
 .../Backend/Storage/Export/DumpOptions.php    |  2 +
 .../Server/Backend/Write/WriteContext.php     |  2 +
 .../Ldap/Server/Logging/EventLogPolicy.php    |  2 +
 .../Ldap/Server/Logging/EventLogger.php       |  2 +
 .../Server/Operation/WriteOperationResult.php |  1 +
 .../Ldap/Server/Paging/PagingRequest.php      |  2 +
 .../Decision/PasswordPolicyOutcome.php        |  2 +
 .../Server/PasswordPolicy/PasswordPolicy.php  |  2 +
 .../Rules/PasswordChangeRules.php             |  2 +
 .../Rules/PasswordExpirationRules.php         |  2 +
 .../Rules/PasswordLockoutRules.php            |  2 +
 .../Rules/PasswordQualityRules.php            |  2 +
 src/FreeDSx/Ldap/Server/RequestContext.php    |  2 +
 src/FreeDSx/Ldap/Server/Token/AnonToken.php   |  2 +
 src/FreeDSx/Ldap/Server/Token/BindToken.php   |  2 +
 src/FreeDSx/Ldap/Server/Token/SystemToken.php |  2 +
 .../Ldap/Server/Token/TokenInterface.php      |  2 +
 src/FreeDSx/Ldap/ServerOptions.php            |  3 +
 .../Ldap/Sync/Result/SyncEntryResult.php      |  3 +
 .../Ldap/Sync/Result/SyncIdSetResult.php      |  2 +
 .../Ldap/Sync/Result/SyncReferralResult.php   |  3 +
 .../Ldap/Sync/Result/SyncResultTrait.php      | 17 +++++
 src/FreeDSx/Ldap/Sync/Session.php             |  3 +
 src/FreeDSx/Ldap/Sync/SyncRepl.php            |  2 +
 .../PhpStan/ApiMemberUsageProvider.php        | 65 +++++++++++++++++++
 125 files changed, 359 insertions(+), 1 deletion(-)
 create mode 100644 tests/support/PhpStan/ApiMemberUsageProvider.php

diff --git a/composer.json b/composer.json
index 29693707..cfa80c6f 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,8 @@
     "slevomat/coding-standard": "^7.2",
     "phpstan/phpstan-phpunit": "^2.0",
     "phpstan/extension-installer": "^1.4",
-    "swoole/ide-helper": "^6.0"
+    "swoole/ide-helper": "^6.0",
+    "shipmonk/dead-code-detector": "^1.2"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
diff --git a/phpstan.neon b/phpstan.neon
index d23dec32..e26e37b8 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,3 +1,9 @@
+services:
+    -
+        class: Tests\Support\FreeDSx\Ldap\PhpStan\ApiMemberUsageProvider
+        tags:
+            - shipmonk.deadCode.memberUsageProvider
+
 parameters:
     level: 9
     paths:
@@ -8,3 +14,7 @@ parameters:
     reportUnmatchedIgnoredErrors: false
     ignoreErrors:
         - '#Unsafe usage of new static\(\).#'
+    shipmonkDeadCode:
+        usageExcluders:
+            tests:
+                enabled: true
diff --git a/phpstan.tests.neon b/phpstan.tests.neon
index 09871428..8e72b96c 100644
--- a/phpstan.tests.neon
+++ b/phpstan.tests.neon
@@ -3,3 +3,11 @@ parameters:
     level: 10
     paths:
         - %currentWorkingDirectory%/tests
+    reportUnmatchedIgnoredErrors: false
+    # Dead-code detection targets src; the test suite is intentionally exempt.
+    ignoreErrors:
+        - identifier: shipmonk.deadMethod
+        - identifier: shipmonk.deadConstant
+        - identifier: shipmonk.deadEnumCase
+        - identifier: shipmonk.deadProperty.neverRead
+        - identifier: shipmonk.deadProperty.neverWritten
diff --git a/src/FreeDSx/Ldap/ClientOptions.php b/src/FreeDSx/Ldap/ClientOptions.php
index a6561840..ab3d1b0d 100644
--- a/src/FreeDSx/Ldap/ClientOptions.php
+++ b/src/FreeDSx/Ldap/ClientOptions.php
@@ -15,6 +15,9 @@
 
 use FreeDSx\Ldap\Control\ControlBag;
 
+/**
+ * @api
+ */
 final class ClientOptions
 {
     private int $version = 3;
diff --git a/src/FreeDSx/Ldap/Control/Ad/DirSyncRequestControl.php b/src/FreeDSx/Ldap/Control/Ad/DirSyncRequestControl.php
index 650ded33..c75da035 100644
--- a/src/FreeDSx/Ldap/Control/Ad/DirSyncRequestControl.php
+++ b/src/FreeDSx/Ldap/Control/Ad/DirSyncRequestControl.php
@@ -32,6 +32,8 @@
  *      Cookie      OCTET STRING
  *  }
  *
+ * @api
+ *
  * @see https://msdn.microsoft.com/en-us/library/cc223347.aspx
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/Ad/DirSyncResponseControl.php b/src/FreeDSx/Ldap/Control/Ad/DirSyncResponseControl.php
index b4023e67..c15b83e1 100644
--- a/src/FreeDSx/Ldap/Control/Ad/DirSyncResponseControl.php
+++ b/src/FreeDSx/Ldap/Control/Ad/DirSyncResponseControl.php
@@ -32,6 +32,8 @@
  *     CookieServer    OCTET STRING
  * }
  *
+ * @api
+ *
  * @see https://msdn.microsoft.com/en-us/library/cc223347.aspx
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/Ad/ExpectedEntryCountControl.php b/src/FreeDSx/Ldap/Control/Ad/ExpectedEntryCountControl.php
index 8b53a709..76d41416 100644
--- a/src/FreeDSx/Ldap/Control/Ad/ExpectedEntryCountControl.php
+++ b/src/FreeDSx/Ldap/Control/Ad/ExpectedEntryCountControl.php
@@ -31,6 +31,8 @@
  *      searchEntriesMax    INTEGER
  *  }
  *
+ * @api
+ *
  * @see https://msdn.microsoft.com/en-us/library/jj216720.aspx
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/Ad/ExtendedDnControl.php b/src/FreeDSx/Ldap/Control/Ad/ExtendedDnControl.php
index 163e95f2..f62cfcc1 100644
--- a/src/FreeDSx/Ldap/Control/Ad/ExtendedDnControl.php
+++ b/src/FreeDSx/Ldap/Control/Ad/ExtendedDnControl.php
@@ -27,6 +27,8 @@
 /**
  * Used to represent the Extended DN control.
  *
+ * @api
+ *
  * @see https://msdn.microsoft.com/en-us/library/cc223349.aspx
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/Ad/PolicyHintsControl.php b/src/FreeDSx/Ldap/Control/Ad/PolicyHintsControl.php
index 231ac7d7..93aa41e8 100644
--- a/src/FreeDSx/Ldap/Control/Ad/PolicyHintsControl.php
+++ b/src/FreeDSx/Ldap/Control/Ad/PolicyHintsControl.php
@@ -29,6 +29,8 @@
  *      Flags    INTEGER
  *  }
  *
+ * @api
+ *
  * @see https://msdn.microsoft.com/en-us/library/hh128228.aspx
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/Ad/SdFlagsControl.php b/src/FreeDSx/Ldap/Control/Ad/SdFlagsControl.php
index 0d6a7f36..641f0181 100644
--- a/src/FreeDSx/Ldap/Control/Ad/SdFlagsControl.php
+++ b/src/FreeDSx/Ldap/Control/Ad/SdFlagsControl.php
@@ -24,6 +24,8 @@
  *     Flags    INTEGER
  * }
  *
+ * @api
+ *
  * @see https://msdn.microsoft.com/en-us/library/cc223323.aspx
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/Ad/SetOwnerControl.php b/src/FreeDSx/Ldap/Control/Ad/SetOwnerControl.php
index fe78b87d..092d7cbc 100644
--- a/src/FreeDSx/Ldap/Control/Ad/SetOwnerControl.php
+++ b/src/FreeDSx/Ldap/Control/Ad/SetOwnerControl.php
@@ -27,6 +27,8 @@
  *
  *   SID octetString
  *
+ * @api
+ *
  * https://msdn.microsoft.com/en-us/library/dn392490.aspx
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/AssertionControl.php b/src/FreeDSx/Ldap/Control/AssertionControl.php
index f934e5e6..bd6e7271 100644
--- a/src/FreeDSx/Ldap/Control/AssertionControl.php
+++ b/src/FreeDSx/Ldap/Control/AssertionControl.php
@@ -23,6 +23,8 @@
  *
  * The operation proceeds only if the filter matches the target entry.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class AssertionControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/Control.php b/src/FreeDSx/Ldap/Control/Control.php
index f27a829d..6a840832 100644
--- a/src/FreeDSx/Ldap/Control/Control.php
+++ b/src/FreeDSx/Ldap/Control/Control.php
@@ -35,6 +35,8 @@
  *     criticality             BOOLEAN DEFAULT FALSE,
  *     controlValue            OCTET STRING OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Control implements ProtocolElementInterface, Stringable
diff --git a/src/FreeDSx/Ldap/Control/ControlBag.php b/src/FreeDSx/Ldap/Control/ControlBag.php
index 59902318..49fcdd7f 100644
--- a/src/FreeDSx/Ldap/Control/ControlBag.php
+++ b/src/FreeDSx/Ldap/Control/ControlBag.php
@@ -26,6 +26,8 @@
 /**
  * Represents a set of controls.
  *
+ * @api
+ *
  * @implements IteratorAggregate<Control>
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Control/PagingControl.php b/src/FreeDSx/Ldap/Control/PagingControl.php
index cdae3b12..74bee15e 100644
--- a/src/FreeDSx/Ldap/Control/PagingControl.php
+++ b/src/FreeDSx/Ldap/Control/PagingControl.php
@@ -31,6 +31,8 @@
  *                          -- result set size estimate from server
  *     cookie          OCTET STRING }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class PagingControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/ProxyAuthorizationControl.php b/src/FreeDSx/Ldap/Control/ProxyAuthorizationControl.php
index 6ec87eb8..2481eaf7 100644
--- a/src/FreeDSx/Ldap/Control/ProxyAuthorizationControl.php
+++ b/src/FreeDSx/Ldap/Control/ProxyAuthorizationControl.php
@@ -20,6 +20,8 @@
 /**
  * Represents a proxied authorization control. RFC 4370.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class ProxyAuthorizationControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/PwdPolicyResponseControl.php b/src/FreeDSx/Ldap/Control/PwdPolicyResponseControl.php
index 05228704..3870b432 100644
--- a/src/FreeDSx/Ldap/Control/PwdPolicyResponseControl.php
+++ b/src/FreeDSx/Ldap/Control/PwdPolicyResponseControl.php
@@ -40,6 +40,8 @@
  *         passwordTooYoung            (7),
  *         passwordInHistory           (8) } OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class PwdPolicyResponseControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/ReadEntry/ReadEntryResponseControl.php b/src/FreeDSx/Ldap/Control/ReadEntry/ReadEntryResponseControl.php
index 5af55d1c..36631eb9 100644
--- a/src/FreeDSx/Ldap/Control/ReadEntry/ReadEntryResponseControl.php
+++ b/src/FreeDSx/Ldap/Control/ReadEntry/ReadEntryResponseControl.php
@@ -24,6 +24,8 @@
  *
  * Carries the entry state as a SearchResultEntry.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 abstract class ReadEntryResponseControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/Sorting/SortKey.php b/src/FreeDSx/Ldap/Control/Sorting/SortKey.php
index ac53686c..d1ce2295 100644
--- a/src/FreeDSx/Ldap/Control/Sorting/SortKey.php
+++ b/src/FreeDSx/Ldap/Control/Sorting/SortKey.php
@@ -16,6 +16,8 @@
 /**
  * Represents a server side sorting request SortKey.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SortKey
diff --git a/src/FreeDSx/Ldap/Control/Sorting/SortingControl.php b/src/FreeDSx/Ldap/Control/Sorting/SortingControl.php
index 4cf4381b..66c7a669 100644
--- a/src/FreeDSx/Ldap/Control/Sorting/SortingControl.php
+++ b/src/FreeDSx/Ldap/Control/Sorting/SortingControl.php
@@ -33,6 +33,8 @@
  *     orderingRule    [0] MatchingRuleId OPTIONAL,
  *     reverseOrder    [1] BOOLEAN DEFAULT FALSE }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SortingControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/Sorting/SortingResponseControl.php b/src/FreeDSx/Ldap/Control/Sorting/SortingResponseControl.php
index 4dc88c70..32913cec 100644
--- a/src/FreeDSx/Ldap/Control/Sorting/SortingResponseControl.php
+++ b/src/FreeDSx/Ldap/Control/Sorting/SortingResponseControl.php
@@ -49,6 +49,8 @@
  *         },
  *     attributeType [0] AttributeDescription OPTIONAL }
  *
+ * @api
+ *
  *  @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SortingResponseControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/SubentriesControl.php b/src/FreeDSx/Ldap/Control/SubentriesControl.php
index 9f7a2452..80f78ffb 100644
--- a/src/FreeDSx/Ldap/Control/SubentriesControl.php
+++ b/src/FreeDSx/Ldap/Control/SubentriesControl.php
@@ -22,6 +22,8 @@
 /**
  * Represents a subentries control. RFC 3672.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SubentriesControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/Sync/SyncDoneControl.php b/src/FreeDSx/Ldap/Control/Sync/SyncDoneControl.php
index 5cfc30a5..3337b817 100644
--- a/src/FreeDSx/Ldap/Control/Sync/SyncDoneControl.php
+++ b/src/FreeDSx/Ldap/Control/Sync/SyncDoneControl.php
@@ -31,6 +31,8 @@
  *     refreshDeletes  BOOLEAN DEFAULT FALSE
  * }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com
  * @see https://tools.ietf.org/html/rfc4533
  */
diff --git a/src/FreeDSx/Ldap/Control/Sync/SyncRequestControl.php b/src/FreeDSx/Ldap/Control/Sync/SyncRequestControl.php
index e86e31e1..bb146fde 100644
--- a/src/FreeDSx/Ldap/Control/Sync/SyncRequestControl.php
+++ b/src/FreeDSx/Ldap/Control/Sync/SyncRequestControl.php
@@ -38,6 +38,8 @@
  *     reloadHint BOOLEAN DEFAULT FALSE
  * }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com
  * @see https://tools.ietf.org/html/rfc4533
  */
diff --git a/src/FreeDSx/Ldap/Control/Sync/SyncStateControl.php b/src/FreeDSx/Ldap/Control/Sync/SyncStateControl.php
index 31358f64..385264d5 100644
--- a/src/FreeDSx/Ldap/Control/Sync/SyncStateControl.php
+++ b/src/FreeDSx/Ldap/Control/Sync/SyncStateControl.php
@@ -40,6 +40,8 @@
  *     cookie    syncCookie OPTIONAL
  * }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com
  * @see https://tools.ietf.org/html/rfc4533
  */
diff --git a/src/FreeDSx/Ldap/Control/Vlv/VlvControl.php b/src/FreeDSx/Ldap/Control/Vlv/VlvControl.php
index 131977a7..04481c6d 100644
--- a/src/FreeDSx/Ldap/Control/Vlv/VlvControl.php
+++ b/src/FreeDSx/Ldap/Control/Vlv/VlvControl.php
@@ -34,6 +34,8 @@
  *         greaterThanOrEqual [1] AssertionValue },
  *     contextID     OCTET STRING OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class VlvControl extends Control
diff --git a/src/FreeDSx/Ldap/Control/Vlv/VlvResponseControl.php b/src/FreeDSx/Ldap/Control/Vlv/VlvResponseControl.php
index 6b673a82..59e72e5f 100644
--- a/src/FreeDSx/Ldap/Control/Vlv/VlvResponseControl.php
+++ b/src/FreeDSx/Ldap/Control/Vlv/VlvResponseControl.php
@@ -45,6 +45,8 @@
  *         ... },
  *     contextID     OCTET STRING OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class VlvResponseControl extends Control
diff --git a/src/FreeDSx/Ldap/Controls.php b/src/FreeDSx/Ldap/Controls.php
index 832b92f4..a509374d 100644
--- a/src/FreeDSx/Ldap/Controls.php
+++ b/src/FreeDSx/Ldap/Controls.php
@@ -38,6 +38,8 @@
 /**
  * Provides some simple factory methods for building controls.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Controls
diff --git a/src/FreeDSx/Ldap/Entry/Attribute.php b/src/FreeDSx/Ldap/Entry/Attribute.php
index e111c3fa..e68c0857 100644
--- a/src/FreeDSx/Ldap/Entry/Attribute.php
+++ b/src/FreeDSx/Ldap/Entry/Attribute.php
@@ -33,6 +33,8 @@
 /**
  * Represents an entry attribute and any values.
  *
+ * @api
+ *
  * @implements IteratorAggregate<int|string, string>
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Entry/Change.php b/src/FreeDSx/Ldap/Entry/Change.php
index d6a25e69..3f730e8f 100644
--- a/src/FreeDSx/Ldap/Entry/Change.php
+++ b/src/FreeDSx/Ldap/Entry/Change.php
@@ -18,6 +18,8 @@
 /**
  * Represents an entry change.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Change
diff --git a/src/FreeDSx/Ldap/Entry/Changes.php b/src/FreeDSx/Ldap/Entry/Changes.php
index aa8c5fdb..fba2b6c8 100644
--- a/src/FreeDSx/Ldap/Entry/Changes.php
+++ b/src/FreeDSx/Ldap/Entry/Changes.php
@@ -24,6 +24,8 @@
 /**
  * Represents a set of change objects.
  *
+ * @api
+ *
  * @implements IteratorAggregate<Change>
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Entry/Entries.php b/src/FreeDSx/Ldap/Entry/Entries.php
index 9dc4c5fa..5ced356e 100644
--- a/src/FreeDSx/Ldap/Entry/Entries.php
+++ b/src/FreeDSx/Ldap/Entry/Entries.php
@@ -29,6 +29,8 @@
 /**
  * Represents a collection of entry objects.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  *
  * @implements IteratorAggregate<Entry>
diff --git a/src/FreeDSx/Ldap/Entry/Entry.php b/src/FreeDSx/Ldap/Entry/Entry.php
index 5dcbdb7d..9f115938 100644
--- a/src/FreeDSx/Ldap/Entry/Entry.php
+++ b/src/FreeDSx/Ldap/Entry/Entry.php
@@ -26,6 +26,8 @@
 /**
  * Represents an Entry in LDAP.
  *
+ * @api
+ *
  * @implements IteratorAggregate<Attribute>
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Entry/EscapeTrait.php b/src/FreeDSx/Ldap/Entry/EscapeTrait.php
index d5ebeca0..ba946357 100644
--- a/src/FreeDSx/Ldap/Entry/EscapeTrait.php
+++ b/src/FreeDSx/Ldap/Entry/EscapeTrait.php
@@ -22,12 +22,16 @@
 /**
  * Some common methods around escaping attribute values and RDN values.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 trait EscapeTrait
 {
     /**
      * Escape all characters in a value.
+     *
+     * @api
      */
     public static function escapeAll(string $value): string
     {
diff --git a/src/FreeDSx/Ldap/Entry/Option.php b/src/FreeDSx/Ldap/Entry/Option.php
index 830bdec3..f6394c73 100644
--- a/src/FreeDSx/Ldap/Entry/Option.php
+++ b/src/FreeDSx/Ldap/Entry/Option.php
@@ -22,6 +22,8 @@
 /**
  * Represents an attribute option. Described in RFC 4512, Section 2.5.2.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Option implements Stringable
diff --git a/src/FreeDSx/Ldap/Entry/Options.php b/src/FreeDSx/Ldap/Entry/Options.php
index e00cac0a..8f432c84 100644
--- a/src/FreeDSx/Ldap/Entry/Options.php
+++ b/src/FreeDSx/Ldap/Entry/Options.php
@@ -25,6 +25,8 @@
 /**
  * Represents a collection of attribute options.
  *
+ * @api
+ *
  * @implements IteratorAggregate<Option>
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Entry/Rdn.php b/src/FreeDSx/Ldap/Entry/Rdn.php
index 80baf582..13673bd9 100644
--- a/src/FreeDSx/Ldap/Entry/Rdn.php
+++ b/src/FreeDSx/Ldap/Entry/Rdn.php
@@ -28,6 +28,8 @@
 /**
  * Represents a Relative Distinguished Name.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Rdn implements Stringable
diff --git a/src/FreeDSx/Ldap/Exception/LdifParseException.php b/src/FreeDSx/Ldap/Exception/LdifParseException.php
index f8283c12..28070a4c 100644
--- a/src/FreeDSx/Ldap/Exception/LdifParseException.php
+++ b/src/FreeDSx/Ldap/Exception/LdifParseException.php
@@ -18,6 +18,8 @@
 /**
  * Represents an issue encountered while parsing LDIF.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class LdifParseException extends Exception
diff --git a/src/FreeDSx/Ldap/Exception/OperationException.php b/src/FreeDSx/Ldap/Exception/OperationException.php
index 0e915e7d..96ff0853 100644
--- a/src/FreeDSx/Ldap/Exception/OperationException.php
+++ b/src/FreeDSx/Ldap/Exception/OperationException.php
@@ -23,6 +23,8 @@
  * indicate an error during server-side operation processing. The resulting message and code is used in the
  * LDAP result sent back to the client (when thrown from the request handler).
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class OperationException extends Exception
diff --git a/src/FreeDSx/Ldap/Exception/ReferralException.php b/src/FreeDSx/Ldap/Exception/ReferralException.php
index b0980100..4017603f 100644
--- a/src/FreeDSx/Ldap/Exception/ReferralException.php
+++ b/src/FreeDSx/Ldap/Exception/ReferralException.php
@@ -20,6 +20,8 @@
 /**
  * Represents a referral exception from an operation that needs to be chased to be completed.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class ReferralException extends Exception
diff --git a/src/FreeDSx/Ldap/LdapClient.php b/src/FreeDSx/Ldap/LdapClient.php
index baa0f045..08253ea9 100644
--- a/src/FreeDSx/Ldap/LdapClient.php
+++ b/src/FreeDSx/Ldap/LdapClient.php
@@ -48,6 +48,8 @@
 /**
  * The LDAP client.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class LdapClient
diff --git a/src/FreeDSx/Ldap/LdapServer.php b/src/FreeDSx/Ldap/LdapServer.php
index b982bceb..d3f4f737 100644
--- a/src/FreeDSx/Ldap/LdapServer.php
+++ b/src/FreeDSx/Ldap/LdapServer.php
@@ -50,6 +50,8 @@
 /**
  * The LDAP server.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class LdapServer
diff --git a/src/FreeDSx/Ldap/LdapUrl.php b/src/FreeDSx/Ldap/LdapUrl.php
index e179d578..b5858976 100644
--- a/src/FreeDSx/Ldap/LdapUrl.php
+++ b/src/FreeDSx/Ldap/LdapUrl.php
@@ -36,6 +36,8 @@
 /**
  * Represents a LDAP URL. RFC 4516.
  *
+ * @api
+ *
  * @see https://tools.ietf.org/html/rfc4516
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/LdapUrlExtension.php b/src/FreeDSx/Ldap/LdapUrlExtension.php
index 26bf8dec..1449bf7a 100644
--- a/src/FreeDSx/Ldap/LdapUrlExtension.php
+++ b/src/FreeDSx/Ldap/LdapUrlExtension.php
@@ -24,6 +24,8 @@
 /**
  * Represents a LDAP URL extension component. RFC 4516, Section 2.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class LdapUrlExtension implements Stringable
diff --git a/src/FreeDSx/Ldap/Ldif/LdifChanges.php b/src/FreeDSx/Ldap/Ldif/LdifChanges.php
index 6316e6be..2e019849 100644
--- a/src/FreeDSx/Ldap/Ldif/LdifChanges.php
+++ b/src/FreeDSx/Ldap/Ldif/LdifChanges.php
@@ -34,6 +34,8 @@
 /**
  * The full outcome of an LDIF parse: write requests in original record order.
  *
+ * @api
+ *
  * @implements IteratorAggregate<RequestInterface>
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
diff --git a/src/FreeDSx/Ldap/Ldif/LdifOutputOptions.php b/src/FreeDSx/Ldap/Ldif/LdifOutputOptions.php
index 1e2bc0b8..3ca93cbf 100644
--- a/src/FreeDSx/Ldap/Ldif/LdifOutputOptions.php
+++ b/src/FreeDSx/Ldap/Ldif/LdifOutputOptions.php
@@ -16,6 +16,8 @@
 /**
  * Output options for {@see LdifWriter}.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class LdifOutputOptions
diff --git a/src/FreeDSx/Ldap/Ldif/LdifParser.php b/src/FreeDSx/Ldap/Ldif/LdifParser.php
index 65287b56..d7b53669 100644
--- a/src/FreeDSx/Ldap/Ldif/LdifParser.php
+++ b/src/FreeDSx/Ldap/Ldif/LdifParser.php
@@ -29,6 +29,8 @@
 /**
  * Parses RFC 2849 LDIF (content and change records) into a unified collection of write requests.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class LdifParser
diff --git a/src/FreeDSx/Ldap/Ldif/LdifWriter.php b/src/FreeDSx/Ldap/Ldif/LdifWriter.php
index ad853924..4fe2e318 100644
--- a/src/FreeDSx/Ldap/Ldif/LdifWriter.php
+++ b/src/FreeDSx/Ldap/Ldif/LdifWriter.php
@@ -40,6 +40,8 @@
 /**
  * Serializes write requests to RFC 2849 LDIF (content and change records).
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class LdifWriter
diff --git a/src/FreeDSx/Ldap/Ldif/Loader/FileLdifLoader.php b/src/FreeDSx/Ldap/Ldif/Loader/FileLdifLoader.php
index 8e8d80f9..c9cf6182 100644
--- a/src/FreeDSx/Ldap/Ldif/Loader/FileLdifLoader.php
+++ b/src/FreeDSx/Ldap/Ldif/Loader/FileLdifLoader.php
@@ -28,6 +28,8 @@
 /**
  * Streams LDIF lines from a file.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class FileLdifLoader implements LdifLoaderInterface
diff --git a/src/FreeDSx/Ldap/Ldif/Output/FileLdifOutput.php b/src/FreeDSx/Ldap/Ldif/Output/FileLdifOutput.php
index 1b6c6d87..f379f625 100644
--- a/src/FreeDSx/Ldap/Ldif/Output/FileLdifOutput.php
+++ b/src/FreeDSx/Ldap/Ldif/Output/FileLdifOutput.php
@@ -26,6 +26,8 @@
 /**
  * Streams LDIF chunks to a file path.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class FileLdifOutput implements LdifOutputInterface
diff --git a/src/FreeDSx/Ldap/Ldif/Output/StringLdifOutput.php b/src/FreeDSx/Ldap/Ldif/Output/StringLdifOutput.php
index 47acca78..80de5077 100644
--- a/src/FreeDSx/Ldap/Ldif/Output/StringLdifOutput.php
+++ b/src/FreeDSx/Ldap/Ldif/Output/StringLdifOutput.php
@@ -18,6 +18,8 @@
 /**
  * Accumulates LDIF chunks into an in-memory string.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class StringLdifOutput implements LdifOutputInterface, Stringable
diff --git a/src/FreeDSx/Ldap/Ldif/Parser/LdifLineCursor.php b/src/FreeDSx/Ldap/Ldif/Parser/LdifLineCursor.php
index fbcdc199..27d7a23f 100644
--- a/src/FreeDSx/Ldap/Ldif/Parser/LdifLineCursor.php
+++ b/src/FreeDSx/Ldap/Ldif/Parser/LdifLineCursor.php
@@ -27,6 +27,8 @@
 /**
  * Streaming cursor over LDIF lines exposing the shared low-level reading primitives.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class LdifLineCursor
diff --git a/src/FreeDSx/Ldap/Operation/LdapResult.php b/src/FreeDSx/Ldap/Operation/LdapResult.php
index f4ee4dd6..f129e748 100644
--- a/src/FreeDSx/Ldap/Operation/LdapResult.php
+++ b/src/FreeDSx/Ldap/Operation/LdapResult.php
@@ -87,6 +87,8 @@
  *     diagnosticMessage  LDAPString,
  *     referral           [3] Referral OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class LdapResult implements ResponseInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/AbandonRequest.php b/src/FreeDSx/Ldap/Operation/Request/AbandonRequest.php
index 5307a371..754ff8c0 100644
--- a/src/FreeDSx/Ldap/Operation/Request/AbandonRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/AbandonRequest.php
@@ -23,6 +23,8 @@
  *
  * AbandonRequest ::= [APPLICATION 16] MessageID
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class AbandonRequest implements RequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/AddRequest.php b/src/FreeDSx/Ldap/Operation/Request/AddRequest.php
index 4ae2cf73..9d724cb2 100644
--- a/src/FreeDSx/Ldap/Operation/Request/AddRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/AddRequest.php
@@ -47,6 +47,8 @@
  *
  * AttributeValue ::= OCTET STRING
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class AddRequest implements RequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/BindRequest.php b/src/FreeDSx/Ldap/Operation/Request/BindRequest.php
index 8c39bc9c..ff97f55c 100644
--- a/src/FreeDSx/Ldap/Operation/Request/BindRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/BindRequest.php
@@ -29,6 +29,8 @@
  *     name                    LDAPDN,
  *     authentication          AuthenticationChoice }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 abstract class BindRequest implements RequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/CancelRequest.php b/src/FreeDSx/Ldap/Operation/Request/CancelRequest.php
index cb0346fc..cf0a0903 100644
--- a/src/FreeDSx/Ldap/Operation/Request/CancelRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/CancelRequest.php
@@ -29,6 +29,8 @@
  *     -- MessageID is as defined in [RFC2251]
  * }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class CancelRequest extends ExtendedRequest
diff --git a/src/FreeDSx/Ldap/Operation/Request/CompareRequest.php b/src/FreeDSx/Ldap/Operation/Request/CompareRequest.php
index 6ba55b6a..e5b1cdf5 100644
--- a/src/FreeDSx/Ldap/Operation/Request/CompareRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/CompareRequest.php
@@ -30,6 +30,8 @@
  *     entry           LDAPDN,
  *     ava             AttributeValueAssertion }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class CompareRequest implements RequestInterface, DnRequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/ExtendedRequest.php b/src/FreeDSx/Ldap/Operation/Request/ExtendedRequest.php
index 21b7005e..d14e6233 100644
--- a/src/FreeDSx/Ldap/Operation/Request/ExtendedRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/ExtendedRequest.php
@@ -32,6 +32,8 @@
  *     requestName      [0] LDAPOID,
  *     requestValue     [1] OCTET STRING OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class ExtendedRequest implements RequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/ModifyDnRequest.php b/src/FreeDSx/Ldap/Operation/Request/ModifyDnRequest.php
index 16bae31c..f48763ce 100644
--- a/src/FreeDSx/Ldap/Operation/Request/ModifyDnRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/ModifyDnRequest.php
@@ -36,6 +36,8 @@
  *     deleteoldrdn    BOOLEAN,
  *     newSuperior     [0] LDAPDN OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class ModifyDnRequest implements RequestInterface, DnRequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/ModifyRequest.php b/src/FreeDSx/Ldap/Operation/Request/ModifyRequest.php
index 654b9550..376e4795 100644
--- a/src/FreeDSx/Ldap/Operation/Request/ModifyRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/ModifyRequest.php
@@ -40,6 +40,8 @@
  *             ...  },
  *         modification    PartialAttribute } }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class ModifyRequest implements RequestInterface, DnRequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/PasswordModifyRequest.php b/src/FreeDSx/Ldap/Operation/Request/PasswordModifyRequest.php
index 79454ce2..c382356a 100644
--- a/src/FreeDSx/Ldap/Operation/Request/PasswordModifyRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/PasswordModifyRequest.php
@@ -28,6 +28,8 @@
  *     oldPasswd       [1]  OCTET STRING OPTIONAL
  *     newPasswd       [2]  OCTET STRING OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class PasswordModifyRequest extends ExtendedRequest
diff --git a/src/FreeDSx/Ldap/Operation/Request/SearchRequest.php b/src/FreeDSx/Ldap/Operation/Request/SearchRequest.php
index 3fac11c6..2bc510cb 100644
--- a/src/FreeDSx/Ldap/Operation/Request/SearchRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/SearchRequest.php
@@ -52,6 +52,8 @@
  *     filter          Filter,
  *     attributes      AttributeSelection }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SearchRequest implements RequestInterface
diff --git a/src/FreeDSx/Ldap/Operation/Request/SimpleBindRequest.php b/src/FreeDSx/Ldap/Operation/Request/SimpleBindRequest.php
index c35cd828..5c1c07cb 100644
--- a/src/FreeDSx/Ldap/Operation/Request/SimpleBindRequest.php
+++ b/src/FreeDSx/Ldap/Operation/Request/SimpleBindRequest.php
@@ -27,6 +27,8 @@
  *     sasl                    [3] SaslCredentials,
  *     ...  }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SimpleBindRequest extends BindRequest
diff --git a/src/FreeDSx/Ldap/Operation/Response/IntermediateResponse.php b/src/FreeDSx/Ldap/Operation/Response/IntermediateResponse.php
index 22e5c67a..65468687 100644
--- a/src/FreeDSx/Ldap/Operation/Response/IntermediateResponse.php
+++ b/src/FreeDSx/Ldap/Operation/Response/IntermediateResponse.php
@@ -28,6 +28,8 @@
  *     responseName     [0] LDAPOID OPTIONAL,
  *     responseValue    [1] OCTET STRING OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class IntermediateResponse implements ResponseInterface
diff --git a/src/FreeDSx/Ldap/Operation/Response/PasswordModifyResponse.php b/src/FreeDSx/Ldap/Operation/Response/PasswordModifyResponse.php
index 0cb8d589..064bed28 100644
--- a/src/FreeDSx/Ldap/Operation/Response/PasswordModifyResponse.php
+++ b/src/FreeDSx/Ldap/Operation/Response/PasswordModifyResponse.php
@@ -27,6 +27,8 @@
  * PasswdModifyResponseValue ::= SEQUENCE {
  *     genPasswd       [0]     OCTET STRING OPTIONAL }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class PasswordModifyResponse extends ExtendedResponse
diff --git a/src/FreeDSx/Ldap/Operation/Response/SearchResponse.php b/src/FreeDSx/Ldap/Operation/Response/SearchResponse.php
index 99a8fe44..d319037d 100644
--- a/src/FreeDSx/Ldap/Operation/Response/SearchResponse.php
+++ b/src/FreeDSx/Ldap/Operation/Response/SearchResponse.php
@@ -22,6 +22,8 @@
 /**
  * This response encapsulates the entries returned from the search overall, along with the LDAP result at the end.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SearchResponse extends SearchResultDone
diff --git a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
index 6ba13e50..69ce5c9e 100644
--- a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
+++ b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
@@ -23,6 +23,9 @@
 
 use function count;
 
+/**
+ * @api
+ */
 trait SyncRefreshDoneTrait
 {
     private bool $refreshDone;
diff --git a/src/FreeDSx/Ldap/Operations.php b/src/FreeDSx/Ldap/Operations.php
index 4da2fa11..e875e499 100644
--- a/src/FreeDSx/Ldap/Operations.php
+++ b/src/FreeDSx/Ldap/Operations.php
@@ -47,6 +47,8 @@
 /**
  * Provides a set of factory methods to help quickly construct different operations/requests.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Operations
diff --git a/src/FreeDSx/Ldap/Protocol/ProtocolElementInterface.php b/src/FreeDSx/Ldap/Protocol/ProtocolElementInterface.php
index 53397088..39a6690d 100644
--- a/src/FreeDSx/Ldap/Protocol/ProtocolElementInterface.php
+++ b/src/FreeDSx/Ldap/Protocol/ProtocolElementInterface.php
@@ -31,6 +31,8 @@ interface ProtocolElementInterface
     public function toAsn1(): AbstractType;
 
     /**
+     * @api
+     *
      * @param AbstractType<mixed> $type
      * @return mixed
      * @throws ProtocolException
diff --git a/src/FreeDSx/Ldap/ProxyOptions.php b/src/FreeDSx/Ldap/ProxyOptions.php
index d810f21b..dfd4ce1b 100644
--- a/src/FreeDSx/Ldap/ProxyOptions.php
+++ b/src/FreeDSx/Ldap/ProxyOptions.php
@@ -16,6 +16,8 @@
 /**
  * Options for a forwarding proxy server.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class ProxyOptions
diff --git a/src/FreeDSx/Ldap/Schema/Definition/AttributeTypeOid.php b/src/FreeDSx/Ldap/Schema/Definition/AttributeTypeOid.php
index f7e44d5e..73040adc 100644
--- a/src/FreeDSx/Ldap/Schema/Definition/AttributeTypeOid.php
+++ b/src/FreeDSx/Ldap/Schema/Definition/AttributeTypeOid.php
@@ -15,6 +15,8 @@
 
 /**
  * OIDs, names, aliases, and descriptions for standard LDAP attribute types (RFC 4519 + RFC 4512 operational).
+ *
+ * @api
  */
 final class AttributeTypeOid
 {
diff --git a/src/FreeDSx/Ldap/Schema/Definition/AttributeUsage.php b/src/FreeDSx/Ldap/Schema/Definition/AttributeUsage.php
index d0626d9f..3f106023 100644
--- a/src/FreeDSx/Ldap/Schema/Definition/AttributeUsage.php
+++ b/src/FreeDSx/Ldap/Schema/Definition/AttributeUsage.php
@@ -13,6 +13,9 @@
 
 namespace FreeDSx\Ldap\Schema\Definition;
 
+/**
+ * @api
+ */
 enum AttributeUsage: string
 {
     case UserApplications = 'userApplications';
diff --git a/src/FreeDSx/Ldap/Schema/Definition/MatchingRuleOid.php b/src/FreeDSx/Ldap/Schema/Definition/MatchingRuleOid.php
index 3e185487..6635e048 100644
--- a/src/FreeDSx/Ldap/Schema/Definition/MatchingRuleOid.php
+++ b/src/FreeDSx/Ldap/Schema/Definition/MatchingRuleOid.php
@@ -15,6 +15,8 @@
 
 /**
  * OIDs and names for standard LDAP matching rules (RFC 4517 + AD extensions).
+ *
+ * @api
  */
 final class MatchingRuleOid
 {
diff --git a/src/FreeDSx/Ldap/Schema/Schema.php b/src/FreeDSx/Ldap/Schema/Schema.php
index dca76b13..c2cc234c 100644
--- a/src/FreeDSx/Ldap/Schema/Schema.php
+++ b/src/FreeDSx/Ldap/Schema/Schema.php
@@ -21,6 +21,8 @@
 
 /**
  * Registry of schema definitions; built incrementally via add*() methods.
+ *
+ * @api
  */
 final class Schema
 {
diff --git a/src/FreeDSx/Ldap/Search/DirSync.php b/src/FreeDSx/Ldap/Search/DirSync.php
index 195210c7..a5a01bf1 100644
--- a/src/FreeDSx/Ldap/Search/DirSync.php
+++ b/src/FreeDSx/Ldap/Search/DirSync.php
@@ -32,6 +32,8 @@
 /**
  * Provides a simple wrapper around DirSync for Active Directory.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class DirSync
diff --git a/src/FreeDSx/Ldap/Search/Filter/AttributeValueAssertionTrait.php b/src/FreeDSx/Ldap/Search/Filter/AttributeValueAssertionTrait.php
index de3daca2..ee384a50 100644
--- a/src/FreeDSx/Ldap/Search/Filter/AttributeValueAssertionTrait.php
+++ b/src/FreeDSx/Ldap/Search/Filter/AttributeValueAssertionTrait.php
@@ -27,6 +27,8 @@
 /**
  * Common methods for filters using attribute value assertions.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 trait AttributeValueAssertionTrait
@@ -43,6 +45,9 @@ public function __construct(
         $this->value = $value;
     }
 
+    /**
+     * @api
+     */
     public function setValue(string $value): self
     {
         $this->value = $value;
diff --git a/src/FreeDSx/Ldap/Search/Filter/FilterAttributeTrait.php b/src/FreeDSx/Ldap/Search/Filter/FilterAttributeTrait.php
index 56b029f9..2fdd02c2 100644
--- a/src/FreeDSx/Ldap/Search/Filter/FilterAttributeTrait.php
+++ b/src/FreeDSx/Ldap/Search/Filter/FilterAttributeTrait.php
@@ -16,6 +16,8 @@
 /**
  * Common methods for filters using attributes.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 trait FilterAttributeTrait
@@ -27,6 +29,9 @@ public function getAttribute(): string
         return $this->attribute;
     }
 
+    /**
+     * @api
+     */
     public function setAttribute(string $attribute): static
     {
         $this->attribute = $attribute;
diff --git a/src/FreeDSx/Ldap/Search/Filter/FilterContainerInterface.php b/src/FreeDSx/Ldap/Search/Filter/FilterContainerInterface.php
index 591f804c..ac5c3268 100644
--- a/src/FreeDSx/Ldap/Search/Filter/FilterContainerInterface.php
+++ b/src/FreeDSx/Ldap/Search/Filter/FilterContainerInterface.php
@@ -16,6 +16,8 @@
 /**
  * An interface used for filters that contain other filters.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 interface FilterContainerInterface extends FilterInterface
diff --git a/src/FreeDSx/Ldap/Search/Filter/FilterContainerTrait.php b/src/FreeDSx/Ldap/Search/Filter/FilterContainerTrait.php
index 5ffb5e93..e1d67722 100644
--- a/src/FreeDSx/Ldap/Search/Filter/FilterContainerTrait.php
+++ b/src/FreeDSx/Ldap/Search/Filter/FilterContainerTrait.php
@@ -28,6 +28,8 @@
 /**
  * Methods needed to implement the filter container interface.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 trait FilterContainerTrait
@@ -135,6 +137,8 @@ public function __toString(): string
     /**
      * {@inheritDoc}
      *
+     * @api
+     *
      * @param AbstractType<mixed> $type
      * @throws EncoderException
      * @throws ProtocolException
diff --git a/src/FreeDSx/Ldap/Search/Filter/MatchingRuleFilter.php b/src/FreeDSx/Ldap/Search/Filter/MatchingRuleFilter.php
index 50c50712..b28c9e26 100644
--- a/src/FreeDSx/Ldap/Search/Filter/MatchingRuleFilter.php
+++ b/src/FreeDSx/Ldap/Search/Filter/MatchingRuleFilter.php
@@ -34,6 +34,8 @@
  *     matchValue      [3] AssertionValue,
  *     dnAttributes    [4] BOOLEAN DEFAULT FALSE }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class MatchingRuleFilter implements FilterInterface, Stringable
diff --git a/src/FreeDSx/Ldap/Search/Filter/NotFilter.php b/src/FreeDSx/Ldap/Search/Filter/NotFilter.php
index 9a99c545..eae71a99 100644
--- a/src/FreeDSx/Ldap/Search/Filter/NotFilter.php
+++ b/src/FreeDSx/Ldap/Search/Filter/NotFilter.php
@@ -27,6 +27,8 @@
 /**
  * Represents the negation of a filter. RFC 4511, 4.5.1
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class NotFilter implements FilterInterface, Stringable
diff --git a/src/FreeDSx/Ldap/Search/Filter/PresentFilter.php b/src/FreeDSx/Ldap/Search/Filter/PresentFilter.php
index e036df08..75b778c3 100644
--- a/src/FreeDSx/Ldap/Search/Filter/PresentFilter.php
+++ b/src/FreeDSx/Ldap/Search/Filter/PresentFilter.php
@@ -25,6 +25,8 @@
 /**
  * Checks for the presence of an attribute (ie. whether or not it contains a value). RFC 4511, 4.5.1.7.5
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class PresentFilter implements FilterInterface, Stringable
diff --git a/src/FreeDSx/Ldap/Search/Filter/SubstringFilter.php b/src/FreeDSx/Ldap/Search/Filter/SubstringFilter.php
index 2c567ec0..658dbe1b 100644
--- a/src/FreeDSx/Ldap/Search/Filter/SubstringFilter.php
+++ b/src/FreeDSx/Ldap/Search/Filter/SubstringFilter.php
@@ -36,6 +36,8 @@
  *         final   [2] AssertionValue } -- can occur at most once
  *     }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class SubstringFilter implements FilterInterface, Stringable
diff --git a/src/FreeDSx/Ldap/Search/Filters.php b/src/FreeDSx/Ldap/Search/Filters.php
index 1364bbb6..d8c5708c 100644
--- a/src/FreeDSx/Ldap/Search/Filters.php
+++ b/src/FreeDSx/Ldap/Search/Filters.php
@@ -29,6 +29,8 @@
 /**
  * Provides some simple factory methods for building filters.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Filters
diff --git a/src/FreeDSx/Ldap/Search/LdapQuery.php b/src/FreeDSx/Ldap/Search/LdapQuery.php
index 64476606..c9cd3b12 100644
--- a/src/FreeDSx/Ldap/Search/LdapQuery.php
+++ b/src/FreeDSx/Ldap/Search/LdapQuery.php
@@ -34,6 +34,8 @@
  *
  * Obtain an instance via {@see LdapClient::query()}.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class LdapQuery
diff --git a/src/FreeDSx/Ldap/Search/Paging.php b/src/FreeDSx/Ldap/Search/Paging.php
index c1f2eff0..49414003 100644
--- a/src/FreeDSx/Ldap/Search/Paging.php
+++ b/src/FreeDSx/Ldap/Search/Paging.php
@@ -27,6 +27,8 @@
 /**
  * Provides a simple wrapper around paging a search operation.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Paging
diff --git a/src/FreeDSx/Ldap/Search/RangeRetrieval.php b/src/FreeDSx/Ldap/Search/RangeRetrieval.php
index c06cdb19..3c1bb8f4 100644
--- a/src/FreeDSx/Ldap/Search/RangeRetrieval.php
+++ b/src/FreeDSx/Ldap/Search/RangeRetrieval.php
@@ -25,6 +25,8 @@
 /**
  * Provides simple helper APIs for retrieving ranged results for an entry attribute.
  *
+ * @api
+ *
  * @see https://docs.microsoft.com/en-us/windows/desktop/adsi/attribute-range-retrieval
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
diff --git a/src/FreeDSx/Ldap/Search/Vlv.php b/src/FreeDSx/Ldap/Search/Vlv.php
index 79301396..acccff9f 100644
--- a/src/FreeDSx/Ldap/Search/Vlv.php
+++ b/src/FreeDSx/Ldap/Search/Vlv.php
@@ -31,6 +31,8 @@
 /**
  * Provides a simple wrapper around a VLV (Virtual List View) search operation.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class Vlv
diff --git a/src/FreeDSx/Ldap/Server/AccessControl/AclRules.php b/src/FreeDSx/Ldap/Server/AccessControl/AclRules.php
index c744d57e..778b14db 100644
--- a/src/FreeDSx/Ldap/Server/AccessControl/AclRules.php
+++ b/src/FreeDSx/Ldap/Server/AccessControl/AclRules.php
@@ -21,6 +21,8 @@
 /**
  * The rule sets and defaults that configure {@see RuleBasedAccessControl}.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class AclRules
diff --git a/src/FreeDSx/Ldap/Server/AccessControl/Rule/AttributeRule.php b/src/FreeDSx/Ldap/Server/AccessControl/Rule/AttributeRule.php
index 6808593a..b2e5753d 100644
--- a/src/FreeDSx/Ldap/Server/AccessControl/Rule/AttributeRule.php
+++ b/src/FreeDSx/Ldap/Server/AccessControl/Rule/AttributeRule.php
@@ -22,6 +22,8 @@
  *
  * An empty $attributes list matches all attributes. Attribute names are stored lowercase.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class AttributeRule
diff --git a/src/FreeDSx/Ldap/Server/AccessControl/Rule/ControlRule.php b/src/FreeDSx/Ldap/Server/AccessControl/Rule/ControlRule.php
index d1591b0a..1e8c78c5 100644
--- a/src/FreeDSx/Ldap/Server/AccessControl/Rule/ControlRule.php
+++ b/src/FreeDSx/Ldap/Server/AccessControl/Rule/ControlRule.php
@@ -22,6 +22,8 @@
  *
  * An empty $controlOids list matches all controls.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class ControlRule
diff --git a/src/FreeDSx/Ldap/Server/AccessControl/Rule/OperationRule.php b/src/FreeDSx/Ldap/Server/AccessControl/Rule/OperationRule.php
index 656ea53b..3332f042 100644
--- a/src/FreeDSx/Ldap/Server/AccessControl/Rule/OperationRule.php
+++ b/src/FreeDSx/Ldap/Server/AccessControl/Rule/OperationRule.php
@@ -23,6 +23,8 @@
  *
  * An empty $operations list matches all operation types.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class OperationRule
diff --git a/src/FreeDSx/Ldap/Server/AccessControl/Subject/Subject.php b/src/FreeDSx/Ldap/Server/AccessControl/Subject/Subject.php
index 9ff08f41..09bfb846 100644
--- a/src/FreeDSx/Ldap/Server/AccessControl/Subject/Subject.php
+++ b/src/FreeDSx/Ldap/Server/AccessControl/Subject/Subject.php
@@ -18,6 +18,8 @@
 /**
  * Factory for common subject matchers.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class Subject
diff --git a/src/FreeDSx/Ldap/Server/AccessControl/Target/Target.php b/src/FreeDSx/Ldap/Server/AccessControl/Target/Target.php
index 63c071f5..80de3bce 100644
--- a/src/FreeDSx/Ldap/Server/AccessControl/Target/Target.php
+++ b/src/FreeDSx/Ldap/Server/AccessControl/Target/Target.php
@@ -16,6 +16,8 @@
 /**
  * Factory for common target matchers.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class Target
diff --git a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/JsonFileStorage.php b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/JsonFileStorage.php
index ec8be603..09fbd401 100644
--- a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/JsonFileStorage.php
+++ b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/JsonFileStorage.php
@@ -30,6 +30,8 @@
  *
  * File format: { "cn=x,dc=y": { "dn": "cn=x,dc=y", "attributes": { "cn": ["x"] } } }
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class JsonFileStorage implements EntryStorageInterface
diff --git a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/MysqlStorage.php b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/MysqlStorage.php
index 171d668a..73684fb1 100644
--- a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/MysqlStorage.php
+++ b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/MysqlStorage.php
@@ -26,6 +26,8 @@
 /**
  * MySQL/MariaDB factory for PdoStorage; use forPcntl()/forSwoole() to select the runner. Requires MySQL 8.0+ or MariaDB 10.6+.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class MysqlStorage implements PdoStorageFactoryInterface
diff --git a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryInterface.php b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryInterface.php
index 7d565ec1..42295880 100644
--- a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryInterface.php
+++ b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryInterface.php
@@ -18,6 +18,8 @@
 /**
  * Constructs a configured PdoStorage for a specific database driver (e.g. SqliteStorage::forPcntl('/path/to/db.sqlite')).
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 interface PdoStorageFactoryInterface
diff --git a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryTrait.php b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryTrait.php
index 83047c00..a459a833 100644
--- a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryTrait.php
+++ b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/Pdo/PdoStorageFactoryTrait.php
@@ -31,6 +31,9 @@ abstract protected function translator(): FilterTranslatorInterface;
 
     abstract protected function openConnection(PdoDialectInterface $dialect): PDO;
 
+    /**
+     * @api
+     */
     public function create(): PdoStorage
     {
         return $this->createShared();
diff --git a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/SqliteStorage.php b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/SqliteStorage.php
index 34cc5780..67d53a4b 100644
--- a/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/SqliteStorage.php
+++ b/src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/SqliteStorage.php
@@ -29,6 +29,8 @@
 /**
  * SQLite factory for PdoStorage; use SqliteStorage::forPcntl() or ::forSwoole() to select the runner.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class SqliteStorage implements PdoStorageFactoryInterface
diff --git a/src/FreeDSx/Ldap/Server/Backend/Storage/Export/DumpOptions.php b/src/FreeDSx/Ldap/Server/Backend/Storage/Export/DumpOptions.php
index a25b6c3d..f4182588 100644
--- a/src/FreeDSx/Ldap/Server/Backend/Storage/Export/DumpOptions.php
+++ b/src/FreeDSx/Ldap/Server/Backend/Storage/Export/DumpOptions.php
@@ -19,6 +19,8 @@
 /**
  * Options for {@see DirectoryDumper}. Optional filter and subtree restriction.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class DumpOptions
diff --git a/src/FreeDSx/Ldap/Server/Backend/Write/WriteContext.php b/src/FreeDSx/Ldap/Server/Backend/Write/WriteContext.php
index 55eaf225..8f79239e 100644
--- a/src/FreeDSx/Ldap/Server/Backend/Write/WriteContext.php
+++ b/src/FreeDSx/Ldap/Server/Backend/Write/WriteContext.php
@@ -19,6 +19,8 @@
 /**
  * Carries request-scoped metadata (identity, controls) for write operations.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class WriteContext
diff --git a/src/FreeDSx/Ldap/Server/Logging/EventLogPolicy.php b/src/FreeDSx/Ldap/Server/Logging/EventLogPolicy.php
index c1fa2775..644d3537 100644
--- a/src/FreeDSx/Ldap/Server/Logging/EventLogPolicy.php
+++ b/src/FreeDSx/Ldap/Server/Logging/EventLogPolicy.php
@@ -16,6 +16,8 @@
 /**
  * Immutable set of {@see ServerEvent} cases the server should emit.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class EventLogPolicy
diff --git a/src/FreeDSx/Ldap/Server/Logging/EventLogger.php b/src/FreeDSx/Ldap/Server/Logging/EventLogger.php
index 5bb2e24f..34e3c185 100644
--- a/src/FreeDSx/Ldap/Server/Logging/EventLogger.php
+++ b/src/FreeDSx/Ldap/Server/Logging/EventLogger.php
@@ -23,6 +23,8 @@
 /**
  * Wraps a (nullable) PSR-3 logger with policy-gated, structured server events.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class EventLogger
diff --git a/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php b/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php
index dd1eec31..043ce1f7 100644
--- a/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php
+++ b/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php
@@ -24,6 +24,7 @@
  * The outcome of a dispatched write, carrying any schema violations collected during it.
  *
  * @internal
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final readonly class WriteOperationResult implements AuditableResult
diff --git a/src/FreeDSx/Ldap/Server/Paging/PagingRequest.php b/src/FreeDSx/Ldap/Server/Paging/PagingRequest.php
index 51d23505..9c9e043a 100644
--- a/src/FreeDSx/Ldap/Server/Paging/PagingRequest.php
+++ b/src/FreeDSx/Ldap/Server/Paging/PagingRequest.php
@@ -22,6 +22,8 @@
 /**
  * Encapsulates the paging request from a client and provides some helpful methods.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 final class PagingRequest
diff --git a/src/FreeDSx/Ldap/Server/PasswordPolicy/Decision/PasswordPolicyOutcome.php b/src/FreeDSx/Ldap/Server/PasswordPolicy/Decision/PasswordPolicyOutcome.php
index 54fe4c5a..1d311cf9 100644
--- a/src/FreeDSx/Ldap/Server/PasswordPolicy/Decision/PasswordPolicyOutcome.php
+++ b/src/FreeDSx/Ldap/Server/PasswordPolicy/Decision/PasswordPolicyOutcome.php
@@ -17,6 +17,8 @@
 
 /**
  * Decision returned by {@see PasswordPolicyEngine} methods.
+ *
+ * @api
  */
 final readonly class PasswordPolicyOutcome
 {
diff --git a/src/FreeDSx/Ldap/Server/PasswordPolicy/PasswordPolicy.php b/src/FreeDSx/Ldap/Server/PasswordPolicy/PasswordPolicy.php
index 72c3e5f9..b454a32b 100644
--- a/src/FreeDSx/Ldap/Server/PasswordPolicy/PasswordPolicy.php
+++ b/src/FreeDSx/Ldap/Server/PasswordPolicy/PasswordPolicy.php
@@ -26,6 +26,8 @@
  * Decoded view of a pwdPolicy entry per draft-behera-ldap-password-policy-10 §5.2.
  *
  * Nullable fields on the rule DTOs mean "policy unspecified" and are interpreted as "no limit" by the engine.
+ *
+ * @api
  */
 final readonly class PasswordPolicy
 {
diff --git a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordChangeRules.php b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordChangeRules.php
index 450dce4e..7c650ac1 100644
--- a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordChangeRules.php
+++ b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordChangeRules.php
@@ -15,6 +15,8 @@
 
 /**
  * Constraints on when and by whom a password may be changed (draft-behera-10 §5.2.2, §5.2.12-5.2.15).
+ *
+ * @api
  */
 final readonly class PasswordChangeRules
 {
diff --git a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordExpirationRules.php b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordExpirationRules.php
index e845a212..21f93ba9 100644
--- a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordExpirationRules.php
+++ b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordExpirationRules.php
@@ -15,6 +15,8 @@
 
 /**
  * Rules governing password expiration / any grace window (draft-behera-10 §5.2.3, §5.2.7-5.2.8, §5.2.16, §5.2.19).
+ *
+ * @api
  */
 final readonly class PasswordExpirationRules
 {
diff --git a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordLockoutRules.php b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordLockoutRules.php
index 2790b585..8f614f1e 100644
--- a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordLockoutRules.php
+++ b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordLockoutRules.php
@@ -15,6 +15,8 @@
 
 /**
  * Rules governing account lockout from failed binds (draft-behera-10 §5.2.9-5.2.10, §5.2.17-5.2.18).
+ *
+ * @api
  */
 final readonly class PasswordLockoutRules
 {
diff --git a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordQualityRules.php b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordQualityRules.php
index 0312cb35..7ea4be8c 100644
--- a/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordQualityRules.php
+++ b/src/FreeDSx/Ldap/Server/PasswordPolicy/Rules/PasswordQualityRules.php
@@ -15,6 +15,8 @@
 
 /**
  * Constraints on what a new password is allowed to contain (draft-behera-10 §5.2.4-5.2.6, §5.2.11).
+ *
+ * @api
  */
 final readonly class PasswordQualityRules
 {
diff --git a/src/FreeDSx/Ldap/Server/RequestContext.php b/src/FreeDSx/Ldap/Server/RequestContext.php
index dc70b1ef..b72f53af 100644
--- a/src/FreeDSx/Ldap/Server/RequestContext.php
+++ b/src/FreeDSx/Ldap/Server/RequestContext.php
@@ -20,6 +20,8 @@
  * Represents the context of a server request. This includes any controls associated with the request and the token for
  * authentication details.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class RequestContext
diff --git a/src/FreeDSx/Ldap/Server/Token/AnonToken.php b/src/FreeDSx/Ldap/Server/Token/AnonToken.php
index 791ada22..e984704c 100644
--- a/src/FreeDSx/Ldap/Server/Token/AnonToken.php
+++ b/src/FreeDSx/Ldap/Server/Token/AnonToken.php
@@ -19,6 +19,8 @@
 /**
  * Represents a token for an anonymous bind.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class AnonToken implements TokenInterface
diff --git a/src/FreeDSx/Ldap/Server/Token/BindToken.php b/src/FreeDSx/Ldap/Server/Token/BindToken.php
index 638a7159..60313caf 100644
--- a/src/FreeDSx/Ldap/Server/Token/BindToken.php
+++ b/src/FreeDSx/Ldap/Server/Token/BindToken.php
@@ -20,6 +20,8 @@
 /**
  * Represents a username/password token that is bound and authorized.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 class BindToken implements AuthenticatedTokenInterface
diff --git a/src/FreeDSx/Ldap/Server/Token/SystemToken.php b/src/FreeDSx/Ldap/Server/Token/SystemToken.php
index 8f2c545c..c9b56315 100644
--- a/src/FreeDSx/Ldap/Server/Token/SystemToken.php
+++ b/src/FreeDSx/Ldap/Server/Token/SystemToken.php
@@ -18,6 +18,8 @@
 
 /**
  * Token for server-internal writes, recorded as cn=system rather than any bound user.
+ *
+ * @api
  */
 final readonly class SystemToken implements TokenInterface
 {
diff --git a/src/FreeDSx/Ldap/Server/Token/TokenInterface.php b/src/FreeDSx/Ldap/Server/Token/TokenInterface.php
index 996e62ce..0b97e578 100644
--- a/src/FreeDSx/Ldap/Server/Token/TokenInterface.php
+++ b/src/FreeDSx/Ldap/Server/Token/TokenInterface.php
@@ -18,6 +18,8 @@
 /**
  * Represents a generic authentication token.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
 interface TokenInterface
diff --git a/src/FreeDSx/Ldap/ServerOptions.php b/src/FreeDSx/Ldap/ServerOptions.php
index ac99fe52..146aab35 100644
--- a/src/FreeDSx/Ldap/ServerOptions.php
+++ b/src/FreeDSx/Ldap/ServerOptions.php
@@ -44,6 +44,9 @@
 use Psr\Log\LoggerInterface;
 use Closure;
 
+/**
+ * @api
+ */
 final class ServerOptions
 {
     public const SASL_PLAIN = 'PLAIN';
diff --git a/src/FreeDSx/Ldap/Sync/Result/SyncEntryResult.php b/src/FreeDSx/Ldap/Sync/Result/SyncEntryResult.php
index 5699d7fb..0c9f5a0e 100644
--- a/src/FreeDSx/Ldap/Sync/Result/SyncEntryResult.php
+++ b/src/FreeDSx/Ldap/Sync/Result/SyncEntryResult.php
@@ -17,6 +17,9 @@
 use FreeDSx\Ldap\Protocol\LdapMessageResponse;
 use FreeDSx\Ldap\Search\Result\EntryResult;
 
+/**
+ * @api
+ */
 class SyncEntryResult
 {
     use SyncResultTrait;
diff --git a/src/FreeDSx/Ldap/Sync/Result/SyncIdSetResult.php b/src/FreeDSx/Ldap/Sync/Result/SyncIdSetResult.php
index 1ed1e23c..9f61b17f 100644
--- a/src/FreeDSx/Ldap/Sync/Result/SyncIdSetResult.php
+++ b/src/FreeDSx/Ldap/Sync/Result/SyncIdSetResult.php
@@ -24,6 +24,8 @@
 use function count;
 
 /**
+ * @api
+ *
  * @implements IteratorAggregate<int, string>
  */
 class SyncIdSetResult implements Countable, IteratorAggregate
diff --git a/src/FreeDSx/Ldap/Sync/Result/SyncReferralResult.php b/src/FreeDSx/Ldap/Sync/Result/SyncReferralResult.php
index 819239c4..0ed434c4 100644
--- a/src/FreeDSx/Ldap/Sync/Result/SyncReferralResult.php
+++ b/src/FreeDSx/Ldap/Sync/Result/SyncReferralResult.php
@@ -17,6 +17,9 @@
 use FreeDSx\Ldap\Protocol\LdapMessageResponse;
 use FreeDSx\Ldap\Search\Result\ReferralResult;
 
+/**
+ * @api
+ */
 class SyncReferralResult
 {
     use SyncResultTrait;
diff --git a/src/FreeDSx/Ldap/Sync/Result/SyncResultTrait.php b/src/FreeDSx/Ldap/Sync/Result/SyncResultTrait.php
index a1d19581..388be87f 100644
--- a/src/FreeDSx/Ldap/Sync/Result/SyncResultTrait.php
+++ b/src/FreeDSx/Ldap/Sync/Result/SyncResultTrait.php
@@ -17,6 +17,9 @@
 use FreeDSx\Ldap\Exception\RuntimeException;
 use FreeDSx\Ldap\Protocol\LdapMessageResponse;
 
+/**
+ * @api
+ */
 trait SyncResultTrait
 {
     private ?SyncStateControl $syncState = null;
@@ -43,6 +46,8 @@ public function getState(): int
 
     /**
      * Convenience method to check for a specific state. For the states possible {@see self::getState()}.
+     *
+     * @api
      */
     public function isState(int $state): bool
     {
@@ -51,6 +56,8 @@ public function isState(int $state): bool
 
     /**
      * {@see SyncStateControl::isAdd()}
+     *
+     * @api
      */
     public function isAdd(): bool
     {
@@ -60,6 +67,8 @@ public function isAdd(): bool
 
     /**
      * {@see SyncStateControl::isDelete()}
+     *
+     * @api
      */
     public function isDelete(): bool
     {
@@ -69,6 +78,8 @@ public function isDelete(): bool
 
     /**
      * {@see SyncStateControl::isModify()}
+     *
+     * @api
      */
     public function isModify(): bool
     {
@@ -78,6 +89,8 @@ public function isModify(): bool
 
     /**
      * {@see SyncStateControl::isPresent()}
+     *
+     * @api
      */
     public function isPresent(): bool
     {
@@ -87,6 +100,8 @@ public function isPresent(): bool
 
     /**
      * Get the cookie associated with this sync session / sync state.
+     *
+     * @api
      */
     public function getCookie(): ?string
     {
@@ -96,6 +111,8 @@ public function getCookie(): ?string
 
     /**
      * Get the UUID of the entry for this sync result.
+     *
+     * @api
      */
     public function getEntryUuid(): string
     {
diff --git a/src/FreeDSx/Ldap/Sync/Session.php b/src/FreeDSx/Ldap/Sync/Session.php
index 194a783e..03564bbe 100644
--- a/src/FreeDSx/Ldap/Sync/Session.php
+++ b/src/FreeDSx/Ldap/Sync/Session.php
@@ -15,6 +15,9 @@
 
 use FreeDSx\Ldap\Control\Sync\SyncRequestControl;
 
+/**
+ * @api
+ */
 final class Session
 {
     public const PHASE_DELETE = 0;
diff --git a/src/FreeDSx/Ldap/Sync/SyncRepl.php b/src/FreeDSx/Ldap/Sync/SyncRepl.php
index 0e1e8512..b8c0f676 100644
--- a/src/FreeDSx/Ldap/Sync/SyncRepl.php
+++ b/src/FreeDSx/Ldap/Sync/SyncRepl.php
@@ -27,6 +27,8 @@
 /**
  * A helper class for an LDAP Content Synchronization Operation, described by RFC 4533.
  *
+ * @api
+ *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  * @see https://tools.ietf.org/html/rfc4533
  */
diff --git a/tests/support/PhpStan/ApiMemberUsageProvider.php b/tests/support/PhpStan/ApiMemberUsageProvider.php
new file mode 100644
index 00000000..f70ae950
--- /dev/null
+++ b/tests/support/PhpStan/ApiMemberUsageProvider.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of the FreeDSx LDAP package.
+ *
+ * (c) Chad Sikorra <Chad.Sikorra@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Tests\Support\FreeDSx\Ldap\PhpStan;
+
+use ReflectionClassConstant;
+use ReflectionEnumUnitCase;
+use ReflectionMethod;
+use ReflectionProperty;
+use ShipMonk\PHPStan\DeadCode\Provider\ReflectionBasedMemberUsageProvider;
+use ShipMonk\PHPStan\DeadCode\Provider\VirtualUsageData;
+
+/**
+ * Honors member-level @api, which the built-in provider only resolves on classes and interfaces, not traits.
+ */
+final class ApiMemberUsageProvider extends ReflectionBasedMemberUsageProvider
+{
+    protected function shouldMarkMethodAsUsed(ReflectionMethod $method): ?VirtualUsageData
+    {
+        return $this->markIfApi($method->getDocComment());
+    }
+
+    protected function shouldMarkConstantAsUsed(ReflectionClassConstant $constant): ?VirtualUsageData
+    {
+        return $this->markIfApi($constant->getDocComment());
+    }
+
+    protected function shouldMarkEnumCaseAsUsed(ReflectionEnumUnitCase $enumCase): ?VirtualUsageData
+    {
+        return $this->markIfApi($enumCase->getDocComment());
+    }
+
+    protected function shouldMarkPropertyAsRead(ReflectionProperty $property): ?VirtualUsageData
+    {
+        return $this->markIfApi($property->getDocComment());
+    }
+
+    protected function shouldMarkPropertyAsWritten(ReflectionProperty $property): ?VirtualUsageData
+    {
+        return $this->markIfApi($property->getDocComment());
+    }
+
+    private function markIfApi(string|false $docComment): ?VirtualUsageData
+    {
+        if ($docComment === false) {
+            return null;
+        }
+
+        if (preg_match('/@api\b/', $docComment) !== 1) {
+            return null;
+        }
+
+        return VirtualUsageData::withNote('Member marked @api');
+    }
+}

From 1bb69aed5ba34ff757fd8639f749255c57c8a6a0 Mon Sep 17 00:00:00 2001
From: Chad Sikorra <Chad.Sikorra@gmail.com>
Date: Sat, 6 Jun 2026 09:48:04 -0400
Subject: [PATCH 3/6] Apply fixes for PHPStan level 10.

---
 phpstan.neon                                               | 7 ++++---
 src/FreeDSx/Ldap/Container.php                             | 7 +++++++
 .../Ldap/Operation/Response/SearchResultReference.php      | 6 +++---
 .../Ldap/Operation/Response/SyncInfo/SyncRefreshDelete.php | 6 +++++-
 .../Operation/Response/SyncInfo/SyncRefreshDoneTrait.php   | 6 ++++--
 .../Operation/Response/SyncInfo/SyncRefreshPresent.php     | 6 +++++-
 src/FreeDSx/Ldap/Schema/Matching/Prep/StringPrep.php       | 2 +-
 src/FreeDSx/Ldap/Search/Result/ReferralResult.php          | 2 +-
 src/FreeDSx/Ldap/Server/Proxy/ProxyRequestForwarder.php    | 2 +-
 src/FreeDSx/Ldap/Server/ServerRunner/PcntlServerRunner.php | 2 +-
 tests/performance/Driver.php                               | 7 +++++++
 tests/performance/Workload/Worker.php                      | 4 ++++
 12 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index e26e37b8..82f2f3b3 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -5,9 +5,10 @@ services:
             - shipmonk.deadCode.memberUsageProvider
 
 parameters:
-    level: 9
+    level: 10
     paths:
         - %currentWorkingDirectory%/src
+        - %currentWorkingDirectory%/tests
     scanDirectories:
         - %currentWorkingDirectory%/vendor/swoole/ide-helper/src
     treatPhpDocTypesAsCertain: false
@@ -15,6 +16,6 @@ parameters:
     ignoreErrors:
         - '#Unsafe usage of new static\(\).#'
     shipmonkDeadCode:
-        usageExcluders:
-            tests:
+        usageProviders:
+            phpunit:
                 enabled: true
diff --git a/src/FreeDSx/Ldap/Container.php b/src/FreeDSx/Ldap/Container.php
index fb385e5f..c796e0ee 100644
--- a/src/FreeDSx/Ldap/Container.php
+++ b/src/FreeDSx/Ldap/Container.php
@@ -109,6 +109,13 @@ public function get(string $className): object
         }
 
         $instance = ($this->instanceFactory[$className])();
+        if (!$instance instanceof $className) {
+            throw new RuntimeException(sprintf(
+                'The factory for "%s" did not return the expected type.',
+                $className,
+            ));
+        }
+
         if (!in_array($className, self::FACTORY_ONLY, true)) {
             $this->instances[$className] = $instance;
         }
diff --git a/src/FreeDSx/Ldap/Operation/Response/SearchResultReference.php b/src/FreeDSx/Ldap/Operation/Response/SearchResultReference.php
index 3a12c04d..b64a3473 100644
--- a/src/FreeDSx/Ldap/Operation/Response/SearchResultReference.php
+++ b/src/FreeDSx/Ldap/Operation/Response/SearchResultReference.php
@@ -36,17 +36,17 @@ class SearchResultReference implements ResponseInterface
     protected const TAG_NUMBER = 19;
 
     /**
-     * @var LdapUrl[]
+     * @var array<int, LdapUrl>
      */
     private array $referrals;
 
     public function __construct(LdapUrl ...$referrals)
     {
-        $this->referrals = $referrals;
+        $this->referrals = array_values($referrals);
     }
 
     /**
-     * @return LdapUrl[]
+     * @return array<int, LdapUrl>
      */
     public function getReferrals(): array
     {
diff --git a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDelete.php b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDelete.php
index 693b811b..425732d4 100644
--- a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDelete.php
+++ b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDelete.php
@@ -29,5 +29,9 @@
 class SyncRefreshDelete extends SyncInfoMessage
 {
     use SyncRefreshDoneTrait;
-    protected const VALUE_TAG = 1;
+
+    protected static function valueTag(): int
+    {
+        return 1;
+    }
 }
diff --git a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
index 69ce5c9e..f52972d1 100644
--- a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
+++ b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
@@ -30,6 +30,8 @@ trait SyncRefreshDoneTrait
 {
     private bool $refreshDone;
 
+    abstract protected static function valueTag(): int;
+
     public function __construct(
         bool $refreshDone = true,
         ?string $cookie = null,
@@ -54,7 +56,7 @@ public function setRefreshDone(bool $refreshDone): self
     public function toAsn1(): SequenceType
     {
         $asn1 = Asn1::context(
-            static::VALUE_TAG,
+            static::valueTag(),
             Asn1::sequence(),
         );
 
@@ -85,7 +87,7 @@ public static function fromAsn1(AbstractType $type): IntermediateResponse
             $type,
             [
                 AbstractType::TAG_CLASS_CONTEXT_SPECIFIC => [
-                    self::VALUE_TAG => AbstractType::TAG_TYPE_SEQUENCE,
+                    static::valueTag() => AbstractType::TAG_TYPE_SEQUENCE,
                 ],
             ],
         );
diff --git a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshPresent.php b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshPresent.php
index 16d1f2c7..49d182c0 100644
--- a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshPresent.php
+++ b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshPresent.php
@@ -29,5 +29,9 @@
 class SyncRefreshPresent extends SyncInfoMessage
 {
     use SyncRefreshDoneTrait;
-    protected const VALUE_TAG = 2;
+
+    protected static function valueTag(): int
+    {
+        return 2;
+    }
 }
diff --git a/src/FreeDSx/Ldap/Schema/Matching/Prep/StringPrep.php b/src/FreeDSx/Ldap/Schema/Matching/Prep/StringPrep.php
index ad78d697..ad181655 100644
--- a/src/FreeDSx/Ldap/Schema/Matching/Prep/StringPrep.php
+++ b/src/FreeDSx/Ldap/Schema/Matching/Prep/StringPrep.php
@@ -139,7 +139,7 @@ private function normalize(string $value): string
             Normalizer::FORM_KC,
         );
 
-        return $normalized !== false
+        return is_string($normalized)
             ? $normalized
             : $value;
     }
diff --git a/src/FreeDSx/Ldap/Search/Result/ReferralResult.php b/src/FreeDSx/Ldap/Search/Result/ReferralResult.php
index b591bf16..91c344c1 100644
--- a/src/FreeDSx/Ldap/Search/Result/ReferralResult.php
+++ b/src/FreeDSx/Ldap/Search/Result/ReferralResult.php
@@ -32,7 +32,7 @@
 final class ReferralResult implements Countable, IteratorAggregate, Stringable
 {
     /**
-     * @var null|LdapUrl[]
+     * @var null|array<int, LdapUrl>
      */
     private ?array $referrals = null;
 
diff --git a/src/FreeDSx/Ldap/Server/Proxy/ProxyRequestForwarder.php b/src/FreeDSx/Ldap/Server/Proxy/ProxyRequestForwarder.php
index 2bd0ce50..94701e76 100644
--- a/src/FreeDSx/Ldap/Server/Proxy/ProxyRequestForwarder.php
+++ b/src/FreeDSx/Ldap/Server/Proxy/ProxyRequestForwarder.php
@@ -70,7 +70,7 @@ public function handle(ServerRequestContext $context): OperationResult
         try {
             $response = $this->sendUpstream(
                 $request,
-                $message->controls()->toArray(),
+                array_values($message->controls()->toArray()),
             );
         } catch (OperationException $e) {
             $this->queue->sendMessage($this->responseFactory->getStandardResponse(
diff --git a/src/FreeDSx/Ldap/Server/ServerRunner/PcntlServerRunner.php b/src/FreeDSx/Ldap/Server/ServerRunner/PcntlServerRunner.php
index 044688f9..618c0fe9 100644
--- a/src/FreeDSx/Ldap/Server/ServerRunner/PcntlServerRunner.php
+++ b/src/FreeDSx/Ldap/Server/ServerRunner/PcntlServerRunner.php
@@ -157,7 +157,7 @@ private function cleanUpChildProcesses(): void
                 $this->metricsRecorder->connectionObserved(ConnectionObservation::Closed);
                 $this->recordChildCloseReason(
                     $result,
-                    $status,
+                    is_int($status) ? $status : 0,
                 );
                 $this->logInfo(
                     'The child process has ended.',
diff --git a/tests/performance/Driver.php b/tests/performance/Driver.php
index 773f7b7d..67311290 100644
--- a/tests/performance/Driver.php
+++ b/tests/performance/Driver.php
@@ -134,7 +134,11 @@ private function runCoroutinePool(WorkloadMix $mix, StatsCollector $stats): Stat
 
         Coroutine\run(function () use ($mix, $stats, &$elapsedSeconds, &$workerErrors): void {
             $clients = $this->config->clients;
+
+            /** @var Channel<bool> $readyBarrier */
             $readyBarrier = new Channel($clients);
+
+            /** @var Channel<float|false|null> $startSignal */
             $startSignal = new Channel($clients);
             $waitGroup = new WaitGroup();
 
@@ -191,6 +195,9 @@ private function runCoroutinePool(WorkloadMix $mix, StatsCollector $stats): Stat
         return $stats->snapshot($elapsedSeconds);
     }
 
+    /**
+     * @param Channel<bool> $readyBarrier
+     */
     private function awaitReady(Channel $readyBarrier, int $expected): bool
     {
         $allReady = true;
diff --git a/tests/performance/Workload/Worker.php b/tests/performance/Workload/Worker.php
index ea616e03..19765114 100644
--- a/tests/performance/Workload/Worker.php
+++ b/tests/performance/Workload/Worker.php
@@ -50,6 +50,10 @@ final class Worker
 
     private int $addSeq = 0;
 
+    /**
+     * @param Channel<bool> $readyBarrier
+     * @param Channel<float|false|null> $startSignal
+     */
     public function __construct(
         private readonly int $workerId,
         private readonly Config $config,

From 99f6d46608adda74b3d6b56f3ad548ec42c725e2 Mon Sep 17 00:00:00 2001
From: Chad Sikorra <Chad.Sikorra@gmail.com>
Date: Sat, 6 Jun 2026 10:01:02 -0400
Subject: [PATCH 4/6] Use one phpstan config file. Merge tests analysis into
 the main config. Align their levels.

---
 .github/workflows/analysis.yml |  4 +---
 composer.json                  |  3 ---
 phpstan.tests.neon             | 13 -------------
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 phpstan.tests.neon

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 54f47ead..cc2adeaf 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -63,9 +63,7 @@ jobs:
         run: composer run-script cs-check
 
       - name: Run Static Analysis
-        run: |
-          composer run-script analyse
-          composer run-script analyse-tests
+        run: composer run-script analyse
 
       - name: Run Test Coverage
         run: composer run-script --timeout=0 test-coverage
diff --git a/composer.json b/composer.json
index cfa80c6f..ba465679 100644
--- a/composer.json
+++ b/composer.json
@@ -88,9 +88,6 @@
     "analyse": [
       "phpstan --memory-limit=-1 analyse"
     ],
-    "analyse-tests": [
-      "phpstan --memory-limit=-1 analyse -c phpstan.tests.neon"
-    ],
     "cs-check": [
       "phpcs --standard=ruleset.xml --extensions=php --tab-width=4 -sp src --runtime-set ignore_warnings_on_exit 1",
       "ecs check"
diff --git a/phpstan.tests.neon b/phpstan.tests.neon
deleted file mode 100644
index 8e72b96c..00000000
--- a/phpstan.tests.neon
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-    treatPhpDocTypesAsCertain: false
-    level: 10
-    paths:
-        - %currentWorkingDirectory%/tests
-    reportUnmatchedIgnoredErrors: false
-    # Dead-code detection targets src; the test suite is intentionally exempt.
-    ignoreErrors:
-        - identifier: shipmonk.deadMethod
-        - identifier: shipmonk.deadConstant
-        - identifier: shipmonk.deadEnumCase
-        - identifier: shipmonk.deadProperty.neverRead
-        - identifier: shipmonk.deadProperty.neverWritten

From 3f31d409ad8715feca8ad9b76d4e4a7d7b7c304a Mon Sep 17 00:00:00 2001
From: Chad Sikorra <Chad.Sikorra@gmail.com>
Date: Sat, 6 Jun 2026 10:01:37 -0400
Subject: [PATCH 5/6] Fix a test not prefixed correctly.

---
 tests/unit/Entry/EntryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/Entry/EntryTest.php b/tests/unit/Entry/EntryTest.php
index 2550d54b..0b49a66c 100644
--- a/tests/unit/Entry/EntryTest.php
+++ b/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(): void
+    public function test_it_should_check_if_it_has_an_attribute_using_a_string(): void
     {
         self::assertTrue($this->subject->has('Cn'));
         self::assertFalse($this->subject->has('bleh'));

From a8c967004808387f32a6ba134cc2c6e40b4bf64e Mon Sep 17 00:00:00 2001
From: Chad Sikorra <Chad.Sikorra@gmail.com>
Date: Sat, 6 Jun 2026 10:10:07 -0400
Subject: [PATCH 6/6] Remove dead code.

---
 .../SyncInfo/SyncRefreshDoneTrait.php         |  7 -----
 .../Server/Operation/WriteOperationResult.php | 30 ++-----------------
 tests/performance/Stats/StatsCollector.php    |  5 ----
 tests/support/Clock/FrozenClock.php           |  6 ----
 tests/support/Logging/RecordingLogger.php     |  5 ----
 5 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
index f52972d1..6f9fe4ac 100644
--- a/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
+++ b/src/FreeDSx/Ldap/Operation/Response/SyncInfo/SyncRefreshDoneTrait.php
@@ -46,13 +46,6 @@ public function getRefreshDone(): bool
         return $this->refreshDone;
     }
 
-    public function setRefreshDone(bool $refreshDone): self
-    {
-        $this->refreshDone = $refreshDone;
-
-        return $this;
-    }
-
     public function toAsn1(): SequenceType
     {
         $asn1 = Asn1::context(
diff --git a/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php b/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php
index 043ce1f7..661e9251 100644
--- a/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php
+++ b/src/FreeDSx/Ldap/Server/Operation/WriteOperationResult.php
@@ -13,7 +13,6 @@
 
 namespace FreeDSx\Ldap\Server\Operation;
 
-use FreeDSx\Ldap\Exception\OperationException;
 use FreeDSx\Ldap\Operation\ResultCode;
 use FreeDSx\Ldap\Protocol\LdapMessageRequest;
 use FreeDSx\Ldap\Server\Backend\Write\SchemaViolations;
@@ -32,7 +31,6 @@
     private function __construct(
         private LdapMessageRequest $message,
         private SchemaViolations $schemaViolations,
-        private ?OperationException $failure = null,
     ) {}
 
     public static function success(
@@ -45,28 +43,14 @@ public static function success(
         );
     }
 
-    public static function failure(
-        LdapMessageRequest $message,
-        OperationException $exception,
-        SchemaViolations $schemaViolations,
-    ): self {
-        return new self(
-            $message,
-            $schemaViolations,
-            $exception,
-        );
-    }
-
     public function outcome(): OperationOutcome
     {
-        return $this->failure === null
-            ? OperationOutcome::Succeeded
-            : OperationOutcome::Failed;
+        return OperationOutcome::Succeeded;
     }
 
     public function resultCode(): int
     {
-        return $this->failure?->getCode() ?? ResultCode::SUCCESS;
+        return ResultCode::SUCCESS;
     }
 
     public function record(
@@ -79,16 +63,6 @@ public function record(
             $token,
         );
 
-        if ($this->failure !== null) {
-            $auditor->recordFailure(
-                $this->message,
-                $this->failure,
-                $token,
-            );
-
-            return;
-        }
-
         $auditor->recordWriteSuccess(
             $this->message,
             $token,
diff --git a/tests/performance/Stats/StatsCollector.php b/tests/performance/Stats/StatsCollector.php
index 38abc0f6..caaad4e6 100644
--- a/tests/performance/Stats/StatsCollector.php
+++ b/tests/performance/Stats/StatsCollector.php
@@ -60,11 +60,6 @@ public function stopRecording(): void
         $this->recording = false;
     }
 
-    public function isRecording(): bool
-    {
-        return $this->recording;
-    }
-
     public function recordSuccess(string $op, int $nanos): void
     {
         if (!$this->recording) {
diff --git a/tests/support/Clock/FrozenClock.php b/tests/support/Clock/FrozenClock.php
index fa8bcbc4..b037d209 100644
--- a/tests/support/Clock/FrozenClock.php
+++ b/tests/support/Clock/FrozenClock.php
@@ -13,7 +13,6 @@
 
 namespace Tests\Support\FreeDSx\Ldap\Clock;
 
-use DateInterval;
 use DateTimeImmutable;
 use DateTimeZone;
 use FreeDSx\Ldap\Server\Clock\ClockInterface;
@@ -47,9 +46,4 @@ public function setTo(DateTimeImmutable $instant): void
     {
         $this->instant = $instant->setTimezone(new DateTimeZone('UTC'));
     }
-
-    public function advance(string $interval): void
-    {
-        $this->instant = $this->instant->add(new DateInterval($interval));
-    }
 }
diff --git a/tests/support/Logging/RecordingLogger.php b/tests/support/Logging/RecordingLogger.php
index b0a7ac5f..5d291736 100644
--- a/tests/support/Logging/RecordingLogger.php
+++ b/tests/support/Logging/RecordingLogger.php
@@ -42,9 +42,4 @@ public function log(
             'context' => $context,
         ];
     }
-
-    public function clear(): void
-    {
-        $this->records = [];
-    }
 }