Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 6fea160

Browse files
committed
Merge branch '2.4'
* 2.4: bumped 2.4 to stable updated VENDORS for 2.4.0-RC1 updated to FrameworkExtraBundle 3.0 (examples updated as well) backported #585 Added config to force Symfony to use native session handler by default
2 parents 4f26cfd + 1d2e912 commit 6fea160

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

app/SymfonyRequirements.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,6 @@ class_exists('Locale'),
648648
||
649649
(extension_loaded('apc') && ini_get('apc.enabled'))
650650
||
651-
(extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable'))
652-
||
653651
(extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
654652
||
655653
(extension_loaded('xcache') && ini_get('xcache.cacher'))

app/config/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ framework:
1818
default_locale: "%locale%"
1919
trusted_hosts: ~
2020
trusted_proxies: ~
21-
session: ~
21+
session:
22+
# handler_id set to null will use default session handler from php.ini
23+
handler_id: ~
2224
fragments: ~
2325
http_method_override: true
2426

app/config/security.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,4 @@ security:
3535
# realm: "Secured Demo Area"
3636

3737
access_control:
38-
- { path: ^/demo/secured/hello/admin/, roles: ROLE_ADMIN }
3938
#- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"symfony/swiftmailer-bundle": "~2.3",
1717
"symfony/monolog-bundle": "~2.4",
1818
"sensio/distribution-bundle": "~2.3",
19-
"sensio/framework-extra-bundle": "~2.3",
19+
"sensio/framework-extra-bundle": "~3.0",
2020
"sensio/generator-bundle": "~2.3",
2121
"incenteev/composer-parameter-handler": "~2.0"
2222
},
@@ -39,7 +39,6 @@
3939
"config": {
4040
"bin-dir": "bin"
4141
},
42-
"minimum-stability": "beta",
4342
"extra": {
4443
"symfony-app-dir": "app",
4544
"symfony-web-dir": "web",

src/Acme/DemoBundle/Controller/SecuredController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
88
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
99
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
10+
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
1011

1112
/**
1213
* @Route("/demo/secured")
@@ -59,6 +60,7 @@ public function helloAction($name)
5960

6061
/**
6162
* @Route("/hello/admin/{name}", name="_demo_secured_hello_admin")
63+
* @Security("is_granted('ROLE_ADMIN')")
6264
* @Template()
6365
*/
6466
public function helloadminAction($name)

0 commit comments

Comments
 (0)