浏览代码

Fixes data provider for LDAP converter unit test

Frank Brückner 11 年之前
父节点
当前提交
8f2f506c08
共有 1 个文件被更改,包括 14 次插入3 次删除
  1. 14 3
      tests/Zend/Ldap/ConverterTest.php

+ 14 - 3
tests/Zend/Ldap/ConverterTest.php

@@ -119,21 +119,32 @@ class Zend_Ldap_ConverterTest extends PHPUnit_Framework_TestCase
                 array('O:8:"DateTime":0:{}', new DateTime('@0')),
                 array('a:3:{i:0;s:4:"test";i:1;i:1;s:3:"foo";s:3:"bar";}', array('test',1,'foo'=>'bar')),
             );
-        } elseif (version_compare(PHP_VERSION, '5.6.0beta4', '>=')) {
+        }
+
+        if (getenv('TRAVIS') && version_compare(PHP_VERSION, '5.4.0', '>=')) {
             return array(
                 array('N;', null),
                 array('i:1;', 1),
                 array('O:8:"DateTime":3:{s:4:"date";s:26:"1970-01-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}', new DateTime('@0')),
                 array('a:3:{i:0;s:4:"test";i:1;i:1;s:3:"foo";s:3:"bar";}', array('test',1,'foo'=>'bar')),
             );
-        } else {
+        }
+
+        if (version_compare(PHP_VERSION, '5.6.0beta4', '>=')) {
             return array(
                 array('N;', null),
                 array('i:1;', 1),
-                array('O:8:"DateTime":3:{s:4:"date";s:19:"1970-01-01 00:00:00";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}', new DateTime('@0')),
+                array('O:8:"DateTime":3:{s:4:"date";s:26:"1970-01-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}', new DateTime('@0')),
                 array('a:3:{i:0;s:4:"test";i:1;i:1;s:3:"foo";s:3:"bar";}', array('test',1,'foo'=>'bar')),
             );
         }
+
+        return array(
+            array('N;', null),
+            array('i:1;', 1),
+            array('O:8:"DateTime":3:{s:4:"date";s:19:"1970-01-01 00:00:00";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}', new DateTime('@0')),
+            array('a:3:{i:0;s:4:"test";i:1;i:1;s:3:"foo";s:3:"bar";}', array('test',1,'foo'=>'bar')),
+        );
     }
 
     /**