Skip to content

Commit cfff17a

Browse files
authored
Merge pull request #13 from w473/master
SF4 and php7 mods
2 parents 463d7bb + cad7e37 commit cfff17a

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
*.swp
22
composer.phar
33
vendor/
4-
4+
.idea
55
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
66
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
77
composer.lock

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,3 +343,8 @@ Don't have the pre-commit hook running, please make sure to run the fixer/sniffe
343343
$ vendor/bin/php-cs-fixer fix src/
344344
$ vendor/bin/php-cs-fixer fix tests/
345345
```
346+
347+
PHP 7
348+
-----
349+
Please run before:
350+
composer require alcaeus/mongo-php-adapter

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"require": {
1616
"php": ">=5.3.2",
1717
"doctrine/mongodb": "1.*",
18-
"symfony/console": "^2.5|^3.0",
19-
"symfony/yaml": "^2.5|^3.0"
18+
"symfony/console": "^2.5|^3.0|^4",
19+
"symfony/yaml": "^2.5|^3.0|^4"
2020
},
2121
"require-dev": {
2222
"antimattr/test-case": "~1.0@stable",

0 commit comments

Comments
 (0)