Simplify context calculation

briannesbitt · Jul 19, 2019 · 64e211c · 64e211c
1 parent 91c34dd
commit 64e211c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/phpmd.xml b/phpmd.xml
@@ -26,6 +26,7 @@
     </rule>
     <rule ref="rulesets/controversial.xml" />
     <rule ref="rulesets/design.xml">
+        <exclude name="EvalExpression" />
         <exclude name="CouplingBetweenObjects" />
     </rule>
     <rule ref="rulesets/design.xml/CouplingBetweenObjects">

diff --git a/src/Carbon/Traits/Macro.php b/src/Carbon/Traits/Macro.php
@@ -165,8 +165,7 @@ protected static function loadMixinClass($mixin)
 
     protected static function loadMixinTrait($trait)
     {
-        $context = null;
-        eval('$context = new class() extends '.static::class.' {use '.$trait.';};');
+        $context = eval('return new class() extends '.static::class.' {use '.$trait.';};');
         $className = get_class($context);
         /** @var \ReflectionMethod[] $methods */
         $methods = (new \ReflectionClass($className))->getMethods(\ReflectionMethod::IS_PUBLIC);