Skip to content

Commit

Permalink
Merge pull request #13 from w473/master
Browse files Browse the repository at this point in the history
SF4 and php7 mods
  • Loading branch information
redthor authored Feb 18, 2018
2 parents 463d7bb + cad7e37 commit cfff17a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*.swp
composer.phar
vendor/

.idea
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
composer.lock
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -343,3 +343,8 @@ Don't have the pre-commit hook running, please make sure to run the fixer/sniffe
$ vendor/bin/php-cs-fixer fix src/
$ vendor/bin/php-cs-fixer fix tests/
```

PHP 7
-----
Please run before:
composer require alcaeus/mongo-php-adapter
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"require": {
"php": ">=5.3.2",
"doctrine/mongodb": "1.*",
"symfony/console": "^2.5|^3.0",
"symfony/yaml": "^2.5|^3.0"
"symfony/console": "^2.5|^3.0|^4",
"symfony/yaml": "^2.5|^3.0|^4"
},
"require-dev": {
"antimattr/test-case": "~1.0@stable",
Expand Down

0 comments on commit cfff17a

Please sign in to comment.