Skip to content
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

Fix deprecated factory definition, bump Symfony to 2.8 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deprecated factory definition, bump Symfony to 2.8 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/Propel/om/
/Propel/map/
/vendor/
composer.lock
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason to remove composer.lock from git?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because it is needed only for this library, and not for projects that depend on this library.
https://getcomposer.org/doc/02-libraries.md#lock-file

For your library you may commit the composer.lock file if you want to. This can help your team to always test against the same dependency versions. However, this lock file will not have any effect on other projects that depend on it. It only has an effect on the main project.

If you do not want to commit the lock file and you are using git, add it to the .gitignore.

But I can revert this if it still needed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. Thanks for explanation!

3 changes: 2 additions & 1 deletion Resources/config/couchdb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
<argument>%bazinga.oauth.model.access_token.class%</argument>
</service>

<service id="bazinga.oauth.document_manager" factory-service="doctrine_couchdb" factory-method="getManager" class="Doctrine\ODM\CouchDB\DocumentManager" public="false">
<service id="bazinga.oauth.document_manager" class="Doctrine\ODM\CouchDB\DocumentManager" public="false">
<factory service="doctrine_couchdb" method="getManager" />
<argument>%bazinga.oauth.model_manager_name%</argument>
</service>
</services>
Expand Down
3 changes: 2 additions & 1 deletion Resources/config/mongodb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
<argument>%bazinga.oauth.model.access_token.class%</argument>
</service>

<service id="bazinga.oauth.document_manager" factory-service="doctrine_mongodb" factory-method="getManager" class="Doctrine\ODM\MongoDB\DocumentManager" public="false">
<service id="bazinga.oauth.document_manager" class="Doctrine\ODM\MongoDB\DocumentManager" public="false">
<factory service="doctrine_mongodb" method="getManager" />
<argument>%bazinga.oauth.model_manager_name%</argument>
</service>
</services>
Expand Down
3 changes: 2 additions & 1 deletion Resources/config/orm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
<argument>%bazinga.oauth.model.access_token.class%</argument>
</service>

<service id="bazinga.oauth.entity_manager" factory-service="doctrine" factory-method="getManager" class="Doctrine\ORM\EntityManager" public="false">
<service id="bazinga.oauth.entity_manager" class="Doctrine\ORM\EntityManager" public="false">
<factory service="doctrine" method="getManager" />
<argument>%bazinga.oauth.model_manager_name%</argument>
</service>
</services>
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
],
"require": {
"php": ">=5.3.3",
"symfony/console": "~2.3",
"symfony/framework-bundle": "~2.3",
"symfony/security-bundle": "~2.3"
"symfony/console": "~2.8",
"symfony/framework-bundle": "~2.8",
"symfony/security-bundle": "~2.8"
},
"require-dev": {
"doctrine/doctrine-bundle": "1.3.*@dev",
Expand Down
Loading