diff --git a/temp_database/aria_log.00000001 b/temp_database/aria_log.00000001 index 55180b5967511c414a8200b6fe97ec39e0c89184..a431497a6dc41be75484ad2abfd91d549a8be3e2 100644 Binary files a/temp_database/aria_log.00000001 and b/temp_database/aria_log.00000001 differ diff --git a/temp_database/aria_log_control b/temp_database/aria_log_control index 3a54f98cae5329773ca5fbdad2f3789cf71e3224..423d8866fa9430b529f1734270f6f522789133f2 100644 Binary files a/temp_database/aria_log_control and b/temp_database/aria_log_control differ diff --git a/temp_database/ib_buffer_pool b/temp_database/ib_buffer_pool index 882ca938ecf6b703cb8385159164afe8457c9ee5..9570be1f218667ee7cf6cd171d1e4c11734b6293 100644 --- a/temp_database/ib_buffer_pool +++ b/temp_database/ib_buffer_pool @@ -1,38 +1,43 @@ -4,3 -4,1 -4,0 -2,1 -2,0 -1,1 -1,0 -0,308 -0,307 10,5 10,4 10,3 10,2 10,1 +10,0 9,4 9,3 9,2 9,1 +9,0 8,3 8,2 8,1 +8,0 6,4 6,3 6,2 6,1 +6,0 5,3 5,2 5,1 +5,0 +4,3 +4,1 +4,0 2,3 +2,1 +2,0 1,3 +1,1 +1,0 0,322 +0,308 +0,307 0,243 0,9 -0,0 0,1 +0,0 0,300 0,299 0,298 @@ -209,8 +214,3 @@ 0,2 0,3 0,7 -10,0 -9,0 -8,0 -6,0 -5,0 diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index c6b54af7ba2e1e3e960134233321efe47aa4528c..51e734a774b3ed9ca110a921cb40a74f8c7905c2 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -98,7 +98,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true) { foreach (self::getInstalled() as $installed) { if (isset($installed['versions'][$packageName])) { - return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; } } @@ -119,7 +119,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true) */ public static function satisfies(VersionParser $parser, $packageName, $constraint) { - $constraint = $parser->parseConstraints($constraint); + $constraint = $parser->parseConstraints((string) $constraint); $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); return $provided->matches($constraint); @@ -328,7 +328,9 @@ private static function getInstalled() if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; } elseif (is_file($vendorDir.'/composer/installed.php')) { - $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ + $required = require $vendorDir.'/composer/installed.php'; + $installed[] = self::$installedByVendor[$vendorDir] = $required; if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { self::$installed = $installed[count($installed) - 1]; } @@ -340,12 +342,17 @@ private static function getInstalled() // only require the installed.php file if this file is loaded from its dumped location, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 if (substr(__DIR__, -8, 1) !== 'C') { - self::$installed = require __DIR__ . '/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; } else { self::$installed = array(); } } - $installed[] = self::$installed; + + if (self::$installed !== array()) { + $installed[] = self::$installed; + } return $installed; } diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index d8d7ae89960d66e0dfef7722954a13d881b30da7..9e58190937ab0ebe18859e010cfb14fc5c8a29e2 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -47,7 +47,7 @@ 'Psy\\' => array($vendorDir . '/psy/psysh/src'), 'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'), 'Psr\\Log\\' => array($vendorDir . '/psr/log/src'), - 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'), + 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'), 'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'), 'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'), 'Psr\\Container\\' => array($vendorDir . '/psr/container/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 09d322983bcf272e296730efde00a6ed95e17849..fc7f9f147dec250eb3fa67a8ebfa90344bf732e1 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -335,8 +335,8 @@ class ComposerStaticInitef6e996b0a224900f7a80b20b575f79f ), 'Psr\\Http\\Message\\' => array ( - 0 => __DIR__ . '/..' . '/psr/http-message/src', - 1 => __DIR__ . '/..' . '/psr/http-factory/src', + 0 => __DIR__ . '/..' . '/psr/http-factory/src', + 1 => __DIR__ . '/..' . '/psr/http-message/src', ), 'Psr\\Http\\Client\\' => array ( diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 3a6bf8b06df029a4a70da91f9315db6eff093c89..8dc26a46481d431257de5714e725f5ddf20c83ca 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ <?php return array( 'root' => array( 'name' => 'laravel/laravel', - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => NULL, + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => 'a79e038a7f965fc810fb2a17e54b460cf04cd4ae', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -374,9 +374,9 @@ 'dev_requirement' => false, ), 'laravel/laravel' => array( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => NULL, + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => 'a79e038a7f965fc810fb2a17e54b460cf04cd4ae', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php deleted file mode 100644 index a80956c9d2a0368a3de8c114b357f2dd7f9e338a..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -use Psr\Http\Message\RequestInterface; -use Psr\Http\Message\ResponseInterface; - -/** - * Exception when an HTTP error occurs (4xx or 5xx error) - */ -class BadResponseException extends RequestException -{ - public function __construct( - string $message, - RequestInterface $request, - ResponseInterface $response, - \Throwable $previous = null, - array $handlerContext = [] - ) { - parent::__construct($message, $request, $response, $previous, $handlerContext); - } - - /** - * Current exception and the ones that extend it will always have a response. - */ - public function hasResponse(): bool - { - return true; - } - - /** - * This function narrows the return type from the parent class and does not allow it to be nullable. - */ - public function getResponse(): ResponseInterface - { - /** @var ResponseInterface */ - return parent::getResponse(); - } -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php b/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php deleted file mode 100644 index 12fa5e3518c4487f13d20fd7622c2f81583852d3..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -/** - * Exception when a client error is encountered (4xx codes) - */ -class ClientException extends BadResponseException -{ -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php b/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php deleted file mode 100644 index e1a31519cfa2d6f36a8e5f807285bf6c51195934..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php +++ /dev/null @@ -1,56 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -use Psr\Http\Client\NetworkExceptionInterface; -use Psr\Http\Message\RequestInterface; - -/** - * Exception thrown when a connection cannot be established. - * - * Note that no response is present for a ConnectException - */ -class ConnectException extends TransferException implements NetworkExceptionInterface -{ - /** - * @var RequestInterface - */ - private $request; - - /** - * @var array - */ - private $handlerContext; - - public function __construct( - string $message, - RequestInterface $request, - \Throwable $previous = null, - array $handlerContext = [] - ) { - parent::__construct($message, 0, $previous); - $this->request = $request; - $this->handlerContext = $handlerContext; - } - - /** - * Get the request that caused the exception - */ - public function getRequest(): RequestInterface - { - return $this->request; - } - - /** - * Get contextual information about the error from the underlying handler. - * - * The contents of this array will vary depending on which handler you are - * using. It may also be just an empty array. Relying on this data will - * couple you to a specific handler, but can give more debug information - * when needed. - */ - public function getHandlerContext(): array - { - return $this->handlerContext; - } -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php deleted file mode 100644 index fa3ed6998c2d16fb7a4194c9fbae2764909de5f2..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -use Psr\Http\Client\ClientExceptionInterface; - -interface GuzzleException extends ClientExceptionInterface -{ -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php b/vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php deleted file mode 100644 index bfd20e232bba460f910e7c4ed7315e9a244ffad2..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -final class InvalidArgumentException extends \InvalidArgumentException implements GuzzleException -{ -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php deleted file mode 100644 index c2d0a9cccfc5151114033c751754de01de298aa0..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php +++ /dev/null @@ -1,166 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -use GuzzleHttp\BodySummarizer; -use GuzzleHttp\BodySummarizerInterface; -use Psr\Http\Client\RequestExceptionInterface; -use Psr\Http\Message\RequestInterface; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\UriInterface; - -/** - * HTTP Request exception - */ -class RequestException extends TransferException implements RequestExceptionInterface -{ - /** - * @var RequestInterface - */ - private $request; - - /** - * @var ResponseInterface|null - */ - private $response; - - /** - * @var array - */ - private $handlerContext; - - public function __construct( - string $message, - RequestInterface $request, - ResponseInterface $response = null, - \Throwable $previous = null, - array $handlerContext = [] - ) { - // Set the code of the exception if the response is set and not future. - $code = $response ? $response->getStatusCode() : 0; - parent::__construct($message, $code, $previous); - $this->request = $request; - $this->response = $response; - $this->handlerContext = $handlerContext; - } - - /** - * Wrap non-RequestExceptions with a RequestException - */ - public static function wrapException(RequestInterface $request, \Throwable $e): RequestException - { - return $e instanceof RequestException ? $e : new RequestException($e->getMessage(), $request, null, $e); - } - - /** - * Factory method to create a new exception with a normalized error message - * - * @param RequestInterface $request Request sent - * @param ResponseInterface $response Response received - * @param \Throwable|null $previous Previous exception - * @param array $handlerContext Optional handler context - * @param BodySummarizerInterface|null $bodySummarizer Optional body summarizer - */ - public static function create( - RequestInterface $request, - ResponseInterface $response = null, - \Throwable $previous = null, - array $handlerContext = [], - BodySummarizerInterface $bodySummarizer = null - ): self { - if (!$response) { - return new self( - 'Error completing request', - $request, - null, - $previous, - $handlerContext - ); - } - - $level = (int) \floor($response->getStatusCode() / 100); - if ($level === 4) { - $label = 'Client error'; - $className = ClientException::class; - } elseif ($level === 5) { - $label = 'Server error'; - $className = ServerException::class; - } else { - $label = 'Unsuccessful request'; - $className = __CLASS__; - } - - $uri = $request->getUri(); - $uri = static::obfuscateUri($uri); - - // Client Error: `GET /` resulted in a `404 Not Found` response: - // <html> ... (truncated) - $message = \sprintf( - '%s: `%s %s` resulted in a `%s %s` response', - $label, - $request->getMethod(), - $uri->__toString(), - $response->getStatusCode(), - $response->getReasonPhrase() - ); - - $summary = ($bodySummarizer ?? new BodySummarizer())->summarize($response); - - if ($summary !== null) { - $message .= ":\n{$summary}\n"; - } - - return new $className($message, $request, $response, $previous, $handlerContext); - } - - /** - * Obfuscates URI if there is a username and a password present - */ - private static function obfuscateUri(UriInterface $uri): UriInterface - { - $userInfo = $uri->getUserInfo(); - - if (false !== ($pos = \strpos($userInfo, ':'))) { - return $uri->withUserInfo(\substr($userInfo, 0, $pos), '***'); - } - - return $uri; - } - - /** - * Get the request that caused the exception - */ - public function getRequest(): RequestInterface - { - return $this->request; - } - - /** - * Get the associated response - */ - public function getResponse(): ?ResponseInterface - { - return $this->response; - } - - /** - * Check if a response was received - */ - public function hasResponse(): bool - { - return $this->response !== null; - } - - /** - * Get contextual information about the error from the underlying handler. - * - * The contents of this array will vary depending on which handler you are - * using. It may also be just an empty array. Relying on this data will - * couple you to a specific handler, but can give more debug information - * when needed. - */ - public function getHandlerContext(): array - { - return $this->handlerContext; - } -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php b/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php deleted file mode 100644 index 8055e067c0a36bee35978008d81920b4d37d0834..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -/** - * Exception when a server error is encountered (5xx codes) - */ -class ServerException extends BadResponseException -{ -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php b/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php deleted file mode 100644 index fad3a57cfdeafce68ffeea2350bba62e16bc1913..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -class TooManyRedirectsException extends RequestException -{ -} diff --git a/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php deleted file mode 100644 index 5076336080a88acd6c0031911d513055e484b9b0..0000000000000000000000000000000000000000 --- a/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php - -namespace GuzzleHttp\Exception; - -class TransferException extends \RuntimeException implements GuzzleException -{ -}