Replace dropped calls with checker, factory and security replacements

[airbundle] / DataFixtures / AirFixtures.php

diff --git a/DataFixtures/AirFixtures.php b/DataFixtures/AirFixtures.php
index 7a68c66871c982f94c24fa39f274072707a8ba9c..18fda1b568be2e86b4ffbdde8b4342749ea03fd9 100644 (file)
--- a/DataFixtures/AirFixtures.php
+++ b/DataFixtures/AirFixtures.php
@@ -2,46 +2,68 @@
 
 namespace Rapsys\AirBundle\DataFixtures;
 
-use Rapsys\AirBundle\Entity\Title;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
+
+use Rapsys\AirBundle\Entity\Civility;
 use Rapsys\AirBundle\Entity\Group;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Location;
 use Rapsys\AirBundle\Entity\Slot;
 
-class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Symfony\Component\DependencyInjection\ContainerAwareInterface {
+class AirFixtures extends Fixture {
        /**
-        * @var ContainerInterface
+        * Air fixtures constructor
         */
-       private $container;
-
-       public function setContainer(\Symfony\Component\DependencyInjection\ContainerInterface $container = null) {
-               $this->container = $container;
+       public function __construct(protected ContainerInterface $container, protected UserPasswordHasherInterface $hasher) {
        }
 
        /**
         * {@inheritDoc}
         */
-       public function load(\Doctrine\Common\Persistence\ObjectManager $manager) {
-               $encoder = $this->container->get('security.password_encoder');
+       public function load(ObjectManager $manager) {
+               //Civility tree
+               $civilityTree = array(
+                       'Mister',
+                       'Madam',
+                       'Miss'
+               );
 
-               //Title tree
-               $titleTree = array(
-                       'Mr.' => 'Mister',
-                       'Mrs.' => 'Madam',
-                       'Ms.' => 'Miss'
+               //Create titles
+               $civilitys = array();
+               foreach($civilityTree as $civilityData) {
+                       $civility = new Civility();
+                       $civility->setTitle($civilityData);
+                       $civility->setCreated(new \DateTime('now'));
+                       $civility->setUpdated(new \DateTime('now'));
+                       $manager->persist($civility);
+                       $civilitys[$civilityData] = $civility;
+                       unset($civility);
+               }
+
+               //TODO: insert countries from https://raw.githubusercontent.com/raramuridesign/mysql-country-list/master/country-lists/mysql-country-list-detailed-info.sql
+               #CREATE TABLE `countries` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `code` varchar(2) NOT NULL, `alpha` varchar(3) NOT NULL, `title` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, `created` datetime NOT NULL, `updated` datetime NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `code` (`code`), UNIQUE KEY `alpha` (`alpha`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+               #insert into countries (code, alpha, title, created, updated) select countryCode, isoAlpha3, countryName, NOW(), NOW() FROM apps_countries_detailed ORDER BY countryCode ASC, isoAlpha3 ASC;
+
+               //Dance tree
+               $danceTree = array(
+                       'Argentine Tango' => [
+                          'Milonga', 'Class and milonga', 'Public class', 'Private class'
+                       ]
                );
 
                //Create titles
-               $titles = array();
-               foreach($titleTree as $shortData => $titleData) {
-                       $title = new Title();
-                       $title->setShort($shortData);
-                       $title->setTitle($titleData);
-                       $title->setCreated(new \DateTime('now'));
-                       $title->setUpdated(new \DateTime('now'));
-                       $manager->persist($title);
-                       $titles[$shortData] = $title;
-                       unset($title);
+               $dances = array();
+               foreach($danceTree as $danceTitle => $danceData) {
+                       foreach($danceData as $danceType) {
+                               $dance = new Dance($danceTitle, $danceType);
+                               $dance->setCreated(new \DateTime('now'));
+                               $dance->setUpdated(new \DateTime('now'));
+                               $manager->persist($dance);
+                               unset($dance);
+                       }
                }
 
                //Group tree
@@ -115,15 +137,13 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                //Create users
                $users = array();
                foreach($userTree as $userData) {
-                       $user = new User();
-                       $user->setMail($userData['mail']);
+                       $user = new User($userData['mail']);
                        $user->setPseudonym($userData['pseudonym']);
                        $user->setForename($userData['forename']);
                        $user->setSurname($userData['surname']);
                        $user->setPhone($userData['phone']);
-                       $user->setPassword($encoder->encodePassword($user, $userData['password']));
-                       $user->setActive(true);
-                       $user->setTitle($titles[$userData['short']]);
+                       $user->setPassword($this->hasher->hashPassword($user, $userData['password']));
+                       $user->setCivility($civilitys[$userData['short']]);
                        $user->addGroup($groups[$userData['group']]);
                        $user->setCreated(new \DateTime('now'));
                        $user->setUpdated(new \DateTime('now'));
@@ -258,6 +278,26 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'latitude' => 48.892503,
                                'longitude' => 2.389300,
                                'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Louvre palace',
+                               'short' => 'Louvre',
+                               'address' => 'Quai François Mitterrand',
+                               'zipcode' => '75001',
+                               'city' => 'Paris',
+                               'latitude' => 48.860386,
+                               'longitude' => 2.332611,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Monde garden',
+                               'short' => 'Monde',
+                               'address' => '63 avenue Pierre Mendès-France',
+                               'zipcode' => '75013',
+                               'city' => 'Paris',
+                               'latitude' => 48.840451,
+                               'longitude' => 2.367638,
+                               'hotspot' => false
                        ]
                ];