Skip to content

Commit

Permalink
convert to short array notation
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbu
dbu committed Jan 8, 2017
1 parent 8b06707 commit 5aa9eae
Show file tree
Hide file tree
Showing 22 changed files with 288 additions and 286 deletions.
186 changes: 93 additions & 93 deletions src/DependencyInjection/CmfCoreExtension.php
View file
Expand Up @@ -38,164 +38,164 @@ public function prepend(ContainerBuilder $container)

$extensions = $container->getExtensions();
if (isset($config['multilang']['locales'], $extensions['cmf_routing'])) {
$container->prependExtensionConfig('cmf_routing', array(
'dynamic' => array('locales' => $config['multilang']['locales']),
));
$container->prependExtensionConfig('cmf_routing', [
'dynamic' => ['locales' => $config['multilang']['locales']],
]);
}

if ($config['persistence']['phpcr']) {
$bundles = $container->getParameter('kernel.bundles');
$persistenceConfig = $config['persistence']['phpcr'];

foreach ($container->getExtensions() as $name => $extension) {
$prependConfig = array();
$prependConfig = [];

switch ($name) {
case 'cmf_block':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'block_basepath' => $persistenceConfig['basepath'].'/content',
'manager_name' => $persistenceConfig['manager_name'],
),
),
);
],
],
];

break;
case 'cmf_content':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'content_basepath' => $persistenceConfig['basepath'].'/content',
),
),
);
],
],
];

break;
case 'cmf_create':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
),
),
);
],
],
];
// if cmf_media is there, it will prepend the image path to its media_basepath
// setting.
if (!isset($extensions['cmf_media'])) {
$prependConfig['persistence']['phpcr']['image'] = array(
$prependConfig['persistence']['phpcr']['image'] = [
'enabled' => false,
'basepath' => $persistenceConfig['basepath'].'/media',
);
];
}

break;
case 'cmf_media':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'media_basepath' => $persistenceConfig['basepath'].'/media',
'manager_name' => $persistenceConfig['manager_name'],
),
),
);
],
],
];

break;
case 'cmf_menu':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'content_basepath' => $persistenceConfig['basepath'].'/content',
'menu_basepath' => $persistenceConfig['basepath'].'/menu',
'manager_name' => $persistenceConfig['manager_name'],
),
),
);
],
],
];

break;
case 'cmf_routing':
$routePaths = array($persistenceConfig['basepath'].'/routes');
$prependConfig = array(
'dynamic' => array(
$routePaths = [$persistenceConfig['basepath'].'/routes'];
$prependConfig = [
'dynamic' => [
'enabled' => true,
'persistence' => array(
'phpcr' => array(
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'content_basepath' => $persistenceConfig['basepath'].'/content',
'route_basepaths' => $routePaths,
'manager_name' => $persistenceConfig['manager_name'],
),
),
),
);
],
],
],
];

if (isset($bundles['CmfContentBundle'])) {
$prependConfig['dynamic']['generic_controller'] = 'cmf_content.controller:indexAction';
}

break;
case 'cmf_routing_auto':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'route_basepath' => $persistenceConfig['basepath'].'/routes',
),
),
);
],
],
];

break;
case 'cmf_search':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'search_basepath' => $persistenceConfig['basepath'].'/content',
'manager_name' => $persistenceConfig['manager_name'],
'manager_registry' => $persistenceConfig['manager_registry'],
),
),
);
],
],
];
if (!empty($persistenceConfig['translation_strategy'])) {
$prependConfig['persistence']['phpcr']['translation_strategy'] = $persistenceConfig['translation_strategy'];
}

break;
case 'cmf_simple_cms':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
'basepath' => $persistenceConfig['basepath'].'/simple',
'manager_name' => $persistenceConfig['manager_name'],
'manager_registry' => $persistenceConfig['manager_registry'],
),
),
);
],
],
];

break;
case 'cmf_tree_browser':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
),
),
);
],
],
];

break;
case 'cmf_seo':
$prependConfig = array(
'persistence' => array(
'phpcr' => array(
$prependConfig = [
'persistence' => [
'phpcr' => [
'enabled' => $persistenceConfig['enabled'],
),
),
);
],
],
];

break;
}
Expand All @@ -211,35 +211,35 @@ public function prepend(ContainerBuilder $container)
$persistenceConfig = $config['persistence']['orm'];

foreach ($container->getExtensions() as $name => $extension) {
$prependConfig = array();
$prependConfig = [];

switch ($name) {
case 'cmf_routing':
$prependConfig = array(
'dynamic' => array(
$prependConfig = [
'dynamic' => [
'enabled' => true,
'persistence' => array(
'orm' => array(
'persistence' => [
'orm' => [
'enabled' => $persistenceConfig['enabled'],
'manager_name' => $persistenceConfig['manager_name'],
),
),
),
);
],
],
],
];

if (isset($bundles['CmfContentBundle'])) {
$prependConfig['dynamic']['generic_controller'] = 'cmf_content.controller:indexAction';
}
break;

case 'cmf_seo':
$prependConfig = array(
'persistence' => array(
'orm' => array(
$prependConfig = [
'persistence' => [
'orm' => [
'enabled' => $persistenceConfig['enabled'],
),
),
);
],
],
];
break;
}

Expand All @@ -265,10 +265,10 @@ public function load(array $configs, ContainerBuilder $container)
$container->setParameter($this->getAlias().'.persistence.phpcr.basepath', $config['persistence']['phpcr']['basepath']);

$templatingHelper = $container->getDefinition($this->getAlias().'.templating.helper');
$templatingHelper->addMethodCall('setDoctrineRegistry', array(
$templatingHelper->addMethodCall('setDoctrineRegistry', [
new Reference($config['persistence']['phpcr']['manager_registry']),
'%cmf_core.persistence.phpcr.manager_name%',
));
]);
}
if ($config['publish_workflow']['enabled']) {
$this->loadPublishWorkflow($config['publish_workflow'], $loader, $container);
Expand Down Expand Up @@ -306,7 +306,7 @@ public function setupFormTypes(ContainerBuilder $container, LoaderInterface $loa
// if there is twig, register our form type with twig
if ($container->hasParameter('twig.form.resources')) {
$resources = $container->getParameter('twig.form.resources');
$container->setParameter('twig.form.resources', array_merge($resources, array('CmfCoreBundle:Form:checkbox_url_label_form_type.html.twig')));
$container->setParameter('twig.form.resources', array_merge($resources, ['CmfCoreBundle:Form:checkbox_url_label_form_type.html.twig']));
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
View file
Expand Up @@ -70,7 +70,7 @@ public function process(ContainerBuilder $container)
$chainDriverDefService = $this->getChainDriverServiceName($container);
$chainDriverDef = $container->getDefinition($chainDriverDefService);
foreach ($this->namespaces as $namespace) {
$chainDriverDef->addMethodCall('addDriver', array($this->driver, $namespace));
$chainDriverDef->addMethodCall('addDriver', [$this->driver, $namespace]);
}
}

Expand Down Expand Up @@ -107,11 +107,11 @@ protected function getChainDriverServiceName(ContainerBuilder $container)
* enable the mapping. Set to false to not do any check,
* optional
*/
public static function createXmlMappingDriver(array $mappings, array $managerParameters = array(), $enabledParameter = false)
public static function createXmlMappingDriver(array $mappings, array $managerParameters = [], $enabledParameter = false)
{
$arguments = array($mappings, '.orm.xml');
$arguments = [$mappings, '.orm.xml'];
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);
$driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', array($locator));
$driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', [$locator]);

return new self($driver, $mappings, $managerParameters, $enabledParameter);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Doctrine/Phpcr/NonTranslatableMetadataListener.php
View file
Expand Up @@ -28,9 +28,9 @@ class NonTranslatableMetadataListener implements EventSubscriber
*/
public function getSubscribedEvents()
{
return array(
return [
'loadClassMetadata',
);
];
}

/**
Expand All @@ -51,7 +51,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
foreach ($meta->translatableFields as $field) {
unset($meta->mappings[$field]['translated']);
}
$meta->translatableFields = array();
$meta->translatableFields = [];
if (null !== $meta->localeMapping) {
unset($meta->mappings[$meta->localeMapping]);
$meta->localeMapping = null;
Expand Down
4 changes: 2 additions & 2 deletions src/Doctrine/Phpcr/TranslatableMetadataListener.php
View file
Expand Up @@ -40,9 +40,9 @@ public function __construct($translationStrategy)
*/
public function getSubscribedEvents()
{
return array(
return [
'loadClassMetadata',
);
];
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/EventListener/PublishWorkflowListener.php
View file
Expand Up @@ -91,8 +91,8 @@ public function onKernelRequest(GetResponseEvent $event)
*/
public static function getSubscribedEvents()
{
return array(
KernelEvents::REQUEST => array(array('onKernelRequest', 1)),
);
return [
KernelEvents::REQUEST => [['onKernelRequest', 1]],
];
}
}

0 comments on commit 5aa9eae

Please sign in to comment.