Skip to content

Commit b8fdc35

Browse files
committed
style fix
1 parent 9664a54 commit b8fdc35

File tree

3 files changed

+34
-10
lines changed

3 files changed

+34
-10
lines changed

Tests/Functional/app/BasicAuth/framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
$frameworkConfig['http_method_override'] = true;
2323
}
2424

25-
$container->loadFromExtension('framework', $frameworkConfig);
25+
$container->loadFromExtension('framework', $frameworkConfig);

Tests/Functional/app/Configuration/config.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
imports:
22
- { resource: ../config/default.yml }
33
- { resource: ../config/sensio_framework_extra.yml }
4+
- { resource: framework.php }
45
- { resource: security.php }
56

6-
framework:
7-
annotations:
8-
enabled: true
9-
property_access: ~
10-
serializer:
11-
enabled: true
12-
router: { resource: "%kernel.project_dir%/Configuration/routing.yml" }
13-
profiler: { only_exceptions: false }
14-
157
fos_rest:
168
view:
179
mime_types: true
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the FOSRestBundle package.
5+
*
6+
* (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
$frameworkConfig = [
13+
'annotations' => [
14+
'enabled' => true,
15+
],
16+
'property_access' => null,
17+
'serializer' => [
18+
'enabled' => true,
19+
],
20+
'router' => [
21+
'resource' => '%kernel.project_dir%/BasicAuth/routing.yml',
22+
],
23+
'profiler' => [
24+
'only_exceptions' => false,
25+
],
26+
];
27+
28+
if (\Symfony\Component\HttpKernel\Kernel::VERSION_ID >= 60100) {
29+
$frameworkConfig['http_method_override'] = true;
30+
}
31+
32+
$container->loadFromExtension('framework', $frameworkConfig);

0 commit comments

Comments
 (0)