Author: fabien
Date: 2010-03-26 16:30:07 +0100 (Fri, 26 Mar 2010)
New Revision: 28803
Modified:
branches/2.0/phpunit.xml
branches/2.0/src/Symfony/Components/DependencyInjection/Container.php
branches/2.0/src/Symfony/Components/Routing/Generator/UrlGenerator.php
branches/2.0/tests/Symfony/Tests/Components/Console/ApplicationTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Command/CommandTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Command/HelpCommandTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Command/ListCommandTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Helper/FormatterHelperTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArgvInputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArrayInputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputArgumentTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputOptionTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Input/StringInputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Output/ConsoleOutputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Output/NullOutputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Output/OutputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Output/StreamOutputTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/ApplicationTesterTest.php
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/CommandTesterTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ContainerTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/DefinitionTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/DumperTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/FileResourceTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ParameterTest.php
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ReferenceTest.php
branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventDispatcherTest.php
branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventTest.php
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ArrayDecoratorTest.php
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/EscaperTest.php
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ObjectDecoratorTest.php
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/SafeDecoratorTest.php
branches/2.0/tests/Symfony/Tests/Components/RequestHandler/RequestTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/EngineTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/AssetsTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/HelperTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/JavascriptsHelperTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/SlotsHelperTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/StylesheetsHelperTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StorageTest.php
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StringStorageTest.php
branches/2.0/tests/Symfony/Tests/Components/Yaml/DumperTest.php
branches/2.0/tests/Symfony/Tests/Components/Yaml/InlineTest.php
branches/2.0/tests/Symfony/Tests/Components/Yaml/ParserTest.php
branches/2.0/tests/Symfony/Tests/bootstrap.php
Log:
Merge branch 'master' of git://github.com/symfony/symfony
Modified: branches/2.0/phpunit.xml
===================================================================
--- branches/2.0/phpunit.xml 2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/phpunit.xml 2010-03-26 15:30:07 UTC (rev 28803)
@@ -9,6 +9,7 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
+ bootstrap="tests/Symfony/Tests/bootstrap.php"
>
<testsuites>
<testsuite name="Symfony Test Suite">
Modified: branches/2.0/src/Symfony/Components/DependencyInjection/Container.php
===================================================================
--- branches/2.0/src/Symfony/Components/DependencyInjection/Container.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/src/Symfony/Components/DependencyInjection/Container.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -193,7 +193,7 @@
throw new \InvalidArgumentException(sprintf('A service id should be a
string (%s given).', str_replace("\n", '', var_export($id, true))));
}
- if (method_exists($this, $method = 'get'.strtr($id, array('_' => '', '.'
=> '_')).'Service'))
+ if (method_exists($this, $method = 'get'.strtr($id, array('_' => '', '.'
=> '_')).'Service') && 'getService' !== $method)
{
return $this->$method();
}
Modified: branches/2.0/src/Symfony/Components/Routing/Generator/UrlGenerator.php
===================================================================
--- branches/2.0/src/Symfony/Components/Routing/Generator/UrlGenerator.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/src/Symfony/Components/Routing/Generator/UrlGenerator.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -38,7 +38,7 @@
public function __construct(RouteCollection $routes, array $context =
array(), array $defaults = array())
{
$this->routes = $routes;
- $this->context = array_merge(array('base_url' => ''), $context);
+ $this->context = $context;
$this->defaults = $defaults;
$this->cache = array();
}
@@ -123,7 +123,7 @@
$url .= '?'.http_build_query($extra);
}
- $url = $this->context['base_url'].$url;
+ $url = (isset($this->context['base_url']) ? $this->context['base_url'] :
'').$url;
if ($absolute && isset($this->context['host']))
{
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/ApplicationTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Console/ApplicationTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Console/ApplicationTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\Console\Application;
use Symfony\Components\Console\Input\ArrayInput;
use Symfony\Components\Console\Output\Output;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Command/CommandTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Console/Command/CommandTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Console/Command/CommandTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Command;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Command\Command;
use Symfony\Components\Console\Application;
use Symfony\Components\Console\Input\InputDefinition;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Command/HelpCommandTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Command/HelpCommandTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Command/HelpCommandTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Command;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Tester\CommandTester;
use Symfony\Components\Console\Command\HelpCommand;
use Symfony\Components\Console\Command\ListCommand;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Command/ListCommandTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Command/ListCommandTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Command/ListCommandTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Command;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Tester\CommandTester;
use Symfony\Components\Console\Application;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Helper/FormatterHelperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Helper/FormatterHelperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Helper/FormatterHelperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Formatter;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Helper\FormatterHelper;
class FormatterHelperTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArgvInputTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArgvInputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArgvInputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Input;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Input\ArgvInput;
use Symfony\Components\Console\Input\InputDefinition;
use Symfony\Components\Console\Input\InputArgument;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArrayInputTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArrayInputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Input/ArrayInputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Input;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Input\ArrayInput;
use Symfony\Components\Console\Input\InputDefinition;
use Symfony\Components\Console\Input\InputArgument;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputArgumentTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputArgumentTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputArgumentTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Input;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Exception;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputDefinitionTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Input;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Input\InputDefinition;
use Symfony\Components\Console\Input\InputArgument;
use Symfony\Components\Console\Input\InputOption;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputOptionTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputOptionTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputOptionTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Input;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Input\InputOption;
use Symfony\Components\Console\Exception;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Console/Input/InputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Input;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Input\ArrayInput;
use Symfony\Components\Console\Input\InputDefinition;
use Symfony\Components\Console\Input\InputArgument;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Input/StringInputTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Input/StringInputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Input/StringInputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Input;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Input\StringInput;
class StringInputTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Output/ConsoleOutputTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Output/ConsoleOutputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Output/ConsoleOutputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Output;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Output\ConsoleOutput;
use Symfony\Components\Console\Output\Output;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Output/NullOutputTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Output/NullOutputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Output/NullOutputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Output;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Output\NullOutput;
class NullOutputTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Output/OutputTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Console/Output/OutputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Console/Output/OutputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Output;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Output\Output;
class OutputTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Output/StreamOutputTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Output/StreamOutputTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Output/StreamOutputTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Output;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Output\Output;
use Symfony\Components\Console\Output\StreamOutput;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/ApplicationTesterTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/ApplicationTesterTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/ApplicationTesterTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Tester;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Application;
use Symfony\Components\Console\Output\Output;
use Symfony\Components\Console\Tester\ApplicationTester;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/CommandTesterTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/CommandTesterTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Console/Tester/CommandTesterTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\Console\Tester;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Console\Command\Command;
use Symfony\Components\Console\Output\Output;
use Symfony\Components\Console\Tester\CommandTester;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderConfigurationTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\BuilderConfiguration;
use Symfony\Components\DependencyInjection\Definition;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/BuilderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\BuilderConfiguration;
use Symfony\Components\DependencyInjection\Definition;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ContainerTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ContainerTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ContainerTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Container;
class ContainerTest extends \PHPUnit_Framework_TestCase
@@ -176,6 +174,20 @@
{
}
}
+
+ public function testGetService()
+ {
+ $sc = new Container();
+
+ try
+ {
+ $sc->getService('');
+ $this->fail('->getService() throws a \InvalidArgumentException exception
if the service is empty');
+ }
+ catch (\InvalidArgumentException $e)
+ {
+ }
+ }
}
class ProjectServiceContainer extends Container
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/CrossCheckTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
class CrossCheckTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/DefinitionTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/DefinitionTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/DefinitionTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Definition;
class DefinitionTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/DumperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/DumperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/DumperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Dumper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Dumper\Dumper;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/GraphvizDumperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Dumper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Dumper\GraphvizDumper;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/PhpDumperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Dumper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Dumper\PhpDumper;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/XmlDumperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Dumper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Dumper\XmlDumper;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Dumper/YamlDumperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Dumper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Dumper\YamlDumper;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/FileResourceTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/FileResourceTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/FileResourceTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\FileResource;
class FileResourceTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/FileLoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Loader\FileLoader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/IniFileLoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Loader\IniFileLoader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
require_once
__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/includes/ProjectExtension.php';
class LoaderExtensionTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
require_once
__DIR__.'/../../../../../fixtures/Symfony/Components/DependencyInjection/includes/ProjectExtension.php';
use Symfony\Components\DependencyInjection\Loader\Loader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/XmlFileLoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Components\DependencyInjection\Definition;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/Loader/YamlFileLoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Builder;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Components\DependencyInjection\Definition;
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ParameterTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ParameterTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ParameterTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Parameter;
class ParameterTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ReferenceTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ReferenceTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/DependencyInjection/ReferenceTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\DependencyInjection;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\DependencyInjection\Reference;
class ReferenceTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventDispatcherTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventDispatcherTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventDispatcherTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\EventDispatcher;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\EventDispatcher\Event;
use Symfony\Components\EventDispatcher\EventDispatcher;
Modified:
branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/EventDispatcher/EventTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\EventDispatcher;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\EventDispatcher\Event;
class EventTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ArrayDecoratorTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ArrayDecoratorTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ArrayDecoratorTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\OutputEscaper;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\OutputEscaper\Escaper;
class ArrayDecoratorTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/EscaperTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/EscaperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/EscaperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\OutputEscaper;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\OutputEscaper\Escaper;
use Symfony\Components\OutputEscaper\SafeDecorator;
use Symfony\Components\OutputEscaper\IteratorDecorator;
Modified:
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ObjectDecoratorTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ObjectDecoratorTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/ObjectDecoratorTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\OutputEscaper;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\OutputEscaper\Escaper;
class ObjectDecoratorTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/SafeDecoratorTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/SafeDecoratorTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/OutputEscaper/SafeDecoratorTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\OutputEscaper;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\OutputEscaper\SafeDecorator;
class SafeDecoratorTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/RequestHandler/RequestTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/RequestHandler/RequestTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/RequestHandler/RequestTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,14 +11,12 @@
namespace Symfony\Tests\Components\RequestHandler;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\RequestHandler\Request;
class RequestTest extends \PHPUnit_Framework_TestCase
{
/**
- * @covers Request::__construct()
+ * @covers Symfony\Components\RequestHandler\Request::__construct
*/
public function testConstructor()
{
@@ -26,7 +24,7 @@
}
/**
- * @covers Request::setParameters()
+ * @covers Symfony\Components\RequestHandler\Request::setParameters
*/
public function testSetParameters()
{
@@ -46,7 +44,7 @@
}
/**
- * @covers Request::duplicate()
+ * @covers Symfony\Components\RequestHandler\Request::duplicate
*/
public function testDuplicate()
{
Modified: branches/2.0/tests/Symfony/Tests/Components/Templating/EngineTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Templating/EngineTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Templating/EngineTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating;
-require_once __DIR__.'/../../bootstrap.php';
-
require_once
__DIR__.'/../../../../lib/SymfonyTests/Components/Templating/SimpleHelper.php';
use Symfony\Components\Templating\Engine;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/AssetsTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/AssetsTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/AssetsTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Helper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Helper\AssetsHelper;
class AssetsHelperTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/HelperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/HelperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/HelperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Helper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Helper\Helper;
class HelperTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/JavascriptsHelperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/JavascriptsHelperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/JavascriptsHelperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Helper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Helper\AssetsHelper;
use Symfony\Components\Templating\Helper\JavascriptsHelper;
use Symfony\Components\Templating\Loader\FilesystemLoader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/SlotsHelperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/SlotsHelperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/SlotsHelperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Helper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Helper\SlotsHelper;
class SlotsHelperTest extends \PHPUnit_Framework_TestCase
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/StylesheetsHelperTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/StylesheetsHelperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Helper/StylesheetsHelperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Helper;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Helper\AssetsHelper;
use Symfony\Components\Templating\Helper\StylesheetsHelper;
use Symfony\Components\Templating\Loader\FilesystemLoader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/CacheLoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
require_once
__DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
use Symfony\Components\Templating\Loader\Loader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/ChainLoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
require_once
__DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
use Symfony\Components\Templating\Loader\ChainLoader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/FilesystemLoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
require_once
__DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
use Symfony\Components\Templating\Loader\FilesystemLoader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Loader/LoaderTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Loader;
-require_once __DIR__.'/../../../bootstrap.php';
-
require_once
__DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/ProjectTemplateDebugger.php';
use Symfony\Components\Templating\Loader\Loader;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/PhpRendererTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Renderer;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Renderer\PhpRenderer;
use Symfony\Components\Templating\Storage\Storage;
use Symfony\Components\Templating\Storage\StringStorage;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Renderer/RendererTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Renderer;
-require_once __DIR__.'/../../../bootstrap.php';
-
require_once
__DIR__.'/../../../../../lib/SymfonyTests/Components/Templating/SimpleHelper.php';
use Symfony\Components\Templating\Engine;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/FileStorageTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Storage;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Storage\Storage;
use Symfony\Components\Templating\Storage\FileStorage;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StorageTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StorageTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StorageTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Storage;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Storage\Storage;
use Symfony\Components\Templating\Renderer\PhpRenderer;
Modified:
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StringStorageTest.php
===================================================================
---
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StringStorageTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++
branches/2.0/tests/Symfony/Tests/Components/Templating/Storage/StringStorageTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -11,8 +11,6 @@
namespace Symfony\Tests\Components\Templating\Storage;
-require_once __DIR__.'/../../../bootstrap.php';
-
use Symfony\Components\Templating\Storage\Storage;
use Symfony\Components\Templating\Storage\StringStorage;
Modified: branches/2.0/tests/Symfony/Tests/Components/Yaml/DumperTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Yaml/DumperTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Yaml/DumperTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\OutputEscaper;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\Yaml\Yaml;
use Symfony\Components\Yaml\Parser;
use Symfony\Components\Yaml\Dumper;
Modified: branches/2.0/tests/Symfony/Tests/Components/Yaml/InlineTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Yaml/InlineTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Yaml/InlineTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\OutputEscaper;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\Yaml\Yaml;
use Symfony\Components\Yaml\Inline;
Modified: branches/2.0/tests/Symfony/Tests/Components/Yaml/ParserTest.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/Components/Yaml/ParserTest.php
2010-03-26 15:26:15 UTC (rev 28802)
+++ branches/2.0/tests/Symfony/Tests/Components/Yaml/ParserTest.php
2010-03-26 15:30:07 UTC (rev 28803)
@@ -10,8 +10,6 @@
namespace Symfony\Tests\Components\OutputEscaper;
-require_once __DIR__.'/../../bootstrap.php';
-
use Symfony\Components\Yaml\Yaml;
use Symfony\Components\Yaml\Parser;
use Symfony\Components\Yaml\ParserException;
Modified: branches/2.0/tests/Symfony/Tests/bootstrap.php
===================================================================
--- branches/2.0/tests/Symfony/Tests/bootstrap.php 2010-03-26 15:26:15 UTC
(rev 28802)
+++ branches/2.0/tests/Symfony/Tests/bootstrap.php 2010-03-26 15:30:07 UTC
(rev 28803)
@@ -10,7 +10,6 @@
*/
require_once
__DIR__.'/../../../src/Symfony/Foundation/UniversalClassLoader.php';
-require_once 'PHPUnit/Framework.php';
$loader = new Symfony\Foundation\UniversalClassLoader();
$loader->registerNamespace('Symfony', __DIR__.'/../../../src');
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
