From 122535b87b472ecf9de174828f0a8bc504abecd4 Mon Sep 17 00:00:00 2001
From: Boy Baukema <boy@ibuildings.nl>
Date: Tue, 4 Aug 2015 17:26:16 +0200
Subject: [PATCH] Fixed "ServiceProvider given, array expected during
 unsollicited single sign-on" #149

https://github.com/OpenConext/OpenConext-engineblock/issues/149
---
 library/EngineBlock/Corto/Module/Service/SingleSignOn.php | 5 +++--
 library/EngineBlock/Corto/ProxyServer.php                 | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/EngineBlock/Corto/Module/Service/SingleSignOn.php b/library/EngineBlock/Corto/Module/Service/SingleSignOn.php
index f926a3e522..18152b9075 100644
--- a/library/EngineBlock/Corto/Module/Service/SingleSignOn.php
+++ b/library/EngineBlock/Corto/Module/Service/SingleSignOn.php
@@ -2,6 +2,7 @@
 
 use \OpenConext\Component\EngineBlockFixtures\IdFrame;
 use OpenConext\Component\EngineBlockMetadata\Entity\IdentityProvider;
+use OpenConext\Component\EngineBlockMetadata\Entity\ServiceProvider;
 
 class EngineBlock_Corto_Module_Service_SingleSignOn extends EngineBlock_Corto_Module_Service_Abstract
 {
@@ -133,12 +134,12 @@ protected function _getRequest($serviceName)
 
     /**
      * @param EngineBlock_Saml2_AuthnRequestAnnotationDecorator $request
-     * @param array $remoteEntity
+     * @param ServiceProvider $remoteEntity
      * @return bool
      */
     protected function _verifyAcsLocation(
         EngineBlock_Saml2_AuthnRequestAnnotationDecorator $request,
-        array $remoteEntity
+        ServiceProvider $remoteEntity
     ) {
         /** @var SAML2_AuthnRequest $request */
         // show error when acl is given without binding or vice versa
diff --git a/library/EngineBlock/Corto/ProxyServer.php b/library/EngineBlock/Corto/ProxyServer.php
index 4c7568b550..a59353563d 100644
--- a/library/EngineBlock/Corto/ProxyServer.php
+++ b/library/EngineBlock/Corto/ProxyServer.php
@@ -587,8 +587,9 @@ public function getDefaultAssertionConsumer(ServiceProvider $serviceProvider)
      * Returns a custom ACS location from request or false when
      * none is specified
      *
-     * @param array $request
-     * @param array $serviceProvider
+     * @param EngineBlock_Saml2_AuthnRequestAnnotationDecorator $request
+     * @param ServiceProvider $serviceProvider
+     * @return null|\OpenConext\Component\EngineBlockMetadata\IndexedService
      */
     public function getCustomAssertionConsumer(
         EngineBlock_Saml2_AuthnRequestAnnotationDecorator $request,