Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
db2be55e
Commit
db2be55e
authored
Apr 30, 2010
by
Roman S. Borschel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DDC-561] Fixed.
parent
47ebbb43
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
3 deletions
+7
-3
AssociationMapping.php
lib/Doctrine/ORM/Mapping/AssociationMapping.php
+2
-1
ClassMetadata.php
lib/Doctrine/ORM/Mapping/ClassMetadata.php
+1
-0
AnnotationDriver.php
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+1
-1
PersistentCollection.php
lib/Doctrine/ORM/PersistentCollection.php
+1
-1
ClassMetadataTest.php
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+2
-0
No files found.
lib/Doctrine/ORM/Mapping/AssociationMapping.php
View file @
db2be55e
...
...
@@ -356,7 +356,8 @@ abstract class AssociationMapping
$serialized
=
array
(
'sourceEntityName'
,
'targetEntityName'
,
'sourceFieldName'
'sourceFieldName'
,
'fetchMode'
);
if
(
$this
->
isCascadeDetach
)
{
...
...
lib/Doctrine/ORM/Mapping/ClassMetadata.php
View file @
db2be55e
...
...
@@ -286,6 +286,7 @@ class ClassMetadata extends ClassMetadataInfo
'identifier'
,
'isIdentifierComposite'
,
// TODO: REMOVE
'name'
,
'namespace'
,
// TODO: REMOVE
'table'
,
'rootEntityName'
,
'idGenerator'
,
//TODO: Does not really need to be serialized. Could be moved to runtime.
...
...
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View file @
db2be55e
...
...
@@ -143,7 +143,7 @@ class AnnotationDriver implements Driver
throw
MappingException
::
classIsNotAValidEntityOrMappedSuperClass
(
$className
);
}
// Evaluate
Doctrine
Table annotation
// Evaluate Table annotation
if
(
isset
(
$classAnnotations
[
'Doctrine\ORM\Mapping\Table'
]))
{
$tableAnnot
=
$classAnnotations
[
'Doctrine\ORM\Mapping\Table'
];
$primaryTable
=
array
(
...
...
lib/Doctrine/ORM/PersistentCollection.php
View file @
db2be55e
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
View file @
db2be55e
...
...
@@ -37,6 +37,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
// Check state
$this
->
assertTrue
(
count
(
$cm
->
getReflectionProperties
())
>
0
);
$this
->
assertEquals
(
'Doctrine\Tests\Models\CMS'
,
$cm
->
namespace
);
$this
->
assertTrue
(
$cm
->
reflClass
instanceof
\ReflectionClass
);
$this
->
assertEquals
(
'Doctrine\Tests\Models\CMS\CmsUser'
,
$cm
->
name
);
$this
->
assertEquals
(
'UserParent'
,
$cm
->
rootEntityName
);
...
...
@@ -47,6 +48,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$this
->
assertTrue
(
$cm
->
getAssociationMapping
(
'phonenumbers'
)
instanceof
\Doctrine\ORM\Mapping\OneToOneMapping
);
$this
->
assertEquals
(
1
,
count
(
$cm
->
associationMappings
));
$oneOneMapping
=
$cm
->
getAssociationMapping
(
'phonenumbers'
);
$this
->
assertTrue
(
$oneOneMapping
->
fetchMode
==
\Doctrine\ORM\Mapping\AssociationMapping
::
FETCH_LAZY
);
$this
->
assertEquals
(
'phonenumbers'
,
$oneOneMapping
->
sourceFieldName
);
$this
->
assertEquals
(
'Doctrine\Tests\Models\CMS\Bar'
,
$oneOneMapping
->
targetEntityName
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment