[#226] Update getServiceType() to reflect changes to service names

Originally, this looked for just namespaced segments (`Rest` and `Rpc`).
However, with the changes made for 1.0.4 to remove encoded slashes from
service names, this breaks link injection, as it could not identify a
REST service by the namespace, and thus always identified services as
RPC. The change introduced will now also detect when the service name
contains dash-separated namespaces (`-Rest-`).

Module.php

@@ -8,7 +8,6 @@
 
 use Zend\Http\Header\GenericHeader;
 use Zend\Http\Header\GenericMultiHeader;
-use Zend\ModuleManager\ModuleManagerInterface;
 use Zend\Mvc\MvcEvent;
 use Zend\Mvc\Router\RouteMatch;
 use ZF\Configuration\ConfigResource;
@@ -35,21 +34,6 @@ class Module
      */
     protected $sm;
 
-    /**
-     * Ensure the UI module is loaded
-     *
-     * @param ModuleManagerInterface $modules
-     */
-    public function init(ModuleManagerInterface $modules)
-    {
-        $loaded = $modules->getLoadedModules();
-        if (isset($loaded['ZF\Apigility\Admin\Ui'])) {
-            return;
-        }
-
-        $modules->loadModule('ZF\Apigility\Admin\Ui');
-    }
-
     public function onBootstrap(MvcEvent $e)
     {
         $app      = $e->getApplication();
@@ -752,7 +736,9 @@ protected function injectLinksForServicesByType($type, $services, LinkCollection
 
     protected function getServiceType($service)
     {
-        if (strstr($service, '\\Rest\\')) {
+        if (strstr($service, '\\Rest\\')
+            || strstr($service, '-Rest-')
+        ) {
             return 'rest';
         }
         return 'rpc';