Krautspace/calcifer
Archived
2
0
Fork 0
Code Issues 11 Pull requests 2 Activity

Update symfony to 2.8

Browse source 
fixes #57
This commit is contained in:
Tim Schumacher 2016-06-10 00:17:29 +02:00
parent 2ceb78114d
commit 3f1e728781
4 changed files with 668 additions and 399 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/AppKernel.php
View file

@ -18,7 +18,6 @@ class AppKernel extends Kernel
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new Hackspace\Bundle\CalciferBundle\CalciferBundle(), new Hackspace\Bundle\CalciferBundle\CalciferBundle(),
new Knp\Bundle\MarkdownBundle\KnpMarkdownBundle(), new Knp\Bundle\MarkdownBundle\KnpMarkdownBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
); );
if (in_array($this->getEnvironment(), array('dev', 'test'))) { if (in_array($this->getEnvironment(), array('dev', 'test'))) {

6
app/check.php
View file

@ -80,7 +80,7 @@ function get_error_message(Requirement $requirement, $lineSize)
return; return;
} }
$errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
$errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL;
return $errorMessage; return $errorMessage;
@ -121,8 +121,8 @@ function echo_block($style, $title, $message)
echo PHP_EOL.PHP_EOL; echo PHP_EOL.PHP_EOL;
echo_style($style, str_repeat(' ', $width).PHP_EOL); echo_style($style, str_repeat(' ', $width).PHP_EOL);
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_repeat(' ', $width).PHP_EOL); echo_style($style, str_repeat(' ', $width).PHP_EOL);
} }

28
composer.json
View file

@ -20,28 +20,26 @@
} }
], ],
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.6",
"symfony/symfony": "2.5.*", "symfony/symfony": "^2.8",
"doctrine/orm": "~2.2,>=2.2.3", "doctrine/doctrine-bundle": "^1.6",
"doctrine/doctrine-bundle": "~1.2", "doctrine/orm": "^2.5",
"twig/extensions": "~1.1", "twig/extensions": "^1.3",
"symfony/assetic-bundle": "~2.3", "symfony/assetic-bundle": "^2.8",
"symfony/swiftmailer-bundle": "~2.3", "symfony/swiftmailer-bundle": "^2.3",
"symfony/monolog-bundle": "~2.4", "symfony/monolog-bundle": "^2.11",
"sensio/distribution-bundle": "~3.0", "sensio/distribution-bundle": "^4.0",
"sensio/framework-extra-bundle": "~3.0", "sensio/framework-extra-bundle": "~3.0",
"incenteev/composer-parameter-handler": "~2.0", "incenteev/composer-parameter-handler": "~2.1",
"jquery/jquery": "1.10.*", "jquery/jquery": "1.10.*",
"knplabs/knp-markdown-bundle": "~1.3", "knplabs/knp-markdown-bundle": "~1.5",
"enko/ics": "~0.2", "enko/ics": "~0.2",
"doctrine/migrations": "dev-master", "jbroadway/urlify" : "^1.0",
"doctrine/doctrine-migrations-bundle": "dev-master",
"jbroadway/urlify" : "~1.0",
"enko/relativedateparser" : "0.5", "enko/relativedateparser" : "0.5",
"sabre/vobject": "^4.1" "sabre/vobject": "^4.1"
}, },
"require-dev": { "require-dev": {
"sensio/generator-bundle": "~2.3" "sensio/generator-bundle": "~3.0"
}, },
"scripts": { "scripts": {
"post-root-package-install": [ "post-root-package-install": [

1032
composer.lock generated
View file

File diff suppressed because it is too large Load diff