updated core to 8.6.3
This commit is contained in:
@@ -200,7 +200,7 @@ class PhpArrayContainer extends Container {
|
||||
// The PhpArrayDumper just uses the hash of the private service
|
||||
// definition to generate a unique ID.
|
||||
//
|
||||
// @see \Drupal\Component\DependecyInjection\Dumper\OptimizedPhpArrayDumper::getPrivateServiceCall
|
||||
// @see \Drupal\Component\DependencyInjection\Dumper\OptimizedPhpArrayDumper::getPrivateServiceCall
|
||||
if ($type == 'private_service') {
|
||||
$id = $argument->id;
|
||||
|
||||
|
||||
@@ -394,7 +394,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
|
||||
($this->context != 'MSGCTXT') &&
|
||||
($this->context != 'MSGID_PLURAL') &&
|
||||
($this->context != 'MSGSTR_ARR')) {
|
||||
// Plural message strings must come after msgid, msgxtxt,
|
||||
// Plural message strings must come after msgid, msgctxt,
|
||||
// msgid_plural, or other msgstr[] entries.
|
||||
$this->errors[] = new FormattableMarkup('The translation stream %uri contains an error: "msgstr[]" is unexpected on line %line.', $log_vars);
|
||||
return FALSE;
|
||||
|
||||
@@ -36,7 +36,7 @@ abstract class SecuredRedirectResponse extends RedirectResponse {
|
||||
* Copies over the values from the given response.
|
||||
*
|
||||
* @param \Symfony\Component\HttpFoundation\RedirectResponse $response
|
||||
* The redirect reponse object.
|
||||
* The redirect response object.
|
||||
*/
|
||||
protected function fromResponse(RedirectResponse $response) {
|
||||
$this->setProtocolVersion($response->getProtocolVersion());
|
||||
|
||||
@@ -29,7 +29,7 @@ abstract class PluginManagerBase implements PluginManagerInterface {
|
||||
/**
|
||||
* The object that returns the preconfigured plugin instance appropriate for a particular runtime condition.
|
||||
*
|
||||
* @var \Drupal\Component\Plugin\Mapper\MapperInterface
|
||||
* @var \Drupal\Component\Plugin\Mapper\MapperInterface|null
|
||||
*/
|
||||
protected $mapper;
|
||||
|
||||
@@ -104,6 +104,9 @@ abstract class PluginManagerBase implements PluginManagerInterface {
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getInstance(array $options) {
|
||||
if (!$this->mapper) {
|
||||
throw new \BadMethodCallException(sprintf('%s does not support this method unless %s::$mapper is set.', static::class, static::class));
|
||||
}
|
||||
return $this->mapper->getInstance($options);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user