This commit is contained in:
Fabien Potencier 2012-04-07 09:10:50 +02:00
parent 0a585b7130
commit 72e854e943
14 changed files with 89 additions and 91 deletions

View File

@ -178,6 +178,7 @@ class EntityChoiceList extends ObjectChoiceList
if (empty($values)) { if (empty($values)) {
return array(); return array();
} }
return $this->entityLoader->getEntitiesByIds(current($this->identifier), $values); return $this->entityLoader->getEntitiesByIds(current($this->identifier), $values);
} }

View File

@ -251,7 +251,7 @@ class EntityChoiceListTest extends DoctrineOrmTestCase
$this->assertEquals(array(1, 2), $choiceList->getValuesForChoices(array($item1, $item2))); $this->assertEquals(array(1, 2), $choiceList->getValuesForChoices(array($item1, $item2)));
$this->assertEquals(array(1, 2), $choiceList->getIndicesForChoices(array($item1, $item2))); $this->assertEquals(array(1, 2), $choiceList->getIndicesForChoices(array($item1, $item2)));
} }
// Ticket #3446 // Ticket #3446
public function testGetEmptyArrayChoicesForEmptyValues() public function testGetEmptyArrayChoicesForEmptyValues()
{ {
@ -263,7 +263,7 @@ class EntityChoiceListTest extends DoctrineOrmTestCase
null, null,
$entityLoader $entityLoader
); );
$this->assertEquals(array(), $choiceList->getChoicesForValues(array())); $this->assertEquals(array(), $choiceList->getChoicesForValues(array()));
} }
} }

View File

@ -11,7 +11,6 @@
namespace Symfony\Bridge\Twig; namespace Symfony\Bridge\Twig;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Templating\EngineInterface; use Symfony\Component\Templating\EngineInterface;
use Symfony\Component\Templating\StreamingEngineInterface; use Symfony\Component\Templating\StreamingEngineInterface;
use Symfony\Component\Templating\TemplateNameParserInterface; use Symfony\Component\Templating\TemplateNameParserInterface;

View File

@ -94,6 +94,7 @@ class ApcClassLoader
{ {
if ($file = $this->findFile($class)) { if ($file = $this->findFile($class)) {
require $file; require $file;
return true; return true;
} }
} }

View File

@ -72,6 +72,7 @@ class ClassLoader
foreach ((array) $paths as $path) { foreach ((array) $paths as $path) {
$this->fallbackDirs[] = $path; $this->fallbackDirs[] = $path;
} }
return; return;
} }
if (isset($this->prefixes[$prefix])) { if (isset($this->prefixes[$prefix])) {
@ -133,6 +134,7 @@ class ClassLoader
{ {
if ($file = $this->findFile($class)) { if ($file = $this->findFile($class)) {
require $file; require $file;
return true; return true;
} }
} }

View File

@ -15,7 +15,6 @@ use Symfony\Component\Form\Util\PropertyPath;
use Symfony\Component\Form\Form; use Symfony\Component\Form\Form;
use Symfony\Component\Form\Tests\Fixtures\Author; use Symfony\Component\Form\Tests\Fixtures\Author;
use Symfony\Component\Form\Tests\Fixtures\FixedDataTransformer; use Symfony\Component\Form\Tests\Fixtures\FixedDataTransformer;
use Symfony\Component\Form\Tests\Fixtures\FixedFilterListener;
class FieldTypeTest extends TypeTestCase class FieldTypeTest extends TypeTestCase
{ {

View File

@ -11,7 +11,6 @@
namespace Symfony\Component\HttpFoundation\Session; namespace Symfony\Component\HttpFoundation\Session;
use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface; use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface; use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;

View File

@ -42,4 +42,4 @@ abstract class ConfigurableExtension extends Extension
* @param ContainerBuilder $container * @param ContainerBuilder $container
*/ */
abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container); abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container);
} }

View File

@ -14,7 +14,6 @@ namespace Symfony\Component\HttpKernel\Tests\DataCollector;
use Symfony\Component\HttpKernel\DataCollector\EventDataCollector; use Symfony\Component\HttpKernel\DataCollector\EventDataCollector;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\HttpKernel\Tests\Fixtures\TestEventDispatcher; use Symfony\Component\HttpKernel\Tests\Fixtures\TestEventDispatcher;

View File

@ -17,7 +17,6 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest; use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest;
use Symfony\Component\HttpKernel\Tests\Fixtures\FooBarBundle; use Symfony\Component\HttpKernel\Tests\Fixtures\FooBarBundle;

View File

@ -1,21 +1,21 @@
<?php <?php
/* /*
* This file is part of the Symfony package. * This file is part of the Symfony package.
* *
* (c) Fabien Potencier <fabien@symfony.com> * (c) Fabien Potencier <fabien@symfony.com>
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Symfony\Component\Process\Exception; namespace Symfony\Component\Process\Exception;
/** /**
* Marker Interface for the Process Component. * Marker Interface for the Process Component.
* *
* @author Johannes M. Schmitt <schmittjoh@gmail.com> * @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/ */
interface ExceptionInterface interface ExceptionInterface
{ {
} }

View File

@ -1,40 +1,40 @@
<?php <?php
/* /*
* This file is part of the Symfony package. * This file is part of the Symfony package.
* *
* (c) Fabien Potencier <fabien@symfony.com> * (c) Fabien Potencier <fabien@symfony.com>
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Symfony\Component\Process\Exception; namespace Symfony\Component\Process\Exception;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
/** /**
* Exception for failed processes. * Exception for failed processes.
* *
* @author Johannes M. Schmitt <schmittjoh@gmail.com> * @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/ */
class ProcessFailedException extends RuntimeException class ProcessFailedException extends RuntimeException
{ {
private $process; private $process;
public function __construct(Process $process) public function __construct(Process $process)
{ {
if ($process->isSuccessful()) { if ($process->isSuccessful()) {
throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.'); throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.');
} }
parent::__construct(sprintf('The command "%s" failed.'."\n\nOutput:\n================\n".$process->getOutput()."\n\nError Output:\n================\n".$process->getErrorOutput())); parent::__construct(sprintf('The command "%s" failed.'."\n\nOutput:\n================\n".$process->getOutput()."\n\nError Output:\n================\n".$process->getErrorOutput()));
$this->process = $process; $this->process = $process;
} }
public function getProcess() public function getProcess()
{ {
return $this->process; return $this->process;
} }
} }

View File

@ -1,21 +1,21 @@
<?php <?php
/* /*
* This file is part of the Symfony package. * This file is part of the Symfony package.
* *
* (c) Fabien Potencier <fabien@symfony.com> * (c) Fabien Potencier <fabien@symfony.com>
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace Symfony\Component\Process\Exception; namespace Symfony\Component\Process\Exception;
/** /**
* RuntimeException for the Process Component. * RuntimeException for the Process Component.
* *
* @author Johannes M. Schmitt <schmittjoh@gmail.com> * @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/ */
class RuntimeException extends \RuntimeException implements ExceptionInterface class RuntimeException extends \RuntimeException implements ExceptionInterface
{ {
} }

View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Validator\Tests\Mapping;
use Symfony\Component\Validator\Tests\Fixtures\Entity; use Symfony\Component\Validator\Tests\Fixtures\Entity;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA; use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
use Symfony\Component\Validator\Mapping\ClassMetadataFactory; use Symfony\Component\Validator\Mapping\ClassMetadataFactory;
use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Loader\LoaderInterface; use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;