Skip to content

Commit

Permalink
Merge pull request #89 from frank9999/backports
Browse files Browse the repository at this point in the history
Backports from UW 2.0
  • Loading branch information
frank9999 committed Jul 20, 2019
2 parents 9818b95 + 070d71c commit 2b66447
Show file tree
Hide file tree
Showing 141 changed files with 1,117 additions and 1,063 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,7 +1,7 @@
language: php

php:
- 7.2
- 7.3

before_script:
- composer install --no-interaction --prefer-source
31 changes: 16 additions & 15 deletions composer.json
Expand Up @@ -2,27 +2,28 @@
"type": "project",
"license": "proprietary",
"require": {
"php": "^7.2",
"php": "^7.3",
"doctrine/common": "^2.10",
"doctrine/doctrine-bundle": "^1.10",
"doctrine/doctrine-bundle": "^1.11",
"doctrine/doctrine-migrations-bundle": "^1.3",
"doctrine/orm": "^2.6",
"symfony/asset": "^4.2",
"symfony/console": "^4.2",
"symfony/flex": "^1.1",
"symfony/form": "^4.2",
"symfony/framework-bundle": "^4.2",
"symfony/asset": "^4.3",
"symfony/console": "^4.3",
"symfony/flex": "^1.2",
"symfony/form": "^4.3",
"symfony/framework-bundle": "^4.3",
"symfony/monolog-bundle": "^3.3",
"symfony/security-bundle": "^4.2",
"symfony/security-bundle": "^4.3",
"symfony/swiftmailer-bundle": "^3.2",
"symfony/translation": "^4.2",
"symfony/twig-bundle": "^4.2",
"symfony/web-profiler-bundle": "^4.2",
"symfony/yaml": "^4.2",
"twig/twig": "^2.5"
"symfony/translation": "^4.3",
"symfony/twig-bundle": "^4.3",
"symfony/web-profiler-bundle": "^4.3",
"symfony/webpack-encore-bundle": "^1.4",
"symfony/yaml": "^4.3",
"twig/twig": "^2.10"
},
"require-dev": {
"symfony/dotenv": "^4.2"
"symfony/dotenv": "^4.3"
},
"config": {
"preferred-install": {
Expand Down Expand Up @@ -59,7 +60,7 @@
"symfony": {
"id": "01C0SF16B9AEFHYZFFXCZJK7ZN",
"allow-contrib": false,
"require": "4.2.*"
"require": "4.3.*"
}
}
}

0 comments on commit 2b66447

Please sign in to comment.