[11.x] Simplify condition structure and add @throw to docblock for resolve method

[11.x] Simplify condition structure and add @throw to docblock for resolve method #2898