Skip to content

Commit 58d9b11

Browse files
committed
fixes, and composer update
1 parent 6035f2a commit 58d9b11

11 files changed

+1217
-635
lines changed

Diff for: app/config/config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ fos_user:
9696
db_driver: orm # other valid values are 'mongodb', 'couchdb' and 'propel'
9797
firewall_name: main
9898
user_class: AppBundle\Entity\User
99+
from_email:
100+
address: "%fos_user.from_email.address%"
101+
sender_name: "%fos_user.from_email.sender_name%"
99102

100103

101104
# FOS REST Bundle

Diff for: app/config/parameters.yml.dist

+7-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ parameters:
1818
# A secret key that's used to generate certain security-related tokens
1919
secret: ThisTokenIsNotSoSecretChangeIt
2020

21+
# fos user bundle
22+
fos_user.from_email.address: "[email protected]"
23+
fos_user.from_email.sender_name: "Demo App"
24+
2125
# nelmio cors
2226
cors_allow_origin: 'http://localhost'
2327

@@ -26,7 +30,7 @@ parameters:
2630
api_description: 'The full description of your API'
2731

2832
# lexik jwt
29-
jwt_private_key_path: %kernel.root_dir%/var/jwt/private.pem # ssh private key path
30-
jwt_public_key_path: %kernel.root_dir%/var/jwt/public.pem # ssh public key path
31-
jwt_key_pass_phrase: '1234' # ssh key pass phrase
33+
jwt_private_key_path: %kernel.root_dir%/../var/jwt/private.pem # ssh private key path
34+
jwt_public_key_path: %kernel.root_dir%/../var/jwt/public.pem # ssh public key path
35+
jwt_key_pass_phrase: '1234' # ssh key pass phrase
3236
jwt_token_ttl: 86400

Diff for: app/config/routing.yml

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
api_login_check:
2-
path: /login
3-
4-
51
NelmioApiDocBundle:
62
resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
73
prefix: "/doc"

Diff for: app/config/routing_api.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
login:
2+
type: rest
3+
resource: AppBundle\Controller\RestLoginController
4+
5+
16
accounts:
27
type: rest
38
resource: AppBundle\Controller\AccountsController

Diff for: app/config/security.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ security:
4949

5050

5151
access_control:
52-
- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
53-
- { path: ^/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
54-
- { path: ^/, roles: IS_AUTHENTICATED_FULLY }
52+
- { path: ^/login$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
53+
- { path: ^/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
54+
- { path: ^/, roles: IS_AUTHENTICATED_FULLY }

Diff for: app/config/services.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ services:
200200

201201

202202

203-
# -- MANAGERS --
204-
crv.manager.user_manager:
205-
class: AppBundle\Model\UserManager
206-
arguments:
207-
- "@fos_user.entity_manager"
203+
# # -- MANAGERS --
204+
# crv.manager.user_manager:
205+
# class: AppBundle\Model\UserManager
206+
# arguments:
207+
# - "@fos_user.user_manager"
208208

209209

210210

Diff for: bin/symfony_requirements

+12-9
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ $lineSize = 70;
77
$symfonyRequirements = new SymfonyRequirements();
88
$iniPath = $symfonyRequirements->getPhpIniConfigPath();
99

10-
echo_title('Symfony2 Requirements Checker');
10+
echo_title('Symfony Requirements Checker');
1111

1212
echo '> PHP is using the following php.ini file:'.PHP_EOL;
1313
if ($iniPath) {
1414
echo_style('green', ' '.$iniPath);
1515
} else {
16-
echo_style('warning', ' WARNING: No configuration file (php.ini) used by PHP!');
16+
echo_style('yellow', ' WARNING: No configuration file (php.ini) used by PHP!');
1717
}
1818

1919
echo PHP_EOL.PHP_EOL;
@@ -22,7 +22,6 @@ echo '> Checking Symfony requirements:'.PHP_EOL.' ';
2222

2323
$messages = array();
2424
foreach ($symfonyRequirements->getRequirements() as $req) {
25-
/** @var $req Requirement */
2625
if ($helpText = get_error_message($req, $lineSize)) {
2726
echo_style('red', 'E');
2827
$messages['error'][] = $helpText;
@@ -43,9 +42,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) {
4342
}
4443

4544
if ($checkPassed) {
46-
echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
45+
echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
4746
} else {
48-
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
47+
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');
4948

5049
echo_title('Fix the following mandatory requirements', 'red');
5150

@@ -121,10 +120,14 @@ function echo_block($style, $title, $message)
121120

122121
echo PHP_EOL.PHP_EOL;
123122

124-
echo_style($style, str_repeat(' ', $width).PHP_EOL);
125-
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
126-
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
127-
echo_style($style, str_repeat(' ', $width).PHP_EOL);
123+
echo_style($style, str_repeat(' ', $width));
124+
echo PHP_EOL;
125+
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT));
126+
echo PHP_EOL;
127+
echo_style($style, $message);
128+
echo PHP_EOL;
129+
echo_style($style, str_repeat(' ', $width));
130+
echo PHP_EOL;
128131
}
129132

130133
function has_color_support()

0 commit comments

Comments
 (0)