gedi 13 лет назад
Родитель
Сommit
75e5747025

+ 5 - 5
bin/vendors.php

@@ -34,11 +34,11 @@ $deps22x = array(
     array('Symfony/Component/Yaml', 'http://github.com/symfony/Yaml.git', 'v2.0.7'),
 );
 $deps23x = array(
-    array('doctrine-orm', 'git://github.com/doctrine/doctrine2.git', '1b2b831feb'),
-    array('doctrine-dbal', 'git://github.com/doctrine/dbal.git', 'd9c3509e8d'),
-    array('doctrine-common', 'git://github.com/doctrine/common.git', 'd62352cc72'),
-    array('doctrine-mongodb', 'git://github.com/doctrine/mongodb.git', 'd7fdcff25b'),
-    array('doctrine-mongodb-odm', 'git://github.com/doctrine/mongodb-odm.git', 'fcff6211db'),
+    array('doctrine-orm', 'git://github.com/doctrine/doctrine2.git', '0a09a28ec9'),
+    array('doctrine-dbal', 'git://github.com/doctrine/dbal.git', '493ced5cd0'),
+    array('doctrine-common', 'git://github.com/doctrine/common.git', '4f78640efd'),
+    array('doctrine-mongodb', 'git://github.com/doctrine/mongodb.git', '727a12d25b'),
+    array('doctrine-mongodb-odm', 'git://github.com/doctrine/mongodb-odm.git', '47c185fff5'),
 
     array('Symfony/Component/ClassLoader', 'git://github.com/symfony/ClassLoader.git', 'v2.0.12'),
     array('Symfony/Component/Console', 'git://github.com/symfony/Console.git', 'v2.0.12'),

+ 2 - 1
lib/Gedmo/Timestampable/Mapping/Driver/Xml.php

@@ -31,7 +31,8 @@ class Xml extends BaseXml
         'time',
         'datetime',
         'timestamp',
-        'zenddate'
+        'zenddate',
+        'vardatetime'
     );
 
     /**

+ 2 - 1
lib/Gedmo/Timestampable/Mapping/Driver/Yaml.php

@@ -36,7 +36,8 @@ class Yaml extends File implements Driver
         'time',
         'datetime',
         'timestamp',
-        'zenddate'
+        'zenddate',
+        'vardatetime'
     );
 
     /**

+ 3 - 3
tests/Gedmo/Translatable/PersonalTranslationTest.php

@@ -153,8 +153,8 @@ class PersonalTranslationTest extends BaseTestCaseORM
         $this->em->persist($article);
         $this->em->flush();
         $sqlQueriesExecuted = $this->queryAnalyzer->getExecutedQueries();
-        $this->assertCount(1, $sqlQueriesExecuted);
-        $this->assertEquals("UPDATE article_translations SET content = 'change lt' WHERE id = 1", $sqlQueriesExecuted[0]);
+        $this->assertCount(3, $sqlQueriesExecuted); // one update, transaction start - commit
+        $this->assertEquals("UPDATE article_translations SET content = 'change lt' WHERE id = 1", $sqlQueriesExecuted[1]);
     }
 
     /**
@@ -211,4 +211,4 @@ class PersonalTranslationTest extends BaseTestCaseORM
             self::TRANSLATION
         );
     }
-}
+}