Skip to content

Commit

Permalink
CS
Browse files Browse the repository at this point in the history
   1) Tests/Admin/BaseFieldDescriptionTest.php (array_element_white_space_after_comma)
   2) Tests/Controller/CRUDControllerTest.php (unneeded_control_parentheses, extra_empty_lines)
   3) Controller/CRUDController.php (unneeded_control_parentheses)
   4) Form/Type/AdminType.php (unneeded_control_parentheses)
  • Loading branch information
soullivaneuh committed Dec 2, 2015
1 parent ce50209 commit c5b0944
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Controller/CRUDController.php
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ public function createAction()
*/
protected function isPreviewRequested()
{
return ($this->get('request')->get('btn_preview') !== null);
return $this->get('request')->get('btn_preview') !== null;
}

/**
Expand All @@ -676,7 +676,7 @@ protected function isPreviewRequested()
*/
protected function isPreviewApproved()
{
return ($this->get('request')->get('btn_preview_approve') !== null);
return $this->get('request')->get('btn_preview_approve') !== null;
}

/**
Expand All @@ -702,7 +702,7 @@ protected function isInPreviewMode()
*/
protected function isPreviewDeclined()
{
return ($this->get('request')->get('btn_preview_decline') !== null);
return $this->get('request')->get('btn_preview_decline') !== null;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Form/Type/AdminType.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$resolver->setDefaults(array(
'delete' => function (Options $options) {
return ($options['btn_delete'] !== false);
return $options['btn_delete'] !== false;
},
'delete_options' => array(
'type' => 'checkbox',
Expand Down
2 changes: 1 addition & 1 deletion Tests/Admin/BaseFieldDescriptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function testGetValue()
* Test with Two parameters int
*/
$arg2 = 4;
$twoParameters = array($arg1,$arg2);
$twoParameters = array($arg1, $arg2);
$description2 = new FieldDescription();
$description2->setOption('code', 'getWithTwoParameters');
$description2->setOption('parameters', $twoParameters);
Expand Down
5 changes: 2 additions & 3 deletions Tests/Controller/CRUDControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ protected function setUp()
$this->logger = $this->getMock('Psr\Log\LoggerInterface');
$logger = $this->logger; // php 5.3 BC


$requestStack = null;
if (Kernel::MINOR_VERSION > 3) {
$requestStack = new \Symfony\Component\HttpFoundation\RequestStack();
Expand Down Expand Up @@ -1541,7 +1540,7 @@ public function testCreateActionSuccess($expectedToStringValue, $toStringValue)
return true;
}

return ($objectIn === $object);
return $objectIn === $object;
}));

$this->admin->expects($this->once())
Expand Down Expand Up @@ -1692,7 +1691,7 @@ public function testCreateActionAjaxSuccess()
return true;
}

return ($objectIn === $object);
return $objectIn === $object;
}));

$this->admin->expects($this->once())
Expand Down

0 comments on commit c5b0944

Please sign in to comment.