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

renamed Symfony\Components to Symfony\Component

Browse Source
This commit is contained in:
Fabien Potencier 2010-08-20 23:09:55 +02:00
parent a40a7b8f36
commit bf82cf42dd
825 changed files with 2587 additions and 2587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bundle/DoctrineBundle/Command/ClearMetadataCacheDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\Tools\Console\Command\ClearCache\MetadataCommand;
/*

6
src/Symfony/Bundle/DoctrineBundle/Command/ClearQueryCacheDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\Tools\Console\Command\ClearCache\QueryCommand;
/*

6
src/Symfony/Bundle/DoctrineBundle/Command/ClearResultCacheDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\Tools\Console\Command\ClearCache\ResultCommand;
/*

10
src/Symfony/Bundle/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand;
use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;

10
src/Symfony/Bundle/DoctrineBundle/Command/ConvertMappingDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand;
/*

10
src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
use Doctrine\Common\Cli\Configuration;
use Doctrine\Common\Cli\CliController as DoctrineCliController;

10
src/Symfony/Bundle/DoctrineBundle/Command/CreateSchemaDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\SchemaTool\CreateCommand;
/*

12
src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php
View File

@ -3,12 +3,12 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Bundle\FrameworkBundle\Command\Command;
use Symfony\Components\Console\Input\ArrayInput;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Framework\Bundle\Bundle;
use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;

10
src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
use Doctrine\Common\Cli\Configuration;
use Doctrine\Common\Cli\CliController as DoctrineCliController;

10
src/Symfony/Bundle/DoctrineBundle/Command/DropSchemaDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\SchemaTool\DropCommand;
/*

10
src/Symfony/Bundle/DoctrineBundle/Command/EnsureProductionSettingsDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\EnsureProductionSettingsCommand;
/*

10
src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Framework\Bundle\Bundle;
use Doctrine\ORM\Tools\EntityGenerator;

10
src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Export\ClassMetadataExporter;
use Doctrine\ORM\Tools\EntityGenerator;
use Doctrine\ORM\Mapping\ClassMetadataInfo;

10
src/Symfony/Bundle/DoctrineBundle/Command/GenerateProxiesDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\GenerateProxiesCommand;
/*

6
src/Symfony/Bundle/DoctrineBundle/Command/GenerateRepositoriesDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\Tools\EntityRepositoryGenerator;
/*

10
src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand;
use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;

12
src/Symfony/Bundle/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Components\Finder\Finder;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Component\Finder\Finder;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
use Doctrine\Common\Cli\Configuration;
use Doctrine\Common\Cli\CliController as DoctrineCliController;

10
src/Symfony/Bundle/DoctrineBundle/Command/RunDqlDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\RunDqlCommand;
/*

10
src/Symfony/Bundle/DoctrineBundle/Command/RunSqlDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\DBAL\Tools\Console\Command\RunSqlCommand;
/*

10
src/Symfony/Bundle/DoctrineBundle/Command/UpdateSchemaDoctrineCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\DoctrineBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand;
/*

4
src/Symfony/Bundle/DoctrineBundle/DataCollector/DoctrineDataCollector.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\DoctrineBundle\DataCollector;
use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Component\DependencyInjection\ContainerInterface;
/*
* This file is part of the Symfony framework.

12
src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\DoctrineBundle\DependencyInjection;
use Symfony\Components\DependencyInjection\Extension\Extension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Definition;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Components\DependencyInjection\Resource\FileResource;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Resource\FileResource;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/DoctrineBundle/Logger/DbalLogger.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Bundle\DoctrineBundle\Logger;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
use Doctrine\DBAL\Logging\DebugStack;
/*

32
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
View File

@ -13,10 +13,10 @@ namespace Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection;
use Symfony\Bundle\DoctrineBundle\Tests\TestCase;
use Symfony\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\ParameterBag\ParameterBag;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
abstract class AbstractDoctrineExtensionTest extends TestCase
{
@ -146,9 +146,9 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.dbal.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.orm.default_configuration', (string) $arguments[1]);
$definition = $container->getDefinition('doctrine.orm.default_configuration');
@ -184,9 +184,9 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.dbal.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.orm.default_configuration', (string) $arguments[1]);
}
@ -218,9 +218,9 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.dbal.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.orm.default_configuration', (string) $arguments[1]);
}
@ -249,9 +249,9 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.dbal.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.orm.default_configuration', (string) $arguments[1]);
}
@ -282,9 +282,9 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.dbal.conn1_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.orm.dm1_configuration', (string) $arguments[1]);
$definition = $container->getDefinition('doctrine.dbal.conn2_connection');
@ -302,9 +302,9 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.dbal.conn2_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.orm.dm2_configuration', (string) $arguments[1]);
$definition = $container->getDefinition('doctrine.orm.dm1_metadata_cache');

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/XmlDoctrineExtensionTest.php
View File

@ -11,8 +11,8 @@
namespace Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
class XmlDoctrineExtensionTest extends AbstractDoctrineExtensionTest
{

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/YamlDoctrineExtensionTest.php
View File

@ -11,8 +11,8 @@
namespace Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
class YamlDoctrineExtensionTest extends AbstractDoctrineExtensionTest
{

6
src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsDiffDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineMigrationsBundle\Command;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Doctrine\DBAL\Migrations\Tools\Console\Command\DiffCommand;
/*

6
src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsExecuteDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineMigrationsBundle\Command;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Doctrine\DBAL\Migrations\Tools\Console\Command\ExecuteCommand;
/*

6
src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsGenerateDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineMigrationsBundle\Command;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Doctrine\DBAL\Migrations\Tools\Console\Command\GenerateCommand;
/*

6
src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsMigrateDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineMigrationsBundle\Command;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Doctrine\DBAL\Migrations\Tools\Console\Command\MigrateCommand;
/*

6
src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsStatusDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineMigrationsBundle\Command;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Doctrine\DBAL\Migrations\Tools\Console\Command\StatusCommand;
/*

6
src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsVersionDoctrineCommand.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\DoctrineMigrationsBundle\Command;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption;
use Doctrine\DBAL\Migrations\Tools\Console\Command\VersionCommand;
/*

12
src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\DoctrineMongoDBBundle\DependencyInjection;
use Symfony\Components\DependencyInjection\Extension\Extension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Components\DependencyInjection\Definition;
use Symfony\Components\DependencyInjection\Resource\FileResource;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Resource\FileResource;
/**
* Doctrine MongoDB ODM extension.

32
src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
View File

@ -13,10 +13,10 @@ namespace Symfony\Bundle\DoctrineMongoDBBundle\Tests\DependencyInjection;
use Symfony\Bundle\DoctrineMongoDBBundle\Tests\TestCase;
use Symfony\Bundle\DoctrineMongoDBBundle\DependencyInjection\DoctrineMongoDBExtension;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Components\DependencyInjection\ParameterBag\ParameterBag;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
abstract class AbstractMongoDBExtensionTest extends TestCase
{
@ -66,9 +66,9 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
}
@ -92,9 +92,9 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
}
@ -123,9 +123,9 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
}
@ -148,9 +148,9 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.odm.mongodb.default_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.odm.mongodb.default_configuration', (string) $arguments[1]);
}
@ -175,9 +175,9 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.odm.mongodb.conn1_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.odm.mongodb.dm1_configuration', (string) $arguments[1]);
$definition = $container->getDefinition('doctrine.odm.mongodb.conn2_connection');
@ -189,9 +189,9 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$this->assertEquals('create', $definition->getFactoryMethod());
$arguments = $definition->getArguments();
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[0]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[0]);
$this->assertEquals('doctrine.odm.mongodb.conn2_connection', (string) $arguments[0]);
$this->assertInstanceOf('Symfony\Components\DependencyInjection\Reference', $arguments[1]);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $arguments[1]);
$this->assertEquals('doctrine.odm.mongodb.dm2_configuration', (string) $arguments[1]);
}

4
src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/XmlMongoDBExtensionTest.php
View File

@ -11,8 +11,8 @@
namespace Symfony\Bundle\DoctrineMongoDBBundle\Tests\DependencyInjection;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
class XmlMongoDBExtensionTest extends AbstractMongoDBExtensionTest
{

4
src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/YamlMongoDBExtensionTest.php
View File

@ -11,8 +11,8 @@
namespace Symfony\Bundle\DoctrineMongoDBBundle\Tests\DependencyInjection;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
class YamlMongoDBExtensionTest extends AbstractMongoDBExtensionTest
{

10
src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
/*

12
src/Symfony/Bundle/FrameworkBundle/Command/Command.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Components\Console\Command\Command as BaseCommand;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Component\Console\Command\Command as BaseCommand;
/*
* This file is part of the Symfony framework.

12
src/Symfony/Bundle/FrameworkBundle/Command/InitApplicationCommand.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Components\Console\Command\Command as BaseCommand;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Command\Command as BaseCommand;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
use Symfony\Bundle\FrameworkBundle\Util\Mustache;

10
src/Symfony/Bundle/FrameworkBundle/Command/InitBundleCommand.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
use Symfony\Bundle\FrameworkBundle\Util\Mustache;

12
src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Components\Routing\Matcher\Dumper\ApacheMatcherDumper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Component\Routing\Matcher\Dumper\ApacheMatcherDumper;
/*
* This file is part of the Symfony framework.

12
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\FrameworkBundle\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Components\Routing\Matcher\Dumper\ApacheMatcherDumper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Component\Routing\Matcher\Dumper\ApacheMatcherDumper;
/*
* This file is part of the Symfony framework.

8
src/Symfony/Bundle/FrameworkBundle/Console/Application.php
View File

@ -2,10 +2,10 @@
namespace Symfony\Bundle\FrameworkBundle\Console;
use Symfony\Components\Console\Application as BaseApplication;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Component\Console\Application as BaseApplication;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Framework\Kernel;
/*

8
src/Symfony/Bundle/FrameworkBundle/Console/BootstrapApplication.php
View File

@ -2,10 +2,10 @@
namespace Symfony\Bundle\FrameworkBundle\Console;
use Symfony\Components\Console\Application as BaseApplication;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Component\Console\Application as BaseApplication;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Framework\Kernel;
use Symfony\Bundle\FrameworkBundle\Command\InitApplicationCommand;

2
src/Symfony/Bundle/FrameworkBundle/Console/Shell.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Bundle\FrameworkBundle\Console;
use Symfony\Components\Console\Shell as BaseShell;
use Symfony\Component\Console\Shell as BaseShell;
/*
* This file is part of the Symfony framework.

4
src/Symfony/Bundle/FrameworkBundle/Controller.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Response;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameConverter.php
View File

@ -3,7 +3,7 @@
namespace Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Framework\Kernel;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
/*
* This file is part of the Symfony framework.

14
src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Components\HttpKernel\Controller\ControllerResolver as BaseControllerResolver;
use Symfony\Components\HttpKernel\HttpKernelInterface;
use Symfony\Components\HttpFoundation\Request;
use Symfony\Components\EventDispatcher\Event;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Controller\ControllerResolver as BaseControllerResolver;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameConverter;
/*
@ -90,7 +90,7 @@ class ControllerResolver extends BaseControllerResolver
* Renders a Controller and returns the Response content.
*
* Note that this method generates an esi:include tag only when both the standalone
* option is set to true and the request has ESI capability (@see Symfony\Components\HttpKernel\Cache\ESI).
* option is set to true and the request has ESI capability (@see Symfony\Component\HttpKernel\Cache\ESI).
*
* Available options:
*

2
src/Symfony/Bundle/FrameworkBundle/Controller/DefaultController.php
View File

@ -3,7 +3,7 @@
namespace Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Response;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/FrameworkBundle/Controller/InternalController.php
View File

@ -3,7 +3,7 @@
namespace Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Response;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
View File

@ -3,7 +3,7 @@
namespace Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Response;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
View File

@ -3,7 +3,7 @@
namespace Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Response;
/*
* This file is part of the Symfony framework.

4
src/Symfony/Bundle/FrameworkBundle/DataCollector/AppDataCollector.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\DataCollector;
use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Component\DependencyInjection\ContainerInterface;
/*
* This file is part of the Symfony framework.

4
src/Symfony/Bundle/FrameworkBundle/DataCollector/ConfigDataCollector.php
View File

@ -3,8 +3,8 @@
namespace Symfony\Bundle\FrameworkBundle\DataCollector;
use Symfony\Framework\Kernel;
use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Component\DependencyInjection\ContainerInterface;
/*
* This file is part of the Symfony framework.

4
src/Symfony/Bundle/FrameworkBundle/DataCollector/TimerDataCollector.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\DataCollector;
use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Component\DependencyInjection\ContainerInterface;
/*
* This file is part of the Symfony framework.

10
src/Symfony/Bundle/FrameworkBundle/Debug/ExceptionListener.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\FrameworkBundle\Debug;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\EventDispatcher\EventDispatcher;
use Symfony\Components\EventDispatcher\Event;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Components\HttpKernel\HttpKernelInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\HttpKernelInterface;
/*
* This file is part of the Symfony framework.

10
src/Symfony/Bundle/FrameworkBundle/Debug/ExceptionManager.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\FrameworkBundle\Debug;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\HttpKernel\Exception\HttpException;
use Symfony\Components\HttpFoundation\Request;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Components\HttpKernel\Log\DebugLoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
/*
* This file is part of the Symfony framework.

74
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php
View File

@ -2,12 +2,12 @@
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
use Symfony\Components\DependencyInjection\Extension\Extension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\Resource\FileResource;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Components\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Resource\FileResource;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Definition;
/*
* This file is part of the Symfony framework.
@ -60,15 +60,15 @@ class WebExtension extends Extension
$container->setParameter('routing.resource', $config['router']['resource']);
$this->addCompiledClasses($container, array(
'Symfony\\Components\\Routing\\RouterInterface',
'Symfony\\Components\\Routing\\Router',
'Symfony\\Components\\Routing\\Matcher\\UrlMatcherInterface',
'Symfony\\Components\\Routing\\Matcher\\UrlMatcher',
'Symfony\\Components\\Routing\\Generator\\UrlGeneratorInterface',
'Symfony\\Components\\Routing\\Generator\\UrlGenerator',
'Symfony\\Components\\Routing\\Loader\\Loader',
'Symfony\\Components\\Routing\\Loader\\DelegatingLoader',
'Symfony\\Components\\Routing\\Loader\\LoaderResolver',
'Symfony\\Component\\Routing\\RouterInterface',
'Symfony\\Component\\Routing\\Router',
'Symfony\\Component\\Routing\\Matcher\\UrlMatcherInterface',
'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
'Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface',
'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
'Symfony\\Component\\Routing\\Loader\\Loader',
'Symfony\\Component\\Routing\\Loader\\DelegatingLoader',
'Symfony\\Component\\Routing\\Loader\\LoaderResolver',
'Symfony\\Bundle\\FrameworkBundle\\Routing\\LoaderResolver',
'Symfony\\Bundle\\FrameworkBundle\\Routing\\DelegatingLoader',
));
@ -107,20 +107,20 @@ class WebExtension extends Extension
}
$this->addCompiledClasses($container, array(
'Symfony\\Components\\HttpFoundation\\ParameterBag',
'Symfony\\Components\\HttpFoundation\\HeaderBag',
'Symfony\\Components\\HttpFoundation\\Request',
'Symfony\\Components\\HttpFoundation\\Response',
'Symfony\\Component\\HttpFoundation\\ParameterBag',
'Symfony\\Component\\HttpFoundation\\HeaderBag',
'Symfony\\Component\\HttpFoundation\\Request',
'Symfony\\Component\\HttpFoundation\\Response',
'Symfony\\Components\\HttpKernel\\HttpKernel',
'Symfony\\Components\\HttpKernel\\ResponseListener',
'Symfony\\Components\\HttpKernel\\Controller\\ControllerResolver',
'Symfony\\Component\\HttpKernel\\HttpKernel',
'Symfony\\Component\\HttpKernel\\ResponseListener',
'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver',
'Symfony\\Bundle\\FrameworkBundle\\RequestListener',
'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameConverter',
'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
'Symfony\\Components\\EventDispatcher\\Event',
'Symfony\\Component\\EventDispatcher\\Event',
'Symfony\\Bundle\\FrameworkBundle\\Controller',
));
@ -194,18 +194,18 @@ class WebExtension extends Extension
// compilation
$this->addCompiledClasses($container, array(
'Symfony\\Components\\Templating\\Loader\\LoaderInterface',
'Symfony\\Components\\Templating\\Loader\\Loader',
'Symfony\\Components\\Templating\\Loader\\FilesystemLoader',
'Symfony\\Components\\Templating\\Engine',
'Symfony\\Components\\Templating\\Renderer\\RendererInterface',
'Symfony\\Components\\Templating\\Renderer\\Renderer',
'Symfony\\Components\\Templating\\Renderer\\PhpRenderer',
'Symfony\\Components\\Templating\\Storage\\Storage',
'Symfony\\Components\\Templating\\Storage\\FileStorage',
'Symfony\\Component\\Templating\\Loader\\LoaderInterface',
'Symfony\\Component\\Templating\\Loader\\Loader',
'Symfony\\Component\\Templating\\Loader\\FilesystemLoader',
'Symfony\\Component\\Templating\\Engine',
'Symfony\\Component\\Templating\\Renderer\\RendererInterface',
'Symfony\\Component\\Templating\\Renderer\\Renderer',
'Symfony\\Component\\Templating\\Renderer\\PhpRenderer',
'Symfony\\Component\\Templating\\Storage\\Storage',
'Symfony\\Component\\Templating\\Storage\\FileStorage',
'Symfony\\Bundle\\FrameworkBundle\\Templating\\Engine',
'Symfony\\Components\\Templating\\Helper\\Helper',
'Symfony\\Components\\Templating\\Helper\\SlotsHelper',
'Symfony\\Component\\Templating\\Helper\\Helper',
'Symfony\\Component\\Templating\\Helper\\SlotsHelper',
'Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\ActionsHelper',
'Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\RouterHelper',
'Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\RouterHelper',
@ -225,9 +225,9 @@ class WebExtension extends Extension
$messageFiles = array();
// default entries by the framework
$xmlMappingFiles[] = __DIR__.'/../../../Components/Form/Resources/config/validation.xml';
$messageFiles[] = __DIR__ . '/../../../Components/Validator/Resources/i18n/messages.en.xml';
$messageFiles[] = __DIR__ . '/../../../Components/Form/Resources/i18n/messages.en.xml';
$xmlMappingFiles[] = __DIR__.'/../../../Component/Form/Resources/config/validation.xml';
$messageFiles[] = __DIR__ . '/../../../Component/Validator/Resources/i18n/messages.en.xml';
$messageFiles[] = __DIR__ . '/../../../Component/Form/Resources/i18n/messages.en.xml';
foreach ($container->getParameter('kernel.bundles') as $className) {
$tmp = dirname(str_replace('\\', '/', $className));

8
src/Symfony/Bundle/FrameworkBundle/Profiler.php
View File

@ -2,10 +2,10 @@
namespace Symfony\Bundle\FrameworkBundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\HttpKernel\Profiler\Profiler as BaseProfiler;
use Symfony\Components\HttpKernel\Profiler\ProfilerStorage;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Profiler\Profiler as BaseProfiler;
use Symfony\Component\HttpKernel\Profiler\ProfilerStorage;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
/*
* This file is part of the Symfony framework.

10
src/Symfony/Bundle/FrameworkBundle/RequestListener.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\FrameworkBundle;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Components\EventDispatcher\EventDispatcher;
use Symfony\Components\EventDispatcher\Event;
use Symfony\Components\Routing\RouterInterface;
use Symfony\Components\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\Routing\RouterInterface;
use Symfony\Component\HttpKernel\HttpKernelInterface;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
View File

@ -8,7 +8,7 @@
<parameter key="data_collector.config.class">Symfony\Bundle\FrameworkBundle\DataCollector\ConfigDataCollector</parameter>
<parameter key="data_collector.app.class">Symfony\Bundle\FrameworkBundle\DataCollector\AppDataCollector</parameter>
<parameter key="data_collector.timer.class">Symfony\Bundle\FrameworkBundle\DataCollector\TimerDataCollector</parameter>
<parameter key="data_collector.memory.class">Symfony\Components\HttpKernel\Profiler\DataCollector\MemoryDataCollector</parameter>
<parameter key="data_collector.memory.class">Symfony\Component\HttpKernel\Profiler\DataCollector\MemoryDataCollector</parameter>
</parameters>
<services>

4
src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
View File

@ -6,10 +6,10 @@
<parameters>
<parameter key="profiler.class">Symfony\Bundle\FrameworkBundle\Profiler</parameter>
<parameter key="profiler.storage.class">Symfony\Components\HttpKernel\Profiler\ProfilerStorage</parameter>
<parameter key="profiler.storage.class">Symfony\Component\HttpKernel\Profiler\ProfilerStorage</parameter>
<parameter key="profiler.storage.file">%kernel.cache_dir%/profiler.db</parameter>
<parameter key="profiler.storage.lifetime">86400</parameter>
<parameter key="profiler_listener.class">Symfony\Components\HttpKernel\Profiler\ProfilerListener</parameter>
<parameter key="profiler_listener.class">Symfony\Component\HttpKernel\Profiler\ProfilerListener</parameter>
</parameters>
<services>

8
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
View File

@ -5,12 +5,12 @@
xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="router.class">Symfony\Components\Routing\Router</parameter>
<parameter key="router.class">Symfony\Component\Routing\Router</parameter>
<parameter key="routing.loader.class">Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader</parameter>
<parameter key="routing.resolver.class">Symfony\Bundle\FrameworkBundle\Routing\LoaderResolver</parameter>
<parameter key="routing.loader.xml.class">Symfony\Components\Routing\Loader\XmlFileLoader</parameter>
<parameter key="routing.loader.yml.class">Symfony\Components\Routing\Loader\YamlFileLoader</parameter>
<parameter key="routing.loader.php.class">Symfony\Components\Routing\Loader\PhpFileLoader</parameter>
<parameter key="routing.loader.xml.class">Symfony\Component\Routing\Loader\XmlFileLoader</parameter>
<parameter key="routing.loader.yml.class">Symfony\Component\Routing\Loader\YamlFileLoader</parameter>
<parameter key="routing.loader.php.class">Symfony\Component\Routing\Loader\PhpFileLoader</parameter>
</parameters>
<services>

12
src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
View File

@ -6,12 +6,12 @@
<parameters>
<parameter key="templating.engine.class">Symfony\Bundle\FrameworkBundle\Templating\Engine</parameter>
<parameter key="templating.loader.filesystem.class">Symfony\Components\Templating\Loader\FilesystemLoader</parameter>
<parameter key="templating.loader.cache.class">Symfony\Components\Templating\Loader\CacheLoader</parameter>
<parameter key="templating.loader.chain.class">Symfony\Components\Templating\Loader\ChainLoader</parameter>
<parameter key="templating.helper.javascripts.class">Symfony\Components\Templating\Helper\JavascriptsHelper</parameter>
<parameter key="templating.helper.stylesheets.class">Symfony\Components\Templating\Helper\StylesheetsHelper</parameter>
<parameter key="templating.helper.slots.class">Symfony\Components\Templating\Helper\SlotsHelper</parameter>
<parameter key="templating.loader.filesystem.class">Symfony\Component\Templating\Loader\FilesystemLoader</parameter>
<parameter key="templating.loader.cache.class">Symfony\Component\Templating\Loader\CacheLoader</parameter>
<parameter key="templating.loader.chain.class">Symfony\Component\Templating\Loader\ChainLoader</parameter>
<parameter key="templating.helper.javascripts.class">Symfony\Component\Templating\Helper\JavascriptsHelper</parameter>
<parameter key="templating.helper.stylesheets.class">Symfony\Component\Templating\Helper\StylesheetsHelper</parameter>
<parameter key="templating.helper.slots.class">Symfony\Component\Templating\Helper\SlotsHelper</parameter>
<parameter key="templating.helper.assets.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper</parameter>
<parameter key="templating.helper.actions.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\ActionsHelper</parameter>
<parameter key="templating.helper.router.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\RouterHelper</parameter>

2
src/Symfony/Bundle/FrameworkBundle/Resources/config/toolbar.xml
View File

@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="debug.toolbar.class">Symfony\Components\HttpKernel\Profiler\WebDebugToolbarListener</parameter>
<parameter key="debug.toolbar.class">Symfony\Component\HttpKernel\Profiler\WebDebugToolbarListener</parameter>
</parameters>
<services>

22
src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
View File

@ -5,17 +5,17 @@
xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="validator.class">Symfony\Components\Validator\Validator</parameter>
<parameter key="validator.validator_factory.class">Symfony\Components\Validator\Extension\DependencyInjectionValidatorFactory</parameter>
<parameter key="validator.message_interpolator.class">Symfony\Components\Validator\MessageInterpolator\XliffMessageInterpolator</parameter>
<parameter key="validator.mapping.class_metadata_factory.class">Symfony\Components\Validator\Mapping\ClassMetadataFactory</parameter>
<parameter key="validator.mapping.loader.loader_chain.class">Symfony\Components\Validator\Mapping\Loader\LoaderChain</parameter>
<parameter key="validator.mapping.loader.static_method_loader.class">Symfony\Components\Validator\Mapping\Loader\StaticMethodLoader</parameter>
<parameter key="validator.mapping.loader.annotation_loader.class">Symfony\Components\Validator\Mapping\Loader\AnnotationLoader</parameter>
<parameter key="validator.mapping.loader.xml_file_loader.class">Symfony\Components\Validator\Mapping\Loader\XmlFileLoader</parameter>
<parameter key="validator.mapping.loader.yaml_file_loader.class">Symfony\Components\Validator\Mapping\Loader\YamlFileLoader</parameter>
<parameter key="validator.mapping.loader.xml_files_loader.class">Symfony\Components\Validator\Mapping\Loader\XmlFilesLoader</parameter>
<parameter key="validator.mapping.loader.yaml_files_loader.class">Symfony\Components\Validator\Mapping\Loader\YamlFilesLoader</parameter>
<parameter key="validator.class">Symfony\Component\Validator\Validator</parameter>
<parameter key="validator.validator_factory.class">Symfony\Component\Validator\Extension\DependencyInjectionValidatorFactory</parameter>
<parameter key="validator.message_interpolator.class">Symfony\Component\Validator\MessageInterpolator\XliffMessageInterpolator</parameter>
<parameter key="validator.mapping.class_metadata_factory.class">Symfony\Component\Validator\Mapping\ClassMetadataFactory</parameter>
<parameter key="validator.mapping.loader.loader_chain.class">Symfony\Component\Validator\Mapping\Loader\LoaderChain</parameter>
<parameter key="validator.mapping.loader.static_method_loader.class">Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader</parameter>
<parameter key="validator.mapping.loader.annotation_loader.class">Symfony\Component\Validator\Mapping\Loader\AnnotationLoader</parameter>
<parameter key="validator.mapping.loader.xml_file_loader.class">Symfony\Component\Validator\Mapping\Loader\XmlFileLoader</parameter>
<parameter key="validator.mapping.loader.yaml_file_loader.class">Symfony\Component\Validator\Mapping\Loader\YamlFileLoader</parameter>
<parameter key="validator.mapping.loader.xml_files_loader.class">Symfony\Component\Validator\Mapping\Loader\XmlFilesLoader</parameter>
<parameter key="validator.mapping.loader.yaml_files_loader.class">Symfony\Component\Validator\Mapping\Loader\YamlFilesLoader</parameter>
<parameter key="validator.mapping.loader.static_method_loader.method_name">loadValidatorMetadata</parameter>
</parameters>

6
src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
View File

@ -8,12 +8,12 @@
<parameter key="request_listener.class">Symfony\Bundle\FrameworkBundle\RequestListener</parameter>
<parameter key="controller_resolver.class">Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver</parameter>
<parameter key="controller_name_converter.class">Symfony\Bundle\FrameworkBundle\Controller\ControllerNameConverter</parameter>
<parameter key="response_listener.class">Symfony\Components\HttpKernel\ResponseListener</parameter>
<parameter key="response_listener.class">Symfony\Component\HttpKernel\ResponseListener</parameter>
<parameter key="exception_listener.class">Symfony\Bundle\FrameworkBundle\Debug\ExceptionListener</parameter>
<parameter key="exception_listener.controller">Symfony\Bundle\FrameworkBundle\Controller\ExceptionController::exceptionAction</parameter>
<parameter key="exception_manager.class">Symfony\Bundle\FrameworkBundle\Debug\ExceptionManager</parameter>
<parameter key="esi.class">Symfony\Components\HttpKernel\Cache\Esi</parameter>
<parameter key="esi_listener.class">Symfony\Components\HttpKernel\Cache\EsiListener</parameter>
<parameter key="esi.class">Symfony\Component\HttpKernel\Cache\Esi</parameter>
<parameter key="esi_listener.class">Symfony\Component\HttpKernel\Cache\EsiListener</parameter>
</parameters>
<services>

2
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php
View File

@ -3,7 +3,7 @@
require_once __DIR__.'/../src/autoload.php';
use Symfony\Framework\Kernel;
use Symfony\Components\DependencyInjection\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\Loader\LoaderInterface;
use Symfony\Framework\KernelBundle;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;

4
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php
View File

@ -1,7 +1,7 @@
<?php
use Symfony\Components\Routing\RouteCollection;
use Symfony\Components\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\Routing\Route;
$collection = new RouteCollection();

4
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Bundle.php
View File

@ -3,8 +3,8 @@
namespace {{ namespace }}\{{ bundle }};
use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
class {{ bundle }} extends Bundle
{

6
src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
View File

@ -3,9 +3,9 @@
namespace Symfony\Bundle\FrameworkBundle\Routing;
use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameConverter;
use Symfony\Components\Routing\Loader\DelegatingLoader as BaseDelegatingLoader;
use Symfony\Components\Routing\Loader\LoaderResolverInterface;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Component\Routing\Loader\DelegatingLoader as BaseDelegatingLoader;
use Symfony\Component\Routing\Loader\LoaderResolverInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
/*
* This file is part of the Symfony framework.

6
src/Symfony/Bundle/FrameworkBundle/Routing/LoaderResolver.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\FrameworkBundle\Routing;
use Symfony\Components\Routing\Loader\LoaderResolver as BaseLoaderResolver;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\Routing\Loader\LoaderInterface;
use Symfony\Component\Routing\Loader\LoaderResolver as BaseLoaderResolver;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Routing\Loader\LoaderInterface;
/*
* This file is part of the Symfony package.

4
src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\Templating;
use Symfony\Components\Templating\DebuggerInterface;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Component\Templating\DebuggerInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
/*
* This file is part of the Symfony package.

10
src/Symfony/Bundle/FrameworkBundle/Templating/Engine.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\FrameworkBundle\Templating;
use Symfony\Components\Templating\Engine as BaseEngine;
use Symfony\Components\Templating\Loader\LoaderInterface;
use Symfony\Components\OutputEscaper\Escaper;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Component\Templating\Engine as BaseEngine;
use Symfony\Component\Templating\Loader\LoaderInterface;
use Symfony\Component\OutputEscaper\Escaper;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Response;
/*
* This file is part of the Symfony package.

4
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
use Symfony\Components\Templating\Helper\Helper;
use Symfony\Components\OutputEscaper\Escaper;
use Symfony\Component\Templating\Helper\Helper;
use Symfony\Component\OutputEscaper\Escaper;
use Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver;
/*

4
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
use Symfony\Components\HttpFoundation\Request;
use Symfony\Components\Templating\Helper\AssetsHelper as BaseAssetsHelper;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Templating\Helper\AssetsHelper as BaseAssetsHelper;
/*
* This file is part of the Symfony package.

2
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
use Symfony\Components\Templating\Helper\Helper;
use Symfony\Component\Templating\Helper\Helper;
/*
* This file is part of the Symfony framework.

6
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
use Symfony\Components\Templating\Helper\Helper;
use Symfony\Components\HttpFoundation\Request;
use Symfony\Component\Templating\Helper\Helper;
use Symfony\Component\HttpFoundation\Request;
/*
* This file is part of the Symfony framework.
@ -39,7 +39,7 @@ class RequestHelper extends Helper
* @param string $key The name of the parameter
* @param string $default A default value
*
* @see Symfony\Components\HttpFoundation\Request::get()
* @see Symfony\Component\HttpFoundation\Request::get()
*/
public function getParameter($key, $default = null)
{

4
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
use Symfony\Components\Templating\Helper\Helper;
use Symfony\Components\Routing\Router;
use Symfony\Component\Templating\Helper\Helper;
use Symfony\Component\Routing\Router;
/*
* This file is part of the Symfony framework.

4
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
use Symfony\Components\Templating\Helper\Helper;
use Symfony\Components\HttpFoundation\Request;
use Symfony\Component\Templating\Helper\Helper;
use Symfony\Component\HttpFoundation\Request;
/*
* This file is part of the Symfony framework.

6
src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
View File

@ -3,9 +3,9 @@
namespace Symfony\Bundle\FrameworkBundle\Test;
use Symfony\Framework\Test\WebTestCase as BaseWebTestCase;
use Symfony\Components\Finder\Finder;
use Symfony\Components\HttpFoundation\Response;
use Symfony\Components\HttpKernel\HttpKernelInterface;
use Symfony\Component\Finder\Finder;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\HttpKernelInterface;
/*
* This file is part of the Symfony package.

4
src/Symfony/Bundle/FrameworkBundle/Tests/Command/InitApplicationCommandTest.php
View File

@ -14,8 +14,8 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
use Symfony\Bundle\FrameworkBundle\Command\InitApplicationCommand;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
use Symfony\Components\Console\Tester\CommandTester;
use Symfony\Components\HttpFoundation\Request;
use Symfony\Component\Console\Tester\CommandTester;
use Symfony\Component\HttpFoundation\Request;
require_once __DIR__.'/../TestCase.php';

8
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/WebExtensionTest.php
View File

@ -13,8 +13,8 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\WebExtension;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\ParameterBag\ParameterBag;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
class WebExtensionTest extends TestCase
{
@ -34,7 +34,7 @@ class WebExtensionTest extends TestCase
$this->assertFalse($container->getParameterBag()->has('debug.toolbar.class'), '->configLoad() does not load the toolbar.xml file');
$loader->configLoad(array('toolbar' => true), $container);
$this->assertEquals('Symfony\\Components\\HttpKernel\\Profiler\\WebDebugToolbarListener', $container->getParameter('debug.toolbar.class'), '->configLoad() loads the collectors.xml file if the toolbar option is given');
$this->assertEquals('Symfony\\Component\\HttpKernel\\Profiler\\WebDebugToolbarListener', $container->getParameter('debug.toolbar.class'), '->configLoad() loads the collectors.xml file if the toolbar option is given');
}
public function testTemplatingLoad()
@ -52,7 +52,7 @@ class WebExtensionTest extends TestCase
$loader = new WebExtension();
$loader->configLoad(array('validation' => array('enabled' => true)), $container);
$this->assertEquals('Symfony\Components\Validator\Validator', $container->getParameter('validator.class'), '->validationLoad() loads the validation.xml file if not already loaded');
$this->assertEquals('Symfony\Component\Validator\Validator', $container->getParameter('validator.class'), '->validationLoad() loads the validation.xml file if not already loaded');
$this->assertFalse($container->hasDefinition('validator.mapping.loader.annotation_loader'), '->validationLoad() doesn\'t load the annotations service unless its needed');
$loader->configLoad(array('validation' => array('enabled' => true, 'annotations' => true)), $container);

2
src/Symfony/Bundle/FrameworkBundle/Tests/Kernel.php
View File

@ -12,7 +12,7 @@
namespace Symfony\Bundle\FrameworkBundle\Tests;
use Symfony\Framework\Kernel as BaseKernel;
use Symfony\Components\DependencyInjection\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\Loader\LoaderInterface;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
class Kernel extends BaseKernel

2
src/Symfony/Bundle/FrameworkBundle/Tests/Logger.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\Tests;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
class Logger implements LoggerInterface
{

10
src/Symfony/Bundle/PropelBundle/Command/BuildCommand.php
View File

@ -5,11 +5,11 @@ namespace Symfony\Bundle\PropelBundle\Command;
use Symfony\Bundle\PropelBundle\Command\PhingCommand;
use Symfony\Bundle\PropelBundle\Command\BuildModelCommand;
use Symfony\Bundle\PropelBundle\Command\BuildSqlCommand;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
/*
* This file is part of the Symfony framework.

10
src/Symfony/Bundle/PropelBundle/Command/BuildModelCommand.php
View File

@ -3,11 +3,11 @@
namespace Symfony\Bundle\PropelBundle\Command;
use Symfony\Bundle\PropelBundle\Command\PhingCommand;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
/*
* This file is part of the Symfony framework.

10
src/Symfony/Bundle/PropelBundle/Command/BuildSqlCommand.php
View File

@ -3,11 +3,11 @@
namespace Symfony\Bundle\PropelBundle\Command;
use Symfony\Bundle\PropelBundle\Command\PhingCommand;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
/*

14
src/Symfony/Bundle/PropelBundle/Command/PhingCommand.php
View File

@ -2,14 +2,14 @@
namespace Symfony\Bundle\PropelBundle\Command;
use Symfony\Components\Console\Command\Command;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
use Symfony\Components\Finder\Finder;
use Symfony\Component\Finder\Finder;
/*
* This file is part of the Symfony framework.

10
src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
View File

@ -2,11 +2,11 @@
namespace Symfony\Bundle\PropelBundle\DependencyInjection;
use Symfony\Components\DependencyInjection\Extension\Extension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Definition;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;
class PropelExtension extends Extension
{

2
src/Symfony/Bundle/PropelBundle/Logger/PropelLogger.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Bundle\PropelBundle\Logger;
use Symfony\Components\HttpKernel\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Log\LoggerInterface;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/PropelBundle/Tests/DependencyInjection/PropelExtensionTest.php
View File

@ -13,7 +13,7 @@ namespace Symfony\Bundle\PropelBundle\Tests\DependencyInjection;
use Symfony\Bundle\PropelBundle\Tests\TestCase;
use Symfony\Bundle\PropelBundle\DependencyInjection\PropelExtension;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ContainerBuilder;
class PropelExtensionTest extends TestCase
{

8
src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
View File

@ -2,10 +2,10 @@
namespace Symfony\Bundle\SwiftmailerBundle\DependencyInjection;
use Symfony\Components\DependencyInjection\Extension\Extension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/SwiftmailerBundle/Tests/DependencyInjection/SwiftmailerExtensionTest.php
View File

@ -13,7 +13,7 @@ namespace Symfony\Bundle\SwiftmailerBundle\Tests\DependencyInjection;
use Symfony\Bundle\SwiftmailerBundle\Tests\TestCase;
use Symfony\Bundle\SwiftmailerBundle\DependencyInjection\SwiftmailerExtension;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ContainerBuilder;
class SwiftmailerExtensionTest extends TestCase
{

6
src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\TwigBundle\DependencyInjection;
use Symfony\Components\DependencyInjection\Extension\Extension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/TwigBundle/Environment.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Bundle\TwigBundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/*
* This file is part of the Symfony framework.

2
src/Symfony/Bundle/TwigBundle/Extension/Helpers.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Bundle\TwigBundle\Extension;
use Symfony\Components\Templating\Engine;
use Symfony\Component\Templating\Engine;
use Symfony\Bundle\TwigBundle\TokenParser\HelperTokenParser;
/*

6
src/Symfony/Bundle/TwigBundle/Loader/Loader.php
View File

@ -2,9 +2,9 @@
namespace Symfony\Bundle\TwigBundle\Loader;
use Symfony\Components\Templating\Engine;
use Symfony\Components\Templating\Storage\Storage;
use Symfony\Components\Templating\Storage\FileStorage;
use Symfony\Component\Templating\Engine;
use Symfony\Component\Templating\Storage\Storage;
use Symfony\Component\Templating\Storage\FileStorage;
/*
* This file is part of the Symfony package.

4
src/Symfony/Bundle/TwigBundle/Renderer/Renderer.php
View File

@ -2,8 +2,8 @@
namespace Symfony\Bundle\TwigBundle\Renderer;
use Symfony\Components\Templating\Renderer\Renderer as BaseRenderer;
use Symfony\Components\Templating\Storage\Storage;
use Symfony\Component\Templating\Renderer\Renderer as BaseRenderer;
use Symfony\Component\Templating\Storage\Storage;
/*
* This file is part of the Symfony package.

2
src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
View File

@ -13,7 +13,7 @@ namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection;
use Symfony\Bundle\TwigBundle\Tests\TestCase;
use Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension;
use Symfony\Components\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ContainerBuilder;
class TwigExtensionTest extends TestCase
{

Some files were not shown because too many files have changed in this diff Show More