Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions DataCollector/ProfilerDataCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\Component\Serializer\Serializer;
use Symfony\Component\Serializer\Encoder\JsonEncoder;
use Symfony\Component\Stopwatch\Stopwatch;
use Throwable;

/*
* @author Emmanuel VAISSE
Expand Down Expand Up @@ -53,7 +54,7 @@ public function __construct(protected bool $debug)
{
}

public function collect(Request $request, Response $response, \Throwable $exception = null): void
public function collect(Request $request, Response $response, ?Throwable $exception = null): void
{
$this->data = array(
'countRequests' => count($this->calls),
Expand Down Expand Up @@ -332,7 +333,7 @@ public function fetchResponseInfos(Response $response): array
return $data;
}

public function fetchErrorInfos(\Throwable $error): array
public function fetchErrorInfos(Throwable $error): array
{
return [
'class' => get_class($error),
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/BadGatewayHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class BadGatewayHttpException extends ServerErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(502, $message, $previous, array(), $code);
}
Expand Down
8 changes: 5 additions & 3 deletions Http/Exception/ExpectationFailedHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class ExpectationFailedHttpException extends ClientErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param string|null $message The internal exception message
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(417, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/ForbiddenHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class ForbiddenHttpException extends ClientErrorHttpException
{
/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(403, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/GatewayTimeoutHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class GatewayTimeoutHttpException extends ServerErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(504, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/HttpVersionNotSupportedHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class HttpVersionNotSupportedHttpException extends ServerErrorHttpException
{
/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(505, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/InternalServerErrorHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class InternalServerErrorHttpException extends ServerErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(500, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/NotImplementedHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class NotImplementedHttpException extends ServerErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(501, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/ProxyAuthenticationRequiredHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class ProxyAuthenticationRequiredHttpException extends ClientErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(407, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/RequestEntityTooLargeHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class RequestEntityTooLargeHttpException extends ClientErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(413, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/RequestTimeoutHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class RequestTimeoutHttpException extends ClientErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(408, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/RequestUriTooLongHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class RequestUriTooLongHttpException extends ClientErrorHttpException {

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(414, $message, $previous, array(), $code);
}
Expand Down
6 changes: 4 additions & 2 deletions Http/Exception/RequestedRangeNotSatisfiableHttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;


use Exception;

class RequestedRangeNotSatisfiableHttpException extends ClientErrorHttpException
{

/**
* Constructor.
*
* @param string $message The internal exception message
* @param \Exception $previous The previous exception
* @param Exception|null $previous The previous exception
* @param int $code The internal exception code
*/
public function __construct($message = null, \Exception $previous = null, $code = 0)
public function __construct($message = null, ?Exception $previous = null, $code = 0)
{
parent::__construct(416, $message, $previous, array(), $code);
}
Expand Down
5 changes: 3 additions & 2 deletions Http/Exception/ResponseException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace evaisse\SimpleHttpBundle\Http\Exception;

use evaisse\SimpleHttpBundle\Http\Response;
use Exception;
use Symfony\Component\HttpKernel\Exception\HttpException;


Expand All @@ -30,9 +31,9 @@ class ResponseException extends HttpException
* @param Response $response response attached to error
* @param string $message Message describing exception
* @param int $code error code
* @param \Exception $previous optionnal previous exception
* @param Exception|null $previous optionnal previous exception
*/
public function __construct(Response $response, $message = "", $code = 0, \Exception $previous = null)
public function __construct(Response $response, $message = "", $code = 0, ?Exception $previous = null)
{
parent::__construct(580, $message, $previous, [], $code); // TODO: Change the autogenerated stub
$this->setResponse($response);
Expand Down
6 changes: 3 additions & 3 deletions Http/Exception/TransportException.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace evaisse\SimpleHttpBundle\Http\Exception;

use evaisse\SimpleHttpBundle\Http\Exception;
use Exception;
use Symfony\Component\HttpKernel\Exception\HttpException;

abstract class TransportException extends HttpException
Expand All @@ -11,9 +11,9 @@ abstract class TransportException extends HttpException
/**
* @param string $message
* @param int $code
* @param \Exception $previous
* @param Exception|null $previous
*/
public function __construct($message = null, $code = 0, \Exception $previous = null)
public function __construct($message = null, $code = 0, ?Exception $previous = null)
{
/*
* @see https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
Expand Down
6 changes: 3 additions & 3 deletions Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Kernel extends RemoteHttpKernel
* @param EventDispatcherInterface $eventDispatcher
* @param RequestGenerator|null $generator Optionnal generator to construct curlrequest
*/
public function __construct(EventDispatcherInterface $eventDispatcher, RequestGenerator $generator = null)
public function __construct(EventDispatcherInterface $eventDispatcher, ?RequestGenerator $generator = null)
{
$this->setEventDispatcher($eventDispatcher);
parent::__construct($generator);
Expand Down Expand Up @@ -354,13 +354,13 @@ protected function prepareRawCurlHandler(Statement $stmt): array
*
* @param string $filename realpath to file
* @param string $mimetype mime content type
* @param string $postname base name for file
* @param string|null $postname base name for file
*
* @throws \InvalidArgumentException
*
* @return mixed|string|CURLFile if version >= 5.5, CURLFile instance will be return, otherwise a string resource
*/
protected function createCurlFile(string $filename, string $mimetype, string $postname = null): mixed
protected function createCurlFile(string $filename, string $mimetype, ?string $postname = null): mixed
{
if (!realpath($filename) && is_file($filename)) {
throw new \InvalidArgumentException('invalid given filepath : ' . $filename);
Expand Down
2 changes: 1 addition & 1 deletion Http/Kernel/RemoteHttpKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class RemoteHttpKernel implements HttpKernelInterface

private $lastCurlRequest;

public function __construct(RequestGenerator $generator = null)
public function __construct(?RequestGenerator $generator = null)
{
$this->generator = $generator;
}
Expand Down
2 changes: 1 addition & 1 deletion Http/SessionCookieJar.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class SessionCookieJar extends CookieJar
* @param SessionInterface $session Session storage to persist cookieJar
* @param string $cookieJarName A key in which will be stored the cookie jar
*/
function __construct(SessionInterface $session = null, $cookieJarName = "_simple_http.cookiejar")
function __construct(?SessionInterface $session = null, $cookieJarName = "_simple_http.cookiejar")
{
$session = $session ? $session : new Session(new MockArraySessionStorage());
$this->setSession($session);
Expand Down
4 changes: 2 additions & 2 deletions Http/Statement.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function setHttpKernel(Kernel $httpKernel): void
*
* @param Request $request An http request object to send
*/
public function __construct(Request $request, EventDispatcherInterface $eventDispatcher, Kernel $httpKernel = null)
public function __construct(Request $request, EventDispatcherInterface $eventDispatcher, ?Kernel $httpKernel = null)
{
$this->setRequest($request);
$this->deferred = new Deferred();
Expand Down Expand Up @@ -327,7 +327,7 @@ public function getUid()
* @throws Error
* @throws Exception
*/
public function execute(Kernel $httpKernel = null)
public function execute(?Kernel $httpKernel = null)
{
$this->sent = true;
$http = $httpKernel ? $httpKernel : $this->httpKernel;
Expand Down
2 changes: 1 addition & 1 deletion Serializer/CustomGetSetNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class CustomGetSetNormalizer extends GetSetMethodNormalizer
/**
* {@inheritdoc}
*/
public function normalize(mixed $object, string $format = null, array $context = [])
public function normalize(mixed $object, ?string $format = null, array $context = [])
{
if ($object instanceof \Throwable) {
return $this->normalizeThrowable($object);
Expand Down
Loading