Merge branch '2.2'

* 2.2: (28 commits)
  added missing license and type in composer.json (refs #527)
  updated VENDORS for 2.2.1
  Add commented framework.validation.cache = apc to prod config
  added loader variable typehint for easier manipulation in IDEs
  updated VENDORS for 2.1.9
  add info about changed htaccess file
  made the startpage work when mod_rewrite is not available
  Refactoring isMethod, bind and Flash
  removed useless "use" statement
  redirect /app.php to prevent duplicate content
  updated VENDORS for 2.2.0
  enabled the HTTP method override by default to be more BC (closes sensio/SensioGeneratorBundle#165)
  Revert "merged branch Tobion/patch-2 (PR #497)"
  Fragments typo
  updated VENDORS for 2.2.0-RC3
  updated VENDORS for 2.1.8
  Update composer.json
  added info about changed .htaccess
  removed QSA flag that is not needed
  redirect /app.php to prevent duplicate content
  ...

Conflicts:
	composer.json
	composer.lock
	src/Acme/DemoBundle/Controller/DemoController.php

Author: fabpot

UPGRADE-2.2.md

@@ -1,17 +1,23 @@
 UPGRADE FROM 2.1 to 2.2
 =======================
 
- * The ``_internal`` route is not used any more. It should then be removed from
-   both your routing and security configurations. A ``router_proxy`` key has
+ * The [`web/.htaccess`](https://github.com/symfony/symfony-standard/blob/2.2/web/.htaccess)
+   file has been enhanced substantially to prevent duplicate content with and
+   without `/app.php` in the URI. It also improves functionality when using
+   Apache aliases or when mod_rewrite is not available. So you might want to
+   update your `.htaccess` file as well.
+
+ * The ``_internal`` route is not used any more. It should then be removed
+   from both your routing and security configurations. A ``fragments`` key has
    been added to the framework configuration and must be specified when ESI or
    Hinclude are in use. No security configuration is required for this path as
-   by default ESI access is only permitted for trusted hosts and Hinclude access
-   uses an URL signing mechanism.
+   by default ESI access is only permitted for trusted hosts and Hinclude
+   access uses an URL signing mechanism.
 
    ```
    framework:
        # ...
-       router_proxy: { path: /_proxy }
+       fragments: { path: /_proxy }
    ```
 
 Functional Tests

app/autoload.php

@@ -1,7 +1,11 @@
 <?php
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
 
+/**
+ * @var $loader ClassLoader
+ */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
 // intl

app/config/config.yml

@@ -9,14 +9,16 @@ framework:
     router:
         resource: "%kernel.root_dir%/config/routing.yml"
         strict_requirements: %kernel.debug%
-    form:            true
-    csrf_protection: true
+    form:            ~
+    csrf_protection: ~
     validation:      { enable_annotations: true }
-    templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
+    templating:
+        engines: ['twig']
+        #assets_version: SomeVersionScheme
     default_locale:  "%locale%"
     trusted_proxies: ~
     session:         ~
-    #router_proxy:   { path: /_proxy }
+    fragments:       ~
 
 # Twig Configuration
 twig:

app/config/config_prod.yml

@@ -8,6 +8,8 @@ imports:
 framework:
     router:
         strict_requirements: null
+    #validation:
+    #    cache: apc
 
 #doctrine:
 #    orm:

composer.json

@@ -1,5 +1,7 @@
 {
     "name": "symfony/framework-standard-edition",
+    "license": "MIT",
+    "type": "project",
     "description": "The \"Symfony Standard Edition\" distribution",
     "autoload": {
         "psr-0": { "": "src/" }
@@ -36,13 +38,12 @@
     "config": {
         "bin-dir": "bin"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "alpha",
     "extra": {
         "symfony-app-dir": "app",
         "symfony-web-dir": "web",
         "branch-alias": {
             "dev-master": "2.3-dev"
         }
-    },
-    "type": "project"
+    }
 }

src/Acme/DemoBundle/Controller/DemoController.php

@@ -39,14 +39,14 @@ public function contactAction()
         $form = $this->get('form.factory')->create(new ContactType());
 
         $request = $this->get('request');
-        if ('POST' == $request->getMethod()) {
+        if ($request->isMethod('POST')) {
             $form->bind($request);
             if ($form->isValid()) {
                 $mailer = $this->get('mailer');
                 // .. setup a message and send it
                 // http://symfony.com/doc/current/cookbook/email.html
 
-                $this->get('session')->setFlash('notice', 'Message sent!');
+                $this->get('session')->getFlashBag()->set('notice', 'Message sent!');
 
                 return new RedirectResponse($this->generateUrl('_demo'));
             }

src/Acme/DemoBundle/EventListener/ControllerListener.php

@@ -2,7 +2,6 @@
 
 namespace Acme\DemoBundle\EventListener;
 
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Acme\DemoBundle\Twig\Extension\DemoExtension;

src/Acme/DemoBundle/Twig/Extension/DemoExtension.php

@@ -2,15 +2,14 @@
 
 namespace Acme\DemoBundle\Twig\Extension;
 
-use Symfony\Bundle\TwigBundle\Loader\FilesystemLoader;
 use CG\Core\ClassUtils;
 
 class DemoExtension extends \Twig_Extension
 {
     protected $loader;
     protected $controller;
 
-    public function __construct(FilesystemLoader $loader)
+    public function __construct(\Twig_LoaderInterface $loader)
     {
         $this->loader = $loader;
     }

web/.htaccess

@@ -1,10 +1,48 @@
+# Use the front controller as index file. It serves as fallback solution when
+# every other rewrite/redirect fails (e.g. in an aliased environment without
+# mod_rewrite). Additionally, this reduces the matching process for the
+# startpage (path "/") because otherwise Apache will apply the rewritting rules
+# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
+DirectoryIndex app.php
+
 <IfModule mod_rewrite.c>
     RewriteEngine On
 
-    #<IfModule mod_vhost_alias.c>
-    #    RewriteBase /
-    #</IfModule>
+    # Redirect to URI without front controller to prevent duplicate content
+    # (with and without `/app.php`). Only do this redirect on the initial
+    # rewrite by Apache and not on subsequent cycles. Otherwise we would get an
+    # endless redirect loop (request -> rewrite to front controller ->
+    # redirect -> request -> ...).
+    # So in case you get a "too many redirects" error or you always get redirected
+    # to the startpage because your Apache does not expose the REDIRECT_STATUS
+    # environment variable, you have 2 choices:
+    # - disable this feature by commenting the following 2 lines or
+    # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
+    #   following RewriteCond (best solution)
+    RewriteCond %{ENV:REDIRECT_STATUS} ^$
+    RewriteRule ^app\.php(/(.*)|$) %{CONTEXT_PREFIX}/$2 [R=301,L]
+
+    # If the requested filename exists, simply serve it.
+    # We only want to let Apache serve files and not directories.
+    RewriteCond %{REQUEST_FILENAME} -f
+    RewriteRule .? - [L]
+
+    # The following rewrites all other queries to the front controller. The
+    # condition ensures that if you are using Apache aliases to do mass virtual
+    # hosting, the base path will be prepended to allow proper resolution of the
+    # app.php file; it will work in non-aliased environments as well, providing
+    # a safe, one-size fits all solution.
+    RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$
+    RewriteRule ^(.*) - [E=BASE:%1]
+    RewriteRule .? %{ENV:BASE}app.php [L]
+</IfModule>
 
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ app.php [QSA,L]
+<IfModule !mod_rewrite.c>
+    <IfModule mod_alias.c>
+        # When mod_rewrite is not available, we instruct a temporary redirect of
+        # the startpage to the front controller explicitly so that the website
+        # and the generated links can still be used.
+        RedirectMatch 302 ^/$ /app.php/
+        # RedirectTemp cannot be used instead
+    </IfModule>
 </IfModule>

web/app.php

@@ -19,6 +19,7 @@
 $kernel = new AppKernel('prod', false);
 $kernel->loadClassCache();
 //$kernel = new AppCache($kernel);
+Request::enableHttpMethodParameterOverride();
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();

web/app_dev.php

@@ -21,6 +21,7 @@
 
 $kernel = new AppKernel('dev', true);
 $kernel->loadClassCache();
+Request::enableHttpMethodParameterOverride();
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();