Update 3 commands to use new StdinAwareInterface. (#3865)

weitzman · web-flow · commit 5e00d4609590 · 2019-01-17T14:15:49.000-05:00
Update 3 commands to use new StdinAwareInterface.
diff --git a/src/Commands/core/PhpCommands.php b/src/Commands/core/PhpCommands.php
@@ -1,11 +1,14 @@
 <?php
 namespace Drush\Commands\core;
 
+use Consolidation\AnnotatedCommand\Input\StdinAwareInterface;
+use Consolidation\AnnotatedCommand\Input\StdinAwareTrait;
 use Drush\Commands\DrushCommands;
 use Symfony\Component\Finder\Finder;
 
-class PhpCommands extends DrushCommands
+class PhpCommands extends DrushCommands implements StdinAwareInterface
 {
+    use StdinAwareTrait;
 
     /**
      * Evaluate arbitrary php code after bootstrapping Drupal (if available).
@@ -57,7 +60,7 @@ public function script(array $extra, $options = ['format' => 'var_export', 'scri
         $script = array_shift($extra);
 
         if ($script == '-') {
-            return eval(stream_get_contents(STDIN));
+            return eval($this->stdin()->contents());
         } elseif (file_exists($script)) {
             $found = $script;
         } else {
diff --git a/src/Drupal/Commands/config/ConfigCommands.php b/src/Drupal/Commands/config/ConfigCommands.php
@@ -3,6 +3,8 @@
 
 use Consolidation\AnnotatedCommand\CommandError;
 use Consolidation\AnnotatedCommand\CommandData;
+use Consolidation\AnnotatedCommand\Input\StdinAwareInterface;
+use Consolidation\AnnotatedCommand\Input\StdinAwareTrait;
 use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
 use Consolidation\SiteProcess\Util\Escape;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -20,8 +22,9 @@
 use Symfony\Component\Yaml\Parser;
 use Webmozart\PathUtil\Path;
 
-class ConfigCommands extends DrushCommands
+class ConfigCommands extends DrushCommands implements StdinAwareInterface
 {
+    use StdinAwareTrait;
     use ExecTrait;
 
     /**
@@ -84,7 +87,6 @@ public function get($config_name, $key = '', $options = ['format' => 'yaml', 'so
      * @param $key The config key, for example "page.front".
      * @param $value The value to assign to the config key. Use '-' to read from STDIN.
      * @option input-format Format to parse the object. Use "string" for string (default), and "yaml" for YAML.
-     * // A convenient way to pass a multiline value within a backend request.
      * @option value The value to assign to the config key (if any).
      * @hidden-options value
      * @usage drush config:set system.site page.front node
@@ -106,7 +108,7 @@ public function set($config_name, $key, $value = null, $options = ['input-format
 
         // Special flag indicating that the value has been passed via STDIN.
         if ($data === '-') {
-            $data = stream_get_contents(STDIN);
+            $data = $this->stdin()->contents();
         }
 
         // Now, we parse the value.
diff --git a/src/Drupal/Commands/core/StateCommands.php b/src/Drupal/Commands/core/StateCommands.php
@@ -2,13 +2,16 @@
 
 namespace Drush\Drupal\Commands\core;
 
+use Consolidation\AnnotatedCommand\Input\StdinAwareInterface;
+use Consolidation\AnnotatedCommand\Input\StdinAwareTrait;
 use Consolidation\OutputFormatters\StructuredData\PropertyList;
 use Drupal\Core\State\StateInterface;
 use Drush\Commands\DrushCommands;
 use Symfony\Component\Yaml\Yaml;
 
-class StateCommands extends DrushCommands
+class StateCommands extends DrushCommands implements StdinAwareInterface
 {
+    use StdinAwareTrait;
 
     protected $state;
 
@@ -74,7 +77,7 @@ public function set($key, $value, $options = ['input-format' => 'auto', 'value'
 
         // Special flag indicating that the value has been passed via STDIN.
         if ($value === '-') {
-            $value = stream_get_contents(STDIN);
+            $value = $this->stdin()->contents();
         }
 
         // If the value is a string (usual case, unless we are called from code),
