Merge remote branch 'igorw/master'

* igorw/master:
  fix extension test namespaces
  rename WebTestCase::{createApp => createApplication}
  do not read files twice when compiling

src/Silex/Compiler.php

@@ -72,7 +72,7 @@ class Compiler
         $path = str_replace(realpath(__DIR__.'/../..').'/', '', $file->getRealPath());
         $content = file_get_contents($file);
         if ($strip) {
-            $content = Kernel::stripComments(file_get_contents($file));
+            $content = Kernel::stripComments($content);
         }
 
         $phar->addFromString($path, $content);

src/Silex/WebTestCase.php

@@ -31,15 +31,15 @@ abstract class WebTestCase extends BaseWebTestCase
      */
     public function setUp()
     {
-        $this->app = $this->createApp();
+        $this->app = $this->createApplication();
     }
 
     /**
-     * Creates the application (HttpKernel, most likely Framework).
+     * Creates the application.
      *
      * @return Symfony\Component\HttpKernel\HttpKernel
      */
-    abstract public function createApp();
+    abstract public function createApplication();
 
     /**
      * Creates a Client.

tests/Silex/Tests/Extension/MonologExtensionTest.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Silex\Tests;
+namespace Silex\Tests\Extension;
 
 use Monolog\Handler\TestHandler;
 

tests/Silex/Tests/Extension/SessionExtensionTest.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Silex\Tests;
+namespace Silex\Tests\Extension;
 
 use Silex\Application;
 use Silex\Extension\SessionExtension;

tests/Silex/Tests/Extension/TwigExtensionTest.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Silex\Tests;
+namespace Silex\Tests\Extension;
 
 use Silex\Application;
 use Silex\Extension\TwigExtension;

tests/Silex/Tests/Extension/UrlGeneratorExtensionTest.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Silex\Tests;
+namespace Silex\Tests\Extension;
 
 use Silex\Application;
 use Silex\Extension\UrlGeneratorExtension;

tests/Silex/Tests/WebTestCaseTest.php

@@ -21,7 +21,7 @@ use Silex\WebTestCase;
  */
 class WebTestCaseTest extends WebTestCase
 {
-    public function createApp()
+    public function createApplication()
     {
         $app = new Application();