Skip to content

Commit

Permalink
fix cs
Browse files Browse the repository at this point in the history
  • Loading branch information
noodle69 committed Feb 6, 2018
1 parent b12b387 commit 46cc92f
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 20 deletions.
11 changes: 0 additions & 11 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?php

$header = <<<'EOF'
@copyright Copyright (C) eZ Systems AS. All rights reserved.
@license For full copyright and license information view LICENSE file distributed with this source code.
EOF;

return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
Expand All @@ -18,12 +13,6 @@ return PhpCsFixer\Config::create()
'blank_line_after_opening_tag' => false,
'single_blank_line_before_namespace' => false,
'space_after_semicolon' => false,
'header_comment' => [
'commentType' => 'PHPDoc',
'header' => $header,
'location' => 'after_open',
'separate' => 'top',
],
'yoda_style' => false,
'no_break_comment' => false,
])
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "edgar/ez-uicontentsbytype-bundle",
"license": "GPL-2.0",
"license": "GPL-2.0-only",
"type": "ezplatform-bundle",
"description": "eZ Platform Contents by type",
"authors": [
{
"name": "Emmanuel DROUET"
"name": "Emmanuel DROUET",
"email": "emmanuel.drouet@gmail.com"
}
],
"autoload": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ public function load(array $configs, ContainerBuilder $container)

public function prepend(ContainerBuilder $container)
{
$container->prependExtensionConfig('assetic', array('bundles' => array('EdgarEzUIContentsByTypeBundle')));
$container->prependExtensionConfig('assetic', ['bundles' => ['EdgarEzUIContentsByTypeBundle']]);
}
}
2 changes: 1 addition & 1 deletion src/bundle/EventListener/ConfigureMenuListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function onMenuConfigure(ConfigureMenuEvent $event)
$menu = $event->getMenu();

$contentMenu = $menu->getChild(MainMenuBuilder::ITEM_CONTENT);
$contentMenu->addChild(self::ITEM_CONTENT__LIST, array('route' => 'edgar.uicontentsbytype.menu'));
$contentMenu->addChild(self::ITEM_CONTENT__LIST, ['route' => 'edgar.uicontentsbytype.menu']);
}

/**
Expand Down
7 changes: 6 additions & 1 deletion src/bundle/Resources/translations/content_list.en.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
<body>
<trans-unit id="f6bd942eba8f8d221ec96c1cf4f094e7abb9094f" resname="Additional filters">
<source>Additional filters</source>
<target state="new">Additional filters</target>
<target>Additional filters</target>
<note>key: Additional filters</note>
</trans-unit>
<trans-unit id="dd718de8ed59983b85bf6936d850f5da9e55051c" resname="Show only visible content">
<source>Show only visible content</source>
<target state="new">Show only visible content</target>
<note>key: Show only visible content</note>
</trans-unit>
<trans-unit id="9e9a29bad925bea49781ccff237d223b4860689e" resname="content_list.breadcrumb.view">
<source>Contents by type</source>
<target>Contents by type</target>
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/translations/messages.en.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<note>key: breadcrumb.content</note>
</trans-unit>
<trans-unit id="07ece9c96ddeffadbf29c209d731ec57f3d6991b" resname="edgarez_filtercontentstype.locations">
<source>edgarez_filtercontentstype.locations</source>
<target state="new">Choose parent location(s)</target>
<source>Choose parent location(s)</source>
<target>Choose parent location(s)</target>
<note>key: edgarez_filtercontentstype.locations</note>
</trans-unit>
<trans-unit id="a8256cebb724ba47e6a711b199b46fc040ea5bc6" resname="main__content__list">
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Form/Data/FilterContentData.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class FilterContentData
*/
private $content_type;

/** @var array|null */
/** @var array|null */
private $locations;

/** @var bool */
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Form/Factory/FormFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ public function filterContent(
FilterContentData $data,
?string $name = null
): ?FormInterface {
$name = 'edgarfiltercontentstype';
$name = $name ? $name : 'edgarfiltercontentstype';

return $this->formFactory->createNamed(
$name,
FilterContentType::class,
Expand Down

0 comments on commit 46cc92f

Please sign in to comment.