Turn a trait into a class to simplify the code

elifesciences/issues#9034
elifesciences · Jan 8, 2025 · 1b85b69 · 1b85b69
1 parent e1d9b2d
commit 1b85b69
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php
@@ -62,7 +62,6 @@ final class ArticlesController extends Controller
     const DISMISSIBLE_INFO_BAR_COOKIE_DURATION = '+365 days';
 
     use HasPages;
-    use AssessmentBuilder;
 
     public function textAction(Request $request, string $id, int $version = null) : Response
     {
@@ -637,6 +636,7 @@ private function createFirstPage(Request $request, string $id, array $arguments)
                 if ($item instanceof ArticleVoR && $item->getElifeAssessmentArticleSection()) {
                     $elifeAssessment = $item->getElifeAssessmentArticleSection();
                     $elifeAssessmentTitle = $item->getElifeAssessmentTitle();
+                    $assessmentBuilder = new AssessmentBuilder();
                     return ArticleSection::basic(
                         $this->render(...$this->convertContent($elifeAssessment, 2, $context)),
                         $elifeAssessmentTitle,
@@ -650,7 +650,7 @@ private function createFirstPage(Request $request, string $id, array $arguments)
                         null,
                         null,
                         null,
-                        $this->createAssessment($elifeAssessment)
+                        $assessmentBuilder->createAssessment($elifeAssessment)
                     );
                 }
             });

diff --git a/src/ViewModel/Converter/AssessmentBuilder.php b/src/ViewModel/Converter/AssessmentBuilder.php
@@ -8,7 +8,7 @@
 use eLife\Patterns\ViewModel\Assessment;
 use eLife\Patterns\ViewModel\Term;
 
-trait AssessmentBuilder
+class AssessmentBuilder
 {
     private static $termDescriptions = [
         'landmark' => 'Findings with profound implications that are expected to have widespread influence',

diff --git a/test/ViewModel/Converter/AssessmentBuilderTest.php b/test/ViewModel/Converter/AssessmentBuilderTest.php
@@ -167,16 +167,14 @@ public function it_displays_selected_terms_when_the_assessment_contains_a_variat
 
     private function getTestResult(string $contentText)
     {
-        $controller = new class {
-            use AssessmentBuilder;
-        };
+        $assessmentBuilder = new AssessmentBuilder();
         $content = new ArraySequence([
             new Paragraph($contentText)
         ]);
         $doi = '10.7554/eLife.94242.3.sa0';
         $id = 'sa0';
         $elifeAssessment = new ArticleSection($content, $doi, $id);
-        return $controller->createAssessment($elifeAssessment);
+        return $assessmentBuilder->createAssessment($elifeAssessment);
     }
 
     private function assertHasSignificance(string $term, Assessment $result)