Update to documentation and minor serialization update #80

Merged
merged 6 commits into from Sep 22, 2013

Conversation

Projects
None yet
2 participants
Contributor

MrHash commented Sep 10, 2013

No description provided.

@Baachi Baachi commented on the diff Sep 12, 2013

README.markdown
```php
<?php
namespace Entities;
-use Doctrine\Search\Mapping\Annotation as Search;
+use Doctrine\Search\Mapping\Annotations as MAP;
@Baachi

Baachi Sep 12, 2013

Contributor

MAP? I think Search is a better name.

@MrHash

MrHash Sep 12, 2013

Contributor

I don't think it really matters at this stage for the readme, and anyway these are currently only mapping annotations as the annotation serializer is not yet written.

Contributor

Baachi commented Sep 12, 2013

Really cool 👍

But can you update your code to follow the PSR-2 coding standard?

MrHash added some commits Sep 12, 2013

MrHash Update to meet coding standards 28c088e
MrHash Fix annotation class name
The class needs refactoring for PSR-2 compliance
1f6c2dd
Contributor

MrHash commented Sep 20, 2013

Done

Contributor

Baachi commented Sep 21, 2013

Cool, thank you. I cannot merge your PR because it conflicts with master. Can you rebase?

MrHash Merge branch 'master' of https://github.com/doctrine/search
Conflicts:
	lib/Doctrine/Search/Mapping/Annotations/ElasticSearchable.php
36165ce
Contributor

MrHash commented Sep 21, 2013

Should be merged now

@Baachi Baachi added a commit that referenced this pull request Sep 22, 2013

@Baachi Baachi Merge pull request #80 from MrHash/master
Update to documentation and minor serialization update
8b761a8

@Baachi Baachi merged commit 8b761a8 into doctrine:master Sep 22, 2013

Contributor

Baachi commented Sep 22, 2013

Yep, merged thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment