Browse Source

Fix Xml and Yaml Drivers

Lukas Botsch 14 năm trước cách đây
mục cha
commit
c4eb4e33d3

+ 4 - 2
lib/Gedmo/Sortable/Mapping/Driver/Xml.php

@@ -5,6 +5,8 @@ namespace Gedmo\Sortable\Mapping\Driver;
 use Gedmo\Mapping\Driver\Xml as BaseXml,
 use Gedmo\Mapping\Driver\Xml as BaseXml,
     Gedmo\Exception\InvalidMappingException;
     Gedmo\Exception\InvalidMappingException;
 
 
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+
 /**
 /**
  * This is a xml mapping driver for Sortable
  * This is a xml mapping driver for Sortable
  * behavioral extension. Used for extraction of extended
  * behavioral extension. Used for extraction of extended
@@ -34,7 +36,7 @@ class Xml extends BaseXml
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
-    public function validateFullMetadata($meta, array $config)
+    public function validateFullMetadata(ClassMetadata $meta, array $config)
     {
     {
         if ($config && !isset($config['position'])) {
         if ($config && !isset($config['position'])) {
             throw new InvalidMappingException("Missing property: 'position' in class - {$meta->name}");
             throw new InvalidMappingException("Missing property: 'position' in class - {$meta->name}");
@@ -44,7 +46,7 @@ class Xml extends BaseXml
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
-    public function readExtendedMetadata($meta, array &$config)
+    public function readExtendedMetadata(ClassMetadata $meta, array &$config)
     {
     {
         /**
         /**
          * @var \SimpleXmlElement $xml
          * @var \SimpleXmlElement $xml

+ 4 - 2
lib/Gedmo/Sortable/Mapping/Driver/Yaml.php

@@ -6,6 +6,8 @@ use Gedmo\Mapping\Driver\File,
     Gedmo\Mapping\Driver,
     Gedmo\Mapping\Driver,
     Gedmo\Exception\InvalidMappingException;
     Gedmo\Exception\InvalidMappingException;
 
 
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+
 /**
 /**
  * This is a yaml mapping driver for Sortable
  * This is a yaml mapping driver for Sortable
  * behavioral extension. Used for extraction of extended
  * behavioral extension. Used for extraction of extended
@@ -40,7 +42,7 @@ class Yaml extends File implements Driver
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
-    public function validateFullMetadata($meta, array $config)
+    public function validateFullMetadata(ClassMetadata $meta, array $config)
     {
     {
         if ($config && !isset($config['position'])) {
         if ($config && !isset($config['position'])) {
             throw new InvalidMappingException("Missing property: 'position' in class - {$meta->name}");
             throw new InvalidMappingException("Missing property: 'position' in class - {$meta->name}");
@@ -50,7 +52,7 @@ class Yaml extends File implements Driver
     /**
     /**
      * {@inheritDoc}
      * {@inheritDoc}
      */
      */
-    public function readExtendedMetadata($meta, array &$config)
+    public function readExtendedMetadata(ClassMetadata $meta, array &$config)
     {
     {
         $mapping = $this->_getMapping($meta->name);
         $mapping = $this->_getMapping($meta->name);