浏览代码

fixed some typo

gediminasm 14 年之前
父节点
当前提交
edc0cb5ee0

+ 4 - 6
lib/Gedmo/Timestampable/Mapping/Driver/Annotation.php

@@ -39,10 +39,7 @@ class Annotation implements Driver
     /**
      * {@inheritDoc}
      */
-    public function validateFullMetadata($meta, array $config)
-    {
-
-    }
+    public function validateFullMetadata($meta, array $config) {}
     
     /**
      * {@inheritDoc}
@@ -57,7 +54,7 @@ class Annotation implements Driver
         foreach ($class->getProperties() as $property) {
             if ($meta->isMappedSuperclass && !$property->isPrivate() ||
                 $meta->isInheritedField($property->name) ||
-                $meta->isInheritedAssociation($property->name)
+                isset($meta->associationMappings[$property->name]['inherited'])
             ) {
                 continue;
             }
@@ -97,6 +94,7 @@ class Annotation implements Driver
      */
     protected function _isValidField($meta, $field)
     {
-        return in_array($meta->getTypeOfField($field), $this->_validTypes);
+        $mapping = $meta->getFieldMapping($field);
+        return $mapping && in_array($mapping['type'], $this->_validTypes);
     }
 }

+ 3 - 5
lib/Gedmo/Timestampable/Mapping/Driver/Yaml.php

@@ -40,10 +40,7 @@ class Yaml extends File implements Driver
     /**
      * {@inheritDoc}
      */
-    public function validateFullMetadata($meta, array $config)
-    {
-
-    }
+    public function validateFullMetadata($meta, array $config) {}
     
     /**
      * {@inheritDoc}
@@ -96,6 +93,7 @@ class Yaml extends File implements Driver
      */
     protected function _isValidField($meta, $field)
     {
-        return in_array($meta->getTypeOfField($field), $this->_validTypes);
+        $mapping = $meta->getFieldMapping($field);
+        return $mapping && in_array($mapping['type'], $this->_validTypes);
     }
 }

+ 5 - 7
lib/Gedmo/Translatable/Mapping/Driver/Annotation.php

@@ -49,7 +49,7 @@ class Annotation implements Driver
      * 
      * @var array
      */
-    public $validTypes = array(
+    protected $_validTypes = array(
         'string',
         'text'
     );
@@ -57,10 +57,7 @@ class Annotation implements Driver
     /**
      * {@inheritDoc}
      */
-    public function validateFullMetadata($meta, array $config)
-    {
-
-    }
+    public function validateFullMetadata($meta, array $config) {}
     
     /**
      * {@inheritDoc}
@@ -85,7 +82,7 @@ class Annotation implements Driver
         foreach ($class->getProperties() as $property) {
             if ($meta->isMappedSuperclass && !$property->isPrivate() ||
                 $meta->isInheritedField($property->name) ||
-                $meta->isInheritedAssociation($property->name)
+                isset($meta->associationMappings[$property->name]['inherited'])
             ) {
                 continue;
             }
@@ -127,6 +124,7 @@ class Annotation implements Driver
      */
     protected function _isValidField($meta, $field)
     {
-        return in_array($meta->getTypeOfField($field), $this->validTypes);
+        $mapping = $meta->getFieldMapping($field);
+        return $mapping && in_array($mapping['type'], $this->_validTypes);
     }
 }

+ 4 - 6
lib/Gedmo/Translatable/Mapping/Driver/Yaml.php

@@ -33,7 +33,7 @@ class Yaml extends File implements Driver
      * 
      * @var array
      */
-    public $validTypes = array(
+    protected $_validTypes = array(
         'string',
         'text'
     );
@@ -41,10 +41,7 @@ class Yaml extends File implements Driver
     /**
      * {@inheritDoc}
      */
-    public function validateFullMetadata($meta, array $config)
-    {
-
-    }
+    public function validateFullMetadata($meta, array $config) {}
     
     /**
      * {@inheritDoc}
@@ -100,6 +97,7 @@ class Yaml extends File implements Driver
      */
     protected function _isValidField($meta, $field)
     {
-        return in_array($meta->getTypeOfField($field), $this->validTypes);
+        $mapping = $meta->getFieldMapping($field);
+        return $mapping && in_array($mapping['type'], $this->_validTypes);
     }
 }

+ 3 - 2
lib/Gedmo/Tree/Mapping/Driver/Annotation.php

@@ -86,7 +86,7 @@ class Annotation implements Driver
         foreach ($class->getProperties() as $property) {
             if ($meta->isMappedSuperclass && !$property->isPrivate() ||
                 $meta->isInheritedField($property->name) ||
-                $meta->isInheritedAssociation($property->name)
+                isset($meta->associationMappings[$property->name]['inherited'])
             ) {
                 continue;
             }
@@ -143,6 +143,7 @@ class Annotation implements Driver
      */
     protected function _isValidField($meta, $field)
     {
-        return in_array($meta->getTypeOfField($field), $this->_validTypes);
+        $mapping = $meta->getFieldMapping($field);
+        return $mapping && in_array($mapping['type'], $this->_validTypes);
     }
 }

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

@@ -118,6 +118,7 @@ class Yaml extends File implements Driver
      */
     protected function _isValidField($meta, $field)
     {
-        return in_array($meta->getTypeOfField($field), $this->_validTypes);
+        $mapping = $meta->getFieldMapping($field);
+        return $mapping && in_array($mapping['type'], $this->_validTypes);
     }
 }

+ 15 - 6
tests/Gedmo/Sluggable/SluggableDocumentTest.php

@@ -45,13 +45,22 @@ class SluggableDocumentTest extends \PHPUnit_Framework_TestCase
         $evm = new \Doctrine\Common\EventManager();
         $sluggableListener = new ODM\MongoDB\SluggableListener();
         $evm->addEventSubscriber($sluggableListener);
-        $this->dm = \Doctrine\ODM\MongoDB\DocumentManager::create(
-            new \Doctrine\MongoDB\Connection(),
-            $config, 
-            $evm
-        );
         
-        $this->populate();
+        if (!class_exists('Mongo')) {
+            $this->markTestSkipped('Missing Mongo extension.');
+        }
+        
+        try {
+            $this->dm = \Doctrine\ODM\MongoDB\DocumentManager::create(
+                new \Doctrine\MongoDB\Connection(),
+                $config, 
+                $evm
+            );
+        
+            $this->populate();
+        } catch (\MongoException $e) {
+            $this->markTestSkipped('Doctrine MongoDB ODM connection problem.');
+        }
     }
     
     public function testSlugGeneration()