Merge branch '2.3'

Conflicts:
	Controller/CRUDController.php
	Resources/doc/reference/dashboard.rst

Controller/CRUDController.php

@@ -761,7 +761,7 @@ class CRUDController extends Controller
     {
         $request = $this->resolveRequest($request);
 
-        return ($request->get('btn_preview') !== null);
+        return $request->get('btn_preview') !== null;
     }
 
     /**
@@ -775,7 +775,7 @@ class CRUDController extends Controller
     {
         $request = $this->resolveRequest($request);
 
-        return ($request->get('btn_preview_approve') !== null);
+        return $request->get('btn_preview_approve') !== null;
     }
 
     /**
@@ -809,7 +809,7 @@ class CRUDController extends Controller
     {
         $request = $this->resolveRequest($request);
 
-        return ($request->get('btn_preview_decline') !== null);
+        return $request->get('btn_preview_decline') !== null;
     }
 
     /**

Form/Type/AdminType.php

@@ -117,7 +117,7 @@ class AdminType extends AbstractType
     {
         $resolver->setDefaults(array(
             'delete'          => function (Options $options) {
-                return ($options['btn_delete'] !== false);
+                return $options['btn_delete'] !== false;
             },
             'delete_options'  => array(
                 'type'         => 'checkbox',

Tests/Admin/BaseFieldDescriptionTest.php

@@ -125,7 +125,7 @@ class BaseFieldDescriptionTest extends \PHPUnit_Framework_TestCase
          * Test with Two parameters int
          */
         $arg2 = 4;
-        $twoParameters = array($arg1,$arg2);
+        $twoParameters = array($arg1, $arg2);
         $description2 = new FieldDescription();
         $description2->setOption('code', 'getWithTwoParameters');
         $description2->setOption('parameters', $twoParameters);

Tests/Controller/CRUDControllerTest.php

@@ -1980,7 +1980,7 @@ class CRUDControllerTest extends \PHPUnit_Framework_TestCase
                     return true;
                 }
 
-                return ($objectIn === $object);
+                return $objectIn === $object;
             }));
 
         $this->admin->expects($this->once())
@@ -2232,7 +2232,7 @@ class CRUDControllerTest extends \PHPUnit_Framework_TestCase
                     return true;
                 }
 
-                return ($objectIn === $object);
+                return $objectIn === $object;
             }));
 
         $this->admin->expects($this->once())