Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Apply fixes from StyleCI #504

Merged
merged 1 commit into from Oct 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Admin/Admin.php
Expand Up @@ -117,7 +117,7 @@ public function toString($object)
if (method_exists($object, '__toString') && null !== $object->__toString()) {
$string = (string) $object;

return '' !== $string ? $string : $this->trans('link_add', array(), 'SonataAdminBundle');
return '' !== $string ? $string : $this->trans('link_add', [], 'SonataAdminBundle');
}

$dm = $this->getModelManager()->getDocumentManager();
Expand All @@ -133,9 +133,9 @@ public function toString($object)
*/
protected function configureRoutes(RouteCollection $collection)
{
foreach (array('edit', 'create', 'delete') as $name) {
foreach (['edit', 'create', 'delete'] as $name) {
if ($collection->has($name)) {
$collection->get($name)->addOptions(array('expose' => true));
$collection->get($name)->addOptions(['expose' => true]);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/FieldDescription.php
Expand Up @@ -20,7 +20,7 @@ class FieldDescription extends BaseFieldDescription
{
public function __construct()
{
$this->parentAssociationMappings = array();
$this->parentAssociationMappings = [];
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/Block/TreeBlockService.php
Expand Up @@ -32,7 +32,7 @@ class TreeBlockService extends BaseBlockService
* @param EngineInterface $templating
* @param array $defaults
*/
public function __construct($name, EngineInterface $templating, array $defaults = array())
public function __construct($name, EngineInterface $templating, array $defaults = [])
{
parent::__construct($name, $templating);
$this->defaults = $defaults;
Expand All @@ -53,10 +53,10 @@ public function buildEditForm(FormMapper $form, BlockInterface $block)
*/
public function execute(BlockContextInterface $blockContext, Response $response = null)
{
return $this->renderResponse($blockContext->getTemplate(), array(
return $this->renderResponse($blockContext->getTemplate(), [
'block' => $blockContext->getBlock(),
'settings' => $blockContext->getSettings(),
), $response);
], $response);
}

/**
Expand All @@ -66,7 +66,7 @@ public function configureSettings(OptionsResolver $resolver)
{
// the callables are a workaround to make bundle configuration win over the default values
// see https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/pull/345
$resolver->setDefaults(array(
$resolver->setDefaults([
'template' => function (Options $options, $value) {
return $value ?: 'SonataDoctrinePHPCRAdminBundle:Block:tree.html.twig';
},
Expand All @@ -79,6 +79,6 @@ public function configureSettings(OptionsResolver $resolver)
'routing_defaults' => function (Options $options, $value) {
return $value ?: $this->defaults;
},
));
]);
}
}
10 changes: 5 additions & 5 deletions src/Builder/DatagridBuilder.php
Expand Up @@ -131,7 +131,7 @@ public function addFilter(DatagridInterface $datagrid, $type, FieldDescriptionIn

foreach ($options as $name => $value) {
if (is_array($value)) {
$fieldDescription->setOption($name, array_merge($value, $fieldDescription->getOption($name, array())));
$fieldDescription->setOption($name, array_merge($value, $fieldDescription->getOption($name, [])));
} else {
$fieldDescription->setOption($name, $fieldDescription->getOption($name, $value));
}
Expand All @@ -143,7 +143,7 @@ public function addFilter(DatagridInterface $datagrid, $type, FieldDescriptionIn
$this->fixFieldDescription($admin, $fieldDescription);
$admin->addFilterFieldDescription($fieldDescription->getName(), $fieldDescription);

$fieldDescription->mergeOption('field_options', array('required' => false));
$fieldDescription->mergeOption('field_options', ['required' => false]);
$filter = $this->filterFactory->create($fieldDescription->getName(), $type, $fieldDescription->getOptions());

if (false !== $filter->getLabel() && !$filter->getLabel()) {
Expand All @@ -156,17 +156,17 @@ public function addFilter(DatagridInterface $datagrid, $type, FieldDescriptionIn
/**
* {@inheritdoc}
*/
public function getBaseDatagrid(AdminInterface $admin, array $values = array())
public function getBaseDatagrid(AdminInterface $admin, array $values = [])
{
$defaultOptions = array();
$defaultOptions = [];
if ($this->csrfTokenEnabled) {
$defaultOptions['csrf_protection'] = false;
}

$formBuilder = $this->formFactory->createNamedBuilder(
'filter',
'Symfony\Component\Form\Extension\Core\Type\FormType',
array(),
[],
$defaultOptions
);

Expand Down
14 changes: 7 additions & 7 deletions src/Builder/FormContractor.php
Expand Up @@ -68,14 +68,14 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
$fieldDescription->setAdmin($admin);
$fieldDescription->setOption('edit', $fieldDescription->getOption('edit', 'standard'));

$mappingTypes = array(
$mappingTypes = [
ClassMetadata::MANY_TO_ONE,
ClassMetadata::MANY_TO_MANY,
'children',
'child',
'parent',
'referrers',
);
];

if ($metadata && $metadata->hasAssociation($fieldDescription->getName()) && in_array($fieldDescription->getMappingType(), $mappingTypes)) {
$admin->attachAdminClass($fieldDescription);
Expand All @@ -93,7 +93,7 @@ public function getFormFactory()
/**
* {@inheritdoc}
*/
public function getFormBuilder($name, array $options = array())
public function getFormBuilder($name, array $options = [])
{
return $this->getFormFactory()->createNamedBuilder(
$name,
Expand All @@ -110,7 +110,7 @@ public function getFormBuilder($name, array $options = array())
*/
public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescription)
{
$options = array();
$options = [];
$options['sonata_field_description'] = $fieldDescription;

switch ($type) {
Expand Down Expand Up @@ -154,10 +154,10 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip

$options['type'] = 'Sonata\AdminBundle\Form\Type\AdminType';
$options['modifiable'] = true;
$options['type_options'] = array(
$options['type_options'] = [
'sonata_field_description' => $fieldDescription,
'data_class' => $fieldDescription->getAssociationAdmin()->getClass(),
);
];

break;
}
Expand All @@ -173,7 +173,7 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
protected function getAssociationAdminException(FieldDescriptionInterface $fieldDescription)
{
$msg = sprintf('The current field `%s` is not linked to an admin. Please create one', $fieldDescription->getName());
if (in_array($fieldDescription->getMappingType(), array(ClassMetadata::MANY_TO_ONE, ClassMetadata::MANY_TO_MANY, 'referrers'))) {
if (in_array($fieldDescription->getMappingType(), [ClassMetadata::MANY_TO_ONE, ClassMetadata::MANY_TO_MANY, 'referrers'])) {
if ($fieldDescription->getTargetEntity()) {
$msg .= " for the target document: `{$fieldDescription->getTargetEntity()}`";
}
Expand Down
8 changes: 4 additions & 4 deletions src/Builder/ListBuilder.php
Expand Up @@ -34,7 +34,7 @@ class ListBuilder implements ListBuilderInterface
* @param TypeGuesserInterface $guesser
* @param array $templates
*/
public function __construct(TypeGuesserInterface $guesser, array $templates = array())
public function __construct(TypeGuesserInterface $guesser, array $templates = [])
{
$this->guesser = $guesser;
$this->templates = $templates;
Expand All @@ -43,7 +43,7 @@ public function __construct(TypeGuesserInterface $guesser, array $templates = ar
/**
* {@inheritdoc}
*/
public function getBaseList(array $options = array())
public function getBaseList(array $options = [])
{
return new FieldDescriptionCollection();
}
Expand Down Expand Up @@ -177,14 +177,14 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
}
}

$mappingTypes = array(
$mappingTypes = [
ClassMetadata::MANY_TO_ONE,
ClassMetadata::MANY_TO_MANY,
'children',
'child',
'parent',
'referrers',
);
];

if ($metadata
&& $metadata->hasAssociation($fieldDescription->getName())
Expand Down
6 changes: 3 additions & 3 deletions src/Builder/ShowBuilder.php
Expand Up @@ -43,7 +43,7 @@ public function __construct(TypeGuesserInterface $guesser, array $templates)
/**
* {@inheritdoc}
*/
public function getBaseList(array $options = array())
public function getBaseList(array $options = [])
{
return new FieldDescriptionCollection();
}
Expand Down Expand Up @@ -112,14 +112,14 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
}
}

$mappingTypes = array(
$mappingTypes = [
ClassMetadata::MANY_TO_ONE,
ClassMetadata::MANY_TO_MANY,
'children',
'child',
'parent',
'referrers',
);
];

if ($metadata && $metadata->hasAssociation($fieldDescription->getName()) && in_array($fieldDescription->getMappingType(), $mappingTypes)) {
$admin->attachAdminClass($fieldDescription);
Expand Down
12 changes: 6 additions & 6 deletions src/Controller/AutocompleteController.php
Expand Up @@ -73,7 +73,7 @@ public function autoCompleteAction(Request $request)

$searchText = $request->get('q');
if (mb_strlen($searchText, 'UTF-8') < $minimumInputLength) {
return new JsonResponse(array('status' => 'KO', 'message' => 'Too short search string.'), 403);
return new JsonResponse(['status' => 'KO', 'message' => 'Too short search string.'], 403);
}

$page = $request->get($reqParamPageNumber);
Expand Down Expand Up @@ -111,7 +111,7 @@ public function autoCompleteAction(Request $request)
$more = (count($results) == $itemsPerPage + 1);
$method = $request->get('_method_name');

$items = array();
$items = [];
foreach ($results as $path => $document) {
// handle child translation
if (strpos(PathHelper::getNodeName($path), Translation::LOCALE_NAMESPACE.':') === 0) {
Expand All @@ -131,17 +131,17 @@ public function autoCompleteAction(Request $request)
$label = call_user_func($toStringCallback, $document, $property);
}

$items[] = array(
$items[] = [
'id' => $admin->id($document),
'label' => $label,
);
];
}

return new JsonResponse(array(
return new JsonResponse([
'status' => 'OK',
'more' => $more,
'items' => $items,
));
]);
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/Controller/TreeController.php
Expand Up @@ -74,14 +74,14 @@ public function treeAction(Request $request)
{
$root = $request->attributes->get('root');

return $this->render($this->template, array(
return $this->render($this->template, [
'root_node' => $root,
'routing_defaults' => $this->treeConfiguration['routing_defaults'],
'repository_name' => $this->treeConfiguration['repository_name'],
'reorder' => $this->treeConfiguration['reorder'],
'move' => $this->treeConfiguration['move'],
'sortable_by' => $this->treeConfiguration['sortable_by'],
));
]);
}

/**
Expand All @@ -99,11 +99,11 @@ public function reorderAction(Request $request)
$position = $request->get('position');

if (null === $parentPath || null === $dropedAtPath || null === $targetPath) {
return new JsonResponse(array('Parameters parent, dropped and target has to be set to reorder.'), Response::HTTP_BAD_REQUEST);
return new JsonResponse(['Parameters parent, dropped and target has to be set to reorder.'], Response::HTTP_BAD_REQUEST);
}

if (in_array($position, array('over', 'child'))) {
return new JsonResponse(array('Can not reorder when dropping into a collection.'), Response::HTTP_BAD_REQUEST);
if (in_array($position, ['over', 'child'])) {
return new JsonResponse(['Can not reorder when dropping into a collection.'], Response::HTTP_BAD_REQUEST);
}

$before = 'before' == $position;
Expand Down
4 changes: 2 additions & 2 deletions src/Datagrid/Pager.php
Expand Up @@ -29,7 +29,7 @@ class Pager extends BasePager
*/
public function computeNbResult()
{
return count($this->getQuery()->execute(array(), PHPCRQuery::HYDRATE_PHPCR));
return count($this->getQuery()->execute([], PHPCRQuery::HYDRATE_PHPCR));
}

/**
Expand All @@ -41,7 +41,7 @@ public function computeNbResult()
*/
public function getResults($hydrationMode = null)
{
return $this->getQuery()->execute(array(), $hydrationMode);
return $this->getQuery()->execute([], $hydrationMode);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/Datagrid/ProxyQuery.php
Expand Up @@ -98,7 +98,7 @@ public function __construct(QueryBuilder $queryBuilder, $alias)
*/
public function __call($name, $args)
{
return call_user_func_array(array($this->qb, $name), $args);
return call_user_func_array([$this->qb, $name], $args);
}

/**
Expand Down Expand Up @@ -128,7 +128,7 @@ public function setRootPath($root)
*
* @throws \Exception if $this->sortOrder is not ASC or DESC
*/
public function execute(array $params = array(), $hydrationMode = null)
public function execute(array $params = [], $hydrationMode = null)
{
if ($this->getSortBy()) {
switch ($this->sortOrder) {
Expand Down Expand Up @@ -185,7 +185,7 @@ public function getSortBy()
*/
public function setSortOrder($sortOrder)
{
if (!in_array($sortOrder, array('ASC', 'DESC'))) {
if (!in_array($sortOrder, ['ASC', 'DESC'])) {
throw new \InvalidArgumentException(sprintf('The parameter $sortOrder must be one of "ASC" or "DESC", got "%s"', $sortOrder));
}
$this->sortOrder = $sortOrder;
Expand Down
6 changes: 3 additions & 3 deletions src/DependencyInjection/Compiler/AddGuesserCompilerPass.php
Expand Up @@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
{
// ListBuilder
$definition = $container->getDefinition('sonata.admin.guesser.doctrine_phpcr_list_chain');
$services = array();
$services = [];
foreach ($container->findTaggedServiceIds('sonata.admin.guesser.doctrine_phpcr_list') as $id => $attributes) {
$services[] = new Reference($id);
}
Expand All @@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)

// DatagridBuilder
$definition = $container->getDefinition('sonata.admin.guesser.doctrine_phpcr_datagrid_chain');
$services = array();
$services = [];
foreach ($container->findTaggedServiceIds('sonata.admin.guesser.doctrine_phpcr_datagrid') as $id => $attributes) {
$services[] = new Reference($id);
}
Expand All @@ -48,7 +48,7 @@ public function process(ContainerBuilder $container)

// ShowBuilder
$definition = $container->getDefinition('sonata.admin.guesser.doctrine_phpcr_show_chain');
$services = array();
$services = [];
foreach ($container->findTaggedServiceIds('sonata.admin.guesser.doctrine_phpcr_show') as $id => $attributes) {
$services[] = new Reference($id);
}
Expand Down
6 changes: 3 additions & 3 deletions src/DependencyInjection/Compiler/AddTemplatesCompilerPass.php
Expand Up @@ -34,14 +34,14 @@ public function process(ContainerBuilder $container)
$definition = $container->getDefinition($id);

if (!$definition->hasMethodCall('setFormTheme')) {
$definition->addMethodCall('setFormTheme', array($settings['templates']['form']));
$definition->addMethodCall('setFormTheme', [$settings['templates']['form']]);
}

if (!$definition->hasMethodCall('setFilterTheme')) {
$definition->addMethodCall('setFilterTheme', array($settings['templates']['filter']));
$definition->addMethodCall('setFilterTheme', [$settings['templates']['filter']]);
}

$definition->addMethodCall('setTemplate', array('pager_results', $settings['templates']['pager_results']));
$definition->addMethodCall('setTemplate', ['pager_results', $settings['templates']['pager_results']]);
}
}

Expand Down