This PR was merged into the 2.7 branch.Discussion----------Update 'query_builder' optionThe entity used in 'FROM' clause of 'query_builder' option will always be validated against the class which you have specified in form field option 'class'. If you return another entity instead of the one used in your FROM clause, for instance SELECT an entity from a joined table, it will break validation.Closes#4331Commits-------bab634b Update 'query_builder' option

* 2.7:  [#7220] some minor tweaks  Update 'query_builder' option

* 2.8:  [#7220] some minor tweaks  Use PHP 5.5's ::class notation  [#7243] minor tweak  Deletes duplicate "Deprecated" and adds a more explicit example.  Accepted Suggestions  Update 'query_builder' option  Accepted suggestions in the guard documentation  Accepted suggestions in the guard documentation  Accepted suggestions in the guard documentation  Update guard_authentication.rst  Use PHP 5.5's ::class notation

* 3.1:  [#7220] some minor tweaks  Added "How to Use a Custom Version Strategy for Assets"  Use PHP 5.5's ::class notation  [#7243] minor tweak  Deletes duplicate "Deprecated" and adds a more explicit example.  Accepted Suggestions  Update 'query_builder' option  Accepted suggestions in the guard documentation  Accepted suggestions in the guard documentation  Accepted suggestions in the guard documentation  Update guard_authentication.rst  Use PHP 5.5's ::class notation

* 3.2: (22 commits)  add missing config formats  [#7224] fix indentation  [#7220] some minor tweaks  [#7196] add versionadded directive  Explained how to improve the readability of long numeric literals  Fix typo in workflow usage code lock  Added "How to Use a Custom Version Strategy for Assets"  Use PHP 5.5's ::class notation  Update state-machines.rst  [PHPUnitBridge] Fix copy/paste error  [PHPUnitBridge] Fix copy/paste error  [#7243] minor tweak  Deletes duplicate "Deprecated" and adds a more explicit example.  Accepted Suggestions  Update 'query_builder' option  Mentioned %env(...)% variables in Best Practices book  Accepted suggestions in the guard documentation  Accepted suggestions in the guard documentation  Accepted suggestions in the guard documentation  Update guard_authentication.rst  ...