Skip to content
Browse files

CS fixes

  • Loading branch information...
1 parent 3f68baa commit 8aaae6caf51640acfb8c48267b3d1d53eb5096a4 @lsmith77 lsmith77 committed Sep 28, 2011
Showing with 7 additions and 6 deletions.
  1. +1 −0 lib/Doctrine/ODM/PHPCR/DocumentManager.php
  2. +5 −5 lib/Doctrine/ODM/PHPCR/UnitOfWork.php
  3. +1 −1 lib/vendor/jackalope
View
1 lib/Doctrine/ODM/PHPCR/DocumentManager.php
@@ -218,6 +218,7 @@ public function quote($val, $type = null)
/**
* Create a Query
*
+ * @param string $statement the SQL2 statement
* @param string $type (see \PHPCR\Query\QueryInterface for list of supported types)
* @return PHPCR\Query\QueryInterface
*/
View
10 lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -182,9 +182,9 @@ public function createDocument($documentName, $node, array &$hints = array())
} else {
if (isset($documentName)) {
$class = $this->dm->getClassMetadata($documentName);
- } else if (isset($properties['phpcr:class'])) {
+ } elseif (isset($properties['phpcr:class'])) {
$class = $this->dm->getClassMetadata($properties['phpcr:class']);
- } else if (isset($properties['phpcr:alias'])) {
+ } elseif (isset($properties['phpcr:alias'])) {
$class = $this->dm->getMetadataFactory()->getMetadataForAlias($properties['phpcr:alias']);
}
@@ -659,9 +659,9 @@ private function computeChildChanges($mapping, $child, $parentId)
$targetClass->reflFields[$targetClass->identifier]->setValue($child , $parentId . '/'. $mapping['name']);
$this->persistNew($targetClass, $child, ClassMetadata::GENERATOR_TYPE_ASSIGNED);
$this->computeChangeSet($targetClass, $child);
- } else if ($state == self::STATE_REMOVED) {
+ } elseif ($state == self::STATE_REMOVED) {
throw new \InvalidArgumentException("Removed child document detected during flush");
- } else if ($state == self::STATE_DETACHED) {
+ } elseif ($state == self::STATE_DETACHED) {
throw new \InvalidArgumentException("A detached document was found through a "
. "child relationship during cascading a persist operation.");
}
@@ -680,7 +680,7 @@ private function computeReferenceChanges($mapping, $reference, $referrerId)
if ($state == self::STATE_NEW) {
$this->persistNew($targetClass, $reference, ClassMetadata::GENERATOR_TYPE_ASSIGNED);
$this->computeChangeSet($targetClass, $reference);
- } else if ($state == self::STATE_DETACHED) {
+ } elseif ($state == self::STATE_DETACHED) {
throw new \InvalidArgumentException("A detached document was found through a "
. "reference during cascading a persist operation.");
}
2 lib/vendor/jackalope
@@ -1 +1 @@
-Subproject commit 7c8f859534e6e085d5e080a00e7da0e52a6c2b85
+Subproject commit 9b5b9fd4bb5d11ddf1fec8259c52833e33d81a20

0 comments on commit 8aaae6c

Please sign in to comment.
Something went wrong with that request. Please try again.