Skip to content
This repository has been archived by the owner on Jul 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #159 from core23/rest-dependency
Browse files Browse the repository at this point in the history
Make REST dependency optional
  • Loading branch information
OskarStark committed Jan 20, 2016
2 parents 3953bbf + a275299 commit f5f96a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Resources/doc/reference/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ To begin, add the dependent bundles:
php composer.phar require sonata-project/notification-bundle
php composer.phar require videlalvaro/php-amqplib --no-update # optional
php composer.phar require liip/monitor-bundle --no-update # optional
php composer.phar require friendsofsymfony/rest-bundle --no-update # optional when using api
php composer.phar require nelmio/api-doc-bundle --no-update # optional when using api
php composer.phar update
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"sonata-project/doctrine-extensions": "~1.0",
"sonata-project/easy-extends-bundle": "~2.1",
"sonata-project/core-bundle": "^2.3.10",
"sonata-project/datagrid-bundle": "~2.2",
"friendsofsymfony/rest-bundle": "~1.1",
"jms/serializer-bundle": "~0.11|~1.0",
"nelmio/api-doc-bundle": "~2.4"
"sonata-project/datagrid-bundle": "~2.2"
},
"suggest": {
"sonata-project/doctrine-orm-admin-bundle": "2.2.*",
Expand All @@ -39,7 +36,10 @@
"liip/monitor-bundle": "~2.0",
"symfony/phpunit-bridge": "~2.7|~3.0",
"fabpot/php-cs-fixer": "~0.5|~1.0",
"swiftmailer/swiftmailer": "~4.3|~5"
"swiftmailer/swiftmailer": "~4.3|~5",
"friendsofsymfony/rest-bundle": "~1.1",
"jms/serializer-bundle": "~0.11|~1.0",
"nelmio/api-doc-bundle": "~2.4"
},
"conflict": {
"jms/serializer": "<0.13"
Expand Down

0 comments on commit f5f96a3

Please sign in to comment.