[FrameworkBundle] added some service aliases to avoid some BC breaks

fabpot · fabpot · commit 146a502a0e35 · 2012-02-11T12:36:09.000+01:00
diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
@@ -40,7 +40,6 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
  * changed the default profiler storage to use the filesystem instead of SQLite
  * added support for placeholders in route defaults and requirements (replaced by the value set in the service container)
  * added Filesystem component as a dependency
- * [BC BREAK] changed `session.xml` service name `session.storage.native` to `session.storage.native_file`
  * added new session storage drivers to session.xml: `session.storage.native_memcache`, `session.storage.native_memcached`,
    `session.storage.native_sqlite`, `session.storage.null`, `session.storage.memcache`,
    and `session.storage.memcached`.  Added `session.storage.mock_file` service for functional session testing.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -38,5 +38,9 @@
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="service_container" />
         </service>
+
+        <!-- for BC -->
+        <service id="session.storage.native" alias="session.storage.native_file" />
+        <service id="session.storage.filesystem" alias="session.storage.mock_file" />
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
@@ -46,19 +46,19 @@ public function get($name, $default = null)
         return $this->session->get($name, $default);
     }
 
-    public function getFlash($type, $default = null)
+    public function getFlash($name, $default = null)
     {
-        return $this->session->getFlashes()->get($type);
+        return $this->session->getFlashes()->get($name);
     }
 
     public function getFlashes()
     {
         return $this->session->getFlashes()->all();
     }
 
-    public function hasFlash($type)
+    public function hasFlash($name)
     {
-        return $this->session->getFlashes()->has($type);
+        return $this->session->getFlashes()->has($name);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -46,19 +46,19 @@ public function get($name, $default = null)`
`46`	`46`	`return $this->session->get($name, $default);`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function getFlash($type, $default = null)`
	`49`	`+ public function getFlash($name, $default = null)`
`50`	`50`	`{`
`51`		`- return $this->session->getFlashes()->get($type);`
	`51`	`+ return $this->session->getFlashes()->get($name);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function getFlashes()`
`55`	`55`	`{`
`56`	`56`	`return $this->session->getFlashes()->all();`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function hasFlash($type)`
	`59`	`+ public function hasFlash($name)`
`60`	`60`	`{`
`61`		`- return $this->session->getFlashes()->has($type);`
	`61`	`+ return $this->session->getFlashes()->has($name);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`