diff --git a/sites/all/modules/contrib/admin/metatag/CHANGELOG.txt b/sites/all/modules/contrib/admin/metatag/CHANGELOG.txt index 512dc5927..8955618d3 100644 --- a/sites/all/modules/contrib/admin/metatag/CHANGELOG.txt +++ b/sites/all/modules/contrib/admin/metatag/CHANGELOG.txt @@ -1,3 +1,8 @@ +Metatag 8.x-1.8, 2019-02-20 +--------------------------- +By samuel.mortenson, Berdir, DamienMcKenna: Fix data property definition. + + Metatag 8.x-1.7, 2018-08-31 --------------------------- #2994979 by DamienMcKenna, dspachos, ynotpeanutbutter, oxy86, IT-Cru, kdeds, diff --git a/sites/all/modules/contrib/admin/metatag/metatag.info.yml b/sites/all/modules/contrib/admin/metatag/metatag.info.yml index 37efe692b..e92edaa59 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag.info.yml @@ -13,8 +13,8 @@ test_dependencies: - restui:restui - schema_metatag:schema_web_page -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_app_links/metatag_app_links.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_app_links/metatag_app_links.info.yml index 0c438e827..1f79a53f0 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_app_links/metatag_app_links.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_app_links/metatag_app_links.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_dc/metatag_dc.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_dc/metatag_dc.info.yml index 3123b511b..33eaa6e0a 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_dc/metatag_dc.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_dc/metatag_dc.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml index e9fc95e9e..45c121342 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - metatag:metatag_dc -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_facebook/metatag_facebook.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_facebook/metatag_facebook.info.yml index ed308edda..859e96f3d 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_facebook/metatag_facebook.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_facebook/metatag_facebook.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_favicons/metatag_favicons.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_favicons/metatag_favicons.info.yml index af4b6caa6..5ebb9ac31 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_favicons/metatag_favicons.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_favicons/metatag_favicons.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_google_cse/metatag_google_cse.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_google_cse/metatag_google_cse.info.yml index 7ae07312a..4246003b4 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_google_cse/metatag_google_cse.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_google_cse/metatag_google_cse.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_google_plus/metatag_google_plus.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_google_plus/metatag_google_plus.info.yml index 6a2dd43f1..da67659b7 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_google_plus/metatag_google_plus.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_google_plus/metatag_google_plus.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_hreflang/metatag_hreflang.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_hreflang/metatag_hreflang.info.yml index fde674e1f..1901aaed4 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_hreflang/metatag_hreflang.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_hreflang/metatag_hreflang.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_mobile/metatag_mobile.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_mobile/metatag_mobile.info.yml index fb1c833d5..da52a0823 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_mobile/metatag_mobile.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_mobile/metatag_mobile.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_open_graph/metatag_open_graph.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_open_graph/metatag_open_graph.info.yml index 7755b893b..16ef28d0b 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_open_graph/metatag_open_graph.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_open_graph/metatag_open_graph.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml index 39090f3ba..2e7721e51 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - metatag:metatag_open_graph -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_page_manager/metatag_page_manager.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_page_manager/metatag_page_manager.info.yml index c25fa9338..4da08b567 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_page_manager/metatag_page_manager.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_page_manager/metatag_page_manager.info.yml @@ -7,8 +7,8 @@ dependencies: - page_manager:page_manager - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_pinterest/metatag_pinterest.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_pinterest/metatag_pinterest.info.yml index 836418679..3f9142325 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_pinterest/metatag_pinterest.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_pinterest/metatag_pinterest.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml index 122e885ca..ba3461f19 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_verification/metatag_verification.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_verification/metatag_verification.info.yml index 336c45f08..7d4b7e4c1 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_verification/metatag_verification.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_verification/metatag_verification.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/metatag_views/metatag_views.info.yml b/sites/all/modules/contrib/admin/metatag/metatag_views/metatag_views.info.yml index db451743c..20bbe66bf 100644 --- a/sites/all/modules/contrib/admin/metatag/metatag_views/metatag_views.info.yml +++ b/sites/all/modules/contrib/admin/metatag/metatag_views/metatag_views.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - drupal:views -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/src/MetatagServiceProvider.php b/sites/all/modules/contrib/admin/metatag/src/MetatagServiceProvider.php index 811485a40..aa1ac3051 100644 --- a/sites/all/modules/contrib/admin/metatag/src/MetatagServiceProvider.php +++ b/sites/all/modules/contrib/admin/metatag/src/MetatagServiceProvider.php @@ -4,7 +4,6 @@ namespace Drupal\metatag; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ServiceProviderBase; -use Drupal\metatag\Normalizer\FieldItemNormalizer; use Drupal\metatag\Normalizer\MetatagHalNormalizer; use Drupal\metatag\Normalizer\MetatagNormalizer; use Symfony\Component\DependencyInjection\Definition; @@ -30,10 +29,6 @@ class MetatagServiceProvider extends ServiceProviderBase { $metatag_hal = new Definition(MetatagHalNormalizer::class); $metatag_hal->addTag('normalizer', ['priority' => 31]); $container->setDefinition('metatag.normalizer.metatag.hal', $metatag_hal); - - $metatag_field = new Definition(FieldItemNormalizer::class); - $metatag_field->addTag('normalizer', ['priority' => 30]); - $container->setDefinition('metatag.normalizer.metatag_field', $metatag_field); } } diff --git a/sites/all/modules/contrib/admin/metatag/src/Normalizer/FieldItemNormalizer.php b/sites/all/modules/contrib/admin/metatag/src/Normalizer/FieldItemNormalizer.php deleted file mode 100644 index c567750fe..000000000 --- a/sites/all/modules/contrib/admin/metatag/src/Normalizer/FieldItemNormalizer.php +++ /dev/null @@ -1,28 +0,0 @@ -getValue(); - - $normalized['value'] = unserialize($values['value']); - - return $normalized; - } - -} diff --git a/sites/all/modules/contrib/admin/metatag/src/Normalizer/MetatagHalNormalizer.php b/sites/all/modules/contrib/admin/metatag/src/Normalizer/MetatagHalNormalizer.php index 03c26361c..4d0aff94e 100644 --- a/sites/all/modules/contrib/admin/metatag/src/Normalizer/MetatagHalNormalizer.php +++ b/sites/all/modules/contrib/admin/metatag/src/Normalizer/MetatagHalNormalizer.php @@ -19,7 +19,6 @@ class MetatagHalNormalizer extends MetatagNormalizer { $normalized = parent::normalize($field_item, $format, $context); // Mock the field array similar to the other fields. - // @see Drupal\hal\Normalizer\FieldItemNormalizer return [ 'metatag' => [$normalized], ]; diff --git a/sites/all/modules/contrib/admin/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php b/sites/all/modules/contrib/admin/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php index 1a6726a80..5e23ffd7c 100644 --- a/sites/all/modules/contrib/admin/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php +++ b/sites/all/modules/contrib/admin/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php @@ -14,7 +14,10 @@ use Drupal\Core\TypedData\DataDefinition; * label = @Translation("Meta tags"), * description = @Translation("This field stores code meta tags."), * default_widget = "metatag_firehose", - * default_formatter = "metatag_empty_formatter" + * default_formatter = "metatag_empty_formatter", + * serialized_property_names = { + * "value" + * } * ) */ class MetatagFieldItem extends FieldItemBase { diff --git a/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml b/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml index dad9f064a..23c33ace1 100644 --- a/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml +++ b/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml @@ -6,8 +6,8 @@ package: Testing dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml b/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml index 04a5a51c8..ab69327c1 100644 --- a/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml +++ b/sites/all/modules/contrib/admin/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml @@ -6,8 +6,8 @@ package: Testing dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/sites/all/modules/contrib/dev/devel/README.txt b/sites/all/modules/contrib/dev/devel/README.txt index 9ac4acf9b..634f226a1 100644 --- a/sites/all/modules/contrib/dev/devel/README.txt +++ b/sites/all/modules/contrib/dev/devel/README.txt @@ -1,8 +1,23 @@ -Devel -========== -Devel module contains helper functions and pages for Drupal developers and inquisitive admins: +README.txt for Devel module +--------------------------- + +CONTENTS OF THIS FILE +--------------------- + + * Introduction + * Requirements + * Included Modules and Features + * Recommended Modules + * Installation + * Configuration + * Maintainers + +INTRODUCTION +------------ + +Devel module contains helper functions and pages for Drupal developers and +inquisitive admins: - - A block for running custom PHP on a page - A block for quickly accessing devel pages - A block for masquerading as other users (useful for testing) - A mail-system class which redirects outbound email to files @@ -13,35 +28,61 @@ Devel module contains helper functions and pages for Drupal developers and inqui This module is safe to use on a production site. Just be sure to only grant 'access development information' permission to developers. -Devel Kint -=================== -Provides a dpr() function, which pretty prints variables. + - For a full description of the module visit: + https://www.drupal.org/project/devel + + - To submit bug reports and feature suggestions, or to track changes visit: + https://www.drupal.org/project/issues/devel + + +REQUIREMENTS +------------ + +This module requires no modules outside of Drupal core. + + +INCLUDED MODULES AND FEATURES +----------------------------- + +Devel Kint - Provides a dpr() function, which pretty prints variables. Useful during development. Also see similar helpers like dpm(), dvm(). -Webprofiler -============== -Adds a debug bar at bottom of all pages with tons of useful information like a query list, -cache hit/miss data, memory profiling, page speed, php info, session info, etc. +Webprofiler - Adds a debug bar at bottom of all pages with tons of useful +information like a query list, cache hit/miss data, memory profiling, page +speed, php info, session info, etc. -Devel Generate -================= -Bulk creates nodes, users, comment, terms for development. Has Drush integration. +Devel Generate - Bulk creates nodes, users, comment, terms for development. Has +Drush integration. -Devel Generate Extensions -========================= -Devel Images Provider [http://drupal.org/project/devel_image_provider] allows to configure external providers for images. +Drush Unit Testing - See develDrushTest.php for an example of unit testing of +the Drush integration. This uses Drush's own test framework, based on PHPUnit. +To run the tests, use run-tests-drush.sh. You may pass in any arguments that +are valid for `phpunit`. + + +RECOMMENDED MODULE +------------------ + +Devel Generate Extensions - Devel Images Provider allows to configure external +providers for images. + + - http://drupal.org/project/devel_image_provider + + +INSTALLATION +------------ + + - Install the Devel module as you would normally install a contributed Drupal + module. Visit https://www.drupal.org/node/1897420 for further information. -Drush Unit Testing -================== -See develDrushTest.php for an example of unit testing of the Drush integration. -This uses Drush's own test framework, based on PHPUnit. To run the tests, use -run-tests-drush.sh. You may pass in any arguments that are valid for `phpunit`. Author/Maintainers -====================== -- Moshe Weitzman http://www.acquia.com -- Hans Salvisberg -- Pedro Cambra https://drupal.org/user/122101/contact http://www.ymbra.com/ -- Juan Pablo Novillo https://www.drupal.org/u/juampynr -- lussoluca https://www.drupal.org/u/lussoluca -- willzyx https://www.drupal.org/u/willzyx +------------------ + + - Moshe Weitzman (moshe weitzman) - https://www.drupal.org/u/moshe-weitzman + - Hans Salvisberg (salvis) - https://www.drupal.org/u/salvis + - Pedro Cambra https://drupal.org/user/122101/contact http://www.ymbra.com/ + - Juan Pablo Novillo https://www.drupal.org/u/juampynr + - lussoluca https://www.drupal.org/u/lussoluca + - willzyx https://www.drupal.org/u/willzyx + diff --git a/sites/all/modules/contrib/dev/devel/composer.json b/sites/all/modules/contrib/dev/devel/composer.json index 6faff22e5..3c27d59eb 100644 --- a/sites/all/modules/contrib/dev/devel/composer.json +++ b/sites/all/modules/contrib/dev/devel/composer.json @@ -38,8 +38,15 @@ }, "license": "GPL-2.0+", "minimum-stability": "dev", - "require": {}, - "suggest": { - "symfony/var-dumper": "Pretty print complex values better with var-dumper available" + "require": { + "symfony/var-dumper": "~2.7|^3" + }, + "suggest": {}, + "extra": { + "drush": { + "services": { + "drush.services.yml": "^9" + } + } } } diff --git a/sites/all/modules/contrib/dev/devel/config/install/devel.toolbar.settings.yml b/sites/all/modules/contrib/dev/devel/config/install/devel.toolbar.settings.yml index a9a40374e..b12c5bdc9 100644 --- a/sites/all/modules/contrib/dev/devel/config/install/devel.toolbar.settings.yml +++ b/sites/all/modules/contrib/dev/devel/config/install/devel.toolbar.settings.yml @@ -2,7 +2,6 @@ toolbar_items: - 'devel.admin_settings_link' - 'devel.cache_clear' - 'devel.container_info.service' - - 'devel.execute_php' - 'devel.menu_rebuild' - 'devel.reinstall' - 'devel.route_info' diff --git a/sites/all/modules/contrib/dev/devel/devel.info.yml b/sites/all/modules/contrib/dev/devel/devel.info.yml index fa7fbf894..a1dd9b2ca 100644 --- a/sites/all/modules/contrib/dev/devel/devel.info.yml +++ b/sites/all/modules/contrib/dev/devel/devel.info.yml @@ -7,8 +7,8 @@ configure: devel.admin_settings tags: - developer -# Information added by Drupal.org packaging script on 2017-10-05 -version: '8.x-1.2' +# Information added by Drupal.org packaging script on 2019-01-29 +version: '8.x-2.0' core: '8.x' project: 'devel' -datestamp: 1507197848 +datestamp: 1548799386 diff --git a/sites/all/modules/contrib/dev/devel/devel.links.menu.yml b/sites/all/modules/contrib/dev/devel/devel.links.menu.yml index 2a90f86a1..4becee6f1 100644 --- a/sites/all/modules/contrib/dev/devel/devel.links.menu.yml +++ b/sites/all/modules/contrib/dev/devel/devel.links.menu.yml @@ -46,10 +46,6 @@ devel.phpinfo: title: 'PHPinfo()' route_name: system.php menu_name: devel -devel.execute_php: - title: 'Execute PHP' - route_name: devel.execute_php - menu_name: devel devel.session: title: 'View Session' route_name: devel.session diff --git a/sites/all/modules/contrib/dev/devel/devel.module b/sites/all/modules/contrib/dev/devel/devel.module index 08b93e22f..6364d2ba7 100644 --- a/sites/all/modules/contrib/dev/devel/devel.module +++ b/sites/all/modules/contrib/dev/devel/devel.module @@ -324,6 +324,9 @@ if (!function_exists('dd')) { /** * Wrapper for DevelDumperManager::debug(). * + * @deprecated since Drupal 8.6.0 because symfony now has dd() as a function. + * Use the ddm() function instead. + * * @see \Drupal\devel\DevelDumperManager::debug() */ function dd($data, $label = NULL) { @@ -331,6 +334,17 @@ if (!function_exists('dd')) { } } +if (!function_exists('ddm')) { + /** + * Wrapper for DevelDumperManager::debug() to replace previous dd function. + * + * @see \Drupal\devel\DevelDumperManager::debug() + */ + function ddm($data, $label = NULL) { + return \Drupal::service('devel.dumper')->debug($data, $label, 'default'); + } +} + /** * Wrapper for DevelDumperManager::message(). * diff --git a/sites/all/modules/contrib/dev/devel/devel.permissions.yml b/sites/all/modules/contrib/dev/devel/devel.permissions.yml index 256919de9..e32ad8c11 100644 --- a/sites/all/modules/contrib/dev/devel/devel.permissions.yml +++ b/sites/all/modules/contrib/dev/devel/devel.permissions.yml @@ -3,11 +3,6 @@ access devel information: title: 'Access developer information' restrict access: TRUE -execute php code: - title: 'Execute PHP code' - description: 'Run arbitrary PHP from a block.' - restrict access: TRUE - switch users: title: 'Switch users' description: 'Become any user on the site with just a click.' diff --git a/sites/all/modules/contrib/dev/devel/devel.routing.yml b/sites/all/modules/contrib/dev/devel/devel.routing.yml index 8d20e90d1..e6c6804d8 100644 --- a/sites/all/modules/contrib/dev/devel/devel.routing.yml +++ b/sites/all/modules/contrib/dev/devel/devel.routing.yml @@ -96,16 +96,6 @@ devel.field_info_page: requirements: _permission: 'access devel information' -devel.execute_php: - path: '/devel/php' - defaults: - _form: '\Drupal\devel\Form\ExecutePHP' - _title: 'Execute PHP code' - options: - _admin_route: TRUE - requirements: - _permission: 'execute php code' - devel.session: path: '/devel/session' defaults: diff --git a/sites/all/modules/contrib/dev/devel/devel_generate/README.txt b/sites/all/modules/contrib/dev/devel/devel_generate/README.txt index 2d73ba9be..1f8338963 100644 --- a/sites/all/modules/contrib/dev/devel/devel_generate/README.txt +++ b/sites/all/modules/contrib/dev/devel/devel_generate/README.txt @@ -38,7 +38,7 @@ will want to directly inherit from Drupal\devel_generate\DevelGenerateBase. To give support for a new field type the field type base class should properly implements \Drupal\Core\Field\FieldItemInterface::generateSampleValue(). -Devel generate automatically use the values returned by this method during the +Devel Generate automatically uses the values returned by this method during the generate process for generate placeholder field values. For more information see: https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Field%21FieldItemInterface.php/function/FieldItemInterface::generateSampleValue diff --git a/sites/all/modules/contrib/dev/devel/devel_generate/composer.json b/sites/all/modules/contrib/dev/devel/devel_generate/composer.json new file mode 100644 index 000000000..624589aad --- /dev/null +++ b/sites/all/modules/contrib/dev/devel/devel_generate/composer.json @@ -0,0 +1,52 @@ +{ + "name": "drupal/devel_generate", + "description": "Generate dummy users, nodes, menus, taxonomy terms...", + "type": "drupal-module", + "homepage": "http://drupal.org/project/devel", + "authors": [ + { + "name": "Moshe Weitzman", + "email": "weitzman@tejasa.com", + "homepage": "https://github.com/weitzman", + "role": "Maintainer" + }, + { + "name": "Hans Salvisberg", + "email": "drupal@salvisberg.com", + "homepage": "https://www.drupal.org/u/salvis", + "role": "Maintainer" + }, + { + "name": "Luca Lusso", + "homepage": "https://www.drupal.org/u/lussoluca", + "role": "Maintainer" + }, + { + "name": "Marco (willzyx)", + "homepage": "https://www.drupal.org/u/willzyx", + "role": "Maintainer" + }, + { + "name": "See contributors", + "homepage": "https://www.drupal.org/node/3236/committers" + } + ], + "support": { + "issues": "http://drupal.org/project/devel", + "irc": "irc://irc.freenode.org/drupal-contribute", + "source": "http://cgit.drupalcode.org/devel" + }, + "license": "GPL-2.0+", + "minimum-stability": "dev", + "require": {}, + "suggest": { + "drupal/realistic_dummy_content": "Generate realistic demo content with Devel's devel_generate module." + }, + "extra": { + "drush": { + "services": { + "drush.services.yml": "^9" + } + } + } +} diff --git a/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.info.yml b/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.info.yml index 890261d98..f90b08c80 100644 --- a/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.info.yml +++ b/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.info.yml @@ -1,13 +1,13 @@ type: module -name: 'Devel generate' +name: 'Devel Generate' description: 'Generate dummy users, nodes, menus, taxonomy terms...' package: Development # core: 8.x tags: - developer -# Information added by Drupal.org packaging script on 2017-10-05 -version: '8.x-1.2' +# Information added by Drupal.org packaging script on 2019-01-29 +version: '8.x-2.0' core: '8.x' project: 'devel' -datestamp: 1507197848 +datestamp: 1548799386 diff --git a/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.module b/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.module index 530a4fbc8..3affb925b 100644 --- a/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.module +++ b/sites/all/modules/contrib/dev/devel/devel_generate/devel_generate.module @@ -53,7 +53,7 @@ function devel_generate_entity_insert(EntityInterface $entity) { 'source' => '/node/' . $entity->id(), 'alias' => '/node-' . $entity->id() . '-' . $entity->bundle(), ); - \Drupal::service('path.alias_storage')->save($path['source'], $path['alias']); + \Drupal::service('path.alias_storage')->save($path['source'], $path['alias'], $entity->language()->getId()); } // Add node statistics. diff --git a/sites/all/modules/contrib/dev/devel/devel_generate/src/Form/DevelGenerateForm.php b/sites/all/modules/contrib/dev/devel/devel_generate/src/Form/DevelGenerateForm.php index 63c708b49..72366b887 100644 --- a/sites/all/modules/contrib/dev/devel/devel_generate/src/Form/DevelGenerateForm.php +++ b/sites/all/modules/contrib/dev/devel/devel_generate/src/Form/DevelGenerateForm.php @@ -77,12 +77,12 @@ class DevelGenerateForm extends FormBase { $plugin_id = $this->getPluginIdFromRequest(); $instance = $this->getPluginInstance($plugin_id); $form = $instance->settingsForm($form, $form_state); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( + $form['actions'] = ['#type' => 'actions']; + $form['actions']['submit'] = [ '#type' => 'submit', '#value' => $this->t('Generate'), '#button_type' => 'primary', - ); + ]; return $form; } diff --git a/sites/all/modules/contrib/dev/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml b/sites/all/modules/contrib/dev/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml index b4acf0a6d..4489d46a0 100644 --- a/sites/all/modules/contrib/dev/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml +++ b/sites/all/modules/contrib/dev/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml @@ -1,14 +1,14 @@ -name: 'Devel generate Example' +name: 'Devel Generate Example' type: module -description: 'Create an example of DevelGenerate plugin type for testing purposing.' +description: 'Create an example of a Devel Generate plugin type for testing purposes.' package: Development # core: 8.x configure: admin/config/development/generate tags: - developer -# Information added by Drupal.org packaging script on 2017-10-05 -version: '8.x-1.2' +# Information added by Drupal.org packaging script on 2019-01-29 +version: '8.x-2.0' core: '8.x' project: 'devel' -datestamp: 1507197848 +datestamp: 1548799386 diff --git a/sites/all/modules/contrib/dev/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.module b/sites/all/modules/contrib/dev/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.module deleted file mode 100644 index b3d9bbc7f..000000000 --- a/sites/all/modules/contrib/dev/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.module +++ /dev/null @@ -1 +0,0 @@ -populateFields($node); + $this->populateFields($account); $account->save(); diff --git a/sites/all/modules/contrib/dev/devel/drush/develDrushTest.php b/sites/all/modules/contrib/dev/devel/drush/develDrushTest.php deleted file mode 100644 index 54a5cf936..000000000 --- a/sites/all/modules/contrib/dev/devel/drush/develDrushTest.php +++ /dev/null @@ -1,38 +0,0 @@ -setUpDrupal(1, TRUE, '8'); - - // Symlink this module into the Site Under test so it can be enabled. - $target = dirname(__DIR__); - \symlink($target, $this->webroot() . '/modules/devel'); - $options = array( - 'root' => $this->webroot(), - 'uri' => key($sites), - ); - $this->drush('pm-enable', array('devel'), $options + array('skip' => NULL, 'yes' => NULL)); - - $this->drush('fn-view', array('drush_main'), $options); - $output = $this->getOutput(); - $this->assertContains('@return', $output, 'Output contain @return Doxygen.'); - $this->assertContains('function drush_main() {', $output, 'Output contains function drush_main() declaration'); - - // $this->drush('fn-hook', array('cron'), $options); - // $output = $this->getOutputAsList(); - // $expected = array('dblog', 'file', 'field', 'system', 'update'); - // $this->assertSame($expected, $output); - } - } - -} diff --git a/sites/all/modules/contrib/dev/devel/kint/kint.info.yml b/sites/all/modules/contrib/dev/devel/kint/kint.info.yml index 0b20df64b..5a9af5b29 100644 --- a/sites/all/modules/contrib/dev/devel/kint/kint.info.yml +++ b/sites/all/modules/contrib/dev/devel/kint/kint.info.yml @@ -6,8 +6,8 @@ package: Development tags: - developer -# Information added by Drupal.org packaging script on 2017-10-05 -version: '8.x-1.2' +# Information added by Drupal.org packaging script on 2019-01-29 +version: '8.x-2.0' core: '8.x' project: 'devel' -datestamp: 1507197848 +datestamp: 1548799386 diff --git a/sites/all/modules/contrib/dev/devel/run-tests-drush.sh b/sites/all/modules/contrib/dev/devel/run-tests-drush.sh deleted file mode 100755 index 4dcd4fb4b..000000000 --- a/sites/all/modules/contrib/dev/devel/run-tests-drush.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env sh - -# This script will run phpunit-based test classes using Drush's -# test framework. First, the Drush executable is located, and -# then phpunit is invoked, pointing to Drush's phpunit.xml as -# the configuration. -# -# Any parameters that may be passed to `phpunit` may also be used -# with this script. - -DRUSH_PATH="`which drush`" -DRUSH_DIRNAME="`dirname -- "$DRUSH_PATH"`" -# The following line is needed is you use a `drush` that differs from `which drush` -# export UNISH_DRUSH=$DRUSH_PATH - -if [ $# = 0 ] ; then - phpunit --configuration="$DRUSH_DIRNAME/tests" drush -else - # Pass along any arguments. - phpunit --configuration="$DRUSH_DIRNAME/tests" $@ -fi diff --git a/sites/all/modules/contrib/dev/devel/src/DevelDumperManager.php b/sites/all/modules/contrib/dev/devel/src/DevelDumperManager.php index b88957e5a..d97ab6450 100644 --- a/sites/all/modules/contrib/dev/devel/src/DevelDumperManager.php +++ b/sites/all/modules/contrib/dev/devel/src/DevelDumperManager.php @@ -4,12 +4,15 @@ namespace Drupal\devel; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Session\AccountProxyInterface; +use Drupal\Core\StringTranslation\StringTranslationTrait; /** - * Class DevelDumperManager + * Class DevelDumperManager. */ class DevelDumperManager implements DevelDumperManagerInterface { + use StringTranslationTrait; + /** * The devel config. * @@ -100,7 +103,7 @@ class DevelDumperManager implements DevelDumperManagerInterface { // The temp directory does vary across multiple simpletest instances. $file = file_directory_temp() . '/drupal_debug.txt'; if (file_put_contents($file, $output, FILE_APPEND) === FALSE && $this->hasAccessToDevelInformation()) { - drupal_set_message(t('Devel was unable to write to %file.', ['%file' => $file]), 'error'); + drupal_set_message($this->t('Devel was unable to write to %file.', ['%file' => $file]), 'error'); return FALSE; } } diff --git a/sites/all/modules/contrib/dev/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php b/sites/all/modules/contrib/dev/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php index 596e709b4..32743f597 100644 --- a/sites/all/modules/contrib/dev/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php +++ b/sites/all/modules/contrib/dev/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php @@ -96,7 +96,7 @@ class ThemeInfoRebuildSubscriber implements EventSubscriberInterface { protected function triggerWarningIfNeeded(Request $request) { if ($this->account && $this->account->hasPermission('access devel information')) { $session = $request->getSession(); - if (!$session->has($this->notificationFlag)) { + if ($session && !$session->has($this->notificationFlag)) { $session->set($this->notificationFlag, TRUE); $message = $this->t('The theme information is being rebuilt on every request. Remember to turn off this feature on production websites.', [':url' => Url::fromRoute('devel.admin_settings')->toString()]); drupal_set_message($message, 'warning', TRUE); diff --git a/sites/all/modules/contrib/dev/devel/src/Form/ConfigEditor.php b/sites/all/modules/contrib/dev/devel/src/Form/ConfigEditor.php index e4fe88cc2..231298aac 100644 --- a/sites/all/modules/contrib/dev/devel/src/Form/ConfigEditor.php +++ b/sites/all/modules/contrib/dev/devel/src/Form/ConfigEditor.php @@ -69,11 +69,11 @@ class ConfigEditor extends FormBase { '#required' => TRUE, ); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( + $form['actions'] = ['#type' => 'actions']; + $form['actions']['submit'] = [ '#type' => 'submit', '#value' => $this->t('Save'), - ); + ]; $form['actions']['cancel'] = array( '#type' => 'link', '#title' => $this->t('Cancel'), diff --git a/sites/all/modules/contrib/dev/devel/src/Form/ConfigsList.php b/sites/all/modules/contrib/dev/devel/src/Form/ConfigsList.php index f0993e77b..0c01ca472 100644 --- a/sites/all/modules/contrib/dev/devel/src/Form/ConfigsList.php +++ b/sites/all/modules/contrib/dev/devel/src/Form/ConfigsList.php @@ -35,10 +35,11 @@ class ConfigsList extends FormBase { '#title_display' => 'invisible', '#default_value' => $filter, ); - $form['filter']['show'] = array( + $form['filter']['actions'] = ['#type' => 'actions']; + $form['filter']['actions']['show'] = [ '#type' => 'submit', '#value' => $this->t('Filter'), - ); + ]; $header = array( 'name' => array('data' => $this->t('Name')), diff --git a/sites/all/modules/contrib/dev/devel/src/Form/DevelReinstall.php b/sites/all/modules/contrib/dev/devel/src/Form/DevelReinstall.php index 109e40b75..ee85c36ce 100644 --- a/sites/all/modules/contrib/dev/devel/src/Form/DevelReinstall.php +++ b/sites/all/modules/contrib/dev/devel/src/Form/DevelReinstall.php @@ -116,11 +116,11 @@ class DevelReinstall extends FormBase { $form['#attached']['library'][] = 'system/drupal.system.modules'; - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( + $form['actions'] = ['#type' => 'actions']; + $form['actions']['submit'] = [ '#type' => 'submit', '#value' => $this->t('Reinstall'), - ); + ]; return $form; } diff --git a/sites/all/modules/contrib/dev/devel/src/Form/ExecutePHP.php b/sites/all/modules/contrib/dev/devel/src/Form/ExecutePHP.php deleted file mode 100644 index cd66bf480..000000000 --- a/sites/all/modules/contrib/dev/devel/src/Form/ExecutePHP.php +++ /dev/null @@ -1,55 +0,0 @@ - $this->t('Execute PHP Code'), - '#description' => $this->t('Execute some PHP code'), - ); - $form['execute']['code'] = array( - '#type' => 'textarea', - '#title' => t('PHP code to execute'), - '#description' => t('Enter some code. Do not use <?php ?> tags.'), - '#default_value' => (isset($_SESSION['devel_execute_code']) ? $_SESSION['devel_execute_code'] : ''), - '#rows' => 20, - ); - $form['execute']['op'] = array('#type' => 'submit', '#value' => t('Execute')); - $form['#redirect'] = FALSE; - if (isset($_SESSION['devel_execute_code'])) { - unset($_SESSION['devel_execute_code']); - } - - return $form; - } - - /** - * {@inheritdoc} - */ - public function submitForm(array &$form, FormStateInterface $form_state) { - ob_start(); - $code = $form_state->getValue('code'); - print eval($code); - $_SESSION['devel_execute_code'] = $code; - dpm(ob_get_clean()); - } - -} diff --git a/sites/all/modules/contrib/dev/devel/src/Form/SettingsForm.php b/sites/all/modules/contrib/dev/devel/src/Form/SettingsForm.php index 9321d796e..71367be25 100644 --- a/sites/all/modules/contrib/dev/devel/src/Form/SettingsForm.php +++ b/sites/all/modules/contrib/dev/devel/src/Form/SettingsForm.php @@ -66,7 +66,7 @@ class SettingsForm extends ConfigFormBase { $form['page_alter'] = array('#type' => 'checkbox', '#title' => t('Display $page array'), '#default_value' => $devel_config->get('page_alter'), - '#description' => t('Display $page array from hook_page_alter() in the messages area of each page.'), + '#description' => t('Display $page array from hook_page_attachments_alter() in the messages area of each page.'), ); $form['raw_names'] = array('#type' => 'checkbox', '#title' => t('Display machine names of permissions and modules'), diff --git a/sites/all/modules/contrib/dev/devel/src/Form/SystemStateEdit.php b/sites/all/modules/contrib/dev/devel/src/Form/SystemStateEdit.php index d4ba0eda4..e83c26091 100644 --- a/sites/all/modules/contrib/dev/devel/src/Form/SystemStateEdit.php +++ b/sites/all/modules/contrib/dev/devel/src/Form/SystemStateEdit.php @@ -108,17 +108,17 @@ class SystemStateEdit extends FormBase { '#rows' => 15, ); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( + $form['actions'] = ['#type' => 'actions']; + $form['actions']['submit'] = [ '#type' => 'submit', '#value' => $this->t('Save'), '#disabled' => $disabled, - ); - $form['actions']['cancel'] = array( + ]; + $form['actions']['cancel'] = [ '#type' => 'link', '#title' => $this->t('Cancel'), '#url' => Url::fromRoute('devel.state_system_page') - ); + ]; return $form; } diff --git a/sites/all/modules/contrib/dev/devel/src/Plugin/Block/DevelExecutePHP.php b/sites/all/modules/contrib/dev/devel/src/Plugin/Block/DevelExecutePHP.php deleted file mode 100644 index 23076bfa0..000000000 --- a/sites/all/modules/contrib/dev/devel/src/Plugin/Block/DevelExecutePHP.php +++ /dev/null @@ -1,33 +0,0 @@ -getForm('Drupal\devel\Form\ExecutePHP'); - } - -} diff --git a/sites/all/modules/contrib/dev/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml b/sites/all/modules/contrib/dev/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml index 265aeb347..67a4345b5 100644 --- a/sites/all/modules/contrib/dev/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml +++ b/sites/all/modules/contrib/dev/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml @@ -5,8 +5,8 @@ package: Testing # version: VERSION # core: 8.x -# Information added by Drupal.org packaging script on 2017-10-05 -version: '8.x-1.2' +# Information added by Drupal.org packaging script on 2019-01-29 +version: '8.x-2.0' core: '8.x' project: 'devel' -datestamp: 1507197848 +datestamp: 1548799386 diff --git a/sites/all/modules/contrib/dev/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml b/sites/all/modules/contrib/dev/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml index 4b01554cf..bf935fa8f 100644 --- a/sites/all/modules/contrib/dev/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml +++ b/sites/all/modules/contrib/dev/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml @@ -5,12 +5,12 @@ package: Testing # version: VERSION # core: 8.x dependencies: - - field - - text - - entity_test + - drupal:field + - drupal:text + - drupal:entity_test -# Information added by Drupal.org packaging script on 2017-10-05 -version: '8.x-1.2' +# Information added by Drupal.org packaging script on 2019-01-29 +version: '8.x-2.0' core: '8.x' project: 'devel' -datestamp: 1507197848 +datestamp: 1548799386 diff --git a/sites/all/modules/contrib/dev/devel/tests/modules/devel_test/devel_test.info.yml b/sites/all/modules/contrib/dev/devel/tests/modules/devel_test/devel_test.info.yml index 191c82555..be642aacd 100644 --- a/sites/all/modules/contrib/dev/devel/tests/modules/devel_test/devel_test.info.yml +++ b/sites/all/modules/contrib/dev/devel/tests/modules/devel_test/devel_test.info.yml @@ -5,8 +5,8 @@ package: Testing # version: VERSION # core: 8.x -# Information added by Drupal.org packaging script on 2017-10-05 -version: '8.x-1.2' +# Information added by Drupal.org packaging script on 2019-01-29 +version: '8.x-2.0' core: '8.x' project: 'devel' -datestamp: 1507197848 +datestamp: 1548799386 diff --git a/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelDumperTest.php b/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelDumperTest.php index a4ef9b48f..d46a95c52 100644 --- a/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelDumperTest.php +++ b/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelDumperTest.php @@ -50,7 +50,7 @@ class DevelDumperTest extends BrowserTestBase { 'chromephp', 'var_dumper', ]; - $available_dumpers = ['default', 'drupal_variable']; + $available_dumpers = ['default', 'drupal_variable', 'var_dumper']; foreach ($dumpers as $dumper) { $this->assertFieldByXPath('//input[@type="radio" and @name="dumper"]', $dumper); diff --git a/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelToolbarTest.php b/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelToolbarTest.php index 26293f896..e348bc557 100644 --- a/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelToolbarTest.php +++ b/sites/all/modules/contrib/dev/devel/tests/src/Functional/DevelToolbarTest.php @@ -40,7 +40,6 @@ class DevelToolbarTest extends BrowserTestBase { 'devel.cache_clear', 'devel.container_info.service', 'devel.admin_settings_link', - 'devel.execute_php', 'devel.menu_rebuild', 'devel.reinstall', 'devel.route_info', @@ -59,7 +58,6 @@ class DevelToolbarTest extends BrowserTestBase { $this->develUser = $this->drupalCreateUser([ 'administer site configuration', 'access devel information', - 'execute php code', 'access toolbar', ]); $this->toolbarUser = $this->drupalCreateUser([ diff --git a/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelQueryDebugTest.php b/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelQueryDebugTest.php index 3f129258a..8e83fbc35 100644 --- a/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelQueryDebugTest.php +++ b/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelQueryDebugTest.php @@ -69,7 +69,7 @@ class DevelQueryDebugTest extends KernelTestBase { // permissions. We expect only one status message containing the SQL for // the debugged query. \Drupal::currentUser()->setAccount($this->develUser); - $expected_message = "SELECT u.uid AS uid\nFROM \n{users} u"; + $expected_message = "SELECT u.uid AS uid\nFROM\n{users} u"; $query = \Drupal::database()->select('users', 'u'); $query->fields('u', ['uid']); @@ -102,7 +102,7 @@ class DevelQueryDebugTest extends KernelTestBase { // permissions. We expect only one status message containing the SQL for // the debugged entity query. \Drupal::currentUser()->setAccount($this->develUser); - $expected_message = "SELECT base_table.uid AS uid, base_table.uid AS base_table_uid\nFROM \n{users} base_table"; + $expected_message = "SELECT base_table.uid AS uid, base_table.uid AS base_table_uid\nFROM\n{users} base_table"; $query = \Drupal::entityQuery('user'); $query->addTag('debug'); diff --git a/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelTwigExtensionTest.php b/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelTwigExtensionTest.php index 3d22d13c1..349ab09fc 100644 --- a/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelTwigExtensionTest.php +++ b/sites/all/modules/contrib/dev/devel/tests/src/Kernel/DevelTwigExtensionTest.php @@ -70,7 +70,7 @@ class DevelTwigExtensionTest extends KernelTestBase { */ public function testTwigExtensionLoaded() { $twig_service = \Drupal::service('twig'); - $extension = $twig_service->getExtension('devel_debug'); + $extension = $twig_service->getExtension(Debug::class); $this->assertEquals(get_class($extension), Debug::class, 'Debug Extension loaded successfully.'); } diff --git a/sites/all/modules/contrib/dev/devel/tests/src/Unish/DevelDrushTest.php b/sites/all/modules/contrib/dev/devel/tests/src/Unish/DevelDrushTest.php new file mode 100644 index 000000000..42981445c --- /dev/null +++ b/sites/all/modules/contrib/dev/devel/tests/src/Unish/DevelDrushTest.php @@ -0,0 +1,31 @@ +setUpDrupal(1, true); + $this->drush('pm:enable', ['devel']); + } + + /** + * Test devel:services command. + */ + public function testServices() { + $this->drush('devel:services'); + $output = $this->getOutput(); + $this->assertContains('account_switcher', $output); + } + +} + diff --git a/sites/all/modules/contrib/dev/devel/tests/src/Unish/README.md b/sites/all/modules/contrib/dev/devel/tests/src/Unish/README.md new file mode 100644 index 000000000..debe184f1 --- /dev/null +++ b/sites/all/modules/contrib/dev/devel/tests/src/Unish/README.md @@ -0,0 +1,6 @@ +Running Unish Tests +=================== + +Follow instructions provided by [Drush test README.md](https://github.com/drush-ops/drush/blob/master/tests/README.md) in order to test Unish test cases provided by contrib modules. + +See: https://github.com/drush-ops/drush/blob/master/tests/README.md \ No newline at end of file diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/Controller/ToolbarController.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/Controller/ToolbarController.php index de0e240e5..b79a18278 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/Controller/ToolbarController.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/Controller/ToolbarController.php @@ -62,7 +62,9 @@ class ToolbarController extends ControllerBase { * * @param Profile $profile * - * @return array + * @return \Symfony\Component\HttpFoundation\Response + * + * @throws \Exception */ public function toolbarAction(Profile $profile) { $this->profiler->disable(); diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php index 2c766a415..ddfbab3c0 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php @@ -43,8 +43,16 @@ class DatabaseDataCollector extends DataCollector implements DrupalDataCollector public function collect(Request $request, Response $response, \Exception $exception = NULL) { $connections = []; foreach (Database::getAllConnectionInfo() as $key => $info) { - $database = Database::getConnection('default', $key); - $connections[$key] = $database->getLogger()->get('webprofiler'); + try { + $database = Database::getConnection('default', $key); + + if ($database->getLogger()) { + $connections[$key] = $database->getLogger()->get('webprofiler'); + } + } catch(\Exception $e) { + // There was some error during database connection, maybe a stale + // configuration in settings.php or wrong values used for a migration. + } } $this->data['connections'] = array_keys($connections); diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php index 98a3faf46..8fdede4f9 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php @@ -7,6 +7,13 @@ namespace Drupal\webprofiler\DataCollector; */ trait DrupalDataCollectorTrait { + /** + * {@inheritdoc} + */ + public function reset() { + $this->data = array(); + } + /** * {@inheritdoc} */ @@ -47,8 +54,6 @@ trait DrupalDataCollectorTrait { * @param $method * * @return array - * - * @throws \ReflectionException */ public function getMethodData($class, $method) { $class = is_object($class) ? get_class($class) : $class; diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/FormsDataCollector.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/FormsDataCollector.php index 79f633253..a6a1b4046 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/FormsDataCollector.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/FormsDataCollector.php @@ -41,11 +41,11 @@ class FormsDataCollector extends DataCollector implements DrupalDataCollectorInt * @return array */ public function getForms() { - return $this->data['forms']; + return (!empty($this->data['forms']) && is_array($this->data['forms'])) ? $this->data['forms'] : []; } /** - * @return array + * @return int */ public function getFormsCount() { return count($this->getForms()); diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/RequestDataCollector.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/RequestDataCollector.php index 9de8f4942..a23d54075 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/RequestDataCollector.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/DataCollector/RequestDataCollector.php @@ -51,7 +51,8 @@ class RequestDataCollector extends BaseRequestDataCollector implements DrupalDat /** * @param $service_id * @param $callable - * @param $request + * @param \Symfony\Component\HttpFoundation\Request $request + * */ public function addAccessCheck($service_id, $callable, Request $request) { $this->accessCheck[$request->getPathInfo()][] = [ @@ -71,7 +72,7 @@ class RequestDataCollector extends BaseRequestDataCollector implements DrupalDat * {@inheritdoc} */ public function getPanelSummary() { - return $this->data['status_code'].' '.$this->data['status_text']; + return $this->data['status_code'] . ' ' . $this->data['status_text']; } /** @@ -80,4 +81,33 @@ class RequestDataCollector extends BaseRequestDataCollector implements DrupalDat public function getIcon() { return 'iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAQAAADYBBcfAAACvElEQVR42tVTbUhTYRTerDCnKVoUUr/KCZmypA9Koet0bXNLJ5XazDJ/WFaCUY0pExRZXxYiJgsxWWjkaL+yK+po1gjyR2QfmqWxtBmaBtqWGnabT++c11Fu4l/P4VzOPc95zoHznsNZodIbLDdRcKnc1Bu8DAK45ZsOnykQNMopsNooLxCknb0cDq5vml9FtHiIgpBR0R6iihYyFMTDt2Lg56ObPkI6TMGXSof1EV67IqCwisJSWliFAG/E0CfFIiebdNypcxi/1zgyFiIiZ3sJQr0RQx5frLa6k7SOKRo3oMFNR5t62h2rttKXEOKFqDCxtXNmmBokO2KKTlp3IdWuT2dYRNGKwEXEBCcL172G5FG0aIxC0kR9PBTVH1kkwQn+IqJnCE33EalVzT9GJQS1tAdD3CKicJYFrxqx7W2ejCEdZy1FiC5tZxHhLJKOZaRdQJAyV/YAvDliySALHxmxR4Hqe2iwvaOR/CEuZYJFSgYhVbZRkA8KGdEktrqnqra90NndCdkt77fjIHIhexOrfO6O3bbbOj/rqu5IptgyR3sU93QbOYhquZK4MCDp0Ina/PLsu5JvbCTRaapUdUmIV/RzoMdsk/0hWRNdAvKOmvqlN0drsJbJf1P4YsQ5lGrJeuosiOUgbOC8cto3LfOXTdVd7BqZsQKbse+0jUL6WPcesqs4MNSUTQAxGjwFiC8m3yzmqwHJBWYKBJ9WNqW/dHkpU/osch1Yj5RJfXPfSEe/2UPsN490NPfZG5CKyJmcV5ayHyzy7BMqsXfuHhGK/cjAIeSpR92gehR55D8TcQhDEKJwytBJ4fr4NULvrEM8NszfJPyxDoHYAQ1oPCWmIX4gifmDS/DV2DKeb25FHWr76yEG7/9L4YFPeiQQ4/8LkgJ8Et+NncTCsYqzXAEXa7CWdPZzGWdlyV+vST0JanfPvwAAAABJRU5ErkJggg=='; } + + /** + * @return array|string + */ + public function getData() { + // Drupal 8.5+ uses Symfony 3.4.x that changes the way the Request data are + // collected. Data is altered with \Symfony\Component\HttpKernel\DataCollector\DataCollector::cloneVar. + // The stored data (of type \Symfony\Component\VarDumper\Cloner\Data) is + // suitable to be converted to a string by a Dumper (\Symfony\Component\VarDumper\Dumper\DataDumperInterface). + // In our implementation however we need that data as an array, to be later + // converted in a json response by a REST endpoint. We need to refactor the + // whole way Web Profiler works to allow that. At the moment we just + // retrieve the raw Data value and do some string manipulation to clean the + // output a bit. + + $data = $this->data->getValue(TRUE); + unset($data['request_attributes']['_route_params']); + unset($data['request_attributes']['_access_result']); + + $route_object = []; + foreach($data['request_attributes']['_route_object'] as $key => $result) { + $key = str_replace("\0", '', $key); + $key = str_replace('Symfony\Component\Routing\Route', 'Symfony\Component\Routing\Route::', $key); + $route_object[$key] = $result; + } + $data['request_attributes']['_route_object'] = $route_object; + + return $data; + } } diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/Entity/Decorators/Config/ImageStyleStorageDecorator.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/Entity/Decorators/Config/ImageStyleStorageDecorator.php new file mode 100644 index 000000000..a075b29ee --- /dev/null +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/Entity/Decorators/Config/ImageStyleStorageDecorator.php @@ -0,0 +1,33 @@ +getOriginalObject()->setReplacementId($name, $replacement); + } + + /** + * {@inheritdoc} + */ + public function getReplacementId($name) { + return $this->getOriginalObject()->getReplacementId($name); + } + + /** + * {@inheritdoc} + */ + public function clearReplacementId($name) { + return $this->getOriginalObject()->clearReplacementId($name); + } + +} diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/Entity/EntityManagerWrapper.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/Entity/EntityManagerWrapper.php index c6381a0d2..357971021 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/Entity/EntityManagerWrapper.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/Entity/EntityManagerWrapper.php @@ -8,6 +8,7 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\EntityViewBuilderInterface; use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\webprofiler\Entity\Decorators\Config\ConfigEntityStorageDecorator; +use Drupal\webprofiler\Entity\Decorators\Config\ImageStyleStorageDecorator; use Drupal\webprofiler\Entity\Decorators\Config\RoleStorageDecorator; use Drupal\webprofiler\Entity\Decorators\Config\ShortcutSetStorageDecorator; use Drupal\webprofiler\Entity\Decorators\Config\VocabularyStorageDecorator; @@ -98,6 +99,9 @@ class EntityManagerWrapper extends DefaultPluginManager implements EntityTypeMan case 'shortcut_set': return new ShortcutSetStorageDecorator($handler); break; + case 'image_style': + return new ImageStyleStorageDecorator($handler); + break; default: return new ConfigEntityStorageDecorator($handler); break; diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php index b3451fb50..2664f507b 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php @@ -170,10 +170,18 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements * @param $priority */ private function addCalledListener($definition, $event_name, $priority) { - $this->calledListeners[$event_name][$priority][] = [ - 'class' => get_class($definition['callable'][0]), - 'method' => $definition['callable'][1], - ]; + if ($this->isClosure($definition['callable'])) { + $this->calledListeners[$event_name][$priority][] = [ + 'class' => 'Closure', + 'method' => '', + ]; + } + else { + $this->calledListeners[$event_name][$priority][] = [ + 'class' => get_class($definition['callable'][0]), + 'method' => $definition['callable'][1], + ]; + } foreach ($this->notCalledListeners[$event_name][$priority] as $key => $listener) { if (isset($listener['service'])) { @@ -182,12 +190,25 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements } } else { - if (get_class($listener['callable'][0]) == get_class($definition['callable'][0]) && $listener['callable'][1] == $definition['callable'][1]) { - unset($this->notCalledListeners[$event_name][$priority][$key]); + if ($this->isClosure($listener['callable'])) { + if (is_callable($listener['callable'], TRUE, $listenerCallableName) && is_callable($definition['callable'], TRUE, $definitionCallableName)) { + if ($listenerCallableName == $definitionCallableName) { + unset($this->notCalledListeners[$event_name][$priority][$key]); + } + } + } + else { + if (get_class($listener['callable'][0]) == get_class($definition['callable'][0]) && $listener['callable'][1] == $definition['callable'][1]) { + unset($this->notCalledListeners[$event_name][$priority][$key]); + } } } } } + private function isClosure($t) { + return is_object($t) && ($t instanceof \Closure); + } + } diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/EventSubscriber/ProfilerSubscriber.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/EventSubscriber/ProfilerSubscriber.php new file mode 100644 index 000000000..d3f3124fc --- /dev/null +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/EventSubscriber/ProfilerSubscriber.php @@ -0,0 +1,118 @@ +profiler = $profiler; + $this->matcher = $matcher; + $this->onlyException = (bool) $onlyException; + $this->onlyMasterRequests = (bool) $onlyMasterRequests; + $this->profiles = new \SplObjectStorage(); + $this->parents = new \SplObjectStorage(); + $this->requestStack = $requestStack; + } + + /** + * Handles the onKernelException event. + */ + public function onKernelException(GetResponseForExceptionEvent $event) { + if ($this->onlyMasterRequests && !$event->isMasterRequest()) { + return; + } + + $this->exception = $event->getException(); + } + + /** + * Handles the onKernelResponse event. + */ + public function onKernelResponse(FilterResponseEvent $event) { + $master = $event->isMasterRequest(); + if ($this->onlyMasterRequests && !$master) { + return; + } + + if ($this->onlyException && NULL === $this->exception) { + return; + } + + $request = $event->getRequest(); + $exception = $this->exception; + $this->exception = NULL; + + if (NULL !== $this->matcher && !$this->matcher->matches($request)) { + return; + } + + if (!$profile = $this->profiler->collect($request, $event->getResponse(), $exception)) { + return; + } + + $this->profiles[$request] = $profile; + + $this->parents[$request] = $this->requestStack->getParentRequest(); + } + + public function onKernelFinishRequest(FinishRequestEvent $event) { + // attach children to parents + foreach ($this->profiles as $request) { + if (NULL !== $parentRequest = $this->parents[$request]) { + if (isset($this->profiles[$parentRequest])) { + $this->profiles[$parentRequest]->addChild($this->profiles[$request]); + } + } + } + + // save profiles + foreach ($this->profiles as $request) { + $this->profiler->saveProfile($this->profiles[$request]); + } + + $this->profiles = new \SplObjectStorage(); + $this->parents = new \SplObjectStorage(); + } + + public static function getSubscribedEvents() { + return [ + KernelEvents::RESPONSE => ['onKernelResponse', -100], + KernelEvents::EXCEPTION => 'onKernelException', + KernelEvents::FINISH_REQUEST => ['onKernelFinishRequest', -1024], + ]; + } +} diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/Form/ConfigForm.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/Form/ConfigForm.php index e99e2168c..d95582b7c 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/Form/ConfigForm.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/Form/ConfigForm.php @@ -165,7 +165,8 @@ class ConfigForm extends ConfigFormBase { '#open' => FALSE, ]; - $form['purge']['purge'] = [ + $form['purge']['actions'] = ['#type' => 'actions']; + $form['purge']['actions']['purge'] = [ '#type' => 'submit', '#value' => $this->t('Purge'), '#submit' => [[$this, 'purge']], diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/Http/HttpClientMiddleware.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/Http/HttpClientMiddleware.php index b64a2a6cc..c37c0ca6f 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/Http/HttpClientMiddleware.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/Http/HttpClientMiddleware.php @@ -36,8 +36,18 @@ class HttpClientMiddleware { return function ($handler) { return function (RequestInterface $request, array $options) use ($handler) { - $options['on_stats'] = function (TransferStats $stats) use ($request) { + // If on_stats callback is already set then save it + // and call it after ours. + if (isset($options['on_stats'])) { + $next = $options['on_stats']; + } + else { + $next = function(TransferStats $stats) {}; + } + + $options['on_stats'] = function (TransferStats $stats) use ($request, $next) { $request->stats = $stats; + $next($stats); }; return $handler($request, $options)->then( diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/Mail/MailManagerWrapper.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/Mail/MailManagerWrapper.php index 58ecddcea..2689510d7 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/src/Mail/MailManagerWrapper.php +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/Mail/MailManagerWrapper.php @@ -91,4 +91,14 @@ class MailManagerWrapper extends DefaultPluginManager implements MailManagerInte return $message; } + + /** + * {@inheritdoc} + * + * Must call getInstance on the decorated MailManager. + * @see https://www.drupal.org/node/2625554 + */ + public function getInstance(array $options) { + return $this->mailManager->getInstance($options); + } } diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/src/ProxyClass/Command/ListCommand.php b/sites/all/modules/contrib/dev/devel/webprofiler/src/ProxyClass/Command/ListCommand.php new file mode 100644 index 000000000..e8e22c844 --- /dev/null +++ b/sites/all/modules/contrib/dev/devel/webprofiler/src/ProxyClass/Command/ListCommand.php @@ -0,0 +1,325 @@ +container = $container; + $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id; + } + + /** + * Lazy loads the real service from the container. + * + * @return object + * Returns the constructed real service. + */ + protected function lazyLoadItself() { + if (!isset($this->service)) { + $this->service = $this->container->get($this->drupalProxyOriginalServiceId); + } + + return $this->service; + } + + /** + * {@inheritdoc} + */ + public function showMessage($output, $message, $type = 'info') { + return $this->lazyLoadItself()->showMessage($output, $message, $type); + } + + /** + * {@inheritdoc} + */ + public function ignoreValidationErrors() { + return $this->lazyLoadItself()->ignoreValidationErrors(); + } + + /** + * {@inheritdoc} + */ + public function setApplication(\Symfony\Component\Console\Application $application = NULL) { + return $this->lazyLoadItself()->setApplication($application); + } + + /** + * {@inheritdoc} + */ + public function setHelperSet(\Symfony\Component\Console\Helper\HelperSet $helperSet) { + return $this->lazyLoadItself()->setHelperSet($helperSet); + } + + /** + * {@inheritdoc} + */ + public function getHelperSet() { + return $this->lazyLoadItself()->getHelperSet(); + } + + /** + * {@inheritdoc} + */ + public function getApplication() { + return $this->lazyLoadItself()->getApplication(); + } + + /** + * {@inheritdoc} + */ + public function isEnabled() { + return $this->lazyLoadItself()->isEnabled(); + } + + /** + * {@inheritdoc} + */ + public function run(\Symfony\Component\Console\Input\InputInterface $input, \Symfony\Component\Console\Output\OutputInterface $output) { + return $this->lazyLoadItself()->run($input, $output); + } + + /** + * {@inheritdoc} + */ + public function setCode(callable $code) { + return $this->lazyLoadItself()->setCode($code); + } + + /** + * {@inheritdoc} + */ + public function mergeApplicationDefinition($mergeArgs = TRUE) { + return $this->lazyLoadItself()->mergeApplicationDefinition($mergeArgs); + } + + /** + * {@inheritdoc} + */ + public function setDefinition($definition) { + return $this->lazyLoadItself()->setDefinition($definition); + } + + /** + * {@inheritdoc} + */ + public function getDefinition() { + return $this->lazyLoadItself()->getDefinition(); + } + + /** + * {@inheritdoc} + */ + public function getNativeDefinition() { + return $this->lazyLoadItself()->getNativeDefinition(); + } + + /** + * {@inheritdoc} + */ + public function addArgument($name, $mode = NULL, $description = '', $default = NULL) { + return $this->lazyLoadItself() + ->addArgument($name, $mode, $description, $default); + } + + /** + * {@inheritdoc} + */ + public function addOption($name, $shortcut = NULL, $mode = NULL, $description = '', $default = NULL) { + return $this->lazyLoadItself() + ->addOption($name, $shortcut, $mode, $description, $default); + } + + /** + * {@inheritdoc} + */ + public function setName($name) { + return $this->lazyLoadItself()->setName($name); + } + + /** + * {@inheritdoc} + */ + public function setProcessTitle($title) { + return $this->lazyLoadItself()->setProcessTitle($title); + } + + /** + * {@inheritdoc} + */ + public function getName() { + return $this->lazyLoadItself()->getName(); + } + + /** + * {@inheritdoc} + */ + public function setHidden($hidden) { + return $this->lazyLoadItself()->setHidden($hidden); + } + + /** + * {@inheritdoc} + */ + public function isHidden() { + return $this->lazyLoadItself()->isHidden(); + } + + /** + * {@inheritdoc} + */ + public function setDescription($description) { + return $this->lazyLoadItself()->setDescription($description); + } + + /** + * {@inheritdoc} + */ + public function getDescription() { + return $this->lazyLoadItself()->getDescription(); + } + + /** + * {@inheritdoc} + */ + public function setHelp($help) { + return $this->lazyLoadItself()->setHelp($help); + } + + /** + * {@inheritdoc} + */ + public function getHelp() { + return $this->lazyLoadItself()->getHelp(); + } + + /** + * {@inheritdoc} + */ + public function getProcessedHelp() { + return $this->lazyLoadItself()->getProcessedHelp(); + } + + /** + * {@inheritdoc} + */ + public function setAliases($aliases) { + return $this->lazyLoadItself()->setAliases($aliases); + } + + /** + * {@inheritdoc} + */ + public function getAliases() { + return $this->lazyLoadItself()->getAliases(); + } + + /** + * {@inheritdoc} + */ + public function getSynopsis($short = FALSE) { + return $this->lazyLoadItself()->getSynopsis($short); + } + + /** + * {@inheritdoc} + */ + public function addUsage($usage) { + return $this->lazyLoadItself()->addUsage($usage); + } + + /** + * {@inheritdoc} + */ + public function getUsages() { + return $this->lazyLoadItself()->getUsages(); + } + + /** + * {@inheritdoc} + */ + public function getHelper($name) { + return $this->lazyLoadItself()->getHelper($name); + } + + /** + * {@inheritdoc} + */ + public function setContainer($container) { + return $this->lazyLoadItself()->setContainer($container); + } + + /** + * {@inheritdoc} + */ + public function has($key) { + return $this->lazyLoadItself()->has($key); + } + + /** + * {@inheritdoc} + */ + public function get($key) { + return $this->lazyLoadItself()->get($key); + } + + /** + * {@inheritdoc} + */ + public function setTranslator($translator) { + return $this->lazyLoadItself()->setTranslator($translator); + } + + /** + * {@inheritdoc} + */ + public function trans($key) { + return $this->lazyLoadItself()->trans($key); + } + + } + +} diff --git a/sites/all/modules/contrib/dev/devel/webprofiler/templates/Collector/database.html.twig b/sites/all/modules/contrib/dev/devel/webprofiler/templates/Collector/database.html.twig index cbe155134..f07b7f1fd 100644 --- a/sites/all/modules/contrib/dev/devel/webprofiler/templates/Collector/database.html.twig +++ b/sites/all/modules/contrib/dev/devel/webprofiler/templates/Collector/database.html.twig @@ -57,7 +57,7 @@ - +