TypeError and Undefined variable due to merge conflicts

Type Error

TypeError: Argument 1 passed to _search_api_override_apply_single_override() must be an instance of [error]
SearchApiServer, instance of SearchApiIndex given, called in
/var/www/html/sites/all/modules/contrib/search_api_override/search_api_override.module on line 139 in
_search_api_override_apply_single_override() (line 160 of
/var/www/html/sites/all/modules/contrib/search_api_override/search_api_override.module).

This is because the code standards were updated, giving the function parameter the type SearchApiServer:

function _search_api_override_apply_single_override(SearchApiServer $component, array $override) {

But a different issue changed this to be either a server or an index. Passing a SearchApiIndex as a parameter throws the error shown.

Undefined Variable

In the same function mentioned above, the issue for overriding the "enabled" state added

  if (isset($override['enabled'])) {
    $server->enabled = $override['enabled'];
  }

But this needs to now be the following because the param name is now $component (because server|index are both supported).

  if (isset($override['enabled'])) {
    $component->enabled = $override['enabled'];
  }

---

A patch for the two issues is attached.