Merge branch '#ZF2-151' of github.com:robertboloc/zf2 into #ZF2-151

zendframework · Oct 9, 2012 · 2d23f30 · 2d23f30
commit 2d23f30
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/src/Adapter/Ldap.php b/src/Adapter/Ldap.php
@@ -386,7 +386,7 @@ protected function prepareOptions(ZendLdap\Ldap $ldap, array $options)
                 unset($options[$key]);
                 switch ($key) {
                     case 'groupScope':
-                        $value = (int)$value;
+                        $value = (int) $value;
                         if (in_array($value, array(ZendLdap\Ldap::SEARCH_SCOPE_BASE,
                                 ZendLdap\Ldap::SEARCH_SCOPE_ONE, ZendLdap\Ldap::SEARCH_SCOPE_SUB), true)) {
                            $adapterOptions[$key] = $value;

diff --git a/test/Adapter/Http/AuthTest.php b/test/Adapter/Http/AuthTest.php
@@ -14,7 +14,6 @@
 use Zend\Http\Headers;
 use Zend\Http\Request;
 use Zend\Http\Response;
-use Zend\Stdlib\Parameters;
 
 /**
  * @category   Zend

diff --git a/test/Adapter/Http/ProxyTest.php b/test/Adapter/Http/ProxyTest.php
@@ -14,7 +14,6 @@
 use Zend\Http\Headers;
 use Zend\Http\Request;
 use Zend\Http\Response;
-use Zend\Stdlib\Parameters;
 
 /**
  * @category   Zend