Explorar o código

Fix command for SF2.5

Thomas Rabaix %!s(int64=11) %!d(string=hai) anos
pai
achega
5fbdabdfa5

+ 1 - 1
Command/ExplainAdminCommand.php

@@ -86,7 +86,7 @@ class ExplainAdminCommand extends ContainerAwareCommand
             $output->writeln(sprintf('  - % -25s  % -15s % -15s', $name, $fieldDescription->getType(), $fieldDescription->getTemplate()));
         }
 
-        $validatorFactory = $this->getContainer()->get('validator.mapping.class_metadata_factory');
+        $validatorFactory = $this->getContainer()->get('validator')->getMetadataFactory();
         $metadata = $validatorFactory->getMetadataFor($admin->getClass());
 
         $output->writeln('');

+ 6 - 7
Tests/Command/ExplainAdminCommandTest.php

@@ -131,28 +131,27 @@ class ExplainAdminCommandTest extends \PHPUnit_Framework_TestCase
 
         $this->validatorFactory = $this->getMock('Symfony\Component\Validator\MetadataFactoryInterface');
 
+        $validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
+        $validator->expects($this->any())->method('getMetadataFactory')->will($this->returnValue($this->validatorFactory));
+
         // php 5.3 BC
         $admin = $this->admin;
-        $validatorMetadata = $this->validatorFactory;
 
         $container->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function($id) use ($container, $admin, $validatorMetadata) {
+            ->will($this->returnCallback(function($id) use ($container, $admin, $validator) {
                 switch ($id) {
                     case 'sonata.admin.pool':
                         $pool = new Pool($container, '', '');
                         $pool->setAdminServiceIds(array('acme.admin.foo', 'acme.admin.bar'));
 
                         return $pool;
-                        break;
 
-                    case 'validator.mapping.class_metadata_factory':
-                        return $validatorMetadata;
-                        break;
+                    case 'validator':
+                        return $validator;
 
                     case 'acme.admin.foo':
                         return $admin;
-                        break;
                 }
 
                 return null;