Permalink
Browse files

Fix some CS

  • Loading branch information...
1 parent a265511 commit 27745bb87b0e9ef5949d26ad94845a124bcb46f3 @FabioBatSilva committed with fabio.silva Aug 12, 2012
@@ -2311,6 +2311,7 @@ public function addSqlResultSetMapping(array $resultMapping)
}
$entityResult['entityClass'] = $this->fullyQualifiedClassName($entityResult['entityClass']);
+
$resultMapping['entities'][$key]['entityClass'] = ltrim($entityResult['entityClass'], '\\');
$resultMapping['entities'][$key]['isSelfClass'] = $entityResult['isSelfClass'];
@@ -2496,6 +2497,7 @@ public function setLifecycleCallbacks(array $callbacks)
*
* @param string $callback
* @param string $eventName
+ * @throws \Doctrine\ORM\Mapping\MappingException
*/
public function addEntityListener($eventName, $class, $method)
{
@@ -2510,8 +2512,8 @@ public function addEntityListener($eventName, $class, $method)
}
$this->entityListeners[$eventName][] = array(
- 'class' => $class,
- 'method' => $method
+ 'class' => $class,
+ 'method' => $method
);
}
@@ -436,7 +436,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
}
}
- // evaluate as lifecycle callback if the listener class is not given.
+ // Evaluate as lifecycle callback if the listener class is not given.
if(empty($entityListenersAnnot->value)) {
/* @var $method \Doctrine\ORM\Mapping\LifecycleCallback */
foreach ($entityListenersAnnot->callbacks as $callback) {
@@ -567,8 +567,8 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
$eventName = $prefix . ucfirst($suffix);
$methodName = (string) $callbackElement['method'];
- $listeners[] = array($eventName, $methodName);
+ $listeners[] = array($eventName, $methodName);
}
if (isset($listenerElement['class'])) {
@@ -581,7 +581,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
continue;
}
- // evaluate as lifecycle callback if the listener class is not given.
+ // Evaluate as lifecycle callback if the listener class is not given.
foreach ($listeners as $item) {
$metadata->addLifecycleCallback($item[1], $item[0]);
}
@@ -599,7 +599,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
continue;
}
- // evaluate as lifecycle callback if the listener class is not given.
+ // Evaluate as lifecycle callback if the listener class is not given.
foreach ($listeners as $item){
$metadata->addLifecycleCallback($item[1], $item[0]);
}
@@ -692,10 +692,7 @@ public static function lifecycleCallbackMethodNotFound($className, $methodName)
*/
public static function entityListenerClassNotFound($listenerName, $className)
{
- return new self(sprintf(
- 'Entity Listener "%s" declared on "%s" not found.',
- $listenerName, $className
- ));
+ return new self(sprintf('Entity Listener "%s" declared on "%s" not found.', $listenerName, $className));
}
/**
@@ -707,10 +704,7 @@ public static function entityListenerClassNotFound($listenerName, $className)
*/
public static function entityListenerMethodNotFound($listenerName, $methodName, $className)
{
- return new self(sprintf(
- 'Entity Listener "%s" declared on "%s" has no method "%s".',
- $listenerName, $className, $methodName
- ));
+ return new self(sprintf('Entity Listener "%s" declared on "%s" has no method "%s".', $listenerName, $className, $methodName));
}
/**
@@ -977,7 +977,6 @@ private function executeInserts($class)
}
foreach ($entities as $entity) {
-
if ($hasListeners || $hasEntityListeners | $hasLifecycleCallbacks) {
$event = new LifecycleEventArgs($entity, $this->em);
}

0 comments on commit 27745bb

Please sign in to comment.