ソースを参照

Champs Nom et Prénom nullable

François 6 年 前
コミット
3528eedbf4

+ 27 - 24
composer.lock

@@ -499,16 +499,16 @@
         },
         {
             "name": "doctrine/doctrine-cache-bundle",
-            "version": "1.3.3",
+            "version": "1.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineCacheBundle.git",
-                "reference": "4c8e363f96427924e7e519c5b5119b4f54512697"
+                "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/4c8e363f96427924e7e519c5b5119b4f54512697",
-                "reference": "4c8e363f96427924e7e519c5b5119b4f54512697",
+                "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/5514c90d9fb595e1095e6d66ebb98ce9ef049927",
+                "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927",
                 "shasum": ""
             },
             "require": {
@@ -521,7 +521,7 @@
                 "instaclick/coding-standard": "~1.1",
                 "instaclick/object-calisthenics-sniffs": "dev-master",
                 "instaclick/symfony2-coding-standard": "dev-remaster",
-                "phpunit/phpunit": "~4|~5",
+                "phpunit/phpunit": "~4.8.36|~5.6|~6.5|~7.0",
                 "predis/predis": "~0.8",
                 "satooshi/php-coveralls": "^1.0",
                 "squizlabs/php_codesniffer": "~1.5",
@@ -545,7 +545,10 @@
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Bundle\\DoctrineCacheBundle\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -578,12 +581,12 @@
                 }
             ],
             "description": "Symfony Bundle for Doctrine Cache",
-            "homepage": "http://www.doctrine-project.org",
+            "homepage": "https://www.doctrine-project.org",
             "keywords": [
                 "cache",
                 "caching"
             ],
-            "time": "2018-03-27 09:22:12"
+            "time": "2018-11-09 06:25:35"
         },
         {
             "name": "doctrine/inflector",
@@ -993,16 +996,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.23.0",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
                 "shasum": ""
             },
             "require": {
@@ -1067,7 +1070,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19 01:22:40"
+            "time": "2018-11-05 09:00:11"
         },
         {
             "name": "paragonie/random_compat",
@@ -1578,16 +1581,16 @@
         },
         {
             "name": "symfony/monolog-bundle",
-            "version": "v3.3.0",
+            "version": "v3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/monolog-bundle.git",
-                "reference": "8204f3cd7c1bd6a6e2955c0a34475243a7bd9802"
+                "reference": "572e143afc03419a75ab002c80a2fd99299195ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/8204f3cd7c1bd6a6e2955c0a34475243a7bd9802",
-                "reference": "8204f3cd7c1bd6a6e2955c0a34475243a7bd9802",
+                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/572e143afc03419a75ab002c80a2fd99299195ff",
+                "reference": "572e143afc03419a75ab002c80a2fd99299195ff",
                 "shasum": ""
             },
             "require": {
@@ -1637,7 +1640,7 @@
                 "log",
                 "logging"
             ],
-            "time": "2018-06-04 05:55:43"
+            "time": "2018-11-04 09:58:13"
         },
         {
             "name": "symfony/polyfill-apcu",
@@ -2098,16 +2101,16 @@
         },
         {
             "name": "symfony/symfony",
-            "version": "v3.4.17",
+            "version": "v3.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "de239d25e0bb3be451a17b627705a5970c6c59e6"
+                "reference": "ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/de239d25e0bb3be451a17b627705a5970c6c59e6",
-                "reference": "de239d25e0bb3be451a17b627705a5970c6c59e6",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8",
+                "reference": "ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8",
                 "shasum": ""
             },
             "require": {
@@ -2249,7 +2252,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2018-10-03 12:03:55"
+            "time": "2018-11-03 10:03:29"
         },
         {
             "name": "twbs/bootstrap",
@@ -2427,7 +2430,7 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v3.4.17",
+            "version": "v3.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",

+ 2 - 2
src/AppBundle/Command/AppUserCreateCommand.php

@@ -35,8 +35,8 @@ class AppUserCreateCommand extends ContainerAwareCommand
     {
         $helper = $this->getHelper('question');
         $questionUsername = new Question('Nom (username) de l\'utilisateur : ', 'admin_user');
-        $questionPrenom = new Question('Prénom de l\'utilisateur : ', 'Toto');
-        $questionNom = new Question('Nom de l\'utilisateur : ', 'Titi');
+        $questionPrenom = new Question('Prénom de l\'utilisateur : ');
+        $questionNom = new Question('Nom de l\'utilisateur : ');
         $questionPassword = new Question('Mot de passe :', 'MotDePasse');
         $questionPassword->setHidden(true);
         $questionPassword->setHiddenFallback(false);

+ 6 - 4
src/AppBundle/Entity/User.php

@@ -2,8 +2,6 @@
 
 namespace AppBundle\Entity;
 
-use AppBundle\AppBundle;
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -40,14 +38,14 @@ class User implements AdvancedUserInterface
     /**
      * @var string
      *
-     * @ORM\Column(name="prenom", type="string", length=255)
+     * @ORM\Column(name="prenom", type="string", length=255, nullable=true)
      */
     private $prenom;
 
     /**
      * @var string
      *
-     * @ORM\Column(name="nom", type="string", length=255)
+     * @ORM\Column(name="nom", type="string", length=255, nullable=true)
      */
     private $nom;
 
@@ -471,6 +469,10 @@ class User implements AdvancedUserInterface
      */
     public function getNomComplet()
     {
+        if ($this->prenom == null && $this->nom == null)
+        {
+            return $this->getUsername();
+        } else
         return $this->getPrenom()." ".$this->getNom();
     }
 

+ 6 - 2
src/AppBundle/Form/UserType.php

@@ -28,8 +28,12 @@ class UserType extends AbstractType
                 'second_options'=>  array('label'   => 'Répéter le mot de passe'),
                 'invalid_message'   =>  'Les mots de passe ne correspondent pas'
             ))
-            ->add('prenom', TextType::class)
-            ->add('nom', TextType::class)
+            ->add('prenom', TextType::class, array(
+                'required'  => false
+            ))
+            ->add('nom', TextType::class, array(
+                'required'  => false
+            ))
             ->add('mail', EmailType::class)
             ->add('roles', ChoiceType::class, array(
                 'choices'   => array (

+ 3 - 4
src/AppBundle/Repository/FilmRepository.php

@@ -36,10 +36,9 @@ class FilmRepository extends \Doctrine\ORM\EntityRepository
     public function findFilmWithReal(array $realisateursnames) {
         $qb = $this->createQueryBuilder('f');
         $qb
-            ->innerJoin('f.realisateurs', 'r')
-            ->addSelect('f');
-
-        $qb->where($qb->expr()->in('r.nomComplet', $realisateursnames));
+            ->leftJoin('f.realisateurs', 'rea')
+            ->addSelect('f')
+            ->where($qb->expr()->in('rea.nomComplet', $realisateursnames));
 
         return $qb
             ->getQuery()