opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-04-20 09:56:34 -07:00 • committed by Greg Anderson
parent b11a755ba8
commit c0a0d5a94c
6920 changed files with 64395 additions and 57312 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\Annotation\ImageToolkit.
*/
namespace Drupal\Core\ImageToolkit\Annotation;
use Drupal\Component\Annotation\Plugin;

5
core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\Annotation\ImageToolkitOperation.
*/
namespace Drupal\Core\ImageToolkit\Annotation;
use Drupal\Component\Annotation\Plugin;

5
core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\ImageToolkitBase.
*/
namespace Drupal\Core\ImageToolkit;
use Drupal\Component\Plugin\Exception\PluginNotFoundException;

5
core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\ImageToolkitInterface.
*/
namespace Drupal\Core\ImageToolkit;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;

5
core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\ImageToolkitManager.
*/
namespace Drupal\Core\ImageToolkit;
use Drupal\Core\Cache\CacheBackendInterface;

5
core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\ImageToolkitOperationBase.
*/
namespace Drupal\Core\ImageToolkit;
use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;

5
core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationInterface.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\ImageToolkitOperationInterface.
*/
namespace Drupal\Core\ImageToolkit;
use Drupal\Component\Plugin\PluginInspectionInterface;

34
core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\ImageToolkitOperationManager.
*/
namespace Drupal\Core\ImageToolkit;
use Drupal\Core\Cache\CacheBackendInterface;
@ -32,6 +27,13 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
*/
protected $logger;
/**
* The image toolkit manager.
*
* @var \Drupal\Core\ImageToolkit\ImageToolkitManager
*/
protected $toolkitManager;
/**
* Constructs the ImageToolkitOperationManager object.
*
@ -44,20 +46,23 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
* The module handler to invoke the alter hook with.
* @param \Psr\Log\LoggerInterface $logger
* A logger instance.
* @param \Drupal\Core\ImageToolkit\ImageToolkitManager $toolkit_manager
* The image toolkit manager.
*/
public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, LoggerInterface $logger) {
public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, LoggerInterface $logger, ImageToolkitManager $toolkit_manager) {
parent::__construct('Plugin/ImageToolkit/Operation', $namespaces, $module_handler, 'Drupal\Core\ImageToolkit\ImageToolkitOperationInterface', 'Drupal\Core\ImageToolkit\Annotation\ImageToolkitOperation');
$this->alterInfo('image_toolkit_operation');
$this->setCacheBackend($cache_backend, 'image_toolkit_operation_plugins');
$this->logger = $logger;
$this->toolkitManager = $toolkit_manager;
}
/**
* Returns the plugin ID for a given toolkit and operation.
*
* @param string $toolkit_id
* The toolkit plugin ID.
* @param \Drupal\Core\ImageToolkit\ImageToolkitInterface $toolkit
* The toolkit instance.
* @param string $operation
* The operation (e.g. "crop").
*
@ -67,7 +72,8 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
* @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
* When no plugin is available.
*/
protected function getToolkitOperationPluginId($toolkit_id, $operation) {
protected function getToolkitOperationPluginId(ImageToolkitInterface $toolkit, $operation) {
$toolkit_id = $toolkit->getPluginId();
$definitions = $this->getDefinitions();
$definitions = array_filter($definitions,
@ -77,6 +83,14 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
);
if (!$definitions) {
// If this image toolkit plugin is a derivative and returns no operation,
// try once again with its base plugin.
$base_toolkit_id = $toolkit->getBaseId();
if (($toolkit_id != $base_toolkit_id) && !empty($base_toolkit_id)) {
$base_toolkit = $this->toolkitManager->createInstance($base_toolkit_id);
return $this->getToolkitOperationPluginId($base_toolkit, $operation);
}
$message = SafeMarkup::format("No image operation plugin for '@toolkit' toolkit and '@operation' operation.", array('@toolkit' => $toolkit_id, '@operation' => $operation));
throw new PluginNotFoundException($toolkit_id . '.' . $operation, $message);
}
@ -102,7 +116,7 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
* {@inheritdoc}
*/
public function getToolkitOperation(ImageToolkitInterface $toolkit, $operation) {
$plugin_id = $this->getToolkitOperationPluginId($toolkit->getPluginId(), $operation);
$plugin_id = $this->getToolkitOperationPluginId($toolkit, $operation);
return $this->createInstance($plugin_id, array(), $toolkit);
}

5
core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManagerInterface.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\ImageToolkit\ImageToolkitOperationManagerInterface.
*/
namespace Drupal\Core\ImageToolkit;
/**