Skip to content

Commit

Permalink
Merge branch 'DDC-1280'
Browse files Browse the repository at this point in the history
  • Loading branch information
beberlei committed Jul 26, 2011
2 parents cbf2106 + 93d2e1b commit 2e3d239
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/Doctrine/ORM/Proxy/ProxyFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private function _generateMethods(ClassMetadata $class)
}

if ($method->isPublic() && ! $method->isFinal() && ! $method->isStatic()) {
$methods .= PHP_EOL . ' public function ';
$methods .= "\n" . ' public function ';
if ($method->returnsReference()) {
$methods .= '&';
}
Expand Down Expand Up @@ -208,10 +208,10 @@ private function _generateMethods(ClassMetadata $class)
}

$methods .= $parameterString . ')';
$methods .= PHP_EOL . ' {' . PHP_EOL;
$methods .= ' $this->__load();' . PHP_EOL;
$methods .= "\n" . ' {' . "\n";
$methods .= ' $this->__load();' . "\n";
$methods .= ' return parent::' . $method->getName() . '(' . $argumentString . ');';
$methods .= PHP_EOL . ' }' . PHP_EOL;
$methods .= "\n" . ' }' . "\n";
}
}

Expand Down

0 comments on commit 2e3d239

Please sign in to comment.