Changeset 32456 for branches

Timestamp:

04/07/11 18:15:08 (2 years ago)

Author:

fabien

Message:

Merge branch 'master' of git://github.com/symfony/symfony

Files:

• branches/2.0/src/Symfony/Component/HttpKernel/Bundle/Bundle.php (modified) (1 diff)
• branches/2.0/tests/Symfony/Tests/Component/HttpKernel/KernelTest.php (modified) (1 diff)

branches/2.0/src/Symfony/Component/HttpKernel/Bundle/Bundle.php

@@ -99 +99 @@
-        }
-
-strtr(dirname($this->reflected->getFileName()), '\\', '/'
+dirname($this->reflected->getFileName()
-    }
-

branches/2.0/tests/Symfony/Tests/Component/HttpKernel/KernelTest.php

@@ -660 +660 @@
-            ->expects($this->any())
-            ->method('getPath')
-strtr($dir, '\\', '/')
+$dir
-        ;
-