Merge remote-tracking branch 'origin/3.x'

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.10.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.9.0...3.10.0) - 2019-07-20
+### Added
+- Don't hide edit button `sonata_type_model_list_widget` if there is no value
+
+### Fixed
+- Use a more reliable method for represent composite identifiers in a string
+
 ## [3.9.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.8.3...3.9.0) - 2019-04-17
 ### Added
 - Added support for protected (no public constructor) entity creation

src/Model/ModelManager.php

@@ -16,6 +16,7 @@
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\LockMode;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -339,16 +340,10 @@ public function getIdentifierValues($entity)
                 continue;
             }
 
-            if (method_exists($value, '__toString')) {
-                $identifiers[] = (string) $value;
-
-                continue;
-            }
-
             $fieldType = $metadata->getTypeOfField($name);
             $type = $fieldType && Type::hasType($fieldType) ? Type::getType($fieldType) : null;
             if ($type) {
-                $identifiers[] = $type->convertToDatabaseValue($value, $platform);
+                $identifiers[] = $this->getValueFromType($value, $type, $fieldType, $platform);
 
                 continue;
             }
@@ -633,4 +628,16 @@ protected function camelize($property)
     {
         return str_replace(' ', '', ucwords(str_replace('_', ' ', $property)));
     }
+
+    /**
+     * @param mixed $value
+     */
+    private function getValueFromType($value, Type $type, string $fieldType, AbstractPlatform $platform): string
+    {
+        if ('binary' === $platform->getDoctrineTypeMapping($fieldType)) {
+            return (string) $type->convertToPHPValue($value, $platform);
+        }
+
+        return $type->convertToDatabaseValue($value, $platform);
+    }
 }

tests/Fixtures/DoctrineType/UuidBinaryType.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\DoctrineORMAdminBundle\Tests\Fixtures\DoctrineType;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\StringType;
+use Sonata\DoctrineORMAdminBundle\Tests\Fixtures\Util\NonIntegerIdentifierTestClass;
+
+/**
+ * Mock for a custom doctrine type used in the ModelManagerTest suite.
+ *
+ * @author Jorge Garces <jgarces@iberdat.com>
+ */
+final class UuidBinaryType extends StringType
+{
+    const NAME = 'uuid_binary';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToPHPValue($value, AbstractPlatform $platform)
+    {
+        return !empty($value) ? new NonIntegerIdentifierTestClass($value->toString()) : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    {
+        return $value->toString();
+    }
+}

tests/Model/ModelManagerTest.php

@@ -37,6 +37,7 @@
 use Sonata\DoctrineORMAdminBundle\Datagrid\OrderByToSelectWalker;
 use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
 use Sonata\DoctrineORMAdminBundle\Model\ModelManager;
+use Sonata\DoctrineORMAdminBundle\Tests\Fixtures\DoctrineType\UuidBinaryType;
 use Sonata\DoctrineORMAdminBundle\Tests\Fixtures\DoctrineType\UuidType;
 use Sonata\DoctrineORMAdminBundle\Tests\Fixtures\Entity\AbstractEntity;
 use Sonata\DoctrineORMAdminBundle\Tests\Fixtures\Entity\AssociatedEntity;
@@ -57,6 +58,9 @@ public static function setUpBeforeClass(): void
         if (!Type::hasType('uuid')) {
             Type::addType('uuid', UuidType::class);
         }
+        if (!Type::hasType('uuid_binary')) {
+            Type::addType('uuid_binary', UuidBinaryType::class);
+        }
     }
 
     public function testSortParameters(): void