Merge branch '3.0'

fabpot · fabpot · commit e1d31facdd39 · 2016-01-14T10:53:20.000+01:00
* 3.0:
  force Composer to use PHP 5.3.3 when updating
  updated VENDORS for 2.3.37
  added a doc link
  Make use of getParameter() shortcut method
  do not use php.ini session handler but native file to actually use save_path config
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -26,8 +26,8 @@ framework:
     trusted_hosts:   ~
     trusted_proxies: ~
     session:
-        # handler_id set to null will use default session handler from php.ini
-        handler_id:  ~
+        # http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
+        handler_id:  session.handler.native_file
         save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
     fragments:       ~
     http_method_override: true
diff --git a/composer.json b/composer.json
@@ -44,6 +44,11 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
         ]
     },
+    "config": {
+        "platform": {
+            "php": "5.5.9"
+        }
+    },
     "extra": {
         "symfony-app-dir": "app",
         "symfony-bin-dir": "bin",
diff --git a/composer.lock b/composer.lock
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
@@ -15,7 +15,7 @@ public function indexAction(Request $request)
     {
         // replace this example code with whatever you need
         return $this->render('default/index.html.twig', [
-            'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),
+            'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
         ]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function indexAction(Request $request)`
`15`	`15`	`{`
`16`	`16`	`// replace this example code with whatever you need`
`17`	`17`	`return $this->render('default/index.html.twig', [`
`18`		`- ' 48C8 base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),`
	`18`	`+ 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),`
`19`	`19`	`]);`
`20`	`20`	`}`
`21`	`21`	`}`