Merge pull request #72 from SURFnet/maintenance/symfony-2.7

Upgrade to Symfony 2.7 LTS
OpenConext · Jun 4, 2015 · 694d48c · 694d48c
2 parents 96cfd59 + bf70cdc
commit 694d48c
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 62 deletions.
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -33,7 +33,7 @@
                         {{ 'button.logout'|trans }}
                     </button>
                 </form>
-                {% set locale_switcher = stepup_locale_switcher('ss_switch_locale', {'return-url': app.request.uri}) %}
+                {% set locale_switcher = stepup_locale_switcher(app.request.locale, 'ss_switch_locale', {'return-url': app.request.uri}) %}
                 {{ form_start(locale_switcher, { attr: { class: 'form-inline' }}) }}
                 {{ form_widget(locale_switcher.locale) }}
                 {{ form_widget(locale_switcher.switch) }}

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -16,7 +16,8 @@ framework:
     validation:      { enable_annotations: true }
     templating:
         engines: ['twig']
-        assets_version: %asset_version%
+    assets:
+        version: %asset_version%
     default_locale:  "%default_locale%"
     trusted_hosts:   ~
     trusted_proxies: %trusted_proxies%

diff --git a/app/console b/app/console
@@ -17,7 +17,7 @@ $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('-
     && $env !== 'build';
 
 if ($debug) {
-    Debug::enable();
+    Debug::enable(~E_USER_DEPRECATED);
 }
 
 $kernel = new AppKernel($env, $debug);

diff --git a/app_dev.php.dist b/app_dev.php.dist
@@ -4,7 +4,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Debug\Debug;
 
 $loader = require_once __DIR__.'/../app/bootstrap.php.cache';
-Debug::enable();
+Debug::enable(~E_USER_DEPRECATED);
 
 require_once __DIR__.'/../app/AppKernel.php';
 

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.4",
-        "symfony/symfony": "~2.6,>=2.6.6",
+        "symfony/symfony": "^2.7",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Command/SendSmsChallengeCommand.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Command/SendSmsChallengeCommand.php
@@ -18,14 +18,15 @@
 
 namespace Surfnet\StepupSelfService\SelfServiceBundle\Command;
 
+use Surfnet\StepupBundle\Value\PhoneNumber\Country;
 use Symfony\Component\Validator\Constraints as Assert;
 
 class SendSmsChallengeCommand
 {
     /**
-     * @var string
+     * @var Country
      */
-    public $countryCode;
+    public $country;
 
     /**
      * @Assert\NotBlank(message="ss.send_sms_challenge_command.recipient.may_not_be_empty")

diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/AnchorType.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/AnchorType.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Form\ButtonTypeInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class AnchorType extends AbstractType implements ButtonTypeInterface
 {
@@ -36,7 +36,7 @@ public function getName()
         return 'anchor';
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'route'           => null,
@@ -45,9 +45,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
         $resolver->setRequired(['route']);
 
-        $resolver->setAllowedTypes([
-            'route' => 'string',
-        ]);
+        $resolver->setAllowedTypes('route', 'string');
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)

diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/ProveYubikeyPossessionType.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/ProveYubikeyPossessionType.php
@@ -20,7 +20,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ProveYubikeyPossessionType extends AbstractType
 {
@@ -39,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ]);
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'data_class' => 'Surfnet\StepupSelfService\SelfServiceBundle\Command\VerifyYubikeyOtpCommand',

diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/RevokeSecondFactorType.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/RevokeSecondFactorType.php
@@ -20,7 +20,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class RevokeSecondFactorType extends AbstractType
 {
@@ -38,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ]);
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'data_class' => 'Surfnet\StepupSelfService\SelfServiceBundle\Command\RevokeCommand',

diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/SendSmsChallengeType.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/SendSmsChallengeType.php
@@ -21,18 +21,20 @@
 use Surfnet\StepupBundle\Value\PhoneNumber\CountryCodeListing;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class SendSmsChallengeType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('countryCode', 'choice', [
+            ->add('country', 'choice', [
                 'label'                          => /** @Ignore */ 'country code',
                 'horizontal_label_class'         => 'sr-only',
                 'required'                       => true,
                 'choice_list'                    => CountryCodeListing::asChoiceList(),
+                'preferred_choices'              =>
+                    ['Surfnet\StepupBundle\Value\PhoneNumber\CountryCodeListing', 'isPreferredChoice'],
                 'horizontal_input_wrapper_class' => 'foo',
             ])
             ->add('subscriber', 'text', [
@@ -51,7 +53,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]);
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'attr' => ['class' => 'form-inline'],