Skip to content

Commit a82eca9

Browse files
committed
Update vendors
1 parent c1dd1cb commit a82eca9

12 files changed

+1105
-507
lines changed

app/AppKernel.php

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public function registerBundles()
1212
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
1313
new Symfony\Bundle\TwigBundle\TwigBundle(),
1414
new Symfony\Bundle\MonologBundle\MonologBundle(),
15-
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
1615
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
1716
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
1817
new Overblog\GraphQLBundle\OverblogGraphQLBundle(),

app/config/config.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ framework:
2525
trusted_hosts: ~
2626
trusted_proxies: ~
2727
session:
28-
# http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
29-
handler_id: session.handler.native_file
28+
# handler_id set to null will use default session handler from php.ini
29+
handler_id: ~
3030
save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
3131
fragments: ~
3232
http_method_override: true
3333
assets: ~
34+
php_errors:
35+
log: true
3436

3537
# Twig Configuration
3638
twig:
@@ -59,14 +61,6 @@ doctrine:
5961
naming_strategy: doctrine.orm.naming_strategy.underscore
6062
auto_mapping: true
6163

62-
# Swiftmailer Configuration
63-
swiftmailer:
64-
transport: "%mailer_transport%"
65-
host: "%mailer_host%"
66-
username: "%mailer_user%"
67-
password: "%mailer_password%"
68-
spool: { type: memory }
69-
7064
#graphql
7165
overblog_graphql:
7266
definitions:

app/config/parameters.yml.dist

-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,5 @@ parameters:
1010
# You should uncomment this if you want use pdo_sqlite
1111
# database_path: "%kernel.root_dir%/data.db3"
1212

13-
mailer_transport: smtp
14-
mailer_host: 127.0.0.1
15-
mailer_user: ~
16-
mailer_password: ~
17-
1813
# A secret key that's used to generate certain security-related tokens
1914
secret: ThisTokenIsNotSoSecretChangeIt

bin/symfony_requirements

+8-5
Original file line numberDiff line numberDiff line change
@@ -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;
@@ -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()

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
},
1919
"require": {
2020
"php": ">=5.5.9",
21-
"symfony/symfony": "3.0.*",
21+
"symfony/symfony": "3.2.*",
2222
"doctrine/orm": "^2.5",
2323
"doctrine/doctrine-bundle": "^1.6",
2424
"doctrine/doctrine-cache-bundle": "^1.2",
25-
"symfony/swiftmailer-bundle": "^2.3",
2625
"symfony/monolog-bundle": "^2.8",
2726
"sensio/distribution-bundle": "^5.0",
2827
"sensio/framework-extra-bundle": "^3.0.2",
2928
"incenteev/composer-parameter-handler": "^2.0",
30-
"overblog/graphql-bundle": "dev-master"
29+
"overblog/graphql-bundle": "dev-master",
30+
"twig/twig": "^1.30"
3131
},
3232
"require-dev": {
3333
"sensio/generator-bundle": "^3.0",
34-
"symfony/phpunit-bridge": "^3.0",
34+
"symfony/phpunit-bridge": "^3.2",
3535
"doctrine/doctrine-fixtures-bundle": "^2.3",
3636
"phpunit/phpunit": "^4.1|^5.1",
3737
"liip/functional-test-bundle": "^1.5"

0 commit comments

Comments
 (0)