make classes final for 2.0 (#321)

CHANGELOG.md

@@ -5,6 +5,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 # Version 2
 
 # 2.0.0 - (unreleased)
+
 - Increased min PHP version to 8.1
 - Removed the deprecated `Http\HttplugBundle\ClientFactory\PluginClientFactory`. Use `Http\Client\Common\PluginClientFactory` instead.
 - Fixed a deprecation when creating a `HttpMethodsClient` via `http_methods_client: true`. Only PSR-17 factories are now passed as constructor arguments.
@@ -18,6 +19,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 - Changed the type of `httplug.client.default` to `ClientInterface` instead of `HttpClient`
 - Removed the `DummyClient` interface
 - Removed the `Http\Client\HttpClient` alias use the `Psr\Http\Client\ClientInterface` typehint in your services for autowiring.
+- Changed classes marked as `@final` to be actually `final`. If you extended any of those, instead implement interfaces or decorate the class rather than extending it. Open an issue if you think a class needs to be made non-final to discuss what we should do.
 
 # Version 1
 

src/ClientFactory/AutoDiscoveryFactory.php

@@ -10,10 +10,8 @@
  * Use auto discovery to find a HTTP client.
  *
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class AutoDiscoveryFactory implements ClientFactory
+final class AutoDiscoveryFactory implements ClientFactory
 {
     public function createClient(array $config = [])
     {

src/ClientFactory/BuzzFactory.php

@@ -10,10 +10,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class BuzzFactory implements ClientFactory
+final class BuzzFactory implements ClientFactory
 {
     public function __construct(private readonly ResponseFactoryInterface $responseFactory)
     {

src/ClientFactory/CurlFactory.php

@@ -10,10 +10,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class CurlFactory implements ClientFactory
+final class CurlFactory implements ClientFactory
 {
     public function __construct(
         private readonly ResponseFactoryInterface $responseFactory,

src/ClientFactory/Guzzle6Factory.php

@@ -8,10 +8,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class Guzzle6Factory implements ClientFactory
+final class Guzzle6Factory implements ClientFactory
 {
     public function createClient(array $config = [])
     {

src/ClientFactory/Guzzle7Factory.php

@@ -8,10 +8,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class Guzzle7Factory implements ClientFactory
+final class Guzzle7Factory implements ClientFactory
 {
     public function createClient(array $config = [])
     {

src/ClientFactory/ReactFactory.php

@@ -8,10 +8,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class ReactFactory implements ClientFactory
+final class ReactFactory implements ClientFactory
 {
     public function createClient(array $config = [])
     {

src/ClientFactory/SocketFactory.php

@@ -8,10 +8,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class SocketFactory implements ClientFactory
+final class SocketFactory implements ClientFactory
 {
     public function createClient(array $config = [])
     {

src/ClientFactory/SymfonyFactory.php

@@ -11,10 +11,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class SymfonyFactory implements ClientFactory
+final class SymfonyFactory implements ClientFactory
 {
     public function __construct(
         private readonly ResponseFactoryInterface $responseFactory,

src/Collector/Collector.php

@@ -18,10 +18,8 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class Collector extends DataCollector
+final class Collector extends DataCollector
 {
     private ?Stack $activeStack = null;
 

src/Collector/Formatter.php

@@ -4,7 +4,6 @@
 
 namespace Http\HttplugBundle\Collector;
 
-use Exception;
 use Http\Client\Exception\HttpException;
 use Http\Client\Exception\TransferException;
 use Http\Message\Formatter as MessageFormatter;
@@ -19,10 +18,8 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class Formatter implements MessageFormatter
+final class Formatter implements MessageFormatter
 {
     public function __construct(
         private readonly MessageFormatter $formatter,

src/Collector/ProfileClient.php

@@ -21,10 +21,8 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class ProfileClient implements ClientInterface, HttpAsyncClient
+final class ProfileClient implements ClientInterface, HttpAsyncClient
 {
     use VersionBridgeClient;
 

src/Collector/ProfileClientFactory.php

@@ -16,10 +16,8 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class ProfileClientFactory implements ClientFactory
+final class ProfileClientFactory implements ClientFactory
 {
     /**
      * @var ClientFactory|callable

src/Collector/ProfilePlugin.php

@@ -15,10 +15,8 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class ProfilePlugin implements Plugin
+final class ProfilePlugin implements Plugin
 {
     use Plugin\VersionBridgePlugin;
 

src/Collector/StackPlugin.php

@@ -15,10 +15,8 @@
  * @author Fabien Bourigault <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class StackPlugin implements Plugin
+final class StackPlugin implements Plugin
 {
     use Plugin\VersionBridgePlugin;
 

src/Collector/Twig/HttpMessageMarkupExtension.php

@@ -13,10 +13,8 @@
 
 /**
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class HttpMessageMarkupExtension extends AbstractExtension
+final class HttpMessageMarkupExtension extends AbstractExtension
 {
     private ClonerInterface $cloner;
 

src/DependencyInjection/Configuration.php

@@ -31,10 +31,8 @@
  *
  * @author David Buchmann <[email protected]>
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class Configuration implements ConfigurationInterface
+final class Configuration implements ConfigurationInterface
 {
     /**
      * Whether to use the debug mode.

src/DependencyInjection/HttplugExtension.php

@@ -40,10 +40,8 @@
 /**
  * @author David Buchmann <[email protected]>
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class HttplugExtension extends Extension
+final class HttplugExtension extends Extension
 {
     public const HTTPLUG_CLIENT_TAG = 'httplug.client';
 

src/Discovery/ConfiguredClientsStrategy.php

@@ -14,10 +14,8 @@
  * we can use the web debug toolbar for clients found with the discovery.
  *
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class ConfiguredClientsStrategy implements DiscoveryStrategy
+final class ConfiguredClientsStrategy implements DiscoveryStrategy
 {
     private static ?ClientInterface $client = null;
 

src/Discovery/ConfiguredClientsStrategyListener.php

@@ -9,10 +9,8 @@
 
 /**
  * @author Wouter de Jong <[email protected]>
- *
- * @final
  */
-class ConfiguredClientsStrategyListener implements EventSubscriberInterface
+final class ConfiguredClientsStrategyListener implements EventSubscriberInterface
 {
     /**
      * Make sure to use the custom strategy.

src/HttplugBundle.php

@@ -9,9 +9,7 @@
 /**
  * @author David Buchmann <[email protected]>
  * @author Tobias Nyholm <[email protected]>
- *
- * @final
  */
-class HttplugBundle extends Bundle
+final class HttplugBundle extends Bundle
 {
 }

tests/Functional/DiscoveredClientsTest.php

@@ -16,7 +16,7 @@
 use Psr\Http\Client\ClientInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class DiscoveredClientsTest extends WebTestCase
+final class DiscoveredClientsTest extends WebTestCase
 {
     public function testDiscoveredClient(): void
     {

tests/Functional/Issue206.php

@@ -11,7 +11,7 @@
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class Issue206 extends WebTestCase
+final class Issue206 extends WebTestCase
 {
     public function testCustomClientDoesNotCauseException(): void
     {

tests/Functional/ProfilerTest.php

@@ -8,7 +8,7 @@
 use Psr\Http\Client\ClientInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ProfilerTest extends WebTestCase
+final class ProfilerTest extends WebTestCase
 {
     /**
      * @group legacy

tests/Functional/ProfilingTest.php

@@ -22,7 +22,7 @@
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-class ProfilingTest extends TestCase
+final class ProfilingTest extends TestCase
 {
     private Collector $collector;
 

tests/Functional/ServiceInstantiationTest.php

@@ -24,7 +24,7 @@
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
 
-class ServiceInstantiationTest extends WebTestCase
+final class ServiceInstantiationTest extends WebTestCase
 {
     public function testHttpClient(): void
     {

tests/Unit/ClientFactory/BuzzFactoryTest.php

@@ -12,7 +12,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class BuzzFactoryTest extends TestCase
+final class BuzzFactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/ClientFactory/CurlFactoryTest.php

@@ -13,7 +13,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class CurlFactoryTest extends TestCase
+final class CurlFactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/ClientFactory/Guzzle6FactoryTest.php

@@ -11,7 +11,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class Guzzle6FactoryTest extends TestCase
+final class Guzzle6FactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/ClientFactory/Guzzle7FactoryTest.php

@@ -11,7 +11,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class Guzzle7FactoryTest extends TestCase
+final class Guzzle7FactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/ClientFactory/MockFactoryTest.php

@@ -17,7 +17,7 @@
 /**
  * @author Gary PEGEOT <[email protected]>
  */
-class MockFactoryTest extends TestCase
+final class MockFactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/ClientFactory/ReactFactoryTest.php

@@ -11,7 +11,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class ReactFactoryTest extends TestCase
+final class ReactFactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/ClientFactory/SocketFactoryTest.php

@@ -11,7 +11,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class SocketFactoryTest extends TestCase
+final class SocketFactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/ClientFactory/SymfonyFactoryTest.php

@@ -13,7 +13,7 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class SymfonyFactoryTest extends TestCase
+final class SymfonyFactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {

tests/Unit/Collector/CollectorTest.php

@@ -8,7 +8,7 @@
 use Http\HttplugBundle\Collector\Stack;
 use PHPUnit\Framework\TestCase;
 
-class CollectorTest extends TestCase
+final class CollectorTest extends TestCase
 {
     public function testCollectClientNames(): void
     {

tests/Unit/Collector/FormatterTest.php

@@ -15,7 +15,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-class FormatterTest extends TestCase
+final class FormatterTest extends TestCase
 {
     private MessageFormatter&MockObject $formatter;