Merged branch master into master

.idea/CNinno2k16.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="PHP Runtime" type="php">
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
+        </CLASSES>
+        <SOURCES>
+          <root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="PHARS">
+        <CLASSES>
+          <root url="phar://$MODULE_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar/" />
+          <root url="phar://$MODULE_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/phar/phar-sample.phar/" />
+        </CLASSES>
+        <SOURCES>
+          <root url="phar://$MODULE_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar/" />
+          <root url="phar://$MODULE_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/phar/phar-sample.phar/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/CNinno2k16.iml" filepath="$PROJECT_DIR$/.idea/CNinno2k16.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

app/config/config.yml

@@ -55,11 +55,23 @@ doctrine:
         #   2. Uncomment database_path in parameters.yml.dist
         #   3. Uncomment next line:
         #     path:     "%database_path%"
+        types:
+            point: Wantlet\ORM\PointType
+        mapping_types:
+            point : point
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
-        naming_strategy: doctrine.orm.naming_strategy.underscore
-        auto_mapping: true
+        # naming_strategy: doctrine.orm.naming_strategy.underscore
+        # auto_mapping: true
+        default_entity_manager: default
+        entity_managers:
+          default:
+            auto_mapping: true
+            dql:
+              numeric_functions:
+                DISTANCE: Wantlet\ORM\Distance
+                POINT_STR: Wantlet\ORM\PointStr
 
 # Swiftmailer Configuration
 swiftmailer:

app/config/parameters.yml

@@ -2,7 +2,7 @@
 parameters:
     database_host: 127.0.0.1
     database_port: null
-    database_name: symfony
+    database_name: cninno
     database_user: root
     database_password: null
     mailer_transport: smtp

composer.json

@@ -27,7 +27,8 @@
         "symfony/polyfill-apcu": "^1.0",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^3.0.2",
-        "incenteev/composer-parameter-handler": "^2.0"
+        "incenteev/composer-parameter-handler": "^2.0",
+        "Wantlet": "dev-master"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",
@@ -60,5 +61,12 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": null
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/jhartikainen/doctrine2-spatial",
+            "comment": "Doctrine Spatial Data Types"
+        }
+    ]
 }

src/AppBundle/Entity/Album.php

+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Album
+ *
+ * @ORM\Table(name="album", indexes={@ORM\Index(name="ID_Dossier", columns={"ID_Dossier"})})
+ * @ORM\Entity
+ */
+class Album
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+     */
+    private $nom;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Description", type="string", length=255, nullable=true)
+     */
+    private $description;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="Prive", type="boolean", nullable=false)
+     */
+    private $prive;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="ID_album", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    private $idAlbum;
+
+    /**
+     * @var \AppBundle\Entity\Dossier
+     *
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Dossier")
+     * @ORM\JoinColumns({
+     *   @ORM\JoinColumn(name="ID_Dossier", referencedColumnName="ID_Dossier")
+     * })
+     */
+    private $idDossier;
+
+
+
+    /**
+     * Set nom
+     *
+     * @param string $nom
+     *
+     * @return Album
+     */
+    public function setNom($nom)
+    {
+        $this->nom = $nom;
+
+        return $this;
+    }
+
+    /**
+     * Get nom
+     *
+     * @return string
+     */
+    public function getNom()
+    {
+        return $this->nom;
+    }
+
+    /**
+     * Set description
+     *
+     * @param string $description
+     *
+     * @return Album
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     * Get description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Set prive
+     *
+     * @param boolean $prive
+     *
+     * @return Album
+     */
+    public function setPrive($prive)
+    {
+        $this->prive = $prive;
+
+        return $this;
+    }
+
+    /**
+     * Get prive
+     *
+     * @return boolean
+     */
+    public function getPrive()
+    {
+        return $this->prive;
+    }
+
+    /**
+     * Get idAlbum
+     *
+     * @return integer
+     */
+    public function getIdAlbum()
+    {
+        return $this->idAlbum;
+    }
+
+    /**
+     * Set idDossier
+     *
+     * @param \AppBundle\Entity\Dossier $idDossier
+     *
+     * @return Album
+     */
+    public function setIdDossier(\AppBundle\Entity\Dossier $idDossier = null)
+    {
+        $this->idDossier = $idDossier;
+
+        return $this;
+    }
+
+    /**
+     * Get idDossier
+     *
+     * @return \AppBundle\Entity\Dossier
+     */
+    public function getIdDossier()
+    {
+        return $this->idDossier;
+    }
+}

src/AppBundle/Entity/Dossier.php

+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Dossier
+ *
+ * @ORM\Table(name="dossier")
+ * @ORM\Entity
+ */
+class Dossier
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+     */
+    private $nom;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Chemin", type="string", length=255, nullable=false)
+     */
+    private $chemin;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Description", type="string", length=255, nullable=true)
+     */
+    private $description;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="ID_Dossier", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    private $idDossier;
+
+
+
+    /**
+     * Set nom
+     *
+     * @param string $nom
+     *
+     * @return Dossier
+     */
+    public function setNom($nom)
+    {
+        $this->nom = $nom;
+
+        return $this;
+    }
+
+    /**
+     * Get nom
+     *
+     * @return string
+     */
+    public function getNom()
+    {
+        return $this->nom;
+    }
+
+    /**
+     * Set chemin
+     *
+     * @param string $chemin
+     *
+     * @return Dossier
+     */
+    public function setChemin($chemin)
+    {
+        $this->chemin = $chemin;
+
+        return $this;
+    }
+
+    /**
+     * Get chemin
+     *
+     * @return string
+     */
+    public function getChemin()
+    {
+        return $this->chemin;
+    }
+
+    /**
+     * Set description
+     *
+     * @param string $description
+     *
+     * @return Dossier
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     * Get description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Get idDossier
+     *
+     * @return integer
+     */
+    public function getIdDossier()
+    {
+        return $this->idDossier;
+    }
+}

src/AppBundle/Entity/Personnes.php

+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Personnes
+ *
+ * @ORM\Table(name="personnes")
+ * @ORM\Entity
+ */
+class Personnes
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+     */
+    private $nom;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="Infos_reconnaissance", type="integer", nullable=true)
+     */
+    private $infosReconnaissance;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="ID_Personne", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    private $idPersonne;
+
+    /**
+     * @var \Doctrine\Common\Collections\Collection
+     *
+     * @ORM\ManyToMany(targetEntity="AppBundle\Entity\Photos", mappedBy="idPersonne")
+     */
+    private $idPhotographie;
+
+    /**
+     * @var \Doctrine\Common\Collections\Collection
+     *
+     * @ORM\ManyToMany(targetEntity="AppBundle\Entity\Photos", mappedBy="idPerso")
+     */
+    private $idPhoto;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->idPhotographie = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->idPhoto = new \Doctrine\Common\Collections\ArrayCollection();
+    }
+
+
+    /**
+     * Set nom
+     *
+     * @param string $nom
+     *
+     * @return Personnes
+     */
+    public function setNom($nom)
+    {
+        $this->nom = $nom;
+
+        return $this;
+    }
+
+    /**
+     * Get nom
+     *
+     * @return string
+     */
+    public function getNom()
+    {
+        return $this->nom;
+    }
+
+    /**
+     * Set infosReconnaissance
+     *
+     * @param integer $infosReconnaissance
+     *
+     * @return Personnes
+     */
+    public function setInfosReconnaissance($infosReconnaissance)
+    {
+        $this->infosReconnaissance = $infosReconnaissance;
+
+        return $this;
+    }
+
+    /**
+     * Get infosReconnaissance
+     *
+     * @return integer
+     */
+    public function getInfosReconnaissance()
+    {
+        return $this->infosReconnaissance;
+    }
+
+    /**
+     * Get idPersonne
+     *
+     * @return integer
+     */
+    public function getIdPersonne()
+    {
+        return $this->idPersonne;
+    }
+
+    /**
+     * Add idPhotographie
+     *
+     * @param \AppBundle\Entity\Photos $idPhotographie
+     *
+     * @return Personnes
+     */
+    public function addIdPhotographie(\AppBundle\Entity\Photos $idPhotographie)
+    {
+        $this->idPhotographie[] = $idPhotographie;
+
+        return $this;
+    }
+
+    /**
+     * Remove idPhotographie
+     *
+     * @param \AppBundle\Entity\Photos $idPhotographie
+     */
+    public function removeIdPhotographie(\AppBundle\Entity\Photos $idPhotographie)
+    {
+        $this->idPhotographie->removeElement($idPhotographie);
+    }
+
+    /**
+     * Get idPhotographie
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getIdPhotographie()
+    {
+        return $this->idPhotographie;
+    }
+
+    /**
+     * Add idPhoto
+     *
+     * @param \AppBundle\Entity\Photos $idPhoto
+     *
+     * @return Personnes
+     */
+    public function addIdPhoto(\AppBundle\Entity\Photos $idPhoto)
+    {
+        $this->idPhoto[] = $idPhoto;
+
+        return $this;
+    }
+
+    /**
+     * Remove idPhoto
+     *
+     * @param \AppBundle\Entity\Photos $idPhoto
+     */
+    public function removeIdPhoto(\AppBundle\Entity\Photos $idPhoto)
+    {
+        $this->idPhoto->removeElement($idPhoto);
+    }
+
+    /**
+     * Get idPhoto
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getIdPhoto()
+    {
+        return $this->idPhoto;
+    }
+}

src/AppBundle/Entity/Photographe.php

+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Photographe
+ *
+ * @ORM\Table(name="photographe")
+ * @ORM\Entity
+ */
+class Photographe
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+     */
+    private $nom;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="Informations", type="string", length=255, nullable=true)
+     */
+    private $informations;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="Promotion", type="integer", nullable=true)
+     */
+    private $promotion;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="ID_photographe", type="integer")
+     * @ORM\Id