From 0ad1fc367ebd53bcf88a5f40b0eff25bced1e882 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 1 Sep 2017 13:02:18 +1200 Subject: [PATCH] MINOR Apply PSR-2 linting --- src/GridFieldAddNewMultiClass.php | 2 +- src/GridFieldOrderableRows.php | 12 +-- ...ieldAddNewMultiClassWithNamespacesTest.php | 73 ++++++++++--------- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/src/GridFieldAddNewMultiClass.php b/src/GridFieldAddNewMultiClass.php index ad2f490..9afc7cd 100755 --- a/src/GridFieldAddNewMultiClass.php +++ b/src/GridFieldAddNewMultiClass.php @@ -158,7 +158,7 @@ class GridFieldAddNewMultiClass implements GridField_HTMLProvider, GridField_URL } $sanitised = array(); - foreach($result as $class=>$title) { + foreach ($result as $class => $title) { $sanitised[$this->sanitiseClassName($class)] = $title; } diff --git a/src/GridFieldOrderableRows.php b/src/GridFieldOrderableRows.php index 2d86084..91cb6d3 100755 --- a/src/GridFieldOrderableRows.php +++ b/src/GridFieldOrderableRows.php @@ -516,11 +516,11 @@ class GridFieldOrderableRows extends RequestHandler implements $sortTable = $this->getSortTable($list); $additionalSQL = ''; $baseTable = $sortTable; - if(class_exists($sortTable)) { + if (class_exists($sortTable)) { $baseTable = singleton($sortTable)->baseTable(); } $isBaseTable = ($baseTable == $sortTable); - if(!$list instanceof ManyManyList && $isBaseTable){ + if (!$list instanceof ManyManyList && $isBaseTable) { $additionalSQL = ', "LastEdited" = NOW()'; } @@ -535,7 +535,7 @@ class GridFieldOrderableRows extends RequestHandler implements $this->getSortTableClauseForIds($list, $id) )); - if(!$isBaseTable) { + if (!$isBaseTable) { DB::query(sprintf( 'UPDATE "%s" SET "LastEdited" = NOW() WHERE %s', $baseTable, @@ -570,11 +570,11 @@ class GridFieldOrderableRows extends RequestHandler implements $additionalSQL = ''; $baseTable = $table; - if(class_exists($table)) { + if (class_exists($table)) { $baseTable = singleton($table)->baseTable(); } $isBaseTable = ($baseTable == $table); - if(!$list instanceof ManyManyList && $isBaseTable){ + if (!$list instanceof ManyManyList && $isBaseTable) { $additionalSQL = ', "LastEdited" = NOW()'; } @@ -591,7 +591,7 @@ class GridFieldOrderableRows extends RequestHandler implements $this->getSortTableClauseForIds($list, $id) )); - if(!$isBaseTable) { + if (!$isBaseTable) { DB::query(sprintf( 'UPDATE "%s" SET "LastEdited" = NOW() WHERE %s', $baseTable, diff --git a/tests/GridFieldAddNewMultiClassWithNamespacesTest.php b/tests/GridFieldAddNewMultiClassWithNamespacesTest.php index bb00d5d..e7187e2 100644 --- a/tests/GridFieldAddNewMultiClassWithNamespacesTest.php +++ b/tests/GridFieldAddNewMultiClassWithNamespacesTest.php @@ -13,54 +13,59 @@ use SilverStripe\Forms\GridField\GridFieldDetailForm; use Symbiote\GridFieldExtensions\GridFieldAddNewMultiClass; use Symbiote\GridFieldExtensions\GridFieldAddNewMultiClassHandler; -class GridFieldAddNewMultiClassWithNamespacesTest extends SapphireTest { +class GridFieldAddNewMultiClassWithNamespacesTest extends SapphireTest +{ - public function testGetClassesWithNamespaces() { - $grid = new GridField('TestGridField'); - $grid->setModelClass('Symbiote\\Test\\NamespacedClass'); + public function testGetClassesWithNamespaces() + { + $grid = new GridField('TestGridField'); + $grid->setModelClass('Symbiote\\Test\\NamespacedClass'); - $component = new GridFieldAddNewMultiClass(); + $component = new GridFieldAddNewMultiClass(); - $this->assertEquals( - array( - 'Symbiote-Test-NamespacedClass' => 'NamespacedClass' - ), - $component->getClasses($grid), - 'Namespaced classes are sanitised' - ); - } + $this->assertEquals( + array( + 'Symbiote-Test-NamespacedClass' => 'NamespacedClass' + ), + $component->getClasses($grid), + 'Namespaced classes are sanitised' + ); + } - public function testHandleAddWithNamespaces() { - $grid = new GridField('TestGridField'); - $grid->getConfig()->addComponent(new GridFieldDetailForm()); - $grid->setModelClass('Symbiote\\Test\\NamespacedClass'); - $grid->setForm(Form::create(Controller::create(), 'test', FieldList::create(), FieldList::create())); + public function testHandleAddWithNamespaces() + { + $grid = new GridField('TestGridField'); + $grid->getConfig()->addComponent(new GridFieldDetailForm()); + $grid->setModelClass('Symbiote\\Test\\NamespacedClass'); + $grid->setForm(Form::create(Controller::create(), 'test', FieldList::create(), FieldList::create())); - $request = new HTTPRequest('POST', 'test'); - $request->setRouteParams(array('ClassName' => 'Symbiote-Test-NamespacedClass')); + $request = new HTTPRequest('POST', 'test'); + $request->setRouteParams(array('ClassName' => 'Symbiote-Test-NamespacedClass')); - $component = new GridFieldAddNewMultiClass(); - $response = $component->handleAdd($grid, $request); - - $record = new \ReflectionProperty(GridFieldAddNewMultiClassHandler::class, 'record'); - $record->setAccessible(true); - $this->assertInstanceOf('Symbiote\\Test\\NamespacedClass', $record->getValue($response)); - } + $component = new GridFieldAddNewMultiClass(); + $response = $component->handleAdd($grid, $request); + $record = new \ReflectionProperty(GridFieldAddNewMultiClassHandler::class, 'record'); + $record->setAccessible(true); + $this->assertInstanceOf('Symbiote\\Test\\NamespacedClass', $record->getValue($response)); + } } /**#@+ * @ignore */ -class NamespacedClass implements TestOnly { - public function i18n_singular_name() { - return 'NamespacedClass'; - } +class NamespacedClass implements TestOnly +{ + public function i18n_singular_name() + { + return 'NamespacedClass'; + } - public function canCreate() { - return true; - } + public function canCreate() + { + return true; + } } /**#@-*/