Remove phpunit readAttributes deprecated methods (#372)

Hadryan · Apr 12, 2019 · f6aa1a5 · f6aa1a5
1 parent db82afa
commit f6aa1a5
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 22 deletions.
diff --git a/ecs.yml b/ecs.yml
@@ -18,7 +18,8 @@ services:
     PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer:
         align_double_arrow: false
         align_equals: false
-
+    PhpCsFixer\Fixer\PhpUnit\PhpUnitTestCaseStaticMethodCallsFixer:
+        call_type: 'self'
     # phpdoc
     PhpCsFixer\Fixer\Phpdoc\PhpdocSeparationFixer: ~
     PhpCsFixer\Fixer\Phpdoc\PhpdocAlignFixer: ~

diff --git a/src/Helper/Optimizer/Optimizer.php b/src/Helper/Optimizer/Optimizer.php
@@ -48,6 +48,11 @@ public function setTheta(array $theta): self
         return $this;
     }
 
+    public function theta(): array
+    {
+        return $this->theta;
+    }
+
     /**
      * Executes the optimization with the given samples & targets
      * and returns the weights

diff --git a/src/NeuralNetwork/Network/MultilayerPerceptron.php b/src/NeuralNetwork/Network/MultilayerPerceptron.php
@@ -129,6 +129,16 @@ public function getOutput(): array
         return $result;
     }
 
+    public function getLearningRate(): float
+    {
+        return $this->learningRate;
+    }
+
+    public function getBackpropagation(): Backpropagation
+    {
+        return $this->backpropagation;
+    }
+
     /**
      * @param mixed $target
      */

diff --git a/src/NeuralNetwork/Training/Backpropagation.php b/src/NeuralNetwork/Training/Backpropagation.php
@@ -34,6 +34,11 @@ public function setLearningRate(float $learningRate): void
         $this->learningRate = $learningRate;
     }
 
+    public function getLearningRate(): float
+    {
+        return $this->learningRate;
+    }
+
     /**
      * @param mixed $targetClass
      */

diff --git a/tests/Helper/Optimizer/OptimizerTest.php b/tests/Helper/Optimizer/OptimizerTest.php
@@ -26,9 +26,7 @@ public function testSetTheta(): void
         $optimizer = $this->getMockForAbstractClass(Optimizer::class, [2]);
         $object = $optimizer->setTheta([0.3, 1]);
 
-        $theta = self::getObjectAttribute($optimizer, 'theta');
-
         self::assertSame($object, $optimizer);
-        self::assertSame([0.3, 1], $theta);
+        self::assertSame([0.3, 1], $object->theta());
     }
 }
diff --git a/tests/NeuralNetwork/Network/MultilayerPerceptronTest.php b/tests/NeuralNetwork/Network/MultilayerPerceptronTest.php
@@ -55,14 +55,12 @@ public function testLearningRateSetter(): void
             [5, [3], [0, 1], 1000, null, 0.42]
         );
 
-        self::assertEquals(0.42, self::readAttribute($mlp, 'learningRate'));
-        $backprop = self::readAttribute($mlp, 'backpropagation');
-        self::assertEquals(0.42, self::readAttribute($backprop, 'learningRate'));
+        self::assertEquals(0.42, $mlp->getLearningRate());
+        self::assertEquals(0.42, $mlp->getBackpropagation()->getLearningRate());
 
         $mlp->setLearningRate(0.24);
-        self::assertEquals(0.24, self::readAttribute($mlp, 'learningRate'));
-        $backprop = self::readAttribute($mlp, 'backpropagation');
-        self::assertEquals(0.24, self::readAttribute($backprop, 'learningRate'));
+        self::assertEquals(0.24, $mlp->getLearningRate());
+        self::assertEquals(0.24, $mlp->getBackpropagation()->getLearningRate());
     }
 
     public function testLearningRateSetterWithCustomActivationFunctions(): void
@@ -75,14 +73,12 @@ public function testLearningRateSetterWithCustomActivationFunctions(): void
             [5, [[3, $activation_function], [5, $activation_function]], [0, 1], 1000, null, 0.42]
         );
 
-        self::assertEquals(0.42, self::readAttribute($mlp, 'learningRate'));
-        $backprop = self::readAttribute($mlp, 'backpropagation');
-        self::assertEquals(0.42, self::readAttribute($backprop, 'learningRate'));
+        self::assertEquals(0.42, $mlp->getLearningRate());
+        self::assertEquals(0.42, $mlp->getBackpropagation()->getLearningRate());
 
         $mlp->setLearningRate(0.24);
-        self::assertEquals(0.24, self::readAttribute($mlp, 'learningRate'));
-        $backprop = self::readAttribute($mlp, 'backpropagation');
-        self::assertEquals(0.24, self::readAttribute($backprop, 'learningRate'));
+        self::assertEquals(0.24, $mlp->getLearningRate());
+        self::assertEquals(0.24, $mlp->getBackpropagation()->getLearningRate());
     }
 
     public function testLearningRateSetterWithLayerObject(): void
@@ -95,14 +91,12 @@ public function testLearningRateSetterWithLayerObject(): void
             [5, [new Layer(3, Neuron::class, $activation_function), new Layer(5, Neuron::class, $activation_function)], [0, 1], 1000, null, 0.42]
         );
 
-        self::assertEquals(0.42, self::readAttribute($mlp, 'learningRate'));
-        $backprop = self::readAttribute($mlp, 'backpropagation');
-        self::assertEquals(0.42, self::readAttribute($backprop, 'learningRate'));
+        self::assertEquals(0.42, $mlp->getLearningRate());
+        self::assertEquals(0.42, $mlp->getBackpropagation()->getLearningRate());
 
         $mlp->setLearningRate(0.24);
-        self::assertEquals(0.24, self::readAttribute($mlp, 'learningRate'));
-        $backprop = self::readAttribute($mlp, 'backpropagation');
-        self::assertEquals(0.24, self::readAttribute($backprop, 'learningRate'));
+        self::assertEquals(0.24, $mlp->getLearningRate());
+        self::assertEquals(0.24, $mlp->getBackpropagation()->getLearningRate());
     }
 
     /**