From 589d750e598983009f9f67d3d884c6d5587db1d8 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Mon, 3 Dec 2018 20:23:52 +0100 Subject: [PATCH] allow decimals in users hourly rate (#460) --- src/EventSubscriber/UserPreferenceSubscriber.php | 4 ++-- tests/Controller/ProfileControllerTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/EventSubscriber/UserPreferenceSubscriber.php b/src/EventSubscriber/UserPreferenceSubscriber.php index b6a8e879..69be76c5 100644 --- a/src/EventSubscriber/UserPreferenceSubscriber.php +++ b/src/EventSubscriber/UserPreferenceSubscriber.php @@ -19,7 +19,7 @@ use App\Form\Type\SkinType; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; -use Symfony\Component\Form\Extension\Core\Type\IntegerType; +use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Validator\Constraints\Range; @@ -86,7 +86,7 @@ class UserPreferenceSubscriber implements EventSubscriberInterface (new UserPreference()) ->setName(UserPreference::HOURLY_RATE) ->setValue(0) - ->setType(IntegerType::class) + ->setType(NumberType::class) ->setEnabled($enableHourlyRate) ->addConstraint(new Range(['min' => 0])), diff --git a/tests/Controller/ProfileControllerTest.php b/tests/Controller/ProfileControllerTest.php index 455d0972..32fe3766 100644 --- a/tests/Controller/ProfileControllerTest.php +++ b/tests/Controller/ProfileControllerTest.php @@ -225,9 +225,9 @@ class ProfileControllerTest extends ControllerBaseTest // assert that the user doesn't have the "hourly-rate_own_profile" permission [User::ROLE_USER, UserFixtures::USERNAME_USER, 82, 82, 'ar'], // admins are allowed to update their own hourly rate - [User::ROLE_ADMIN, UserFixtures::USERNAME_ADMIN, 81, 37, 'ar'], + [User::ROLE_ADMIN, UserFixtures::USERNAME_ADMIN, 81, 37.5, 'ar'], // admins are allowed to update other peoples hourly rate - [User::ROLE_SUPER_ADMIN, UserFixtures::USERNAME_USER, 82, 37, 'en'], + [User::ROLE_SUPER_ADMIN, UserFixtures::USERNAME_USER, 82, 37.5, 'en'], ]; } @@ -255,7 +255,7 @@ class ProfileControllerTest extends ControllerBaseTest $client->submit($form, [ 'user_preferences_form' => [ 'preferences' => [ - ['name' => UserPreference::HOURLY_RATE, 'value' => 37], + ['name' => UserPreference::HOURLY_RATE, 'value' => 37.5], // ['name' => 'timezone', 'value' => 'America/Creston'], ['name' => 'language', 'value' => 'ar'], ['name' => UserPreference::SKIN, 'value' => 'blue'],