From ce323331f1d27452459f9032990781d421ab0ca3 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Mon, 25 Jul 2016 10:58:45 +0100 Subject: [PATCH] MDL-54987 charts: fix style issues --- lib/classes/chart_axis.php | 2 +- lib/classes/chart_bar.php | 10 +++++----- lib/classes/chart_base.php | 2 +- lib/classes/chart_line.php | 2 +- lib/classes/chart_series.php | 2 +- mod/quiz/report/overview/tests/report_test.php | 3 +++ 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/classes/chart_axis.php b/lib/classes/chart_axis.php index 1703472bad6..f4407c74146 100644 --- a/lib/classes/chart_axis.php +++ b/lib/classes/chart_axis.php @@ -129,7 +129,7 @@ class chart_axis implements JsonSerializable { * * @return array */ - public function jsonSerialize() { + public function jsonSerialize() { // @codingStandardsIgnoreLine (CONTRIB-6469). return [ 'label' => $this->label, 'labels' => $this->labels, diff --git a/lib/classes/chart_bar.php b/lib/classes/chart_bar.php index 483ee6e1ad9..ace3a810609 100644 --- a/lib/classes/chart_bar.php +++ b/lib/classes/chart_bar.php @@ -38,11 +38,11 @@ class chart_bar extends chart_base { protected $horizontal = false; /** - * Add the horizontal to the parent and return the serialized data. - * - * @return array - */ - public function jsonSerialize() { + * Add the horizontal to the parent and return the serialized data. + * + * @return array + */ + public function jsonSerialize() { // @codingStandardsIgnoreLine (CONTRIB-6469). $data = parent::jsonSerialize(); $data['horizontal'] = $this->get_horizontal(); return $data; diff --git a/lib/classes/chart_base.php b/lib/classes/chart_base.php index bcef0b03ed5..14ff5998f83 100644 --- a/lib/classes/chart_base.php +++ b/lib/classes/chart_base.php @@ -75,7 +75,7 @@ class chart_base implements JsonSerializable, renderable { * * @return array */ - public function jsonSerialize() { + public function jsonSerialize() { // @codingStandardsIgnoreLine (CONTRIB-6469). return [ 'type' => $this->get_type(), 'series' => $this->series, diff --git a/lib/classes/chart_line.php b/lib/classes/chart_line.php index 5a55e0e98e6..4f5525e46da 100644 --- a/lib/classes/chart_line.php +++ b/lib/classes/chart_line.php @@ -42,7 +42,7 @@ class chart_line extends chart_base { * * @return array */ - public function jsonSerialize() { + public function jsonSerialize() { // @codingStandardsIgnoreLine (CONTRIB-6469). $data = parent::jsonSerialize(); $data['smooth'] = $this->get_smooth(); return $data; diff --git a/lib/classes/chart_series.php b/lib/classes/chart_series.php index 2742472a691..b3e79d8c1da 100644 --- a/lib/classes/chart_series.php +++ b/lib/classes/chart_series.php @@ -174,7 +174,7 @@ class chart_series implements JsonSerializable { * * @return array */ - public function jsonSerialize() { + public function jsonSerialize() { // @codingStandardsIgnoreLine (CONTRIB-6469). $data = [ 'label' => $this->label, 'labels' => $this->labels, diff --git a/mod/quiz/report/overview/tests/report_test.php b/mod/quiz/report/overview/tests/report_test.php index f583b302d1b..1713d95b1c6 100644 --- a/mod/quiz/report/overview/tests/report_test.php +++ b/mod/quiz/report/overview/tests/report_test.php @@ -145,7 +145,10 @@ class quiz_overview_report_testcase extends advanced_testcase { /** * Test bands. + * * @dataProvider get_bands_count_and_width_provider + * @param int $grade grade + * @param array $expected */ public function test_get_bands_count_and_width($grade, $expected) { $this->resetAfterTest(true);