Skip to content

SF4 and php7 mods #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 18, 2018
Merged

SF4 and php7 mods #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
028a066
symofny version update
w473 Feb 13, 2018
bc0d015
symofny version update
w473 Feb 13, 2018
c830415
Revert "symofny version update"
w473 Feb 13, 2018
da9d5c2
remove platform json
w473 Feb 14, 2018
8ff9ccf
readme fix
w473 Feb 14, 2018
cad7e37
Merge remote-tracking branch 'upstream/master'
Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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