diff --git a/autoload.php.dist b/autoload.php.dist
index 0d0c15f326b3..95d12bfad31a 100644
--- a/autoload.php.dist
+++ b/autoload.php.dist
@@ -1,8 +1,8 @@
registerNamespaces(array(
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php
index a598f8d81070..269ee2faa869 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php
@@ -10,7 +10,7 @@
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
index ded1d8d3573d..6f2f03fd8afa 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php
@@ -7,7 +7,7 @@
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Output\OutputInterface;
use Symfony\Components\Console\Output\Output;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Doctrine\ORM\Tools\EntityGenerator;
/*
diff --git a/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php b/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php
index 7e82a9525d08..8a807f304559 100644
--- a/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\DoctrineBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
diff --git a/src/Symfony/Bundle/DoctrineMigrationsBundle/DoctrineMigrationsBundle.php b/src/Symfony/Bundle/DoctrineMigrationsBundle/DoctrineMigrationsBundle.php
index 03de622f5003..8b7976b17e60 100644
--- a/src/Symfony/Bundle/DoctrineMigrationsBundle/DoctrineMigrationsBundle.php
+++ b/src/Symfony/Bundle/DoctrineMigrationsBundle/DoctrineMigrationsBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\DoctrineMigrationsBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
/*
* This file is part of the Symfony framework.
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/DoctrineMongoDBBundle.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/DoctrineMongoDBBundle.php
index c873a70eae63..29cd15728ad3 100755
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/DoctrineMongoDBBundle.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/DoctrineMongoDBBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\DoctrineMongoDBBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Bundle\DoctrineMongoDBBundle\DependencyInjection\MongoDBExtension;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index ae742ba1bc89..93ea8a941d85 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -6,7 +6,7 @@
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Output\OutputInterface;
-use Symfony\Foundation\Kernel;
+use Symfony\Framework\Kernel;
/*
* This file is part of the Symfony framework.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/BootstrapApplication.php b/src/Symfony/Bundle/FrameworkBundle/Console/BootstrapApplication.php
index f4c5b6824448..80578bc2cc21 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/BootstrapApplication.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/BootstrapApplication.php
@@ -6,7 +6,7 @@
use Symfony\Components\Console\Input\InputInterface;
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Output\OutputInterface;
-use Symfony\Foundation\Kernel;
+use Symfony\Framework\Kernel;
use Symfony\Bundle\FrameworkBundle\Command\InitApplicationCommand;
/*
diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/ConfigDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/ConfigDataCollector.php
index 09732f12d6ae..17bb2df16017 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/ConfigDataCollector.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/ConfigDataCollector.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\FrameworkBundle\DataCollector;
-use Symfony\Foundation\Kernel;
+use Symfony\Framework\Kernel;
use Symfony\Components\HttpKernel\Profiler\DataCollector\DataCollector;
use Symfony\Components\DependencyInjection\ContainerInterface;
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index 22a7adc8d5ca..37de9fa7f697 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\FrameworkBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Cache.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Cache.php
index c05381ceffda..4a6ce7046648 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Cache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Cache.php
@@ -2,7 +2,7 @@
require_once __DIR__.'/{{ class }}Kernel.php';
-use Symfony\Foundation\Cache\Cache;
+use Symfony\Framework\Cache\Cache;
class {{ class }}Cache extends Cache
{
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Kernel.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Kernel.php
index 7a1abfa0c856..29496dc76fbd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Kernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Kernel.php
@@ -2,11 +2,11 @@
require_once __DIR__.'/../src/autoload.php';
-use Symfony\Foundation\Kernel;
+use Symfony\Framework\Kernel;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader as ContainerLoader;
use Symfony\Components\Routing\Loader\XmlFileLoader as RoutingLoader;
-use Symfony\Foundation\Bundle\KernelBundle;
+use Symfony\Framework\Bundle\KernelBundle;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\ZendBundle\ZendBundle;
use Symfony\Bundle\DoctrineBundle\DoctrineBundle;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Cache.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Cache.php
index c05381ceffda..4a6ce7046648 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Cache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Cache.php
@@ -2,7 +2,7 @@
require_once __DIR__.'/{{ class }}Kernel.php';
-use Symfony\Foundation\Cache\Cache;
+use Symfony\Framework\Cache\Cache;
class {{ class }}Cache extends Cache
{
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Kernel.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Kernel.php
index 55e1e7b02462..4e938e452ba3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Kernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Kernel.php
@@ -2,11 +2,11 @@
require_once __DIR__.'/../src/autoload.php';
-use Symfony\Foundation\Kernel;
+use Symfony\Framework\Kernel;
use Symfony\Components\DependencyInjection\Loader\YamlFileLoader as ContainerLoader;
use Symfony\Components\Routing\Loader\YamlFileLoader as RoutingLoader;
-use Symfony\Foundation\Bundle\KernelBundle;
+use Symfony\Framework\Bundle\KernelBundle;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\ZendBundle\ZendBundle;
use Symfony\Bundle\DoctrineBundle\DoctrineBundle;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Bundle.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Bundle.php
index b905ac433f53..c57092e7f51c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Bundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Bundle.php
@@ -2,7 +2,7 @@
namespace {{ namespace }}\{{ bundle }};
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
class {{ bundle }} extends Bundle
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.txt.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.txt.php
index 8cac97abb533..41faf666de72 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.txt.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.txt.php
@@ -9,5 +9,5 @@
-[symfony] v. (symfony-project.org)
+[symfony] v. (symfony-project.org)
[PHP] v.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
index b55406f6c81b..621cefe882ef 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\FrameworkBundle\Test;
-use Symfony\Foundation\Test\WebTestCase as BaseWebTestCase;
+use Symfony\Framework\Test\WebTestCase as BaseWebTestCase;
use Symfony\Components\Finder\Finder;
use Symfony\Components\HttpFoundation\Response;
diff --git a/src/Symfony/Bundle/PropelBundle/PropelBundle.php b/src/Symfony/Bundle/PropelBundle/PropelBundle.php
index 1201d888659a..be9166c0301d 100644
--- a/src/Symfony/Bundle/PropelBundle/PropelBundle.php
+++ b/src/Symfony/Bundle/PropelBundle/PropelBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\PropelBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/SwiftmailerBundle.php b/src/Symfony/Bundle/SwiftmailerBundle/SwiftmailerBundle.php
index b5117711abd9..a1e3a1c3aac8 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/SwiftmailerBundle.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/SwiftmailerBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\SwiftmailerBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Bundle\SwiftmailerBundle\DependencyInjection\SwiftmailerExtension;
diff --git a/src/Symfony/Bundle/TwigBundle/TwigBundle.php b/src/Symfony/Bundle/TwigBundle/TwigBundle.php
index 26ae535e1231..932a0284ff44 100644
--- a/src/Symfony/Bundle/TwigBundle/TwigBundle.php
+++ b/src/Symfony/Bundle/TwigBundle/TwigBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\TwigBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
diff --git a/src/Symfony/Bundle/ZendBundle/ZendBundle.php b/src/Symfony/Bundle/ZendBundle/ZendBundle.php
index 6ab314b81903..2b64af2925ef 100644
--- a/src/Symfony/Bundle/ZendBundle/ZendBundle.php
+++ b/src/Symfony/Bundle/ZendBundle/ZendBundle.php
@@ -2,7 +2,7 @@
namespace Symfony\Bundle\ZendBundle;
-use Symfony\Foundation\Bundle\Bundle;
+use Symfony\Framework\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Components\DependencyInjection\Loader\Loader;
diff --git a/src/Symfony/Components/HttpKernel/Client.php b/src/Symfony/Components/HttpKernel/Client.php
index fd6e5847b384..d09a992f3852 100644
--- a/src/Symfony/Components/HttpKernel/Client.php
+++ b/src/Symfony/Components/HttpKernel/Client.php
@@ -69,7 +69,7 @@ protected function getScript($request)
$kernel = serialize($this->kernel);
$request = serialize($request);
- $r = new \ReflectionClass('\\Symfony\\Foundation\\UniversalClassLoader');
+ $r = new \ReflectionClass('\\Symfony\\Framework\\UniversalClassLoader');
$requirePath = $r->getFileName();
$symfonyPath = realpath(__DIR__.'/../../..');
@@ -79,7 +79,7 @@ protected function getScript($request)
require_once '$requirePath';
-\$loader = new Symfony\Foundation\UniversalClassLoader();
+\$loader = new Symfony\Framework\UniversalClassLoader();
\$loader->registerNamespaces(array('Symfony' => '$symfonyPath'));
\$loader->register();
diff --git a/src/Symfony/Components/HttpKernel/Test/WebTestCase.php b/src/Symfony/Components/HttpKernel/Test/WebTestCase.php
index c9e11f2cf885..bfc71af74dec 100644
--- a/src/Symfony/Components/HttpKernel/Test/WebTestCase.php
+++ b/src/Symfony/Components/HttpKernel/Test/WebTestCase.php
@@ -30,7 +30,7 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase
* @param Boolean $debug The debug flag
* @param array $server An array of server parameters
*
- * @return Symfony\Foundation\Client A Client instance
+ * @return Symfony\Framework\Client A Client instance
*/
abstract public function createClient(array $options = array(), array $server = array());
}
diff --git a/src/Symfony/Foundation/Bundle/Bundle.php b/src/Symfony/Framework/Bundle/Bundle.php
similarity index 99%
rename from src/Symfony/Foundation/Bundle/Bundle.php
rename to src/Symfony/Framework/Bundle/Bundle.php
index 8c2c09a17a98..b6ee4d750440 100644
--- a/src/Symfony/Foundation/Bundle/Bundle.php
+++ b/src/Symfony/Framework/Bundle/Bundle.php
@@ -1,6 +1,6 @@
registerNamespaces(array('Symfony' => __DIR__.'/../../../..'));
diff --git a/src/Symfony/Foundation/Resources/config/debug.xml b/src/Symfony/Framework/Resources/config/debug.xml
similarity index 85%
rename from src/Symfony/Foundation/Resources/config/debug.xml
rename to src/Symfony/Framework/Resources/config/debug.xml
index 7d2b2874fdcd..b63decc0877d 100644
--- a/src/Symfony/Foundation/Resources/config/debug.xml
+++ b/src/Symfony/Framework/Resources/config/debug.xml
@@ -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">
- Symfony\Foundation\Debug\EventDispatcher
+ Symfony\Framework\Debug\EventDispatcher
diff --git a/src/Symfony/Foundation/Resources/config/services.xml b/src/Symfony/Framework/Resources/config/services.xml
similarity index 90%
rename from src/Symfony/Foundation/Resources/config/services.xml
rename to src/Symfony/Framework/Resources/config/services.xml
index fc80239a5178..6ffe647711d6 100644
--- a/src/Symfony/Foundation/Resources/config/services.xml
+++ b/src/Symfony/Framework/Resources/config/services.xml
@@ -5,11 +5,11 @@
xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
- Symfony\Foundation\EventDispatcher
+ Symfony\Framework\EventDispatcher
Symfony\Components\HttpKernel\HttpKernel
Symfony\Components\HttpFoundation\Request
Symfony\Components\HttpFoundation\Response
- Symfony\Foundation\Debug\ErrorHandler
+ Symfony\Framework\Debug\ErrorHandler
null
true
true
diff --git a/src/Symfony/Foundation/Resources/config/session.xml b/src/Symfony/Framework/Resources/config/session.xml
similarity index 100%
rename from src/Symfony/Foundation/Resources/config/session.xml
rename to src/Symfony/Framework/Resources/config/session.xml
diff --git a/src/Symfony/Foundation/Resources/config/test.xml b/src/Symfony/Framework/Resources/config/test.xml
similarity index 93%
rename from src/Symfony/Foundation/Resources/config/test.xml
rename to src/Symfony/Framework/Resources/config/test.xml
index 94c484dc820a..9de3f282e280 100644
--- a/src/Symfony/Foundation/Resources/config/test.xml
+++ b/src/Symfony/Framework/Resources/config/test.xml
@@ -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">
- Symfony\Foundation\Client
+ Symfony\Framework\Client
Symfony\Components\BrowserKit\History
Symfony\Components\BrowserKit\CookieJar
diff --git a/src/Symfony/Foundation/Test/WebTestCase.php b/src/Symfony/Framework/Test/WebTestCase.php
similarity index 93%
rename from src/Symfony/Foundation/Test/WebTestCase.php
rename to src/Symfony/Framework/Test/WebTestCase.php
index 3e89a2b16a81..79e0d6b1ef70 100644
--- a/src/Symfony/Foundation/Test/WebTestCase.php
+++ b/src/Symfony/Framework/Test/WebTestCase.php
@@ -1,6 +1,6 @@