diff --git a/app/bootstrap.php.cache b/app/bootstrap.php.cache index 35212edfb3..ae5ff197bb 100644 --- a/app/bootstrap.php.cache +++ b/app/bootstrap.php.cache @@ -1358,7 +1358,7 @@ const HTTP_REQUEST_URI_TOO_LONG = 414; const HTTP_UNSUPPORTED_MEDIA_TYPE = 415; const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416; const HTTP_EXPECTATION_FAILED = 417; -const HTTP_I_AM_A_TEAPOT = 418; const HTTP_UNPROCESSABLE_ENTITY = 422; const HTTP_LOCKED = 423; const HTTP_FAILED_DEPENDENCY = 424; const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; const HTTP_UPGRADE_REQUIRED = 426; const HTTP_PRECONDITION_REQUIRED = 428; const HTTP_TOO_MANY_REQUESTS = 429; const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451; +const HTTP_I_AM_A_TEAPOT = 418; const HTTP_MISDIRECTED_REQUEST = 421; const HTTP_UNPROCESSABLE_ENTITY = 422; const HTTP_LOCKED = 423; const HTTP_FAILED_DEPENDENCY = 424; const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; const HTTP_UPGRADE_REQUIRED = 426; const HTTP_PRECONDITION_REQUIRED = 428; const HTTP_TOO_MANY_REQUESTS = 429; const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451; const HTTP_INTERNAL_SERVER_ERROR = 500; const HTTP_NOT_IMPLEMENTED = 501; const HTTP_BAD_GATEWAY = 502; @@ -1407,7 +1407,7 @@ public static $statusTexts = array( 415 =>'Unsupported Media Type', 416 =>'Range Not Satisfiable', 417 =>'Expectation Failed', -418 =>'I\'m a teapot', 422 =>'Unprocessable Entity', 423 =>'Locked', 424 =>'Failed Dependency', 425 =>'Reserved for WebDAV advanced collections expired proposal', 426 =>'Upgrade Required', 428 =>'Precondition Required', 429 =>'Too Many Requests', 431 =>'Request Header Fields Too Large', 451 =>'Unavailable For Legal Reasons', 500 =>'Internal Server Error', +418 =>'I\'m a teapot', 421 =>'Misdirected Request', 422 =>'Unprocessable Entity', 423 =>'Locked', 424 =>'Failed Dependency', 425 =>'Reserved for WebDAV advanced collections expired proposal', 426 =>'Upgrade Required', 428 =>'Precondition Required', 429 =>'Too Many Requests', 431 =>'Request Header Fields Too Large', 451 =>'Unavailable For Legal Reasons', 500 =>'Internal Server Error', 501 =>'Not Implemented', 502 =>'Bad Gateway', 503 =>'Service Unavailable', @@ -2204,6 +2204,10 @@ if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE return; } throw $e; +} catch (\Throwable $e) { +unset($this->loading[$id]); +unset($this->services[$id]); +throw $e; } unset($this->loading[$id]); return $service; @@ -2428,11 +2432,11 @@ protected $booted = false; protected $name; protected $startTime; protected $loadClassCache; -const VERSION ='2.8.6'; -const VERSION_ID = 20806; +const VERSION ='2.8.7'; +const VERSION_ID = 20807; const MAJOR_VERSION = 2; const MINOR_VERSION = 8; -const RELEASE_VERSION = 6; +const RELEASE_VERSION = 7; const EXTRA_VERSION =''; const END_OF_MAINTENANCE ='11/2018'; const END_OF_LIFE ='11/2019'; @@ -3321,6 +3325,10 @@ $response = parent::handle($request, $type, $catch); $this->container->set('request', null,'request'); $this->container->leaveScope('request'); throw $e; +} catch (\Throwable $e) { +$this->container->set('request', null,'request'); +$this->container->leaveScope('request'); +throw $e; } $this->container->set('request', null,'request'); $this->container->leaveScope('request');