Clean up NullWriter references

Author: mattstauffer

cli/includes/helpers.php

@@ -32,8 +32,8 @@
 /**
  * Set or get a global console writer.
  *
- * @param  null|Symfony\Component\Console\Output\ConsoleOutputInterface  $writer
- * @return Symfony\Component\Console\Output\ConsoleOutputInterface
+ * @param  null|OutputInterface  $writer
+ * @return OutputInterface|\NullWriter|null
  */
 function writer($writer = null)
 {
@@ -47,9 +47,11 @@ function writer($writer = null)
         return $container->make('writer');
     }
 
-    return Container::getInstance()->instance('writer', $writer);
+    $container->instance('writer', $writer);
+    return null;
 }
 
+
 /**
  * Output the given text to the console.
  *

tests/UsesNullWriter.php

@@ -6,12 +6,14 @@ trait UsesNullWriter
 {
     public function setNullWriter()
     {
-        Container::getInstance()->instance('writer', new class
-        {
-            public function writeLn($msg)
-            {
-                // do nothing
-            }
-        });
+        Container::getInstance()->instance('writer', new NullWriter);
+    }
+}
+
+class NullWriter
+{
+    public function writeLn($msg)
+    {
+        // do nothing
     }
 }