Merge remote-tracking branch 'upstream/2.4' into techtalk

# By Fabien Potencier (22) and others
# Via Fabien Potencier
* upstream/2.4: (31 commits)
  bumped 2.4 to stable
  updated VENDORS for 2.4.0-RC1
  updated to FrameworkExtraBundle 3.0 (examples updated as well)
  backported symfony#585
  Backport issue 426 / PR 429 to branch 2.2
  Added config to force Symfony to use native session handler by default
  updated VENDORS for 2.2.10
  updated VENDORS for 2.4.0-BETA2
  updated VENDORS for 2.2.9
  updated min stability to beta
  updated VENDORS for 2.4.0-BETA1
  fixed CS
  Refactored contact action to use new form methods in 2.3
  updated VENDORS for 2.2.8
  Revert "merged branch eventhorizonpl/fix_doctrine_common_dependency (PR symfony#591)"
  Added comment about http_method_override and HttpCache
  fix doctrine-common dependency for 2.3 version
  added some functional tests for the secure section of the demo bundle
  updated VENDORS for 2.3.4
  updated VENDORS for 2.2.6
  ...

Conflicts:
	app/SymfonyRequirements.php
	app/autoload.php
	app/config/config.yml
	src/Acme/DemoBundle/Controller/DemoController.php

Author: lsmith77

.gitignore

@@ -2,6 +2,8 @@
 /app/cache/*
 /app/config/parameters.yml
 /app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
 /build/
 /vendor/
 /bin/

UPGRADE.md

@@ -79,7 +79,7 @@ a link cannot be generated):
 
     framework:
         router:
-            strict_requirements: %kernel.debug%
+            strict_requirements: "%kernel.debug%"
 
 You can even disable the requirements check on production with `null` as you should
 know that the parameters for URL generation always pass the requirements, e.g. by
@@ -90,7 +90,7 @@ The `default_locale` parameter is now a setting of the main `framework`
 configuration (it was under the `framework.session` in 2.0):
 
     framework:
-        default_locale: %locale%
+        default_locale: "%locale%"
 
 The `auto_start` setting under `framework.session` must be removed as it is
 not used anymore (the session is now always started on-demand). If

app/SymfonyRequirements.php

@@ -648,8 +648,6 @@ class_exists('Locale'),
             ||
             (extension_loaded('apc') && ini_get('apc.enabled'))
             ||
-            (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable'))
-            ||
             (extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
             ||
             (extension_loaded('xcache') && ini_get('xcache.cacher'))

app/autoload.php

@@ -11,12 +11,7 @@
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
-// intl
-if (!function_exists('intl_get_error_code')) {
-    require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php';
-
-    $loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs');
-}
-
 AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php');
+
+return $loader;

app/config/config.yml

@@ -4,8 +4,8 @@ imports:
 
 framework:
     #esi:             ~
-    #translator:      { fallback: %locale% }
-    secret:          %secret%
+    #translator:      { fallback: "%locale%" }
+    secret:          "%secret%"
     router:
         resource: "%kernel.root_dir%/config/routing.yml"
         strict_requirements: ~
@@ -16,54 +16,57 @@ framework:
         engines: ['twig', 'php']
         #assets_version: SomeVersionScheme
     default_locale:  "%locale%"
+    trusted_hosts:   ~
     trusted_proxies: ~
-    session:         ~
+    session:
+        # handler_id set to null will use default session handler from php.ini
+        handler_id:  ~
     fragments:       ~
     http_method_override: true
 
 # Twig Configuration
 twig:
-    debug:            %kernel.debug%
-    strict_variables: %kernel.debug%
+    debug:            "%kernel.debug%"
+    strict_variables: "%kernel.debug%"
     exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction'
 
 # Assetic Configuration
 assetic:
-    debug:          %kernel.debug%
+    debug:          "%kernel.debug%"
     use_controller: false
     bundles:        [ LiipHelloBundle ]
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
         #closure:
-        #    jar: %kernel.root_dir%/Resources/java/compiler.jar
+        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
         #yui_css:
-        #    jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar
+        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
 
 # Doctrine Configuration
 doctrine:
     dbal:
-        driver:   %database_driver%
-        host:     %database_host%
-        port:     %database_port%
-        dbname:   %database_name%
-        user:     %database_user%
-        password: %database_password%
+        driver:   "%database_driver%"
+        host:     "%database_host%"
+        port:     "%database_port%"
+        dbname:   "%database_name%"
+        user:     "%database_user%"
+        password: "%database_password%"
         charset:  UTF8
         # if using pdo_sqlite as your database driver, add the path in parameters.yml
-        # e.g. database_path: %kernel.root_dir%/data/data.db3
-        path:     %database_path%
+        # e.g. database_path: "%kernel.root_dir%/data/data.db3"
+        path:     "%database_path%"
 
     orm:
-        auto_generate_proxy_classes: %kernel.debug%
+        auto_generate_proxy_classes: "%kernel.debug%"
         auto_mapping: true
 
 # Swiftmailer Configuration
 swiftmailer:
-    transport: %mailer_transport%
-    host:      %mailer_host%
-    username:  %mailer_user%
-    password:  %mailer_password%
+    transport: "%mailer_transport%"
+    host:      "%mailer_host%"
+    username:  "%mailer_user%"
+    password:  "%mailer_password%"
     spool:     { type: memory }
 
 fos_user:

app/config/config_dev.yml

@@ -15,7 +15,7 @@ monolog:
     handlers:
         main:
             type:   stream
-            path:   %kernel.logs_dir%/%kernel.environment%.log
+            path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  debug
         #console:
         #    type:   console

app/config/config_prod.yml

@@ -19,7 +19,7 @@ monolog:
             handler:      nested
         nested:
             type:  stream
-            path:  %kernel.logs_dir%/%kernel.environment%.log
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
         #console:
         #    type:  console

app/config/config_test.yml

@@ -6,7 +6,7 @@ framework:
     session:
         storage_id: session.storage.mock_file
     profiler:
-        enabled: false
+        collect: false
 
 web_profiler:
     toolbar: false

app/config/routing.yml

@@ -1,34 +0,0 @@
-hello:
-    resource: "@LiipHelloBundle/Resources/config/routing.yml"
-
-security:
-    resource: "@FOSUserBundle/Resources/config/routing/security.xml"
-    prefix:   /liip
-
-profile:
-    resource: "@FOSUserBundle/Resources/config/routing/profile.xml"
-    prefix:   /liip/profile
-
-registration:
-    resource: "@FOSUserBundle/Resources/config/routing/registration.xml"
-    prefix:   /liip/register
-
-_imagine:
-    resource: .
-    type:     imagine
-
-NelmioApiDocBundle:
-    resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
-    prefix:   /api/doc
-
-theme:
-    resource: "@LiipThemeBundle/Resources/config/routing.xml"
-    prefix:   /liip/theme
-
-monitor:
-    resource: "@LiipMonitorBundle/Resources/config/routing.yml"
-    prefix:   /liip
-
-fos_facebook_channel:
-    pattern:  /channel.html
-    defaults: { _controller: "FOSFacebookBundle:Facebook:channel" }

app/config/routing_dev.yml

@@ -13,6 +13,41 @@ _configurator:
 _main:
     resource: routing.yml
 
-# AcmeDemoBundle routes (to be removed)
+# demo routes (to be removed)
 _acme_demo:
     resource: "@AcmeDemoBundle/Resources/config/routing.yml"
+
+hello:
+    resource: "@LiipHelloBundle/Resources/config/routing.yml"
+
+security:
+    resource: "@FOSUserBundle/Resources/config/routing/security.xml"
+    prefix:   /liip
+
+profile:
+    resource: "@FOSUserBundle/Resources/config/routing/profile.xml"
+    prefix:   /liip/profile
+
+registration:
+    resource: "@FOSUserBundle/Resources/config/routing/registration.xml"
+    prefix:   /liip/register
+
+_imagine:
+    resource: .
+    type:     imagine
+
+NelmioApiDocBundle:
+    resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
+    prefix:   /api/doc
+
+theme:
+    resource: "@LiipThemeBundle/Resources/config/routing.xml"
+    prefix:   /liip/theme
+
+monitor:
+    resource: "@LiipMonitorBundle/Resources/config/routing.yml"
+    prefix:   /liip
+
+fos_facebook_channel:
+    pattern:  /channel.html
+    defaults: { _controller: "FOSFacebookBundle:Facebook:channel" }

composer.json

@@ -16,7 +16,7 @@
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.3",
         "sensio/distribution-bundle": "~2.3",
-        "sensio/framework-extra-bundle": "~2.3",
+        "sensio/framework-extra-bundle": "~3.0",
         "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
         "doctrine/doctrine-fixtures-bundle": "dev-master",
@@ -56,7 +56,6 @@
     "config": {
         "bin-dir": "bin"
     },
-    "minimum-stability": "dev",
     "extra": {
         "incenteev-parameters": {
             "file": "app/config/parameters.yml"

src/Acme/DemoBundle/Controller/DemoController.php

@@ -4,6 +4,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Acme\DemoBundle\Form\ContactType;
 
 // these import the "@Route" and "@Template" annotations
@@ -34,29 +35,20 @@ public function helloAction($name)
      * @Route("/contact", name="_demo_contact")
      * @Template()
      */
-    public function contactAction()
+    public function contactAction(Request $request)
     {
-        $form = $this->get('form.factory')->create(new ContactType());
+        $form = $this->createForm(new ContactType());
+        $form->handleRequest($request);
 
-        $request = $this->get('request');
-        if ($request->isMethod('POST')) {
-            $form->submit($request);
-            if ($form->isValid()) {
-                $mailer = $this->get('mailer');
-                // .. setup a message and send it
-                // http://symfony.com/doc/current/cookbook/email.html
-                $data = $form->getData();
-                $message = \Swift_Message::newInstance()
-                    ->setSubject('new message')
-                    ->setFrom('[email protected]')
-                    ->setTo($data['email'])
-                    ->setBody($data['message']);
+        if ($form->isValid()) {
+            $mailer = $this->get('mailer');
 
-                $mailer->send($message);
-                $this->get('session')->setFlash('notice', 'Message sent!');
+            // .. setup a message and send it
+            // http://symfony.com/doc/current/cookbook/email.html
 
-                return new RedirectResponse($this->generateUrl('_demo'));
-            }
+            $request->getSession()->getFlashBag()->set('notice', 'Message sent!');
+
+            return new RedirectResponse($this->generateUrl('_demo'));
         }
 
         return array('form' => $form->createView());

src/Acme/DemoBundle/Controller/SecuredController.php

@@ -7,6 +7,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 
 /**
  * @Route("/demo/secured")

src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php

@@ -14,4 +14,32 @@ public function testIndex()
 
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Hello Fabien")')->count());
     }
+
+    public function testSecureSection()
+    {
+        $client = static::createClient();
+
+        // goes to the secure page
+        $crawler = $client->request('GET', '/demo/secured/hello/World');
+
+        // redirects to the login page
+        $crawler = $client->followRedirect();
+
+        // submits the login form
+        $form = $crawler->selectButton('Login')->form(array('_username' => 'admin', '_password' => 'adminpass'));
+        $client->submit($form);
+
+        // redirect to the original page (but now authenticated)
+        $crawler = $client->followRedirect();
+
+        // check that the page is the right one
+        $this->assertCount(1, $crawler->filter('h1.title:contains("Hello World!")'));
+
+        // click on the secure link
+        $link = $crawler->selectLink('Hello resource secured')->link();
+        $crawler = $client->click($link);
+
+        // check that the page is the right one
+        $this->assertCount(1, $crawler->filter('h1.title:contains("secured for Admins only!")'));
+    }
 }

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

@@ -25,7 +25,7 @@ public function setController($controller)
     public function getFunctions()
     {
         return array(
-            'code' => new \Twig_Function_Method($this, 'getCode', array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('code', array($this, 'getCode'), array('is_safe' => array('html'))),
         );
     }
 

web/.htaccess

@@ -1,7 +1,7 @@
-# Use the front controller as index file. It serves as fallback solution when
+# Use the front controller as index file. It serves as a 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
+# start page (path "/") because otherwise Apache will apply the rewriting rules
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
 DirectoryIndex app.php
 
@@ -24,7 +24,7 @@ DirectoryIndex app.php
     # 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
+    # to the start page 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
@@ -44,7 +44,7 @@ DirectoryIndex app.php
 <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
+        # the start page 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

web/app.php

@@ -20,6 +20,9 @@
 $kernel = new AppKernel('prod', false);
 //$kernel->loadClassCache();
 //$kernel = new AppCache($kernel);
+
+// When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
+//Request::enableHttpMethodParameterOverride();
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();