-
Notifications
You must be signed in to change notification settings - Fork 44
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.
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
Fixing bugs on inheritance system and add free primary key capability #98
Open
mmeloni
wants to merge
4
commits into
lphuberdeau:master
Choose a base branch
from
mmeloni:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8e54f4f
Fixing bug on removePreviousRelations method
mmeloni 862f08a
Added a dynamic way to retrieve primary key. Now primary key can assu…
mmeloni 74f97b8
Merge remote-tracking branch 'remotes/lphuberdeau/master'
mmeloni a9f4b7b
fixing bug on test Tests/FreePrimaryKeyTest.php
mmeloni File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| <?php | ||
| /** | ||
| * Copyright (C) 2012 Louis-Philippe Huberdeau | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a | ||
| * copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included | ||
| * in all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| * DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| namespace HireVoice\Neo4j\Tests\Entity; | ||
| use HireVoice\Neo4j\Annotation as OGM; | ||
|
|
||
| /** | ||
| * @OGM\Entity(labels="Olive") | ||
| */ | ||
| class Olive | ||
| { | ||
| /** | ||
| * @OGM\Auto | ||
| */ | ||
| protected $veryStrangePrimaryKey; | ||
|
|
||
| /** | ||
| * @OGM\Property | ||
| * @OGM\Index | ||
| */ | ||
| protected $name; | ||
|
|
||
|
|
||
| /** | ||
| * @param mixed $veryStrangePrimaryKey | ||
| * | ||
| * @return Olive | ||
| */ | ||
| public function setVeryStrangePrimaryKey($veryStrangePrimaryKey) | ||
| { | ||
| $this->veryStrangePrimaryKey = $veryStrangePrimaryKey; | ||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| public function getVeryStrangePrimaryKey() | ||
| { | ||
| return $this->veryStrangePrimaryKey; | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed $name | ||
| * | ||
| * @return Olive | ||
| */ | ||
| public function setName($name) | ||
| { | ||
| $this->name = $name; | ||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| public function getName() | ||
| { | ||
| return $this->name; | ||
| } | ||
|
|
||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| <?php | ||
| /** | ||
| * Copyright (C) 2012 Louis-Philippe Huberdeau | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a | ||
| * copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included | ||
| * in all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| * DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| namespace HireVoice\Neo4j\Tests\Entity; | ||
| use HireVoice\Neo4j\Annotation as OGM; | ||
|
|
||
| /** | ||
| * @OGM\Entity(labels="Pasta") | ||
| */ | ||
| class Pasta | ||
| { | ||
| /** | ||
| * @OGM\Auto | ||
| */ | ||
| protected $strangePrimaryKey; | ||
|
|
||
| /** | ||
| * @OGM\Property | ||
| * @OGM\Index | ||
| */ | ||
| protected $name; | ||
|
|
||
| /** | ||
| * @OGM\ManyToMany(relation="ingredient") | ||
| */ | ||
| protected $olives; | ||
|
|
||
| /** | ||
| * @OGM\ManyToOne(relation="base_ingredient") | ||
| */ | ||
| protected $tomato; | ||
|
|
||
| /** | ||
| * Constructor that initializes references | ||
| * | ||
| */ | ||
| public function __construct(){ | ||
| $this->olives = new \Doctrine\Common\Collections\ArrayCollection(); | ||
| } | ||
| /** | ||
| * @param mixed $strangePrimaryKey | ||
| * | ||
| * @return Pasta | ||
| */ | ||
| public function setStrangePrimaryKey($strangePrimaryKey) | ||
| { | ||
| $this->strangePrimaryKey = $strangePrimaryKey; | ||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| public function getStrangePrimaryKey() | ||
| { | ||
| return $this->strangePrimaryKey; | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed $name | ||
| * | ||
| * @return Pasta | ||
| */ | ||
| public function setName($name) | ||
| { | ||
| $this->name = $name; | ||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| public function getName() | ||
| { | ||
| return $this->name; | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed $olives | ||
| * | ||
| * @return Pasta | ||
| */ | ||
| public function setOlives($olives) | ||
| { | ||
| $this->olives = $olives; | ||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| public function getOlives() | ||
| { | ||
| return $this->olives; | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| * @param | ||
| */ | ||
| public function addOlive($olive) | ||
| { | ||
| $this->olives[] = $olive; | ||
| } | ||
| /** | ||
| * @param mixed $tomato | ||
| * | ||
| * @return Pasta | ||
| */ | ||
| public function setTomato($tomato) | ||
| { | ||
| $this->tomato = $tomato; | ||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| public function getTomato() | ||
| { | ||
| return $this->tomato; | ||
| } | ||
|
|
||
| } | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reflected property should allow to read the value directly from the property rather than relying on the naming convention. There used to be a lot of this, but it has since been removed.
I fail to understand the purpose of the change. Is it not possible to use @auto on an arbitrary property?