Author: fabien Date: 2010-02-22 11:45:09 +0100 (Mon, 22 Feb 2010) New Revision: 28175
Modified: branches/2.0/README branches/2.0/src/Symfony/Components/Templating/Helper/JavascriptsHelper.php branches/2.0/src/Symfony/Components/Templating/Helper/StylesheetsHelper.php branches/2.0/src/Symfony/Framework/WebBundle/Controller/RedirectController.php branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config.xml branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config.yml Log: Merge branch 'master' of git://github.com/symfony/symfony Modified: branches/2.0/README =================================================================== --- branches/2.0/README 2010-02-22 03:44:54 UTC (rev 28174) +++ branches/2.0/README 2010-02-22 10:45:09 UTC (rev 28175) @@ -9,14 +9,14 @@ websites with PHP. Symfony can be used to develop all kind of websites, from your personal blog -to hight traffic ones like Dailymotion or Yahoo! Answers. +to high traffic ones like Dailymotion or Yahoo! Answers. High Performance ---------------- -Built with performance in mind, Symfony 2 is one of the fastest PHP framework. -It is up to 3 times faster than symfony 1.4 or Zend Framework 1.10 and -consumes half the memory. +Built with performance in mind, Symfony 2 is one of the fastest PHP +frameworks. It is up to 3 times faster than symfony 1.4 or Zend Framework 1.10 +and consumes half the memory. Requirements ------------ @@ -26,14 +26,14 @@ Documentation ------------- -Symfony 2.0 is still in the early stages of development, but the "[Quick Tour][1]" -tutorial can get you started fast. +Symfony 2.0 is still in the early stages of development, but the +"[Quick Tour][1]" tutorial can get you started fast. The "Quick Tour" tutorial barely scratches the surface of Symfony 2.0 but it -gives you a first feeling of the framework. If like us you think that Symfony -2.0 can be of great help to speed up your development and take the quality of -your work to the next level, visit the official [Symfony 2 website][2] to -learn about it. +gives you a first feeling of the framework. If, like us, you think that +Symfony 2.0 can help speed up your development and take the quality of your +work to the next level, visit the official [Symfony 2 website][2] to learn +more. [1]: http://symfony-reloaded.org/learn [2]: http://symfony-reloaded.org/ Modified: branches/2.0/src/Symfony/Components/Templating/Helper/JavascriptsHelper.php =================================================================== --- branches/2.0/src/Symfony/Components/Templating/Helper/JavascriptsHelper.php 2010-02-22 03:44:54 UTC (rev 28174) +++ branches/2.0/src/Symfony/Components/Templating/Helper/JavascriptsHelper.php 2010-02-22 10:45:09 UTC (rev 28175) @@ -51,11 +51,11 @@ } /** - * Returns a string representation of this helper as HTML. + * Returns HTML representation of the links to JavaScripts. * * @return string The HTML representation of the JavaScripts */ - public function __toString() + public function render() { $html = ''; foreach ($this->javascripts as $path => $attributes) @@ -73,6 +73,25 @@ } /** + * Outputs HTML representation of the links to JavaScripts. + * + */ + public function output() + { + echo $this->render(); + } + + /** + * Returns a string representation of this helper as HTML. + * + * @return string The HTML representation of the JavaScripts + */ + public function __toString() + { + return $this->render(); + } + + /** * Returns the canonical name of this helper. * * @return string The canonical name Modified: branches/2.0/src/Symfony/Components/Templating/Helper/StylesheetsHelper.php =================================================================== --- branches/2.0/src/Symfony/Components/Templating/Helper/StylesheetsHelper.php 2010-02-22 03:44:54 UTC (rev 28174) +++ branches/2.0/src/Symfony/Components/Templating/Helper/StylesheetsHelper.php 2010-02-22 10:45:09 UTC (rev 28175) @@ -51,11 +51,11 @@ } /** - * Returns a string representation of this helper as HTML. + * Returns HTML representation of the links to stylesheets. * * @return string The HTML representation of the stylesheets */ - public function __toString() + public function render() { $html = ''; foreach ($this->stylesheets as $path => $attributes) @@ -73,6 +73,25 @@ } /** + * Outputs HTML representation of the links to stylesheets. + * + */ + public function output() + { + echo $this->render(); + } + + /** + * Returns a string representation of this helper as HTML. + * + * @return string The HTML representation of the stylesheets + */ + public function __toString() + { + return $this->render(); + } + + /** * Returns the canonical name of this helper. * * @return string The canonical name Modified: branches/2.0/src/Symfony/Framework/WebBundle/Controller/RedirectController.php =================================================================== --- branches/2.0/src/Symfony/Framework/WebBundle/Controller/RedirectController.php 2010-02-22 03:44:54 UTC (rev 28174) +++ branches/2.0/src/Symfony/Framework/WebBundle/Controller/RedirectController.php 2010-02-22 10:45:09 UTC (rev 28175) @@ -15,8 +15,8 @@ */ /** - * * + * * @package symfony * @author Fabien Potencier <[email protected]> */ @@ -41,7 +41,7 @@ return $response; } - $code = $permanent ? 302 : 301; + $code = $permanent ? 301 : 302; $parameters = $this->getRequest()->getPathParameters(); unset($parameters['_route'], $parameters['route']); Modified: branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config.xml =================================================================== --- branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config.xml 2010-02-22 03:44:54 UTC (rev 28174) +++ branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/config/config.xml 2010-02-22 10:45:09 UTC (rev 28175) @@ -27,7 +27,7 @@ <doctrine:dbal dbname="xxxxxxxx" - username="root" + user="root" password="" /> Modified: branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config.yml =================================================================== --- branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config.yml 2010-02-22 03:44:54 UTC (rev 28174) +++ branches/2.0/src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/config/config.yml 2010-02-22 10:45:09 UTC (rev 28175) @@ -10,7 +10,7 @@ doctrine.dbal: dbname: xxxxxxxx - username: root + user: root password: ~ doctrine.orm: ~ -- 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.
