cvs: pear /XML_Query2XML/tests/XML_Query2XML/LDAP ldap_init.php skipif.php /XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery regularOperation.phpt /XML_Query2XML/tests/XML_Query2XML/LDAP/getXML throwLDAPException_queryError.phpt

[email protected] ("Lukas Feiler")
Newsgroups php.pear.cvs
Message-ID <cvslukasfeiler1208562773@cvsserver> 
lukasfeiler		Fri Apr 18 23:52:53 2008 UTC

  Modified files:              
    /pear/XML_Query2XML/tests/XML_Query2XML/LDAP	ldap_init.php 
                                                	skipif.php 
    /pear/XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery	
                                                                                          	regularOperation.phpt 
    /pear/XML_Query2XML/tests/XML_Query2XML/LDAP/getXML	
                                                       	throwLDAPException_queryError.phpt 
  Log:
  the environment variable PHP_PEAR_XML_QUERY2XML_TEST_LDAPLAYER can be use to run these tests with Net_LDAP2 instead of Net_LDAP
  
http://cvs.php.net/viewvc.cgi/pear/XML_Query2XML/tests/XML_Query2XML/LDAP/ldap_init.php?r1=1.1&r2=1.2&diff_format=u
Index: pear/XML_Query2XML/tests/XML_Query2XML/LDAP/ldap_init.php
diff -u pear/XML_Query2XML/tests/XML_Query2XML/LDAP/ldap_init.php:1.1 pear/XML_Query2XML/tests/XML_Query2XML/LDAP/ldap_init.php:1.2
--- pear/XML_Query2XML/tests/XML_Query2XML/LDAP/ldap_init.php:1.1	Sun Nov 25 02:34:35 2007
+++ pear/XML_Query2XML/tests/XML_Query2XML/LDAP/ldap_init.php	Fri Apr 18 23:52:52 2008
@@ -9,12 +9,41 @@
  * @author    Lukas Feiler <[email protected]>
  * @copyright 2007 Lukas Feiler
  * @license   http://www.gnu.org/copyleft/lesser.html  LGPL Version 2.1
- * @version   CVS: $Id: ldap_init.php,v 1.1 2007/11/25 02:34:35 lukasfeiler Exp $
+ * @version   CVS: $Id: ldap_init.php,v 1.2 2008/04/18 23:52:52 lukasfeiler Exp $
  * @link      http://pear.php.net/package/XML_Query2XML
  * @access    private
  */
 
 require_once dirname(dirname(__FILE__)) . '/settings.php';
-require_once 'Net/LDAP.php';
-$ldap = Net_LDAP::connect($ldapConfig);
+if (!defined('LDAP_LAYER')) {
+    if (getenv('PHP_PEAR_XML_QUERY2XML_TEST_LDAPLAYER') != '') {
+        define('LDAP_LAYER', getenv('PHP_PEAR_XML_QUERY2XML_TEST_LDAPLAYER'));
+    } else {
+        if (@include_once 'Net/LDAP2.php') {
+            define('LDAP_LAYER', 'LDAP2');
+        } else {
+            define('LDAP_LAYER', 'LDAP');
+        }
+    }
+}
+
+if (LDAP_LAYER == 'LDAP2') {
+    require_once 'Net/LDAP2.php';
+    $ldap = Net_LDAP2::connect($ldapConfig);
+} else {
+    require_once 'Net/LDAP.php';
+    $ldap = Net_LDAP::connect($ldapConfig);
+}
+
+class XML_Query2XML_TESTS_LDAP_Helper
+{
+    public function LDAP_Filter_factory($ldap, $attr_name, $match, $value = '', $escape = true)
+    {
+        if ($ldap instanceof Net_LDAP2) {
+            return Net_LDAP2_Filter::create($attr_name, $match, $value, $escape);
+        } else {
+            return Net_LDAP_Filter::create($attr_name, $match, $value, $escape);
+        }
+    }
+}
 ?>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/pear/XML_Query2XML/tests/XML_Query2XML/LDAP/skipif.php?r1=1.1&r2=1.2&diff_format=u
Index: pear/XML_Query2XML/tests/XML_Query2XML/LDAP/skipif.php
diff -u pear/XML_Query2XML/tests/XML_Query2XML/LDAP/skipif.php:1.1 pear/XML_Query2XML/tests/XML_Query2XML/LDAP/skipif.php:1.2
--- pear/XML_Query2XML/tests/XML_Query2XML/LDAP/skipif.php:1.1	Sun Nov 25 02:34:35 2007
+++ pear/XML_Query2XML/tests/XML_Query2XML/LDAP/skipif.php	Fri Apr 18 23:52:52 2008
@@ -10,20 +10,47 @@
  * @author    Lukas Feiler <[email protected]>
  * @copyright 2007 Lukas Feiler
  * @license   http://www.gnu.org/copyleft/lesser.html  LGPL Version 2.1
- * @version   CVS: $Id: skipif.php,v 1.1 2007/11/25 02:34:35 lukasfeiler Exp $
+ * @version   CVS: $Id: skipif.php,v 1.2 2008/04/18 23:52:52 lukasfeiler Exp $
  * @link      http://pear.php.net/package/XML_Query2XML
  * @access    private
  */
 
-if (!@include_once 'Net/LDAP.php') {
-    print 'skip could not find Net/LDAP.php';
-    exit;
+if (!defined('LDAP_LAYER')) {
+    if (getenv('PHP_PEAR_XML_QUERY2XML_TEST_LDAPLAYER') != '') {
+        define('LDAP_LAYER', getenv('PHP_PEAR_XML_QUERY2XML_TEST_LDAPLAYER'));
+    } else {
+        if (@include_once 'Net/LDAP2.php') {
+            define('LDAP_LAYER', 'LDAP2');
+        } else {
+            define('LDAP_LAYER', 'LDAP');
+        }
+    }
+}
+
+
+if (LDAP_LAYER == 'LDAP2') {
+    if (!@include_once 'Net/LDAP2.php') {
+        print 'skip could not find Net/LDAP2.php';
+        exit;
+    } else {
+        include_once dirname(dirname(__FILE__)) . '/settings.php';
+        $ldap = Net_LDAP2::connect($ldapConfig);
+        if (PEAR::isError($ldap)) {
+            print 'skip could not connect to LDAP directory';
+            exit;
+        }
+    }
 } else {
-    include_once dirname(dirname(__FILE__)) . '/settings.php';
-    $ldap = Net_LDAP::connect($ldapConfig);
-    if (PEAR::isError($ldap)) {
-        print 'skip could not connect to LDAP directory';
+    if (!@include_once 'Net/LDAP.php') {
+        print 'skip could not find Net/LDAP.php';
         exit;
+    } else {
+        include_once dirname(dirname(__FILE__)) . '/settings.php';
+        $ldap = Net_LDAP::connect($ldapConfig);
+        if (PEAR::isError($ldap)) {
+            print 'skip could not connect to LDAP directory';
+            exit;
+        }
     }
 }
 ?>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/pear/XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery/regularOperation.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pear/XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery/regularOperation.phpt
diff -u pear/XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery/regularOperation.phpt:1.1 pear/XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery/regularOperation.phpt:1.2
--- pear/XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery/regularOperation.phpt:1.1	Sun Nov 25 02:36:17 2007
+++ pear/XML_Query2XML/tests/XML_Query2XML/LDAP/XML_Query2XML_Driver_LDAP-preprocessQuery/regularOperation.phpt	Fri Apr 18 23:52:52 2008
@@ -22,7 +22,7 @@
 $query2 = array(
     'data' => ':inetOrgPerson',
     'base' => 'ou=people,dc=example,dc=com',
-    'filter' => Net_LDAP_Filter::create('objectclass', 'equals', 'inetOrgPerson'),
+    'filter' => XML_Query2XML_TESTS_LDAP_Helper::LDAP_Filter_factory($ldap, 'objectclass', 'equals', 'inetOrgPerson'),
     'options' => array(
         'attributes' => array(
             'cn',
@@ -32,7 +32,7 @@
 );
 
 $query3 = array(
-    'filter' => Net_LDAP_Filter::create('objectclass', 'equals', 'inetOrgPerson'),
+    'filter' => XML_Query2XML_TESTS_LDAP_Helper::LDAP_Filter_factory($ldap, 'objectclass', 'equals', 'inetOrgPerson'),
     'options' => array(
         'attributes' => array(
             'cn',
http://cvs.php.net/viewvc.cgi/pear/XML_Query2XML/tests/XML_Query2XML/LDAP/getXML/throwLDAPException_queryError.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pear/XML_Query2XML/tests/XML_Query2XML/LDAP/getXML/throwLDAPException_queryError.phpt
diff -u pear/XML_Query2XML/tests/XML_Query2XML/LDAP/getXML/throwLDAPException_queryError.phpt:1.1 pear/XML_Query2XML/tests/XML_Query2XML/LDAP/getXML/throwLDAPException_queryError.phpt:1.2
--- pear/XML_Query2XML/tests/XML_Query2XML/LDAP/getXML/throwLDAPException_queryError.phpt:1.1	Wed Jan  2 15:54:32 2008
+++ pear/XML_Query2XML/tests/XML_Query2XML/LDAP/getXML/throwLDAPException_queryError.phpt	Fri Apr 18 23:52:52 2008
@@ -28,7 +28,7 @@
         $dom->formatOutput = true;
         print $dom->saveXML();
     } catch (XML_Query2XML_LDAPException $e) {
-        echo get_class($e) . ': ' . $e->getMessage();
+        echo get_class($e) . ': ' . str_replace('net_ldap2_error', 'net_ldap_error', $e->getMessage());
     }
 ?>
 --EXPECT--
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.