From 7cd32b7d7200e770f54726ace2ae6c68eea94761 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 21 Oct 2016 11:11:18 +1300 Subject: [PATCH] Remove unnecessary $schemaLink parameter --- Forms/Schema/FormSchema.php | 3 +-- admin/code/LeftAndMain.php | 3 +-- tests/forms/FormSchemaTest.php | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Forms/Schema/FormSchema.php b/Forms/Schema/FormSchema.php index 79b5d67f3..73eb8a922 100644 --- a/Forms/Schema/FormSchema.php +++ b/Forms/Schema/FormSchema.php @@ -17,10 +17,9 @@ class FormSchema { * Gets the schema for this form as a nested array. * * @param Form $form - * @param string $schemaLink Link to get this schema * @return array */ - public function getSchema(Form $form, $schemaLink) { + public function getSchema(Form $form) { $schema = [ 'name' => $form->getName(), 'id' => $form->FormName(), diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 56d5f0065..7b10d2f0a 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -379,8 +379,7 @@ class LeftAndMain extends Controller implements PermissionProvider { $return = ['id' => $id]; if (in_array('schema', $schemaParts)) { - $schemaLink = $this->getSchemaLinkForForm($form); - $return['schema'] = $this->schema->getSchema($form, $schemaLink); + $return['schema'] = $this->schema->getSchema($form); } if (in_array('state', $schemaParts)) { diff --git a/tests/forms/FormSchemaTest.php b/tests/forms/FormSchemaTest.php index b3550235b..97e3746d0 100644 --- a/tests/forms/FormSchemaTest.php +++ b/tests/forms/FormSchemaTest.php @@ -52,7 +52,7 @@ class FormSchemaTest extends SapphireTest { 'actions' => [] ]; - $schema = $formSchema->getSchema($form, 'admin/mysection/schema'); + $schema = $formSchema->getSchema($form); $this->assertInternalType('array', $schema); $this->assertJsonStringEqualsJsonString(json_encode($expected), json_encode($schema)); } @@ -334,7 +334,7 @@ class FormSchemaTest extends SapphireTest { ] ]; - $schema = $formSchema->getSchema($form, 'admin/mysection/schema'); + $schema = $formSchema->getSchema($form); $this->assertInternalType('array', $schema); $this->assertJsonStringEqualsJsonString(json_encode($expected), json_encode($schema));