Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

# Conflicts:
#	.bowerrc

lib/Alchemy/Phrasea/Controller/Admin/SetupController.php

@@ -38,12 +38,10 @@ class SetupController extends Controller
 
     public function submitGlobalsAction(Request $request)
     {
-        if (null !== $this->configuration->get('registry'))
-        {
+        if (null !== $this->configuration->get('registry')) {
             $form = $this->registryFormManipulator->createForm($this->configuration);
         }
-        else
-        {
+        else {
             $form = $this->registryFormManipulator->createForm();
         }
 

lib/Alchemy/Phrasea/Controller/Api/V1Controller.php

@@ -376,7 +376,7 @@ class V1Controller extends Controller
                         'password' => $conf->get(['registry', 'email', 'smtp-password']),
                     ],
                 ],
-                'custom-links' => $conf->get(['registry', 'custom-links']),
+                'custom-links'      => $conf->get(['registry', 'custom-links']),
                 'ftp'               => [
                     'active'        => $conf->get(['registry', 'ftp', 'ftp-enabled']),
                     'activeForUser' => $conf->get(['registry', 'ftp', 'ftp-user-access']),

lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php

@@ -147,7 +147,7 @@ class RegistryFormManipulator
                 'recaptcha-public-key' => '',
                 'recaptcha-private-key' => '',
             ],
-            'executables' => [
+            'executables'  => [
                 'h264-streaming-enabled' => false,
                 'auth-token-directory' => null,
                 'auth-token-directory-path' => null,
@@ -162,7 +162,7 @@ class RegistryFormManipulator
                 'default-query' => '',
                 'default-query-type' => 0,
             ],
-            'email' => [
+            'email'        => [
                 'emitter-email' => 'phraseanet@example.com',
                 'prefix' => null,
                 'smtp-enabled' => false,
@@ -173,7 +173,7 @@ class RegistryFormManipulator
                 'smtp-user' => null,
                 'smtp-password' => isset($config['email']['smtp-password']) ? $config['email']['smtp-password'] : null,
             ],
-            'custom-links'     => [
+            'custom-links' => [
                 [
                     'linkName'     => 'Phraseanet store',
                     'linkLanguage' => 'fr',

lib/Alchemy/Phrasea/Form/Configuration/CustomLinkFormType.php

@@ -7,9 +7,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace Alchemy\Phrasea\Form\Configuration;
+
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+
 class CustomLinkFormType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -83,6 +86,7 @@ class CustomLinkFormType extends AbstractType
             ]
         ]);
     }
+
     public function getName()
     {
         return null;

lib/Alchemy/Phrasea/Form/Configuration/MainConfigurationFormType.php

@@ -74,7 +74,7 @@ class MainConfigurationFormType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults([
-            'required' => false,
+            'required'           => false,
             'allow_extra_fields' => true
         ]);
     }