[PHP] [StepStrategy] Clean out temporary methods created to make the refactoring step by step + restore properties and constant visibilities

Author: JavierCane

examples/php/php-step_strategy-02_replace_type_code_with_strategy/src/ExerciseStepType.php

@@ -6,14 +6,9 @@
 
 final class ExerciseStepType extends StepType
 {
-    public const EXERCISE_STEP_DURATION_ESTIMATION_IN_MINUTES = 30;
+    private const EXERCISE_STEP_DURATION_ESTIMATION_IN_MINUTES = 30;
 
-    public function code(): int
-    {
-        return StepType::EXERCISE_STEP_TYPE;
-    }
-
-    public function stepEstimatedCompletionMinutes(Step $instance): int
+    public function estimatedCompletionMinutes(): int
     {
         return self::EXERCISE_STEP_DURATION_ESTIMATION_IN_MINUTES;
     }

examples/php/php-step_strategy-02_replace_type_code_with_strategy/src/QuizStepType.php

@@ -6,21 +6,17 @@
 
 final class QuizStepType extends StepType
 {
-    public const QUIZ_STEP_QUESTION_DURATION_ESTIMATION_IN_MINUTES = 3;
+    private const QUIZ_STEP_QUESTION_DURATION_ESTIMATION_IN_MINUTES = 3;
+
     private array $quizQuestions;
 
     public function __construct(array $quizQuestions)
     {
         $this->quizQuestions = $quizQuestions;
     }
 
-    public function code(): int
-    {
-        return StepType::QUIZ_STEP_TYPE;
-    }
-
-    public function stepEstimatedCompletionMinutes(Step $instance): int
+    public function estimatedCompletionMinutes(): int
     {
-        return self::QUIZ_STEP_QUESTION_DURATION_ESTIMATION_IN_MINUTES * count($instance->quizQuestions);
+        return self::QUIZ_STEP_QUESTION_DURATION_ESTIMATION_IN_MINUTES * count($this->quizQuestions);
     }
 }

examples/php/php-step_strategy-02_replace_type_code_with_strategy/src/Step.php

@@ -7,20 +7,16 @@
 final class Step
 {
     private string   $title;
-    public StepType $type;
-    public ?int     $videoDurationInMinutes;
-    public ?array   $quizQuestions;
+    private StepType $type;
 
     public function __construct(string $title, int $typeCode, ?int $videoDurationInMinutes, ?array $quizQuestions)
     {
-        $this->title                  = $title;
-        $this->type                   = StepType::fromPrimitive($typeCode, $videoDurationInMinutes, $quizQuestions);
-        $this->videoDurationInMinutes = $videoDurationInMinutes;
-        $this->quizQuestions          = $quizQuestions;
+        $this->title = $title;
+        $this->type  = StepType::fromPrimitive($typeCode, $videoDurationInMinutes, $quizQuestions);
     }
 
     public function estimatedCompletionMinutes(): int
     {
-        return $this->type->stepEstimatedCompletionMinutes($this);
+        return $this->type->estimatedCompletionMinutes();
     }
 }

examples/php/php-step_strategy-02_replace_type_code_with_strategy/src/StepType.php

@@ -8,9 +8,9 @@
 
 abstract class StepType
 {
-    public const VIDEO_STEP_TYPE = 0;
-    public const QUIZ_STEP_TYPE = 1;
-    public const EXERCISE_STEP_TYPE = 2;
+    private const VIDEO_STEP_TYPE = 0;
+    private const QUIZ_STEP_TYPE = 1;
+    private const EXERCISE_STEP_TYPE = 2;
 
     public static function fromPrimitive(int $code, ?int $videoDurationInMinutes, ?array $quizQuestions)
     {
@@ -26,7 +26,5 @@ public static function fromPrimitive(int $code, ?int $videoDurationInMinutes, ?a
         }
     }
 
-    abstract public function code(): int;
-
-    abstract public function stepEstimatedCompletionMinutes(Step $instance): int;
+    abstract public function estimatedCompletionMinutes(): int;
 }

examples/php/php-step_strategy-02_replace_type_code_with_strategy/src/VideoStepType.php

@@ -13,13 +13,8 @@ public function __construct(int $videoDurationInMinutes)
         $this->videoDurationInMinutes = $videoDurationInMinutes;
     }
 
-    public function code(): int
+    public function estimatedCompletionMinutes(): int
     {
-        return StepType::VIDEO_STEP_TYPE;
-    }
-
-    public function stepEstimatedCompletionMinutes(Step $instance): int
-    {
-        return $instance->videoDurationInMinutes;
+        return $this->videoDurationInMinutes;
     }
 }