Remove useless else...return

Remove useless else...return

Update composer.json

Merge pull request #5368 from barryvdh/phpdoc-fixes

[PHPDocs] Replace 'dynamic' keyword with 'mixed' + use FQN

Remove double if

Remove double if

Merge pull request #4477 from GrahamCampbell/4.2-testing

[4.2] Testing Improvements

Merge pull request #4477 from GrahamCampbell/4.2-testing

[4.2] Testing Improvements

Merge pull request #4477 from GrahamCampbell/4.2-testing

[4.2] Testing Improvements

Merge pull request #4477 from GrahamCampbell/4.2-testing

[4.2] Testing Improvements