Skip to content

Commit

Permalink
Merge pull request #127 from H2-invent/update_symfony
Browse files Browse the repository at this point in the history
Update symfony
  • Loading branch information
holzi1005 authored Dec 9, 2021
2 parents 991dcff + 6687c05 commit c337d8c
Show file tree
Hide file tree
Showing 10 changed files with 16,463 additions and 1,388 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@ yarn-error.log
/.web-server-pid
###< symfony/web-server-bundle ###
/public/trash/

###> phpunit/phpunit ###
/phpunit.xml
.phpunit.result.cache
###< phpunit/phpunit ###
2 changes: 1 addition & 1 deletion assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import('moment');
import('bootstrap-select');

$(document).ready(function () {
h2Button.init();
h2Button.init("https://www3.h2-invent.com/appsv2.json");
setTimeout(function () {
$('#snackbar').addClass('show');
setTimeout(function () {
Expand Down
61 changes: 37 additions & 24 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,63 @@
"ext-ctype": "*",
"ext-iconv": "*",
"composer/package-versions-deprecated": "^1.10",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.5",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.10",
"h2entwicklung/doctrine-encrypt-bundle": "^4.0",
"knpuniversity/oauth2-client-bundle": "^2.5",
"laminas/laminas-code": "^3.4",
"laminas/laminas-escaper": "^2.6",
"nicoswd/php-gpg": "^1.7",
"nucleos/dompdf-bundle": "^3.0",
"oneup/flysystem-bundle": "^3.4",
"phpdocumentor/reflection-docblock": "^5.3",
"phpoffice/phpword": "^0.17.0",
"sensio/framework-extra-bundle": "^5.2",
"phpstan/phpdoc-parser": "^1.2",
"sensio/framework-extra-bundle": "^5.4",
"stevenmaguire/oauth2-keycloak": "^2.2",
"symfony/apache-pack": "^1.0",
"symfony/asset": "5.2.*",
"symfony/console": "5.2.*",
"symfony/dotenv": "5.2.*",
"symfony/expression-language": "5.2.*",
"symfony/asset": "5.4.*",
"symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/expression-language": "5.4.*",
"symfony/flex": "^1.3.1",
"symfony/form": "5.2.*",
"symfony/framework-bundle": "5.2.*",
"symfony/http-client": "5.2.*",
"symfony/intl": "5.2.*",
"symfony/mailer": "5.2.*",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/mailer": "5.4.*",
"symfony/monolog-bundle": "^3.1",
"symfony/orm-pack": "*",
"symfony/process": "5.2.*",
"symfony/security-bundle": "5.2.*",
"symfony/serializer-pack": "*",
"symfony/process": "5.4.*",
"symfony/property-access": "5.4.*",
"symfony/property-info": "5.4.*",
"symfony/proxy-manager-bridge": "5.4.*",
"symfony/security-bundle": "5.4.*",
"symfony/serializer": "5.4.*",
"symfony/swiftmailer-bundle": "^3.4",
"symfony/templating": "5.2.*",
"symfony/translation": "5.2.*",
"symfony/twig-pack": "*",
"symfony/validator": "5.2.*",
"symfony/web-link": "5.2.*",
"symfony/templating": "5.4.*",
"symfony/translation": "5.4.*",
"symfony/twig-bundle": "5.4.*",
"symfony/validator": "5.4.*",
"symfony/web-link": "5.4.*",
"symfony/webpack-encore-bundle": "^1.7",
"symfony/yaml": "5.2.*",
"symfony/yaml": "5.4.*",
"twig/cssinliner-extra": "^3.0",
"twig/extra-bundle": "^2.12|^3.0",
"twig/inky-extra": "^3.0",
"twig/twig": "^2.0",
"vich/uploader-bundle": "^1.13"
},
"require-dev": {
"symfony/debug-pack": "*",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "5.4.*",
"symfony/css-selector": "5.4.*",
"symfony/debug-bundle": "5.4.*",
"symfony/maker-bundle": "^1.0",
"symfony/profiler-pack": "*",
"symfony/test-pack": "*",
"symfony/phpunit-bridge": "^6.0",
"symfony/stopwatch": "5.4.*",
"symfony/web-profiler-bundle": "5.4.*",
"symfony/web-server-bundle": "4.4.*"
},
"config": {
Expand Down Expand Up @@ -94,7 +107,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.2.*"
"require": "5.4.*"
}
}
}
Loading

0 comments on commit c337d8c

Please sign in to comment.