Cleanup code.

Author: hjerichen

src/PHPProphet.php

@@ -23,10 +23,17 @@ public function __construct(Prophet $prophet)
     public function prophesize(string $namespace): NamespaceProphecy
     {
         $textTemplate = new Template(__DIR__ . '/function.tpl');
-        $functionProphecyStorage = FunctionProphecyStorage::getInstance();
         $functionRevealer = new FunctionRevealer($textTemplate);
+        $functionProphecyStorage = FunctionProphecyStorage::getInstance();
+
+        $namespaceProphecy = new NamespaceProphecy(
+            $this->prophet,
+            $namespace,
+            $functionProphecyStorage,
+            $functionRevealer
+        );
+        $this->namespaceProphecies[$namespace] = $namespaceProphecy;
 
-        $this->namespaceProphecies[$namespace] = new NamespaceProphecy($this->prophet, $namespace, $functionProphecyStorage, $functionRevealer);
         return $this->namespaceProphecies[$namespace];
     }
 

src/PHPProphetTrait.php

@@ -61,8 +61,9 @@ public function runBare(): void
         try {
             parent::runBare();
         } finally {
-            if ($this->phpProphet)
+            if ($this->phpProphet) {
                 $this->phpProphet->unReveal();
+            }
         }
     }
 }