PHPdocs and code style for statistics

fisharebest · Jan 4, 2025 · 46492e3 · 46492e3
1 parent 1f50a43
commit 46492e3
Show file tree

Hide file tree

Showing 44 changed files with 71 additions and 3,385 deletions.
diff --git a/app/Census/CensusColumnConditionCanada.php b/app/Census/CensusColumnConditionCanada.php
@@ -42,7 +42,7 @@ class CensusColumnConditionCanada extends AbstractCensusColumnCondition
     // Text to display for female children
     protected const string GIRL = 'S';
 
-    // Text to display for divorced individuals
+    // Text to display for divorced males
     protected const string DIVORCE = 'D';
 
     // Text to display for divorced females

diff --git a/app/Census/CensusColumnConditionCanadaMarriedSingle.php b/app/Census/CensusColumnConditionCanadaMarriedSingle.php
@@ -42,7 +42,7 @@ class CensusColumnConditionCanadaMarriedSingle extends AbstractCensusColumnCondi
     // Text to display for female children
     protected const string GIRL = 'S';
 
-    // Text to display for divorced individuals
+    // Text to display for divorced males
     protected const string DIVORCE = '';
 
     // Text to display for divorced females

diff --git a/app/Census/CensusColumnConditionCanadaMarriedWidowed.php b/app/Census/CensusColumnConditionCanadaMarriedWidowed.php
@@ -42,7 +42,7 @@ class CensusColumnConditionCanadaMarriedWidowed extends AbstractCensusColumnCond
     // Text to display for female children
     protected const string GIRL = '';
 
-    // Text to display for divorced individuals
+    // Text to display for divorced males
     protected const string DIVORCE = '';
 
     // Text to display for divorced females

diff --git a/app/Census/CensusColumnConditionCanadaWidowed.php b/app/Census/CensusColumnConditionCanadaWidowed.php
@@ -42,7 +42,7 @@ class CensusColumnConditionCanadaWidowed extends AbstractCensusColumnCondition
     // Text to display for female children
     protected const string GIRL = '';
 
-    // Text to display for divorced individuals
+    // Text to display for divorced males
     protected const string DIVORCE = '';
 
     // Text to display for divorced females

diff --git a/app/Census/CensusColumnConditionCanadaWidowedFemale.php b/app/Census/CensusColumnConditionCanadaWidowedFemale.php
@@ -42,7 +42,7 @@ class CensusColumnConditionCanadaWidowedFemale extends AbstractCensusColumnCondi
     // Text to display for female children
     protected const string GIRL = '';
 
-    // Text to display for divorced individuals
+    // Text to display for divorced males
     protected const string DIVORCE = '';
 
     // Text to display for divorced females

diff --git a/app/Census/CensusColumnConditionCanadaWidowedMale.php b/app/Census/CensusColumnConditionCanadaWidowedMale.php
@@ -42,7 +42,7 @@ class CensusColumnConditionCanadaWidowedMale extends AbstractCensusColumnConditi
     // Text to display for female children
     protected const string GIRL = '';
 
-    // Text to display for divorced individuals
+    // Text to display for divorced males
     protected const string DIVORCE = '';
 
     // Text to display for divorced females

diff --git a/app/Census/CensusColumnConditionUs.php b/app/Census/CensusColumnConditionUs.php
@@ -42,7 +42,7 @@ class CensusColumnConditionUs extends CensusColumnConditionEnglish
     // Text to display for female children
     protected const string GIRL = 'S';
 
-    // Text to display for divorced individuals
+    // Text to display for divorced males
     protected const string DIVORCE = 'D';
 
     // Text to display for divorced females

diff --git a/app/Module/StatisticsChartModule.php b/app/Module/StatisticsChartModule.php
@@ -40,7 +40,6 @@
 use function count;
 use function explode;
 use function in_array;
-use function intdiv;
 use function is_numeric;
 use function sprintf;
 
@@ -527,21 +526,17 @@ public function postCustomChartAction(ServerRequestInterface $request): Response
                         $z_axis = $this->axisAll();
                         $rows   = $statistics->statsAgeQuery('DEAT');
                         foreach ($rows as $row) {
-                            foreach ($row as $age) {
-                                $years = (int) ($age / self::DAYS_IN_YEAR);
-                                $this->fillYData($years, 0, 1, $x_axis, $z_axis, $ydata);
-                            }
+                            $years = (int) ($row->days / self::DAYS_IN_YEAR);
+                            $this->fillYData($years, 0, 1, $x_axis, $z_axis, $ydata);
                         }
                         break;
                     case self::Z_AXIS_SEX:
                         $z_axis = $this->axisSexes();
                         foreach (array_keys($z_axis) as $sex) {
                             $rows = $statistics->statsAgeQuery('DEAT', $sex);
                             foreach ($rows as $row) {
-                                foreach ($row as $age) {
-                                    $years = (int) ($age / self::DAYS_IN_YEAR);
-                                    $this->fillYData($years, $sex, 1, $x_axis, $z_axis, $ydata);
-                                }
+                                $years = (int) ($row->days / self::DAYS_IN_YEAR);
+                                $this->fillYData($years, $sex, 1, $x_axis, $z_axis, $ydata);
                             }
                         }
                         break;
@@ -552,10 +547,8 @@ public function postCustomChartAction(ServerRequestInterface $request): Response
                         foreach (array_keys($z_axis) as $boundary) {
                             $rows = $statistics->statsAgeQuery('DEAT', 'BOTH', $prev_boundary, $boundary);
                             foreach ($rows as $row) {
-                                foreach ($row as $age) {
-                                    $years = (int) ($age / self::DAYS_IN_YEAR);
-                                    $this->fillYData($years, $boundary, 1, $x_axis, $z_axis, $ydata);
-                                }
+                                $years = (int) ($row->days / self::DAYS_IN_YEAR);
+                                $this->fillYData($years, $boundary, 1, $x_axis, $z_axis, $ydata);
                             }
                             $prev_boundary = $boundary + 1;
                         }