updated core and modules

sites/all/modules/contrib/dev/devel/drush/devel.drush8.inc

@@ -2,7 +2,8 @@
 
 /**
  * @file
- * Drush integration for the devel module.
+ * This file is only used by Drush8. Drush9 discovers its commands via tagged
+ * service(s) in devel.services.yml. Also see classes in src/Commands.
  */
 
 use Drupal\Component\Uuid\Php;
@@ -160,6 +161,7 @@ function drush_devel_fn_event($event = NULL) {
     drush_log(dt('No implementations.'), 'ok');
   }
 }
+
 /**
  * Command handler.  Show source code of specified function or method.
  */

sites/all/modules/contrib/dev/devel/drush/phpstorm.drush.inc

@@ -1,105 +0,0 @@
-<?php
-
-/**
- * @file
- * Generate PhpStorm metadata file.
- */
-
-/**
- * Implements of hook_drush_command().
- */
-function phpstorm_drush_command() {
-  $items = array();
-
-  $items['phpstorm-metadata'] = array(
-    'description' => 'Save the PhpStorm Metadata file to Drupal root.',
-    'core' => array('8+'),
-    'aliases' => array('phpm'),
-    'category' => 'devel',
-  );
-
-  return $items;
-}
-
-/**
- * Implements hook_drush_help_alter().
- */
-function phpstorm_drush_help_alter(&$command) {
-  if ($command['command'] == 'cache-rebuild') {
-    $command['options']['storm'] = 'Write a new PHPstorm metadata file to Drupal root.';
-  }
-}
-
-/*
- * Implements drush_hook_post_COMMAND().
- */
-function drush_phpstorm_post_cache_rebuild() {
-  if (drush_get_option('storm')) {
-    drush_invoke_process('@self', 'phpstorm-metadata');
-  }
-}
-
-/**
- * Generate PhpStorm Metadata file.
- *
- * @see http://confluence.jetbrains.com/display/PhpStorm/PhpStorm+Advanced+Metadata
- */
-function drush_phpstorm_metadata() {
-  $container = \Drupal::getContainer();
-
-  $reflectedClass = new ReflectionClass($container);
-
-  $map = array();
-
-  // Map for all services of the container.
-  // @see \Symfony\Component\DependencyInjection\Container::getServiceIds().
-  foreach ($reflectedClass->getMethods() as $method) {
-    if (preg_match('/^get(.+)Service$/', $method->name, $match)) {
-      $id = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($match[1], '_', '.')));
-      $service = \Drupal::service($id);
-      if (is_object($service)) {
-        $map["\\Drupal::service('')"][$id] = '\\' . get_class($service);
-      }
-    }
-  }
-
-  // Entity Manager - getStorage
-  foreach (\Drupal::entityTypeManager()->getDefinitions() as $type => $definition) {
-    $class = Drupal::entityTypeManager()->getStorage($type);
-    $map["\\Drupal::entityManager()->getStorage('')"][$type] = '\\' . get_class($class);
-    $map["\\Drupal::entityTypeManager()->getStorage('')"][$type] = '\\' . get_class($class);
-  }
-
-  $content = _drush_phpstorm_metadata_phpstorm_metadata_template($map);
-  file_put_contents(DRUPAL_ROOT . '/.phpstorm.meta.php', $content);
-}
-
-function _drush_phpstorm_metadata_phpstorm_metadata_template($data) {
-  $file = '<?php
-
-namespace PHPSTORM_META {
-
-  /** @noinspection PhpUnusedLocalVariableInspection */
-  /** @noinspection PhpIllegalArrayKeyTypeInspection */
-  $STATIC_METHOD_TYPES = [
-';
-
-  foreach ($data as $method => $map) {
-    $file .= "\n";
-    $file .= "    {$method} => [\n";
-
-    foreach ($map as $argument => $class) {
-      $file .= "      '{$argument}' instanceof {$class},\n";
-    }
-
-    $file .= "    ],";
-    $file .= "\n";
-  }
-
-  $file .= '
-    ];
-  }
-  ';
-
-  return $file;
-}