linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2025-11-01 21:47:54 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update to laravel 7

Browse Source
This commit is contained in:
KodeStar
2022-03-10 11:54:29 +00:00
parent 61a5a1a8b0
commit f9a19fce91
7170 changed files with 274189 additions and 283773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
vendor/php-http/cache-plugin/CHANGELOG.md vendored
View File

@@ -1,5 +1,41 @@
# Change Log
## 1.7.5 - 2022-01-18
- Allow installation with psr/cache 3.0 (1.0 and 2.0 are still allowed too)
## 1.7.4 - 2021-11-30
### Added
- Allow installation with Symfony 6
## 1.7.3 - 2021-11-03
### Changed
- Be more defensive about cache hits. A cache entry can technically contain `null`.
## 1.7.2 - 2021-04-14
### Added
- Allow installation with psr/cache 2.0 (1.0 still allowed too)
## 1.7.1 - 2020-07-13
### Added
- Support for PHP 8
## 1.7.0 - 2019-12-17
### Added
* Support for Symfony 5.
* Support for PSR-17 `StreamFactoryInterface`.
* Added `blacklisted_paths` option, which takes an array of `strings` (regular expressions) and allows to define paths, that shall not be cached in any case.
## 1.6.0 - 2019-01-23
### Added
@@ -15,18 +51,18 @@
### Changed
* Removed check if etag is a string. Etag can never be a string, it is always an array.
* Removed check if etag is a string. Etag can never be a string, it is always an array.
## 1.4.0 - 2017-04-05
### Added
### Added
- `CacheKeyGenerator` interface that allow you to configure how the PSR-6 cache key is created. There are two implementations
of this interface: `SimpleGenerator` (default) and `HeaderCacheKeyGenerator`.
### Fixed
- Issue where deprecation warning always was triggered. Not it is just triggered if `respect_cache_headers` is used.
- Issue where deprecation warning always was triggered. Not it is just triggered if `respect_cache_headers` is used.
## 1.3.0 - 2017-03-28
@@ -34,13 +70,13 @@ of this interface: `SimpleGenerator` (default) and `HeaderCacheKeyGenerator`.
- New `methods` option which allows to configure the request methods which can be cached.
- New `respect_response_cache_directives` option to define specific cache directives to respect when handling responses.
- Introduced `CachePlugin::clientCache` and `CachePlugin::serverCache` factory methods to easily setup the plugin with
- Introduced `CachePlugin::clientCache` and `CachePlugin::serverCache` factory methods to easily setup the plugin with
the correct config settigns for each usecase.
### Changed
- The `no-cache` directive is now respected by the plugin and will not cache the response. If you need the previous behaviour, configure `respect_response_cache_directives`.
- We always rewind the stream after loading response from cache.
- We always rewind the stream after loading response from cache.
### Deprecated

2
vendor/php-http/cache-plugin/README.md vendored
View File

@@ -2,7 +2,7 @@
[![Latest Version](https://img.shields.io/github/release/php-http/cache-plugin.svg?style=flat-square)](https://github.com/php-http/cache-plugin/releases)
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
[![Build Status](https://img.shields.io/travis/php-http/cache-plugin.svg?style=flat-square)](https://travis-ci.org/php-http/cache-plugin)
[![Build Status](https://github.com/php-http/cache-plugin/actions/workflows/tests.yml/badge.svg)](https://github.com/php-http/cache-plugin/actions/workflows/tests.yml)
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-http/cache-plugin.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cache-plugin)
[![Quality Score](https://img.shields.io/scrutinizer/g/php-http/cache-plugin.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cache-plugin)
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/cache-plugin.svg?style=flat-square)](https://packagist.org/packages/php-http/cache-plugin)

13
vendor/php-http/cache-plugin/composer.json vendored
View File

@@ -11,15 +11,14 @@
}
],
"require": {
"php": "^5.4 || ^7.0",
"psr/cache": "^1.0",
"php": "^7.1 || ^8.0",
"psr/cache": "^1.0 || ^2.0 || ^3.0",
"php-http/client-common": "^1.9 || ^2.0",
"php-http/message-factory": "^1.0",
"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0"
"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
},
"require-dev": {
"phpspec/phpspec": "^2.5",
"henrikbjorn/phpspec-code-coverage" : "^1.0"
"phpspec/phpspec": "^5.1 || ^6.0"
},
"autoload": {
"psr-4": {
@@ -39,7 +38,5 @@
"branch-alias": {
"dev-master": "1.6-dev"
}
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}

5
vendor/php-http/cache-plugin/phpstan.neon.dist vendored Normal file
View File

@@ -0,0 +1,5 @@
parameters:
level: 8
paths:
- src
treatPhpDocTypesAsCertain: false

2
vendor/php-http/cache-plugin/src/Cache/Generator/CacheKeyGenerator.php vendored
View File

@@ -14,8 +14,6 @@ interface CacheKeyGenerator
/**
* Generate a cache key from a Request.
*
* @param RequestInterface $request
*
* @return string
*/
public function generate(RequestInterface $request);

4
vendor/php-http/cache-plugin/src/Cache/Generator/HeaderCacheKeyGenerator.php vendored
View File

@@ -14,12 +14,12 @@ class HeaderCacheKeyGenerator implements CacheKeyGenerator
/**
* The header names we should take into account when creating the cache key.
*
* @var array
* @var string[]
*/
private $headerNames;
/**
* @param $headerNames
* @param string[] $headerNames
*/
public function __construct(array $headerNames)
{

4
vendor/php-http/cache-plugin/src/Cache/Listener/AddHeaderCacheListener.php vendored
View File

@@ -9,7 +9,7 @@ use Psr\Cache\CacheItemInterface;
/**
* Adds a header indicating if the response came from cache.
*
* @author Iain Connor <iain.connor@priceline.com>
* @author Iain Connor <iainconnor@gmail.com>
*/
class AddHeaderCacheListener implements CacheListener
{
@@ -27,8 +27,6 @@ class AddHeaderCacheListener implements CacheListener
/**
* Called before the cache plugin returns the response, with information on whether that response came from cache.
*
* @param RequestInterface $request
* @param ResponseInterface $response
* @param bool $fromCache Whether the `$response` was from the cache or not.
* Note that checking `$cacheItem->isHit()` is not sufficent to determine this.
* @param CacheItemInterface|null $cacheItem

4
vendor/php-http/cache-plugin/src/Cache/Listener/CacheListener.php vendored
View File

@@ -11,15 +11,13 @@ use Psr\Cache\CacheItemInterface;
* Provides an opportunity to update the response based on whether the cache was a hit or a miss, or
* other cache-meta-data.
*
* @author Iain Connor <iain.connor@priceline.com>
* @author Iain Connor <iainconnor@gmail.com>
*/
interface CacheListener
{
/**
* Called before the cache plugin returns the response, with information on whether that response came from cache.
*
* @param RequestInterface $request
* @param ResponseInterface $response
* @param bool $fromCache Whether the `$response` was from the cache or not.
* Note that checking `$cacheItem->isHit()` is not sufficent to determine this.
* @param CacheItemInterface|null $cacheItem

200
vendor/php-http/cache-plugin/src/CachePlugin.php vendored
View File

@@ -9,15 +9,19 @@ use Http\Client\Common\Plugin\Cache\Generator\SimpleGenerator;
use Http\Client\Common\Plugin\Cache\Listener\CacheListener;
use Http\Message\StreamFactory;
use Http\Promise\FulfilledPromise;
use Http\Promise\Promise;
use Psr\Cache\CacheItemInterface;
use Psr\Cache\CacheItemPoolInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamFactoryInterface;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Allow for caching a response.
* Allow for caching a response with a PSR-6 compatible caching engine.
*
* It can follow the RFC-7234 caching specification or use a fixed cache lifetime.
*
* @author Tobias Nyholm <tobias.nyholm@gmail.com>
*/
@@ -31,51 +35,51 @@ final class CachePlugin implements Plugin
private $pool;
/**
* @var StreamFactory
* @var StreamFactory|StreamFactoryInterface
*/
private $streamFactory;
/**
* @var array
* @var mixed[]
*/
private $config;
/**
* Cache directives indicating if a response can not be cached.
*
* @var array
* @var string[]
*/
private $noCacheFlags = ['no-cache', 'private', 'no-store'];
/**
* @param CacheItemPoolInterface $pool
* @param StreamFactory $streamFactory
* @param array $config {
* @param StreamFactory|StreamFactoryInterface $streamFactory
* @param mixed[] $config
*
* @var bool $respect_cache_headers Whether to look at the cache directives or ignore them
* @var int $default_ttl (seconds) If we do not respect cache headers or can't calculate a good ttl, use this
* value
* @var string $hash_algo The hashing algorithm to use when generating cache keys
* @var int $cache_lifetime (seconds) To support serving a previous stale response when the server answers 304
* bool respect_cache_headers: Whether to look at the cache directives or ignore them
* int default_ttl: (seconds) If we do not respect cache headers or can't calculate a good ttl, use this value
* string hash_algo: The hashing algorithm to use when generating cache keys
* int cache_lifetime: (seconds) To support serving a previous stale response when the server answers 304
* we have to store the cache for a longer time than the server originally says it is valid for.
* We store a cache item for $cache_lifetime + max age of the response.
* @var array $methods list of request methods which can be cached
* @var array $respect_response_cache_directives list of cache directives this plugin will respect while caching responses
* @var CacheKeyGenerator $cache_key_generator an object to generate the cache key. Defaults to a new instance of SimpleGenerator
* @var CacheListener[] $cache_listeners an array of objects to act on the response based on the results of the cache check.
* string[] methods: list of request methods which can be cached
* string[] blacklisted_paths: list of regex for URLs explicitly not to be cached
* string[] respect_response_cache_directives: list of cache directives this plugin will respect while caching responses
* CacheKeyGenerator cache_key_generator: an object to generate the cache key. Defaults to a new instance of SimpleGenerator
* CacheListener[] cache_listeners: an array of objects to act on the response based on the results of the cache check.
* Defaults to an empty array
* }
*/
public function __construct(CacheItemPoolInterface $pool, StreamFactory $streamFactory, array $config = [])
public function __construct(CacheItemPoolInterface $pool, $streamFactory, array $config = [])
{
if (!($streamFactory instanceof StreamFactory) && !($streamFactory instanceof StreamFactoryInterface)) {
throw new \TypeError(\sprintf('Argument 2 passed to %s::__construct() must be of type %s|%s, %s given.', self::class, StreamFactory::class, StreamFactoryInterface::class, \is_object($streamFactory) ? \get_class($streamFactory) : \gettype($streamFactory)));
}
$this->pool = $pool;
$this->streamFactory = $streamFactory;
if (isset($config['respect_cache_headers']) && isset($config['respect_response_cache_directives'])) {
throw new \InvalidArgumentException(
'You can\'t provide config option "respect_cache_headers" and "respect_response_cache_directives". '.
'Use "respect_response_cache_directives" instead.'
);
if (\array_key_exists('respect_cache_headers', $config) && \array_key_exists('respect_response_cache_directives', $config)) {
throw new \InvalidArgumentException('You can\'t provide config option "respect_cache_headers" and "respect_response_cache_directives". Use "respect_response_cache_directives" instead.');
}
$optionsResolver = new OptionsResolver();
@@ -91,16 +95,15 @@ final class CachePlugin implements Plugin
* This method will setup the cachePlugin in client cache mode. When using the client cache mode the plugin will
* cache responses with `private` cache directive.
*
* @param CacheItemPoolInterface $pool
* @param StreamFactory $streamFactory
* @param array $config For all possible config options see the constructor docs
* @param StreamFactory|StreamFactoryInterface $streamFactory
* @param mixed[] $config For all possible config options see the constructor docs
*
* @return CachePlugin
*/
public static function clientCache(CacheItemPoolInterface $pool, StreamFactory $streamFactory, array $config = [])
public static function clientCache(CacheItemPoolInterface $pool, $streamFactory, array $config = [])
{
// Allow caching of private requests
if (isset($config['respect_response_cache_directives'])) {
if (\array_key_exists('respect_response_cache_directives', $config)) {
$config['respect_response_cache_directives'][] = 'no-cache';
$config['respect_response_cache_directives'][] = 'max-age';
$config['respect_response_cache_directives'] = array_unique($config['respect_response_cache_directives']);
@@ -115,17 +118,21 @@ final class CachePlugin implements Plugin
* This method will setup the cachePlugin in server cache mode. This is the default caching behavior it refuses to
* cache responses with the `private`or `no-cache` directives.
*
* @param CacheItemPoolInterface $pool
* @param StreamFactory $streamFactory
* @param array $config For all possible config options see the constructor docs
* @param StreamFactory|StreamFactoryInterface $streamFactory
* @param mixed[] $config For all possible config options see the constructor docs
*
* @return CachePlugin
*/
public static function serverCache(CacheItemPoolInterface $pool, StreamFactory $streamFactory, array $config = [])
public static function serverCache(CacheItemPoolInterface $pool, $streamFactory, array $config = [])
{
return new self($pool, $streamFactory, $config);
}
/**
* {@inheritdoc}
*
* @return Promise Resolves a PSR-7 Response or fails with an Http\Client\Exception (The same as HttpAsyncClient)
*/
protected function doHandleRequest(RequestInterface $request, callable $next, callable $first)
{
$method = strtoupper($request->getMethod());
@@ -144,22 +151,24 @@ final class CachePlugin implements Plugin
if ($cacheItem->isHit()) {
$data = $cacheItem->get();
// The array_key_exists() is to be removed in 2.0.
if (array_key_exists('expiresAt', $data) && (null === $data['expiresAt'] || time() < $data['expiresAt'])) {
// This item is still valid according to previous cache headers
$response = $this->createResponseFromCacheItem($cacheItem);
$response = $this->handleCacheListeners($request, $response, true, $cacheItem);
if (is_array($data)) {
// The array_key_exists() is to be removed in 2.0.
if (array_key_exists('expiresAt', $data) && (null === $data['expiresAt'] || time() < $data['expiresAt'])) {
// This item is still valid according to previous cache headers
$response = $this->createResponseFromCacheItem($cacheItem);
$response = $this->handleCacheListeners($request, $response, true, $cacheItem);
return new FulfilledPromise($response);
}
return new FulfilledPromise($response);
}
// Add headers to ask the server if this cache is still valid
if ($modifiedSinceValue = $this->getModifiedSinceHeaderValue($cacheItem)) {
$request = $request->withHeader('If-Modified-Since', $modifiedSinceValue);
}
// Add headers to ask the server if this cache is still valid
if ($modifiedSinceValue = $this->getModifiedSinceHeaderValue($cacheItem)) {
$request = $request->withHeader('If-Modified-Since', $modifiedSinceValue);
}
if ($etag = $this->getETag($cacheItem)) {
$request = $request->withHeader('If-None-Match', $etag);
if ($etag = $this->getETag($cacheItem)) {
$request = $request->withHeader('If-None-Match', $etag);
}
}
}
@@ -183,7 +192,7 @@ final class CachePlugin implements Plugin
return $this->handleCacheListeners($request, $this->createResponseFromCacheItem($cacheItem), true, $cacheItem);
}
if ($this->isCacheable($response)) {
if ($this->isCacheable($response) && $this->isCacheableRequest($request)) {
$bodyStream = $response->getBody();
$body = $bodyStream->__toString();
if ($bodyStream->isSeekable()) {
@@ -205,7 +214,7 @@ final class CachePlugin implements Plugin
$this->pool->save($cacheItem);
}
return $this->handleCacheListeners($request, $response, false, isset($cacheItem) ? $cacheItem : null);
return $this->handleCacheListeners($request, $response, false, $cacheItem);
});
}
@@ -213,14 +222,12 @@ final class CachePlugin implements Plugin
* Calculate the timestamp when this cache item should be dropped from the cache. The lowest value that can be
* returned is $maxAge.
*
* @param int|null $maxAge
*
* @return int|null Unix system time passed to the PSR-6 cache
*/
private function calculateCacheItemExpiresAfter($maxAge)
private function calculateCacheItemExpiresAfter(?int $maxAge): ?int
{
if (null === $this->config['cache_lifetime'] && null === $maxAge) {
return;
return null;
}
return $this->config['cache_lifetime'] + $maxAge;
@@ -230,14 +237,12 @@ final class CachePlugin implements Plugin
* Calculate the timestamp when a response expires. After that timestamp, we need to send a
* If-Modified-Since / If-None-Match request to validate the response.
*
* @param int|null $maxAge
*
* @return int|null Unix system time. A null value means that the response expires when the cache item expires
*/
private function calculateResponseExpiresAt($maxAge)
private function calculateResponseExpiresAt(?int $maxAge): ?int
{
if (null === $maxAge) {
return;
return null;
}
return time() + $maxAge;
@@ -246,8 +251,6 @@ final class CachePlugin implements Plugin
/**
* Verify that we can cache this response.
*
* @param ResponseInterface $response
*
* @return bool
*/
protected function isCacheable(ResponseInterface $response)
@@ -266,15 +269,29 @@ final class CachePlugin implements Plugin
return true;
}
/**
* Verify that we can cache this request.
*/
private function isCacheableRequest(RequestInterface $request): bool
{
$uri = $request->getUri()->__toString();
foreach ($this->config['blacklisted_paths'] as $regex) {
if (1 === preg_match($regex, $uri)) {
return false;
}
}
return true;
}
/**
* Get the value of a parameter in the cache control header.
*
* @param ResponseInterface $response
* @param string $name The field of Cache-Control to fetch
* @param string $name The field of Cache-Control to fetch
*
* @return bool|string The value of the directive, true if directive without value, false if directive not present
*/
private function getCacheControlDirective(ResponseInterface $response, $name)
private function getCacheControlDirective(ResponseInterface $response, string $name)
{
$headers = $response->getHeader('Cache-Control');
foreach ($headers as $header) {
@@ -291,12 +308,7 @@ final class CachePlugin implements Plugin
return false;
}
/**
* @param RequestInterface $request
*
* @return string
*/
private function createCacheKey(RequestInterface $request)
private function createCacheKey(RequestInterface $request): string
{
$key = $this->config['cache_key_generator']->generate($request);
@@ -304,13 +316,11 @@ final class CachePlugin implements Plugin
}
/**
* Get a ttl in seconds. It could return null if we do not respect cache headers and got no defaultTtl.
* Get a ttl in seconds.
*
* @param ResponseInterface $response
*
* @return int|null
* Returns null if we do not respect cache headers and got no defaultTtl.
*/
private function getMaxAge(ResponseInterface $response)
private function getMaxAge(ResponseInterface $response): ?int
{
if (!in_array('max-age', $this->config['respect_response_cache_directives'], true)) {
return $this->config['default_ttl'];
@@ -321,7 +331,7 @@ final class CachePlugin implements Plugin
if (!is_bool($maxAge)) {
$ageHeaders = $response->getHeader('Age');
foreach ($ageHeaders as $age) {
return $maxAge - ((int) $age);
return ((int) $maxAge) - ((int) $age);
}
return (int) $maxAge;
@@ -338,10 +348,8 @@ final class CachePlugin implements Plugin
/**
* Configure an options resolver.
*
* @param OptionsResolver $resolver
*/
private function configureOptions(OptionsResolver $resolver)
private function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'cache_lifetime' => 86400 * 30, // 30 days
@@ -353,6 +361,7 @@ final class CachePlugin implements Plugin
'respect_response_cache_directives' => ['no-cache', 'private', 'max-age', 'no-store'],
'cache_key_generator' => null,
'cache_listeners' => [],
'blacklisted_paths' => [],
]);
$resolver->setAllowedTypes('cache_lifetime', ['int', 'null']);
@@ -360,6 +369,7 @@ final class CachePlugin implements Plugin
$resolver->setAllowedTypes('respect_cache_headers', ['bool', 'null']);
$resolver->setAllowedTypes('methods', 'array');
$resolver->setAllowedTypes('cache_key_generator', ['null', 'Http\Client\Common\Plugin\Cache\Generator\CacheKeyGenerator']);
$resolver->setAllowedTypes('blacklisted_paths', 'array');
$resolver->setAllowedValues('hash_algo', hash_algos());
$resolver->setAllowedValues('methods', function ($value) {
/* RFC7230 sections 3.1.1 and 3.2.6 except limited to uppercase characters. */
@@ -386,12 +396,7 @@ final class CachePlugin implements Plugin
});
}
/**
* @param CacheItemInterface $cacheItem
*
* @return ResponseInterface
*/
private function createResponseFromCacheItem(CacheItemInterface $cacheItem)
private function createResponseFromCacheItem(CacheItemInterface $cacheItem): ResponseInterface
{
$data = $cacheItem->get();
@@ -405,24 +410,18 @@ final class CachePlugin implements Plugin
throw new RewindStreamException('Cannot rewind stream.', 0, $e);
}
$response = $response->withBody($stream);
return $response;
return $response->withBody($stream);
}
/**
* Get the value of the "If-Modified-Since" header.
*
* @param CacheItemInterface $cacheItem
*
* @return string|null
* Get the value for the "If-Modified-Since" header.
*/
private function getModifiedSinceHeaderValue(CacheItemInterface $cacheItem)
private function getModifiedSinceHeaderValue(CacheItemInterface $cacheItem): ?string
{
$data = $cacheItem->get();
// The isset() is to be removed in 2.0.
if (!isset($data['createdAt'])) {
return;
return null;
}
$modified = new \DateTime('@'.$data['createdAt']);
@@ -433,17 +432,13 @@ final class CachePlugin implements Plugin
/**
* Get the ETag from the cached response.
*
* @param CacheItemInterface $cacheItem
*
* @return string|null
*/
private function getETag(CacheItemInterface $cacheItem)
private function getETag(CacheItemInterface $cacheItem): ?string
{
$data = $cacheItem->get();
// The isset() is to be removed in 2.0.
if (!isset($data['etag'])) {
return;
return null;
}
foreach ($data['etag'] as $etag) {
@@ -451,19 +446,14 @@ final class CachePlugin implements Plugin
return $etag;
}
}
return null;
}
/**
* Call the cache listeners, if they are set.
*
* @param RequestInterface $request
* @param ResponseInterface $response
* @param bool $cacheHit
* @param CacheItemInterface|null $cacheItem
*
* @return ResponseInterface
* Call the registered cache listeners.
*/
private function handleCacheListeners(RequestInterface $request, ResponseInterface $response, $cacheHit, $cacheItem)
private function handleCacheListeners(RequestInterface $request, ResponseInterface $response, bool $cacheHit, ?CacheItemInterface $cacheItem): ResponseInterface
{
foreach ($this->config['cache_listeners'] as $cacheListener) {
$response = $cacheListener->onCacheResponse($request, $response, $cacheHit, $cacheItem);