TYPO3.Flow

When using SwiftMailer the ProxyClassBuilder creates following code in F3_SwiftMailer_Message.php:

1private function FLOW3_Proxy_injectProperties() {
2    $this->mailer = new \F3\SwiftMailer\Mailer(X);
3}

This obviously leads to an exception here.
I got this fixed by changing line 99 of the ProxyClassBuilder from

1$preparedArguments[] = 'X';

1$preparedArguments[] = '\F3\FLOW3\Core\Bootstrap::$staticObjectManager->get(\'' . $argumentValue . '\')';

Additionally I needed to add following lines to the beginning of the ObjectManager::create() method:

1if (isset($this->objects[$objectName]['f'])) {
2    return $this->buildObjectByFactory($objectName);
3}

Not sure, if that is a clean solution, but it seems to fix the issue for me.