Merge pull request #281 from catalyst/277-fix-trailing-commas

style: fix remaining trailing comma phpcs issues
catalyst · Jul 11, 2022 · ff7a595 · ff7a595
2 parents bdc5b65 + 709527d
commit ff7a595
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/classes/dataflow.php b/classes/dataflow.php
@@ -209,7 +209,7 @@ public function get_variables(): array {
                 'DATAFLOW_RUN_NAME' => $this->engine->run->name ?? null,
             ],
             'dataflow' => $dataflow,
-            'steps' => $steps
+            'steps' => $steps,
         ];
         return $variables;
     }

diff --git a/classes/local/step/connector_s3.php b/classes/local/step/connector_s3.php
@@ -92,7 +92,7 @@ public function execute(): bool {
         $config = $this->enginestep->stepdef->config;
         $connectionoptions = [
             'version' => 'latest',
-            'region' => $config->region
+            'region' => $config->region,
         ];
         if ($config->key !== '') {
             $connectionoptions['credentials'] = [

diff --git a/classes/step.php b/classes/step.php
@@ -547,11 +547,12 @@ protected function validate_link_count(int $count, string $inputoutput, string $
         $steptype = $this->steptype;
         [$min, $max] = $steptype->$fn();
         if ($count < $min || $count > $max) {
-            return ["invalid_count_{$inputoutput}{$flowconnector}s_{$this->id}" => get_string(
-                "stepinvalid{$inputoutput}{$flowconnector}count",
-                'tool_dataflows',
-                $count
-            ) . ' ' . visualiser::get_link_expectations($steptype, $inputoutput)
+            return [
+                "invalid_count_{$inputoutput}{$flowconnector}s_{$this->id}" => get_string(
+                    "stepinvalid{$inputoutput}{$flowconnector}count",
+                    'tool_dataflows',
+                    $count
+                ) . ' ' . visualiser::get_link_expectations($steptype, $inputoutput),
             ];
         }
         return true;

diff --git a/edit.php b/edit.php
@@ -56,7 +56,7 @@
 // Render the specific dataflow form.
 $customdata = [
     'persistent' => $persistent ?? null, // An instance, or null.
-    'userid' => $USER->id // For the hidden userid field.
+    'userid' => $USER->id, // For the hidden userid field.
 ];
 $form = new dataflow_form($PAGE->url->out(false), $customdata);
 if ($form->is_cancelled()) {

diff --git a/tests/tool_dataflows_secret_service_test.php b/tests/tool_dataflows_secret_service_test.php
@@ -56,7 +56,7 @@ protected static function form_define_fields(): array {
             'secret'            => ['type' => PARAM_TEXT, 'secret' => true],
             'source'            => ['type' => PARAM_TEXT],
             'target'            => ['type' => PARAM_TEXT],
-            'sourceremote'      => ['type' => PARAM_BOOL]
+            'sourceremote'      => ['type' => PARAM_BOOL],
         ];
     }
 }