Merge branch '3.3' into 3.4

Tobion · Tobion · commit 89dd146dde94 · 2017-09-13T18:31:11.000+02:00
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ It comes pre-configured with the following bundles:
     capabilities
 
   * [**WebServerBundle**][14] (in dev env) - Adds commands for running applications
-    using the PHP built-in web servep
+    using the PHP built-in web server
 
   * **DebugBundle** (in dev/test env) - Adds Debug and VarDumper component
     integration
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -50,7 +50,7 @@ doctrine:
         charset: UTF8
         # if using pdo_sqlite as your database driver:
         #   1. add the path in parameters.yml
-        #     e.g. database_path: "%kernel.project_dir%/var/data/data.sqlite"
+        #     e.g. database_path: '%kernel.project_dir%/var/data/data.sqlite'
         #   2. Uncomment database_path in parameters.yml.dist
         #   3. Uncomment next line:
         #path: '%database_path%'
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
@@ -3,10 +3,10 @@
 namespace AppBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 
-class DefaultController extends AbstractController
+class DefaultController extends Controller
 {
     /**
      * @Route("/", name="homepage")
