Skip to content

Commit

Permalink
Merge pull request #15 from pixelfederation/14_possible_fix
Browse files Browse the repository at this point in the history
fix for #14
  • Loading branch information
Martin Fris authored Oct 12, 2020
2 parents 7a81f1d + 1fead55 commit ac83aea
Show file tree
Hide file tree
Showing 5 changed files with 637 additions and 529 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ vendor
docker-compose.override.yml
tests/Functional/app/data/*
!tests/Functional/app/data/.gitkeep
.cache
!.cache/.gitkeep
17 changes: 8 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
],
"require": {
"php": ">=7.2",
"doctrine/orm": "^2.7",
"sensio/framework-extra-bundle": "^5.2",
"symfony/config": "^4.1|^5.0",
"symfony/dependency-injection": "^4.1|^5.0",
"symfony/config": "^4.1|^5.0|^5.1",
"symfony/dependency-injection": "^4.1|^5.0|^5.1",
"symfony/orm-pack": "^1.0",
"symfony/yaml": "^4.1|^5.0"
"symfony/yaml": "^4.1|^5.0|^5.1"
},
"autoload": {
"psr-4": {
Expand All @@ -26,8 +25,8 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.15",
"php-parallel-lint/php-parallel-lint": "^1.2",
"nikic/php-parser": "^4.2",
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpcompatibility/php-compatibility": "^9.1",
"phpmd/phpmd": "^2.6",
"phpro/grumphp": "^0.19",
Expand All @@ -36,10 +35,10 @@
"phpunit/phpunit": "^8.1",
"roave/security-advisories": "dev-master",
"squizlabs/php_codesniffer": "^3.4",
"symfony/browser-kit": "^4.1|^5.0",
"symfony/framework-bundle": "^4.1|^5.0",
"symfony/http-kernel": "^4.1|^5.0",
"symfony/phpunit-bridge": "^4.0|^5.0",
"symfony/browser-kit": "^4.1|^5.0|^5.1",
"symfony/framework-bundle": "^4.1|^5.0|^5.1",
"symfony/http-kernel": "^4.1|^5.0|^5.1",
"symfony/phpunit-bridge": "^4.0|^5.0|^5.1",
"vimeo/psalm": "^3.2"
},
"autoload-dev": {
Expand Down
Loading

0 comments on commit ac83aea

Please sign in to comment.