diff --git a/src/TestSuite/Constraint/Console/ContentsContainRow.php b/src/TestSuite/Constraint/Console/ContentsContainRow.php
index 472334cbbcb..e73bb201917 100644
--- a/src/TestSuite/Constraint/Console/ContentsContainRow.php
+++ b/src/TestSuite/Constraint/Console/ContentsContainRow.php
@@ -48,6 +48,10 @@ public function toString()
         return sprintf('row was in %s', $this->output);
     }
 
+    /**
+     * @param mixed $other Expected content
+     * @return string
+     */
     public function failureDescription($other)
     {
         return $this->exporter->shortenedExport($other) . ' ' . $this->toString();
diff --git a/src/TestSuite/Constraint/Response/CookieEncryptedEquals.php b/src/TestSuite/Constraint/Response/CookieEncryptedEquals.php
index 9b855a87738..660f42b2766 100644
--- a/src/TestSuite/Constraint/Response/CookieEncryptedEquals.php
+++ b/src/TestSuite/Constraint/Response/CookieEncryptedEquals.php
@@ -80,7 +80,7 @@ public function toString()
      *
      * @return string
      */
-    public function _getCookieEncryptionKey()
+    protected function _getCookieEncryptionKey()
     {
         return $this->key;
     }
diff --git a/src/TestSuite/Constraint/Response/StatusCode.php b/src/TestSuite/Constraint/Response/StatusCode.php
index 5b9492a5c9b..624c4c38549 100644
--- a/src/TestSuite/Constraint/Response/StatusCode.php
+++ b/src/TestSuite/Constraint/Response/StatusCode.php
@@ -34,7 +34,7 @@ public function toString()
     /**
      * Failure description
      *
-     * @param mixed $other
+     * @param mixed $other Expected code
      * @return string
      */
     public function failureDescription($other)
diff --git a/src/TestSuite/IntegrationTestTrait.php b/src/TestSuite/IntegrationTestTrait.php
index f847c6786c6..3a1b638adfb 100644
--- a/src/TestSuite/IntegrationTestTrait.php
+++ b/src/TestSuite/IntegrationTestTrait.php
@@ -28,13 +28,13 @@
 use Cake\TestSuite\Constraint\Response\BodyRegExp;
 use Cake\TestSuite\Constraint\Response\ContentType;
 use Cake\TestSuite\Constraint\Response\CookieEncryptedEquals;
+use Cake\TestSuite\Constraint\Response\CookieEquals;
 use Cake\TestSuite\Constraint\Response\CookieNotSet;
 use Cake\TestSuite\Constraint\Response\CookieSet;
-use Cake\TestSuite\Constraint\Response\CookieEquals;
 use Cake\TestSuite\Constraint\Response\FileSent;
 use Cake\TestSuite\Constraint\Response\FileSentAs;
-use Cake\TestSuite\Constraint\Response\HeaderEquals;
 use Cake\TestSuite\Constraint\Response\HeaderContains;
+use Cake\TestSuite\Constraint\Response\HeaderEquals;
 use Cake\TestSuite\Constraint\Response\HeaderNotSet;
 use Cake\TestSuite\Constraint\Response\HeaderSet;
 use Cake\TestSuite\Constraint\Response\StatusCode;
@@ -43,8 +43,8 @@
 use Cake\TestSuite\Constraint\Response\StatusOk;
 use Cake\TestSuite\Constraint\Response\StatusSuccess;
 use Cake\TestSuite\Constraint\Session\SessionEquals;
-use Cake\TestSuite\Constraint\View\TemplateFileEquals;
 use Cake\TestSuite\Constraint\View\LayoutFileEquals;
+use Cake\TestSuite\Constraint\View\TemplateFileEquals;
 use Cake\TestSuite\Stub\TestExceptionRenderer;
 use Cake\Utility\CookieCryptTrait;
 use Cake\Utility\Hash;