Merge "phpcs: Fix some "Assignment expression not allowed""