Author: fabien
Date: 2010-09-01 14:00:07 +0200 (Wed, 01 Sep 2010)
New Revision: 30803
Added:
branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Profiler/mongodb_panel.php
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing_dev.php
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_test.xml
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml
branches/2.0/src/Symfony/Component/EventDispatcher/EventDispatcher.php
branches/2.0/src/Symfony/Component/HttpFoundation/Request.php
branches/2.0/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
Log:
Merge branch 'master' of git://github.com/symfony/symfony
Added:
branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Profiler/mongodb_panel.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Profiler/mongodb_panel.php
(rev 0)
+++
branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Profiler/mongodb_panel.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -0,0 +1,6 @@
+<h2>Queries</h2>
+
+<?php if (0 == $data->getQueryCount()): ?>
+ <em>No queries.</em>
+<?php else: ?>
+<?php endif; ?>
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
2010-09-01 12:00:07 UTC (rev 30803)
@@ -46,7 +46,7 @@
<argument key="cache_dir">%kernel.cache_dir%</argument>
<argument key="debug">%kernel.debug%</argument>
<argument
key="matcher_cache_class">%kernel.name%UrlMatcher</argument>
- <argument
key="generator_cache_class">%kernel.name%UrlGenerator</argument>
+ <argument
key="generator_cache_class">%kernel.name%_%kernel.environment%UrlGenerator</argument>
</argument>
</service>
</services>
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -5,12 +5,6 @@
use Symfony\Framework\Kernel;
use Symfony\Component\DependencyInjection\Loader\LoaderInterface;
-use Symfony\Framework\KernelBundle;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Bundle\ZendBundle\ZendBundle;
-use Symfony\Bundle\DoctrineBundle\DoctrineBundle;
-use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
-
class {{ class }}Kernel extends Kernel
{
public function registerRootDir()
@@ -21,18 +15,23 @@
public function registerBundles()
{
$bundles = array(
- new KernelBundle(),
- new FrameworkBundle(),
+ new Symfony\Framework\KernelBundle(),
+ new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
// enable third-party bundles
- new ZendBundle(),
- new DoctrineBundle(),
- new SwiftmailerBundle(),
+ new Symfony\Bundle\ZendBundle\ZendBundle(),
+ new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
+ new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
+ //new
Symfony\Bundle\DoctrineMigrationsBundle\DoctrineMigrationsBundle(),
+ //new Symfony\Bundle\DoctrineMongoDBBundle\DoctrineMongoDBBundle(),
+ //new Symfony\Bundle\PropelBundle\PropelBundle(),
+ //new Symfony\Bundle\TwigBundle\TwigBundle(),
- // register your bundles here
+ // register your bundles
);
if ($this->isDebug()) {
+ $bundles[] = new
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
}
return $bundles;
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -3,7 +3,13 @@
$loader->import('config.php');
$container->loadFromExtension('web', 'config', array(
+ 'router' => array('resource' =>
'%kernel.root_dir%/config/routing_dev.php'),
+ 'profiler' => array('only-exceptions' => false),
+));
+
+$container->loadFromExtension('webprofiler', 'config', array(
'toolbar' => true,
+ 'intercept-redirects' => true,
));
$container->loadFromExtension('zend', 'logger', array(
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -6,8 +6,9 @@
'error_handler' => false,
));
-$container->loadFromExtension('web', 'config', array(
+$container->loadFromExtension('webprofiler', 'config', array(
'toolbar' => false,
+ 'intercept-redirects' => false,
));
$container->loadFromExtension('zend', 'logger', array(
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -4,7 +4,6 @@
use Symfony\Component\Routing\Route;
$collection = new RouteCollection();
-
$collection->addRoute('homepage', new Route('/', array(
'_controller' => 'FrameworkBundle:Default:index',
)));
Added:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing_dev.php
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing_dev.php
(rev 0)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing_dev.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -0,0 +1,10 @@
+<?php
+
+use Symfony\Component\Routing\RouteCollection;
+
+$collection = new RouteCollection();
+$collection->addCollection($loader->import(__DIR__.'/routing.php'));
+
+$collection->addCollection($loader->import("WebProfilerBundle/Resources/config/routing/profiler.xml"),
'/_profiler');
+
+return $collection;
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml
2010-09-01 12:00:07 UTC (rev 30803)
@@ -4,15 +4,23 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:zend="http://www.symfony-project.org/schema/dic/zend";
xmlns:web="http://www.symfony-project.org/schema/dic/symfony";
+ xmlns:webprofiler="http://www.symfony-project.org/schema/dic/webprofiler";
xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services
http://www.symfony-project.org/schema/dic/services/services-1.0.xsd
+ http://www.symfony-project.org/schema/dic/webprofiler
http://www.symfony-project.org/schema/dic/webprofiler/webprofiler-1.0.xsd
http://www.symfony-project.org/schema/dic/zend
http://www.symfony-project.org/schema/dic/zend/zend-1.0.xsd";>
<imports>
<import resource="config.xml" />
</imports>
- <web:config
+ <web:config>
+ <web:router resource="%kernel.root_dir%/config/routing_dev.xml" />
+ <profiler only-exceptions="false" />
+ </web:config>
+
+ <webprofiler:config
toolbar="true"
+ intercept-redirects="true"
/>
<zend:logger
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_test.xml
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_test.xml
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_test.xml
2010-09-01 12:00:07 UTC (rev 30803)
@@ -12,8 +12,9 @@
<import resource="config_dev.xml" />
</imports>
- <web:config
+ <webprofiler:config
toolbar="false"
+ intercept-redirects="false"
/>
<kernel:config
Added:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml
(rev 0)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml
2010-09-01 12:00:07 UTC (rev 30803)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://www.symfony-project.org/schema/routing";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.symfony-project.org/schema/routing
http://www.symfony-project.org/schema/routing/routing-1.0.xsd";>
+
+ <import resource="routing.xml" />
+
+ <import resource="WebProfilerBundle/Resources/config/routing/profiler.xml"
prefix="/_profiler" />
+</routes>
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml
2010-09-01 12:00:07 UTC (rev 30803)
@@ -2,7 +2,12 @@
- { resource: config.yml }
web.config:
+ router: { resource: "%kernel.root_dir%/config/routing_dev.yml" }
+ profiler: { only_exceptions: false }
+
+webprofiler.config:
toolbar: true
+ intercept_redirects: true
zend.logger:
priority: debug
Modified:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml
2010-09-01 12:00:07 UTC (rev 30803)
@@ -4,8 +4,9 @@
kernel.config:
error_handler: false
-web.config:
+webprofiler.config:
toolbar: false
+ intercept_redirects: false
zend.logger:
priority: debug
Added:
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml
===================================================================
---
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml
(rev 0)
+++
branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml
2010-09-01 12:00:07 UTC (rev 30803)
@@ -0,0 +1,6 @@
+_main:
+ resource: routing.yml
+
+_profiler:
+ resource: WebProfilerBundle/Resources/config/routing/profiler.xml
+ prefix: /_profiler
Modified: branches/2.0/src/Symfony/Component/EventDispatcher/EventDispatcher.php
===================================================================
--- branches/2.0/src/Symfony/Component/EventDispatcher/EventDispatcher.php
2010-09-01 10:12:45 UTC (rev 30802)
+++ branches/2.0/src/Symfony/Component/EventDispatcher/EventDispatcher.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -40,12 +40,12 @@
/**
* Disconnects a listener for a given event name.
*
- * @param string $name An event name
- * @param mixed $listener A PHP callable
+ * @param string $name An event name
+ * @param mixed|null $listener A PHP callable or null to disconnect all
listeners
*
* @return mixed false if listener does not exist, null otherwise
*/
- public function disconnect($name, $listener)
+ public function disconnect($name, $listener = null)
{
if (!isset($this->listeners[$name])) {
return false;
Modified: branches/2.0/src/Symfony/Component/HttpFoundation/Request.php
===================================================================
--- branches/2.0/src/Symfony/Component/HttpFoundation/Request.php
2010-09-01 10:12:45 UTC (rev 30802)
+++ branches/2.0/src/Symfony/Component/HttpFoundation/Request.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -254,7 +254,7 @@
public function hasSession()
{
- return '' !== session_id();
+ return $this->cookies->has(session_name());
}
public function setSession(Session $session)
@@ -263,6 +263,26 @@
}
/**
+ * Returns the client IP address.
+ *
+ * @param Boolean $proxy Whether the current request has been made behind
a proxy or not
+ *
+ * @return string The client IP address
+ */
+ public function getClientIp($proxy = false)
+ {
+ if ($proxy) {
+ if ($this->server->has('HTTP_CLIENT_IP')) {
+ return $this->server->get('HTTP_CLIENT_IP');
+ } elseif ($this->server->has('HTTP_X_FORWARDED_FOR')) {
+ return $this->server->get('HTTP_X_FORWARDED_FOR');
+ }
+ }
+
+ return $this->server->get('REMOTE_ADDR');
+ }
+
+ /**
* Returns current script name.
*
* @return string
Modified:
branches/2.0/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
===================================================================
---
branches/2.0/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
2010-09-01 10:12:45 UTC (rev 30802)
+++
branches/2.0/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
2010-09-01 12:00:07 UTC (rev 30803)
@@ -52,6 +52,8 @@
'session_cookie_httponly' => isset($cookieDefaults['httponly']) ?
$cookieDefaults['httponly'] : false,
'session_cache_limiter' => 'none',
), $options);
+
+ session_name($this->options['session_name']);
}
/**
@@ -70,7 +72,6 @@
$this->options['session_cookie_secure'],
$this->options['session_cookie_httponly']
);
- session_name($this->options['session_name']);
if (null !== $this->options['session_cache_limiter']) {
session_cache_limiter($this->options['session_cache_limiter']);
--
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.
