Avoid using global functions.

Signed-off-by: crynobone <crynobone@gmail.com>
Improve testcase.

Signed-off-by: crynobone <crynobone@gmail.com>
Additional testcase improvement.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	tests/Form/FactoryTest.php
	tests/Form/FormBuilderTest.php
	tests/Table/FactoryTest.php
	tests/Table/GridTest.php
	tests/Table/TableBuilderTest.php