[Backport] Fixes in catalog component blocks [2.3-develop]

[chirag-wagento]

Original Pull Request

#15558

Description

This PR fixes a few PHPDocs and annotations typos along with wrong return type suggestions.

It also solves an issue with the method Magento\Backend\Block\Widget\Grid\Extended::addColumn() invoking with 3 parameters when only 2 are required. See line 105

Contribution checklist

• Pull request has a meaningful description of its purpose
• All commits are accompanied by meaningful commit messages
• All new or changed code is covered with unit/integration tests (if applicable)
• All automated tests passed successfully (all builds on Travis CI are green)

[chirag-wagento]

@ishakhsuvarov Could you please check what cause failed travis?

Thanks,

[chirag-wagento]

@ishakhsuvarov

Any update in this PR ?

Thanks

[ishakhsuvarov]

Hi @chirag-wagento
It's being processed at the moment.

[magento-engcom-team]

Hi @chirag-wagento. Thank you for your contribution.
Changes from your Pull Request will be available with the upcoming 2.2.6 release.

Please, consider to port this solution to 2.3 release line.
You may use Porting tool to port commits automatically.