fixed return issue with php versions
Merge branch 'develop'