Merge branch 'master' of git://github.com/zendframework/zf2

src/Converter/Converter.php

@@ -22,7 +22,6 @@
 
 use DateTime;
 use DateTimeZone;
-use Zend\Date\Date;
 
 /**
  * Zend\Ldap\Converter is a collection of useful LDAP related conversion functions.
@@ -114,8 +113,6 @@ public static function toLdap($value, $type = self::STANDARD)
                     } else if (is_object($value)) {
                         if ($value instanceof DateTime) {
                             return self::toLdapDatetime($value);
-                        } else if ($value instanceof Date) {
-                            return self::toLdapDatetime($value);
                         } else {
                             return self::toLdapSerialize($value);
                         }
@@ -137,11 +134,10 @@ public static function toLdap($value, $type = self::STANDARD)
      * Converts a date-entity to an LDAP-compatible date-string
      *
      * The date-entity <var>$date</var> can be either a timestamp, a
-     * DateTime Object, a string that is parseable by strtotime() or a Zend\Date\Date
-     * Object.
+     * DateTime Object, a string that is parseable by strtotime().
      *
-     * @param integer|string|DateTime|Date $date  The date-entity
-     * @param boolean                      $asUtc Whether to return the LDAP-compatible date-string as UTC or as local value
+     * @param integer|string|DateTime $date  The date-entity
+     * @param boolean                 $asUtc Whether to return the LDAP-compatible date-string as UTC or as local value
      * @return string
      * @throws Exception\InvalidArgumentException
      */
@@ -153,8 +149,6 @@ public static function toLdapDateTime($date, $asUtc = true)
                 $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
             } else if (is_string($date)) {
                 $date = new DateTime($date);
-            } else if ($date instanceof Date) {
-                $date = new DateTime($date->get(Date::ISO_8601));
             } else {
                 throw new Exception\InvalidArgumentException('Parameter $date is not of the expected type');
             }

src/Filter/LogicalFilter.php → src/Filter/AbstractLogicalFilter.php

@@ -24,15 +24,15 @@
 use Zend\Ldap\Filter\Exception;
 
 /**
- * Zend\Ldap\Filter\LogicalFilter provides a base implementation for a grouping filter.
+ * Zend\Ldap\Filter\AbstractLogicalFilter provides a base implementation for a grouping filter.
  *
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage Filter
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class LogicalFilter extends AbstractFilter
+abstract class AbstractLogicalFilter extends AbstractFilter
 {
     const TYPE_AND = '&';
     const TYPE_OR  = '|';
@@ -75,7 +75,7 @@ protected function __construct(array $subfilters, $symbol)
      * Adds a filter to this grouping filter.
      *
      * @param  AbstractFilter $filter
-     * @return LogicalFilter
+     * @return AbstractLogicalFilter
      */
     public function addFilter(AbstractFilter $filter)
     {

src/Filter/AndFilter.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class AndFilter extends LogicalFilter
+class AndFilter extends AbstractLogicalFilter
 {
     /**
      * Creates an 'and' grouping filter.

src/Filter/OrFilter.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class OrFilter extends LogicalFilter
+class OrFilter extends AbstractLogicalFilter
 {
     /**
      * Creates an 'or' grouping filter.

src/Ldap.php

@@ -21,7 +21,6 @@
 namespace Zend\Ldap;
 
 use Traversable;
-use Zend\Stdlib\ArrayUtils;
 
 /**
  * @category   Zend
@@ -216,7 +215,7 @@ public function getBoundUser()
      *  accountFilterFormat
      *  allowEmptyPassword
      *  useStartTls
-     *  optRefferals
+     *  optReferrals
      *  tryUsernameSplit
      *  networkTimeout
      *
@@ -227,7 +226,7 @@ public function getBoundUser()
     public function setOptions($options)
     {
         if ($options instanceof Traversable) {
-            $options = ArrayUtils::iteratorToArray($options);
+            $options = iterator_to_array($options);
         }
 
         $permittedOptions = array(

test/Converter/ConverterTest.php

@@ -23,7 +23,6 @@
 
 use DateTime;
 use DateTimeZone;
-use Zend\Date\Date;
 use Zend\Ldap\Converter\Converter;
 
 /**
@@ -84,11 +83,11 @@ public function toLdapDateTimeProvider()
                         'utc' => false), '20100512131445+0300'),
             array(array('date'=> '2010-05-12 13:14:45+0300',
                         'utc' => true), '20100512101445Z'),
-            array(array('date'=> new Date('2010-05-12T13:14:45+0300', Date::ISO_8601),
+            array(array('date'=> DateTime::createFromFormat(DateTime::ISO8601, '2010-05-12T13:14:45+0300'),
                         'utc' => true), '20100512101445Z'),
-            array(array('date'=> new Date('2010-05-12T13:14:45+0300', Date::ISO_8601),
+            array(array('date'=> DateTime::createFromFormat(DateTime::ISO8601, '2010-05-12T13:14:45+0300'),
                         'utc' => false), '20100512131445+0300'),
-            array(array('date'=> new Date('0', Date::TIMESTAMP),
+            array(array('date'=> date_timestamp_set(new DateTime(), 0),
                         'utc' => true), '19700101000000Z'),
         );
     }
@@ -153,7 +152,7 @@ public function toLdapProvider()
                              'type' => 0)),
             array('FALSE', array('value'=> 0,
                                  'type' => 1)),
-            array('19700101000000Z', array('value'=> new Date('1970-01-01T00:00:00+0000', Date::ISO_8601),
+            array('19700101000000Z', array('value'=> DateTime::createFromFormat(DateTime::ISO8601, '1970-01-01T00:00:00+0000'),
                                            'type' => 0)),
 
         );
@@ -192,6 +191,11 @@ public function testFromLdapBoolean()
 
     /**
      * @dataProvider fromLdapDateTimeProvider
+     *
+     * @param DateTime $expected
+     * @param string   $convert
+     * @param boolean  $utc
+     * @return void
      */
     public function testFromLdapDateTime($expected, $convert, $utc)
     {