diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some cleanups

Browse Source
This commit is contained in:
Johannes Schmitt 2011-05-17 07:41:49 +02:00
parent 44950ddb77
commit 54ae90d36d
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autoload.php.dist
View File

@ -13,7 +13,6 @@ $loader->registerNamespaces(array(
'Doctrine' => __DIR__.'/vendor/doctrine/lib', 'Doctrine' => __DIR__.'/vendor/doctrine/lib',
'Assetic' => __DIR__.'/vendor/assetic/src', 'Assetic' => __DIR__.'/vendor/assetic/src',
'Monolog' => __DIR__.'/vendor/monolog/src', 'Monolog' => __DIR__.'/vendor/monolog/src',
'Annotations' => array(__DIR__.'/vendor/annotations/src', __DIR__.'/vendor/annotations/doctrine-compat-src'),
)); ));
$loader->registerPrefixes(array( $loader->registerPrefixes(array(
'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes', 'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',

6
src/Symfony/Bundle/DoctrineBundle/Tests/TestCase.php
View File

@ -11,8 +11,7 @@
namespace Symfony\Bundle\DoctrineBundle\Tests; namespace Symfony\Bundle\DoctrineBundle\Tests;
use Annotations\Reader; use Doctrine\Common\Annotations\Reader;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@ -27,9 +26,6 @@ class TestCase extends \PHPUnit_Framework_TestCase
if (!class_exists('Doctrine\\Common\\Version')) { if (!class_exists('Doctrine\\Common\\Version')) {
$this->markTestSkipped('Doctrine is not available.'); $this->markTestSkipped('Doctrine is not available.');
} }
if (!class_exists('Annotations\Reader')) {
$this->markTestSkipped('Annotations is not available.');
}
} }
/** /**

3
src/Symfony/Component/Validator/ValidatorFactory.php
View File

@ -11,8 +11,7 @@ namespace Symfony\Component\Validator;
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Annotations\Reader; use Doctrine\Common\Annotations\Reader;
use Symfony\Component\Validator\Exception\MappingException; use Symfony\Component\Validator\Exception\MappingException;
use Symfony\Component\Validator\Mapping\ClassMetadataFactory; use Symfony\Component\Validator\Mapping\ClassMetadataFactory;
use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface; use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;