Merge "Fix and improve PHPDoc type hints in FileBackend and FileRepo"