Thomas Rabaix 12 年之前
父节点
当前提交
54547dd7c1
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 5 3
      Admin/Admin.php
  2. 1 1
      Tests/Admin/BaseAdminTest.php

+ 5 - 3
Admin/Admin.php

@@ -440,6 +440,8 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
     }
 
     /**
+     * @deprecated removed with Symfony 2.2
+     *
      * {@inheritdoc}
      */
     protected function configureShowField(ShowMapper $show)
@@ -1952,7 +1954,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
             $id = $this->request->get($this->getIdParameter());
 
             $child = $child->addChild(
-                (string) $this->getSubject(),
+                $this->toString($this->getSubject()),
                 array('uri' => $this->generateUrl('edit', array('id' => $id)))
             );
 
@@ -1967,7 +1969,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
             }
 
             if ($action != 'create' && $this->hasSubject()) {
-                $breadcrumbs = $menu->getBreadcrumbsArray((string) $this->getSubject());
+                $breadcrumbs = $menu->getBreadcrumbsArray($this->toString($this->getSubject()));
             } else {
                 $breadcrumbs = $menu->getBreadcrumbsArray(
                     $this->trans($this->getLabelTranslatorStrategy()->getLabel(sprintf('%s_%s', $this->getClassnameLabel(), $action), 'breadcrumb', 'link'))
@@ -2515,7 +2517,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
             return (string)$object;
         }
 
-        return '';
+        return sprintf("%s:%s", get_class($object), spl_object_hash($object));
     }
 
     /**

+ 1 - 1
Tests/Admin/BaseAdminTest.php

@@ -216,7 +216,7 @@ class BaseAdminTest extends \PHPUnit_Framework_TestCase
 
         $s = new \stdClass();
 
-        $this->assertEquals('', $admin->toString($s));
+        $this->assertNotEmpty($admin->toString($s));
 
         $s = new FooTest_Admin;
         $this->assertEquals('salut', $admin->toString($s));