Merge branch '2.5' into 2.6

* 2.5:
  remove short array syntax
  fix session restart on PHP 5.3

Author: fabpot

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -80,13 +80,13 @@ public function testFirewallWithInvalidUserProvider()
 
         $container->loadFromExtension('security', array(
             'providers' => array(
-                'my_foo' => array('foo' => []),
+                'my_foo' => array('foo' => array()),
             ),
 
             'firewalls' => array(
                 'some_firewall' => array(
                     'pattern' => '/.*',
-                    'http_basic' => [],
+                    'http_basic' => array(),
                 ),
             ),
         ));