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

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

11
web/modules/contrib/webform/src/WebformServiceProvider.php
View file

@ -4,6 +4,7 @@ namespace Drupal\webform;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\DependencyInjection\ServiceProviderBase;
use Drupal\webform\Normalizer\WebformEntityReferenceItemNormalizer;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;
@ -17,10 +18,12 @@ class WebformServiceProvider extends ServiceProviderBase {
*/
public function alter(ContainerBuilder $container) {
$modules = $container->getParameter('container.modules');
if (isset($modules['hal'])) {
// Hal module is enabled, add our new normalizer for webform items.
$service_definition = new Definition('Drupal\webform\Normalizer\WebformEntityReferenceItemNormalizer', [
new Reference('rest.link_manager'),
// Hal module is enabled, add our new normalizer for webform items.
// Core 8.3 and above use hal module https://www.drupal.org/node/2830467.
$manager = isset($modules['hal']) ? 'hal.link_manager' : 'rest.link_manager';
if ($container->has($manager)) {
$service_definition = new Definition(WebformEntityReferenceItemNormalizer::class, [
new Reference($manager),
new Reference('serializer.entity_resolver'),
]);
// The priority must be higher than that of