Skip to content

Commit

Permalink
renamed Symfony\Foundation to Symfony\Framework
Browse files Browse the repository at this point in the history
In existing applications, you need to updated the autoload.php file, the
XXXKernel file and all XXXBundle classes.
  • Loading branch information
fabpot committed Jul 9, 2010
1 parent 15d4398 commit da9f36c
Show file tree
Hide file tree
Showing 45 changed files with 66 additions and 66 deletions.
4 changes: 2 additions & 2 deletions autoload.php.dist
@@ -1,8 +1,8 @@
<?php

require_once __DIR__.'/src/Symfony/Foundation/UniversalClassLoader.php';
require_once __DIR__.'/src/Symfony/Framework/UniversalClassLoader.php';

use Symfony\Foundation\UniversalClassLoader;
use Symfony\Framework\UniversalClassLoader;

$loader = new UniversalClassLoader();
$loader->registerNamespaces(array(
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;

/*
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php
Expand Up @@ -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;
Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Console/Application.php
Expand Up @@ -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.
Expand Down
Expand Up @@ -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;

/*
Expand Down
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
{
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
{
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -9,5 +9,5 @@

<?php endforeach; ?>
<?php endif; ?>
[symfony] v. <?php echo \Symfony\Foundation\Kernel::VERSION ?> (symfony-project.org)
[symfony] v. <?php echo \Symfony\Framework\Kernel::VERSION ?> (symfony-project.org)
[PHP] v. <?php echo PHP_VERSION ?>
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/PropelBundle/PropelBundle.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SwiftmailerBundle/SwiftmailerBundle.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/TwigBundle/TwigBundle.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/ZendBundle/ZendBundle.php
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Components/HttpKernel/Client.php
Expand Up @@ -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__.'/../../..');
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Components/HttpKernel/Test/WebTestCase.php
Expand Up @@ -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());
}
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation\Bundle;
namespace Symfony\Framework\Bundle;

use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\Console\Application;
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation\Bundle;
namespace Symfony\Framework\Bundle;

use Symfony\Components\DependencyInjection\ContainerInterface;

Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation\Cache;
namespace Symfony\Framework\Cache;

use Symfony\Components\HttpKernel\HttpKernelInterface;
use Symfony\Components\HttpKernel\Cache\Cache as BaseCache;
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation;
namespace Symfony\Framework;

/*
* This file is part of the Symfony framework.
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation;
namespace Symfony\Framework;

use Symfony\Components\HttpKernel\HttpKernelInterface;
use Symfony\Components\HttpKernel\Client as BaseClient;
Expand Down Expand Up @@ -55,7 +55,7 @@ public function getContainer()
/**
* Returns the kernel.
*
* @return Symfony\Foundation\Kernel
* @return Symfony\Framework\Kernel
*/
public function getKernel()
{
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation\Debug;
namespace Symfony\Framework\Debug;

/*
* This file is part of the Symfony framework.
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation\Debug;
namespace Symfony\Framework\Debug;

/*
* This file is part of the Symfony framework.
Expand Down
@@ -1,8 +1,8 @@
<?php

namespace Symfony\Foundation\Debug;
namespace Symfony\Framework\Debug;

use Symfony\Foundation\EventDispatcher as BaseEventDispatcher;
use Symfony\Framework\EventDispatcher as BaseEventDispatcher;
use Symfony\Components\EventDispatcher\EventDispatcherInterface;
use Symfony\Components\EventDispatcher\Event;
use Symfony\Components\HttpKernel\LoggerInterface;
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation\DependencyInjection;
namespace Symfony\Framework\DependencyInjection;

use Symfony\Components\DependencyInjection\Loader\LoaderExtension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation;
namespace Symfony\Framework;

use Symfony\Components\EventDispatcher\EventDispatcher as BaseEventDispatcher;
use Symfony\Components\EventDispatcher\Event;
Expand Down
@@ -1,6 +1,6 @@
<?php

namespace Symfony\Foundation;
namespace Symfony\Framework;

use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Builder;
Expand Down
@@ -1,10 +1,10 @@
<?php

namespace Symfony\Foundation;
namespace Symfony\Framework;

use Symfony\Foundation\Bundle\Bundle;
use Symfony\Foundation\ClassCollectionLoader;
use Symfony\Foundation\DependencyInjection\KernelExtension;
use Symfony\Framework\Bundle\Bundle;
use Symfony\Framework\ClassCollectionLoader;
use Symfony\Framework\DependencyInjection\KernelExtension;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
Expand Down
Expand Up @@ -11,8 +11,8 @@
* with this source code in the file LICENSE.
*/

use Symfony\Foundation\UniversalClassLoader;
use Symfony\Foundation\ClassCollectionLoader;
use Symfony\Framework\UniversalClassLoader;
use Symfony\Framework\ClassCollectionLoader;

$loader = new UniversalClassLoader();
$loader->registerNamespaces(array('Symfony' => __DIR__.'/../../../..'));
Expand Down
Expand Up @@ -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.event_dispatcher.class">Symfony\Foundation\Debug\EventDispatcher</parameter>
<parameter key="debug.event_dispatcher.class">Symfony\Framework\Debug\EventDispatcher</parameter>
</parameters>

<services>
Expand Down
Expand Up @@ -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">

<parameters>
<parameter key="event_dispatcher.class">Symfony\Foundation\EventDispatcher</parameter>
<parameter key="event_dispatcher.class">Symfony\Framework\EventDispatcher</parameter>
<parameter key="http_kernel.class">Symfony\Components\HttpKernel\HttpKernel</parameter>
<parameter key="request.class">Symfony\Components\HttpFoundation\Request</parameter>
<parameter key="response.class">Symfony\Components\HttpFoundation\Response</parameter>
<parameter key="error_handler.class">Symfony\Foundation\Debug\ErrorHandler</parameter>
<parameter key="error_handler.class">Symfony\Framework\Debug\ErrorHandler</parameter>
<parameter key="error_handler.level">null</parameter>
<parameter key="error_handler.enable">true</parameter>
<parameter key="kernel.include_core_classes">true</parameter>
Expand Down
Expand Up @@ -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="test.client.class">Symfony\Foundation\Client</parameter>
<parameter key="test.client.class">Symfony\Framework\Client</parameter>
<parameter key="test.client.parameters" type="collection"></parameter>
<parameter key="test.client.history.class">Symfony\Components\BrowserKit\History</parameter>
<parameter key="test.client.cookiejar.class">Symfony\Components\BrowserKit\CookieJar</parameter>
Expand Down

0 comments on commit da9f36c

Please sign in to comment.