fixed several issues in cascade support #58

Merged
merged 1 commit into from Feb 24, 2013

Projects

None yet

3 participants

@lsmith77
Member
lsmith77 commented Jan 3, 2013

fixed missing error handling for cascade, fixed typos in the yaml driver, fixed logic for building the bitmask

code taken from doctrine/phpcr-odm#200

@lsmith77 lsmith77 and 1 other commented on an outdated diff Jan 4, 2013
...trine/ODM/CouchDB/Mapping/Driver/AnnotationDriver.php
@@ -127,4 +119,23 @@ public function loadMetadataForClass($className, ClassMetadata $class)
}
}
}
+
+ /**
+ * Gathers a list of cascade options found in the given cascade element.
+ *
+ * @param $cascadeList cascade list
+ * @return integer a bitmask of cascade options.
+ */
+ private function getCascadeMode($cascadeList)
+ {
+ $cascade = 0;
+ foreach ($cascadeList as $cascadeMode) {
@lsmith77
lsmith77 Jan 4, 2013 Doctrine member

btw this might require a newer doctrine common version, see doctrine/phpcr-odm#205 (comment)

@stof
stof Jan 7, 2013 Doctrine member

@lsmith77 actually, the integer vs array issue is the one fixed in doctrine/phpcr-odm#209 IMO. Using a newer version of Doctrine was probably not related

@lsmith77
Member
lsmith77 commented Jan 4, 2013

did not run the test suite .. and it seems like travis isnt properly enabled?

@lsmith77
Member
lsmith77 commented Jan 7, 2013

probably also requires the changes done in doctrine/phpcr-odm#209

@beberlei beberlei merged commit 23f95b7 into master Feb 24, 2013
@lsmith77 lsmith77 deleted the cascade_fixes branch Feb 24, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment