Merge branch 'master' into feature/view-layer

zendframework · Feb 9, 2012 · ab1e81e · ab1e81e
commit ab1e81e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/src/Attribute.php b/src/Attribute.php
@@ -351,7 +351,7 @@ public static function setDateTimeAttribute(array &$data, $attribName, $value, $
                     $convertedValues[] = $v;
                 }
             }
-        } elseif (!is_null($value)) {
+        } elseif ($value !== null) {
             $value = self::_valueToLdapDateTime($value, $utc);
             if ($value !== null) {
                 $convertedValues[] = $value;

diff --git a/src/Ldap.php b/src/Ldap.php
@@ -30,7 +30,7 @@
  * @uses       \Zend\Ldap\Exception
  * @uses       \Zend\Ldap\Filter\AbstractFilter
  * @uses       \Zend\Ldap\Node
- * @uses       \Zend\Ldap\Node\RootDSE
+ * @uses       \Zend\Ldap\Node\RootDse
  * @uses       \Zend\Ldap\Node\Schema
  * @category   Zend
  * @package    Zend_Ldap
@@ -79,7 +79,7 @@ class Ldap
     protected $_boundUser = false;
 
     /**
-     * Caches the RootDSE
+     * Caches the RootDse
      *
      * @var \Zend\Ldap\Node
      */
@@ -1416,15 +1416,15 @@ public function getBaseNode()
     }
 
     /**
-     * Returns the RootDSE
+     * Returns the RootDse
      *
-     * @return \Zend\Ldap\Node\RootDSE
+     * @return \Zend\Ldap\Node\RootDse
      * @throws \Zend\Ldap\Exception
      */
     public function getRootDse()
     {
         if ($this->_rootDse === null) {
-            $this->_rootDse = Node\RootDSE::create($this);
+            $this->_rootDse = Node\RootDse::create($this);
         }
         return $this->_rootDse;
     }

diff --git a/src/Node/RootDse.php b/src/Node/RootDse.php
@@ -26,7 +26,7 @@
 use Zend\Ldap;
 
 /**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node.
+ * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDse node.
  *
  * @uses       \Zend\Ldap\Dn
  * @uses       \Zend\Ldap\Node\AbstractNode
@@ -47,7 +47,7 @@ class RootDse extends AbstractNode
     const SERVER_TYPE_EDIRECTORY      = 4;
 
     /**
-     * Factory method to create the RootDSE.
+     * Factory method to create the RootDse.
      *
      * @param  \Zend\Ldap\Ldap $ldap
      * @return \Zend\Ldap\Node\RootDse

diff --git a/src/Node/RootDse/ActiveDirectory.php b/src/Node/RootDse/ActiveDirectory.php
@@ -27,7 +27,7 @@
 use Zend\Ldap\Node\RootDse;
 
 /**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of
+ * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDse node of
  * an Active Directory server.
  *
  * @uses       \Zend\Ldap\Dn

diff --git a/src/Node/RootDse/OpenLdap.php b/src/Node/RootDse/OpenLdap.php
@@ -27,7 +27,7 @@
 use Zend\Ldap\Node\RootDse;
 
 /**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of
+ * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDse node of
  * an OpenLDAP server.
  *
  * @uses       \Zend\Ldap\Node\RootDse

diff --git a/src/Node/RootDse/eDirectory.php b/src/Node/RootDse/eDirectory.php
@@ -27,7 +27,7 @@
 use Zend\Ldap\Node\RootDse;
 
 /**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of
+ * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDse node of
  * a Novell eDirectory server.
  *
  * @uses       \Zend\Ldap\Node\RootDse

diff --git a/src/Node/Schema.php b/src/Node/Schema.php
@@ -25,14 +25,14 @@
 namespace Zend\Ldap\Node;
 
 use Zend\Ldap;
-use Zend\Ldap\Node\RootDSE;
+use Zend\Ldap\Node\RootDse;
 
 /**
  * Zend_Ldap_Node_Schema provides a simple data-container for the Schema node.
  *
  * @uses       \Zend\Ldap\Node\AbstractNode
- * @uses       \Zend\Ldap\Node\RootDSE\RootDSE
- * @uses       \Zend\Ldap\Node\RootDSE\ActiveDirectory
+ * @uses       \Zend\Ldap\Node\RootDse\RootDse
+ * @uses       \Zend\Ldap\Node\RootDse\ActiveDirectory
  * @uses       \Zend\Ldap\Node\Schema\ActiveDirectory
  * @category   Zend
  * @package    Zend_Ldap
@@ -59,11 +59,11 @@ public static function create(Ldap\Ldap $ldap)
         $dn = $ldap->getRootDse()->getSchemaDn();
         $data = $ldap->getEntry($dn, array('*', '+'), true);
         switch ($ldap->getRootDse()->getServerType()) {
-            case RootDSE::SERVER_TYPE_ACTIVEDIRECTORY:
+            case RootDse::SERVER_TYPE_ACTIVEDIRECTORY:
                 return new Schema\ActiveDirectory($dn, $data, $ldap);
-            case RootDSE::SERVER_TYPE_OPENLDAP:
+            case RootDse::SERVER_TYPE_OPENLDAP:
                 return new Schema\OpenLdap($dn, $data, $ldap);
-            case RootDSE::SERVER_TYPE_EDIRECTORY:
+            case RootDse::SERVER_TYPE_EDIRECTORY:
             default:
                 return new self($dn, $data, $ldap);
         }