Fix abort() method.

src/Console/ConsoleIo.php

@@ -262,7 +262,7 @@ class ConsoleIo
     {
         $this->error($message);
 
-        throw new StopException($code);
+        throw new StopException($message, $code);
     }
 
     /**

tests/TestCase/Console/ConsoleIoTest.php

@@ -15,6 +15,7 @@
 namespace Cake\Test\TestCase\Console;
 
 use Cake\Console\ConsoleIo;
+use Cake\Console\Exception\StopException;
 use Cake\Filesystem\Folder;
 use Cake\Log\Log;
 use Cake\TestSuite\TestCase;
@@ -30,6 +31,21 @@ class ConsoleIoTest extends TestCase
     protected $io;
 
     /**
+     * @var \Cake\Console\ConsoleOutput|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $out;
+
+    /**
+     * @var \Cake\Console\ConsoleOutput|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $err;
+
+    /**
+     * @var \Cake\Console\ConsoleInput|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $in;
+
+    /**
      * setUp method
      *
      * @return void
@@ -279,8 +295,6 @@ class ConsoleIoTest extends TestCase
     /**
      * Tests abort() wrapper.
      *
-     * @expectedException \Cake\Console\Exception\StopException
-     * @expectedExceptionMessage 1
      * @return void
      */
     public function testAbort()
@@ -289,14 +303,16 @@ class ConsoleIoTest extends TestCase
             ->method('write')
             ->with('<error>Some error</error>', 1);
 
+        $this->expectException(StopException::class);
+        $this->expectExceptionCode(1);
+        $this->expectExceptionMessage('Some error');
+
         $this->io->abort('Some error');
     }
 
     /**
      * Tests abort() wrapper.
      *
-     * @expectedException \Cake\Console\Exception\StopException
-     * @expectedExceptionMessage 99
      * @return void
      */
     public function testAbortCustomCode()
@@ -305,6 +321,10 @@ class ConsoleIoTest extends TestCase
             ->method('write')
             ->with('<error>Some error</error>', 1);
 
+        $this->expectException(StopException::class);
+        $this->expectExceptionCode(99);
+        $this->expectExceptionMessage('Some error');
+
         $this->io->abort('Some error', 99);
     }