Make plugin classes final, related #18

Author: sagikazarmark

src/Plugin/AddHostPlugin.php

@@ -11,10 +11,8 @@
  * Add schema and host to a request. Can be set to overwrite the schema and host if desired.
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class AddHostPlugin implements Plugin
+final class AddHostPlugin implements Plugin
 {
     /**
      * @var UriInterface

src/Plugin/AuthenticationPlugin.php

@@ -10,10 +10,8 @@
  * Send an authenticated request.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class AuthenticationPlugin implements Plugin
+final class AuthenticationPlugin implements Plugin
 {
     /**
      * @var Authentication An authentication system

src/Plugin/ContentLengthPlugin.php

@@ -10,10 +10,8 @@
  * Allow to set the correct content length header on the request or to transfer it as a chunk if not possible.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class ContentLengthPlugin implements Plugin
+final class ContentLengthPlugin implements Plugin
 {
     /**
      * {@inheritdoc}

src/Plugin/CookiePlugin.php

@@ -12,10 +12,8 @@
  * Handle request cookies.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class CookiePlugin implements Plugin
+final class CookiePlugin implements Plugin
 {
     /**
      * Cookie storage.

src/Plugin/DecoderPlugin.php

@@ -17,10 +17,8 @@
  * If Content-Encoding is not disabled, the plugin will add an Accept-Encoding header for the encoding methods it supports.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class DecoderPlugin implements Plugin
+final class DecoderPlugin implements Plugin
 {
     /**
      * @var bool Whether this plugin decode stream with value in the Content-Encoding header (default to true).

src/Plugin/ErrorPlugin.php

@@ -14,10 +14,8 @@
  * By default an exception will be thrown for all status codes from 400 to 599.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class ErrorPlugin implements Plugin
+final class ErrorPlugin implements Plugin
 {
     /**
      * {@inheritdoc}

src/Plugin/HeaderAppendPlugin.php

@@ -14,10 +14,8 @@
  * @link https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
  *
  * @author Soufiane Ghzal <sghzal@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class HeaderAppendPlugin implements Plugin
+final class HeaderAppendPlugin implements Plugin
 {
     /**
      * @var array

src/Plugin/HeaderDefaultsPlugin.php

@@ -10,10 +10,8 @@
  * If a given header already exists the value wont be replaced and the request wont be changed.
  *
  * @author Soufiane Ghzal <sghzal@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class HeaderDefaultsPlugin implements Plugin
+final class HeaderDefaultsPlugin implements Plugin
 {
     /**
      * @var array

src/Plugin/HeaderRemovePlugin.php

@@ -9,10 +9,8 @@
  * Removes headers from the request.
  *
  * @author Soufiane Ghzal <sghzal@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class HeaderRemovePlugin implements Plugin
+final class HeaderRemovePlugin implements Plugin
 {
     /**
      * @var array

src/Plugin/HeaderSetPlugin.php

@@ -10,10 +10,8 @@
  * If the header does not exist it wil be set, if the header already exists it will be replaced.
  *
  * @author Soufiane Ghzal <sghzal@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class HeaderSetPlugin implements Plugin
+final class HeaderSetPlugin implements Plugin
 {
     /**
      * @var array

src/Plugin/HistoryPlugin.php

@@ -11,10 +11,8 @@
  * Record HTTP calls.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class HistoryPlugin implements Plugin
+final class HistoryPlugin implements Plugin
 {
     /**
      * Journal use to store request / responses / exception.

src/Plugin/RedirectPlugin.php

@@ -16,10 +16,8 @@
  * Follow redirections.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class RedirectPlugin implements Plugin
+class RedirectPlugin implements Plugin
 {
     /**
      * Rule on how to redirect, change method for the new request.

src/Plugin/RetryPlugin.php

@@ -14,10 +14,8 @@
  * By default will retry only one time.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class RetryPlugin implements Plugin
+final class RetryPlugin implements Plugin
 {
     /**
      * Number of retry before sending an exception.

src/PluginClient.php

@@ -15,10 +15,8 @@
  * The client managing plugins and providing a decorator around HTTP Clients.
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
- *
- * TODO: make class final in version 2.0, once plugins does not extend it anymore.
  */
-/*final*/ class PluginClient implements HttpClient, HttpAsyncClient
+final class PluginClient implements HttpClient, HttpAsyncClient
 {
     /**
      * An HTTP async client.
@@ -140,7 +138,7 @@ private function createPluginChain($pluginList, callable $clientCallable)
         $firstCalls = 0;
         $firstCallable = function (RequestInterface $request) use ($lastCallable, &$firstCalls) {
             if ($firstCalls > $this->options['max_restarts']) {
-                throw $this->createLoopException($request);
+                return new LoopException('Too many restarts in plugin client', $request);
             }
 
             ++$firstCalls;
@@ -150,18 +148,4 @@ private function createPluginChain($pluginList, callable $clientCallable)
 
         return $firstCallable;
     }
-
-    /**
-     * Creates a new loop exception.
-     *
-     * @param RequestInterface $request
-     *
-     * @return LoopException
-     *
-     * TODO: Remove once plugin client is removed from plugins.
-     */
-    protected function createLoopException(RequestInterface $request)
-    {
-        return new LoopException('Too many restarts in plugin client', $request);
-    }
 }