From 213f7167a6304c5c9e4533ff3760d9e0141a2662 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Wed, 9 Jan 2019 20:59:28 +0100
Subject: [PATCH] ENH Fix phpcs violations

---
 code/Report.php                       | 11 ++++++++---
 code/ReportAdmin.php                  | 13 ++++++++-----
 code/ReportWrapper.php                |  2 +-
 code/SideReportView.php               |  4 ++--
 tests/ReportAdminTest.php             |  1 +
 tests/ReportAdminTest/FakeReport.php  |  1 +
 tests/ReportAdminTest/FakeReport2.php |  1 +
 tests/ReportTest/FakeTestAbstract.php |  1 -
 8 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/code/Report.php b/code/Report.php
index 6120a4c3..45e05c5d 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -61,7 +61,8 @@ use SilverStripe\View\ViewableData;
  * Right now, all subclasses of SS_Report will be shown in the ReportAdmin. In SS3 there is only
  * one place where reports can go, so this class is greatly simplifed from its version in SS2.
  *
- * @method SS_List|DataList sourceRecords($params = [], $sort = null, $limit = null) List of records to show for this report
+ * @method SS_List|DataList sourceRecords($params = [], $sort = null, $limit = null)
+ *      List of records to show for this report
  */
 class Report extends ViewableData
 {
@@ -158,7 +159,8 @@ class Report extends ViewableData
     {
         if (!$this->hasMethod('sourceRecords')) {
             throw new \RuntimeException(
-                'Please override sourceQuery()/sourceRecords() and columns() or, if necessary, override getReportField()'
+                'Please override sourceQuery()/sourceRecords() and columns() or, '
+                . 'if necessary, override getReportField()'
             );
         }
 
@@ -353,7 +355,10 @@ class Report extends ViewableData
             }
 
             // Add a search button
-            $formAction = FormAction::create('updatereport', _t('SilverStripe\\Forms\\GridField\\GridField.Filter', 'Filter'));
+            $formAction = FormAction::create(
+                'updatereport',
+                _t('SilverStripe\\Forms\\GridField\\GridField.Filter', 'Filter')
+            );
             $formAction->addExtraClass('btn-primary mb-4');
 
             $fields->push($formAction);
diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 83aa57cb..7d732482 100644
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -181,13 +181,13 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
             }
 
             //build breadcrumb trail to the current report
-            $items->push(new ArrayData(array(
+            $items->push(ArrayData::create([
                 'Title' => $report->title(),
                 'Link' => Controller::join_links(
                     $this->Link(),
-                    '?' . http_build_query(array('q' => $this->request->requestVar('q')))
+                    '?' . http_build_query(['q' => $this->request->requestVar('q')])
                 )
-            )));
+            ]));
         }
 
         return $items;
@@ -236,7 +236,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
             );
             $gridField = GridField::create('Reports', false, $this->Reports(), $gridFieldConfig);
             /** @var GridFieldDataColumns $columns */
-            $columns = $gridField->getConfig()->getComponentByType('SilverStripe\\Forms\\GridField\\GridFieldDataColumns');
+            $columns = $gridField->getConfig()
+                ->getComponentByType('SilverStripe\\Forms\\GridField\\GridFieldDataColumns');
             $columns->setDisplayFields(array(
                 'title' => _t('SilverStripe\\Reports\\ReportAdmin.ReportTitle', 'Title'),
             ));
@@ -250,7 +251,9 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
 
         $actions = new FieldList();
         $form = new Form($this, "EditForm", $fields, $actions);
-        $form->addExtraClass('panel panel--padded panel--scrollable cms-edit-form cms-panel-padded' . $this->BaseCSSClasses());
+        $form->addExtraClass(
+            'panel panel--padded panel--scrollable cms-edit-form cms-panel-padded' . $this->BaseCSSClasses()
+        );
         $form->loadDataFrom($this->request->getVars());
 
         $this->extend('updateEditForm', $form);
diff --git a/code/ReportWrapper.php b/code/ReportWrapper.php
index e6fae9f2..88c1ca89 100644
--- a/code/ReportWrapper.php
+++ b/code/ReportWrapper.php
@@ -21,7 +21,7 @@ abstract class ReportWrapper extends Report
 
     public function __construct($baseReport)
     {
-        $this->baseReport = is_string($baseReport) ? new $baseReport : $baseReport;
+        $this->baseReport = is_string($baseReport) ? new $baseReport() : $baseReport;
         $this->dataClass = $this->baseReport->dataClass();
         parent::__construct();
     }
diff --git a/code/SideReportView.php b/code/SideReportView.php
index d80058b9..e7d627b1 100644
--- a/code/SideReportView.php
+++ b/code/SideReportView.php
@@ -11,8 +11,8 @@ use SilverStripe\View\ViewableData;
  */
 class SideReportView extends ViewableData
 {
-
-    protected $controller, $report;
+    protected $controller;
+    protected $report;
     protected $parameters;
 
     public function __construct($controller, $report)
diff --git a/tests/ReportAdminTest.php b/tests/ReportAdminTest.php
index f84576b3..dcf7c816 100644
--- a/tests/ReportAdminTest.php
+++ b/tests/ReportAdminTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace SilverStripe\Reports\Tests;
 
 use ReflectionClass;
diff --git a/tests/ReportAdminTest/FakeReport.php b/tests/ReportAdminTest/FakeReport.php
index c0a377c8..d571404d 100644
--- a/tests/ReportAdminTest/FakeReport.php
+++ b/tests/ReportAdminTest/FakeReport.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace SilverStripe\Reports\Tests\ReportAdminTest;
 
 use SilverStripe\Dev\TestOnly;
diff --git a/tests/ReportAdminTest/FakeReport2.php b/tests/ReportAdminTest/FakeReport2.php
index cb229082..a4ee7406 100644
--- a/tests/ReportAdminTest/FakeReport2.php
+++ b/tests/ReportAdminTest/FakeReport2.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace SilverStripe\Reports\Tests\ReportAdminTest;
 
 use SilverStripe\Control\Controller;
diff --git a/tests/ReportTest/FakeTestAbstract.php b/tests/ReportTest/FakeTestAbstract.php
index 271cd815..08aadb6d 100644
--- a/tests/ReportTest/FakeTestAbstract.php
+++ b/tests/ReportTest/FakeTestAbstract.php
@@ -8,7 +8,6 @@ use SilverStripe\Reports\Report;
 
 abstract class FakeTestAbstract extends Report implements TestOnly
 {
-
     public function title()
     {
         return 'Report title Abstract';