Skip to content

Commit

Permalink
Applied fixes from StyleCI (sonata-project#3752)
Browse files Browse the repository at this point in the history
  • Loading branch information
soullivaneuh committed May 1, 2016
1 parent 38666e6 commit 813d987
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Admin/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3029,7 +3029,7 @@ public function getActionButtons($action, $object = null)

/**
* Get the list of actions that can be accessed directly from the dashboard.
*
*
* @return array
*/
public function getDashboardActions()
Expand Down
2 changes: 1 addition & 1 deletion Form/FormMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function remove($key)
* @param string $group The group to delete
* @param string $tab The tab the group belongs to, defaults to 'default'
* @param bool $deleteEmptyTab Whether or not the Tab should be deleted, when the deleted group leaves the tab empty after deletion
*
*
* @return $this
*/
public function removeGroup($group, $tab = 'default', $deleteEmptyTab = false)
Expand Down
2 changes: 1 addition & 1 deletion Tests/Admin/AdminTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1612,7 +1612,7 @@ public function testGetFilterFieldDescription()

$datagridBuilder->expects($this->exactly(3))
->method('addFilter')
->will($this->returnCallback(function ($datagrid, $type = null, $fieldDescription, AdminInterface $admin) {
->will($this->returnCallback(function ($datagrid, $type, $fieldDescription, AdminInterface $admin) {
$admin->addFilterFieldDescription($fieldDescription->getName(), $fieldDescription);
$fieldDescription->mergeOption('field_options', array('required' => false));
}));
Expand Down
2 changes: 1 addition & 1 deletion Tests/Form/Widget/FormSonataFilterChoiceWidgetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected function getExtensions()

$mock->expects($this->exactly(3))
->method('trans')
->will($this->returnCallback(function ($arg) { return $arg;})
->will($this->returnCallback(function ($arg) { return $arg; })
);

$extensions = parent::getExtensions();
Expand Down
18 changes: 9 additions & 9 deletions Tests/Twig/Extension/SonataAdminExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ public function getRenderListElementTests()
array('editable' => false),
),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-boolean" objectId="12345">
<span
class="x-editable"
Expand All @@ -558,7 +558,7 @@ class="x-editable"
array('editable' => true),
),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-boolean" objectId="12345">
<span
class="x-editable"
Expand All @@ -578,7 +578,7 @@ class="x-editable"
array('editable' => true),
),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-boolean" objectId="12345">
<span
class="x-editable"
Expand Down Expand Up @@ -746,7 +746,7 @@ class="x-editable"
'Status3' => '<b>Alias3</b>',
), 'multiple' => true), ),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-choice" objectId="12345">
<span
class="x-editable"
Expand All @@ -767,7 +767,7 @@ class="x-editable"
array('editable' => true),
),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-choice" objectId="12345">
<span
class="x-editable"
Expand All @@ -793,7 +793,7 @@ class="x-editable"
),
),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-choice" objectId="12345">
<span
class="x-editable"
Expand All @@ -820,7 +820,7 @@ class="x-editable"
),
),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-choice" objectId="12345">
<span
class="x-editable"
Expand All @@ -846,7 +846,7 @@ class="x-editable"
),
),
array(
<<<EOT
<<<'EOT'
<td class="sonata-ba-list-field sonata-ba-list-field-choice" objectId="12345">
<span
class="x-editable"
Expand Down Expand Up @@ -1744,7 +1744,7 @@ public function testOutput()

$this->environment->enableDebug();
$this->assertSame(
$this->removeExtraWhitespace(<<<EOT
$this->removeExtraWhitespace(<<<'EOT'
<!-- START
fieldName: fd_name
template: SonataAdminBundle:CRUD:base_list_field.html.twig
Expand Down
2 changes: 1 addition & 1 deletion Twig/Extension/SonataAdminExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public function output(
$content = $template->render($parameters);

if ($environment->isDebug()) {
$commentTemplate = <<<EOT
$commentTemplate = <<<'EOT'
<!-- START
fieldName: %s
Expand Down

0 comments on commit 813d987

Please sign in to comment.