diff --git a/src/Database/Expression/BetweenExpression.php b/src/Database/Expression/BetweenExpression.php
index c454712ad01..9bc3d59a5d6 100644
--- a/src/Database/Expression/BetweenExpression.php
+++ b/src/Database/Expression/BetweenExpression.php
@@ -26,8 +26,8 @@
 class BetweenExpression implements ExpressionInterface, FieldInterface
 {
 
-    use FieldTrait;
     use ExpressionTypeCasterTrait;
+    use FieldTrait;
 
     /**
      * The first value in the expression
diff --git a/src/Database/Expression/Comparison.php b/src/Database/Expression/Comparison.php
index 0ae4bb4d0ac..4809dddccbb 100644
--- a/src/Database/Expression/Comparison.php
+++ b/src/Database/Expression/Comparison.php
@@ -29,8 +29,8 @@
 class Comparison implements ExpressionInterface, FieldInterface
 {
 
-    use FieldTrait;
     use ExpressionTypeCasterTrait;
+    use FieldTrait;
 
     /**
      * The value to be used in the right hand side of the operation
@@ -283,7 +283,7 @@ protected function _flattenValue($value, $generator, $type = 'string')
      * and all ExpressionInterface objects that could be found in the second
      * position.
      *
-     * @param array|Traversable $values
+     * @param array|Traversable $values The rows to insert
      * @return array
      */
     protected function _collectExpressions($values)
diff --git a/src/Database/Expression/FunctionExpression.php b/src/Database/Expression/FunctionExpression.php
index 0dbaffef58b..b18981b603e 100644
--- a/src/Database/Expression/FunctionExpression.php
+++ b/src/Database/Expression/FunctionExpression.php
@@ -31,8 +31,8 @@
 class FunctionExpression extends QueryExpression implements TypedResultInterface
 {
 
-    use TypedResultTrait;
     use ExpressionTypeCasterTrait;
+    use TypedResultTrait;
 
     /**
      * The name of the function to be constructed when generating the SQL string
diff --git a/src/Database/Expression/ValuesExpression.php b/src/Database/Expression/ValuesExpression.php
index 0c5cc28c914..5ddccf28fb5 100644
--- a/src/Database/Expression/ValuesExpression.php
+++ b/src/Database/Expression/ValuesExpression.php
@@ -32,8 +32,8 @@
 class ValuesExpression implements ExpressionInterface
 {
 
-    use TypeMapTrait;
     use ExpressionTypeCasterTrait;
+    use TypeMapTrait;
 
     /**
      * Array of values to insert.
diff --git a/src/Database/Type/ExpressionTypeCasterTrait.php b/src/Database/Type/ExpressionTypeCasterTrait.php
index 3d2acdbbb89..762560c5c90 100644
--- a/src/Database/Type/ExpressionTypeCasterTrait.php
+++ b/src/Database/Type/ExpressionTypeCasterTrait.php
@@ -66,7 +66,7 @@ protected function _castToExpression($value, $type)
      */
     protected function _requiresToExpressionCasting($types)
     {
-        $result  = [];
+        $result = [];
         $types = array_filter($types);
         foreach ($types as $k => $type) {
             $object = Type::build($type);
diff --git a/tests/Fixture/OrderedUuidItemsFixture.php b/tests/Fixture/OrderedUuidItemsFixture.php
index d76138eb628..4c6c1b13472 100644
--- a/tests/Fixture/OrderedUuidItemsFixture.php
+++ b/tests/Fixture/OrderedUuidItemsFixture.php
@@ -43,4 +43,3 @@ class OrderedUuidItemsFixture extends TestFixture
     public $records = [
     ];
 }
-
diff --git a/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php b/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php
index ba89d332e7a..5d047c8b194 100644
--- a/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php
+++ b/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php
@@ -43,7 +43,7 @@ public function toPHP($value, Driver $d)
     public function toExpression($value)
     {
         $substr = function ($start, $lenght = null) use ($value) {
-            return  new FunctionExpression(
+            return new FunctionExpression(
                 'SUBSTR',
                 $lenght === null ? [$value, $start] : [$value, $start, $lenght],
                 ['string', 'integer', 'integer']
@@ -194,7 +194,7 @@ public function testSelectWithFunction()
             ->select('id')
             ->from('ordered_uuid_items')
             ->where(function ($exp, $q) {
-               return $exp->eq(
+                return $exp->eq(
                     'id',
                     $q->func()->concat(['48298a29-81c0-4c26-a7fb', '-413140cf8569'], []),
                     'ordered_uuid'
diff --git a/tests/TestCase/Database/ExpressionTypeCastingTest.php b/tests/TestCase/Database/ExpressionTypeCastingTest.php
index 9c1ed9c198c..24687365a35 100644
--- a/tests/TestCase/Database/ExpressionTypeCastingTest.php
+++ b/tests/TestCase/Database/ExpressionTypeCastingTest.php
@@ -13,16 +13,16 @@
  */
 namespace Cake\Test\TestCase\Database;
 
-use Cake\TestSuite\TestCase;
-use Cake\Database\Type\StringType;
-use Cake\Database\Type\ExpressionTypeInterface;
-use Cake\Database\Expression\FunctionExpression;
-use Cake\Database\ValueBinder;
-use Cake\Database\Type;
-use Cake\Database\Expression\Comparison;
 use Cake\Database\Expression\BetweenExpression;
 use Cake\Database\Expression\CaseExpression;
+use Cake\Database\Expression\Comparison;
+use Cake\Database\Expression\FunctionExpression;
 use Cake\Database\Expression\ValuesExpression;
+use Cake\Database\Type;
+use Cake\Database\Type\ExpressionTypeInterface;
+use Cake\Database\Type\StringType;
+use Cake\Database\ValueBinder;
+use Cake\TestSuite\TestCase;
 
 class TestType extends StringType implements ExpressionTypeInterface
 {
@@ -128,7 +128,7 @@ public function testCaseExpression()
         $case = new CaseExpression(
             [new Comparison('foo', '1', 'string', '=')],
             ['value1', 'value2'],
-            ['test' , 'test']
+            ['test', 'test']
         );
 
         $binder = new ValueBinder;