Updated vendorsHEADmaster

8 files changed, 60 insertions, 63 deletions

diff --git a/src/Sde/WebserviceBundle/Entity/Association.php b/src/Sde/WebserviceBundle/Entity/Association.php
index 6210008..ac275e0 100644
--- a/src/Sde/WebserviceBundle/Entity/Association.php
+++ b/src/Sde/WebserviceBundle/Entity/Association.php
@@ -18,6 +18,7 @@
 
 namespace Sde\WebserviceBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -26,52 +27,52 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  *
  * @author Christophe Coevoet
  *
- * @orm:Table(name="bdu.bdu_assoces")
- * @orm:Entity(repositoryClass="Sde\WebserviceBundle\Repository\AssociationRepository", readOnly=true)
+ * @ORM\Table(name="bdu.bdu_assoces")
+ * @ORM\Entity(repositoryClass="Sde\WebserviceBundle\Repository\AssociationRepository", readOnly=true)
  */
 class Association implements NormalizableInterface
 {
     /**
      * @var integer
      *
-     * @orm:Column(name="asso_id", type="integer")
-     * @orm:Id
-     * @orm:GeneratedValue(strategy="AUTO")
+     * @ORM\Column(name="asso_id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var string
      *
-     * @orm:Column(name="asso_nom", type="string")
+     * @ORM\Column(name="asso_nom", type="string")
      */
     private $name;
 
     /**
      * @var string
      *
-     * @orm:Column(name="asso_descr", type="text")
+     * @ORM\Column(name="asso_descr", type="text")
      */
     private $description;
 
     /**
      * @var string
      *
-     * @orm:Column(name="asso_urlogo", type="string")
+     * @ORM\Column(name="asso_urlogo", type="string")
      */
     private $logoUrl;
 
     /**
      * @var string
      *
-     * @orm:Column(name="asso_urlsite", type="string")
+     * @ORM\Column(name="asso_urlsite", type="string")
      */
     private $siteUrl;
 
     /**
      * @var \Doctrine\Common\Collections\ArrayCollection
      *
-     * @orm:OneToMany(targetEntity="Sde\WebserviceBundle\Entity\Position", mappedBy="association")
+     * @ORM\OneToMany(targetEntity="Sde\WebserviceBundle\Entity\Position", mappedBy="association")
      */
     private $positions;
 
diff --git a/src/Sde/WebserviceBundle/Entity/Mandate.php b/src/Sde/WebserviceBundle/Entity/Mandate.php
index 458c94b..40ced7d 100644
--- a/src/Sde/WebserviceBundle/Entity/Mandate.php
+++ b/src/Sde/WebserviceBundle/Entity/Mandate.php
@@ -18,6 +18,7 @@
 
 namespace Sde\WebserviceBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -26,31 +27,31 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  *
  * @author Christophe Coevoet
  *
- * @orm:Table(name="bdu.bdu_ele_fonc")
- * @orm:Entity(repositoryClass="Sde\WebserviceBundle\Repository\MandateRepository", readOnly=true)
+ * @ORM\Table(name="bdu.bdu_ele_fonc")
+ * @ORM\Entity(repositoryClass="Sde\WebserviceBundle\Repository\MandateRepository", readOnly=true)
  */
 class Mandate implements NormalizableInterface
 {
     /**
      * @var integer
      *
-     * @orm:Column(name="id", type="integer")
-     * @orm:Id
-     * @orm:GeneratedValue(strategy="AUTO")
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var \DateTime
      *
-     * @orm:Column(name="datedeb", type="date")
+     * @ORM\Column(name="datedeb", type="date")
      */
     private $start;
 
     /**
      * @var \DateTime
      *
-     * @orm:Column(name="datefin", type="date", nullable="true")
+     * @ORM\Column(name="datefin", type="date", nullable="true")
      */
     private $end;
 
@@ -58,16 +59,16 @@ class Mandate implements NormalizableInterface
     /**
      * @var Position
      *
-     * @orm:ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\Position", inversedBy="mandates")
-     * @orm:JoinColumns({@orm:JoinColumn(name="fct_id", referencedColumnName="fct_id")})
+     * @ORM\ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\Position", inversedBy="mandates")
+     * @ORM\JoinColumns({@ORM\JoinColumn(name="fct_id", referencedColumnName="fct_id")})
      */
     private $position;
 
     /**
      * @var Student
      *
-     * @orm:ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\Student", inversedBy="mandates")
-     * @orm:JoinColumns({@orm:JoinColumn(name="ele_id", referencedColumnName="ele_id")})
+     * @ORM\ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\Student", inversedBy="mandates")
+     * @ORM\JoinColumns({@ORM\JoinColumn(name="ele_id", referencedColumnName="ele_id")})
      */
     private $student;
 
diff --git a/src/Sde/WebserviceBundle/Entity/Position.php b/src/Sde/WebserviceBundle/Entity/Position.php
index 7a7e996..e097f4d 100644
--- a/src/Sde/WebserviceBundle/Entity/Position.php
+++ b/src/Sde/WebserviceBundle/Entity/Position.php
@@ -18,6 +18,7 @@
 
 namespace Sde\WebserviceBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -26,54 +27,54 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  *
  * @author Christophe Coevoet
  *
- * @orm:Table(name="bdu.bdu_fonctions")
- * @orm:Entity(readOnly=true)
+ * @ORM\Table(name="bdu.bdu_fonctions")
+ * @ORM\Entity(readOnly=true)
  */
 class Position implements NormalizableInterface
 {
     /**
      * @var integer
      *
-     * @orm:Column(name="fct_id", type="integer")
-     * @orm:Id
-     * @orm:GeneratedValue(strategy="AUTO")
+     * @ORM\Column(name="fct_id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var string
      *
-     * @orm:Column(name="fct_nom", type="string")
+     * @ORM\Column(name="fct_nom", type="string")
      */
     private $name;
 
     /**
      * @var string
      *
-     * @orm:Column(name="fct_descr", type="text")
+     * @ORM\Column(name="fct_descr", type="text")
      */
     private $description;
 
     /**
      * @var Association
      *
-     * @orm:ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\Association", inversedBy="positions")
-     * @orm:JoinColumns({@orm:JoinColumn(name="asso_id", referencedColumnName="asso_id")})
+     * @ORM\ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\Association", inversedBy="positions")
+     * @ORM\JoinColumns({@ORM\JoinColumn(name="asso_id", referencedColumnName="asso_id")})
      */
     private $association;
 
     /**
      * @var StandardPosition
      *
-     * @orm:ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\StandardPosition")
-     * @orm:JoinColumns({@orm:JoinColumn(name="fct_std_id", referencedColumnName="fct_std_id")})
+     * @ORM\ManyToOne(targetEntity="Sde\WebserviceBundle\Entity\StandardPosition")
+     * @ORM\JoinColumns({@ORM\JoinColumn(name="fct_std_id", referencedColumnName="fct_std_id")})
      */
     private $standardPosition;
 
     /**
      * @var \Doctrine\Common\Collections\ArrayCollection
      *
-     * @orm:OneToMany(targetEntity="Sde\WebserviceBundle\Entity\Mandate", mappedBy="position")
+     * @ORM\OneToMany(targetEntity="Sde\WebserviceBundle\Entity\Mandate", mappedBy="position")
      */
     private $mandates;
 
diff --git a/src/Sde/WebserviceBundle/Entity/StandardPosition.php b/src/Sde/WebserviceBundle/Entity/StandardPosition.php
index e5155b1..ba06a1b 100644
--- a/src/Sde/WebserviceBundle/Entity/StandardPosition.php
+++ b/src/Sde/WebserviceBundle/Entity/StandardPosition.php
@@ -18,6 +18,7 @@
 
 namespace Sde\WebserviceBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -26,24 +27,24 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  *
  * @author Christophe Coevoet
  *
- * @orm:Table(name="bdu.bdu_fonctions_standard")
- * @orm:Entity(readOnly=true)
+ * @ORM\Table(name="bdu.bdu_fonctions_standard")
+ * @ORM\Entity(readOnly=true)
  */
 class StandardPosition
 {
     /**
      * @var integer $id
      *
-     * @orm:Column(name="fct_std_id", type="integer")
-     * @orm:Id
-     * @orm:GeneratedValue(strategy="AUTO")
+     * @ORM\Column(name="fct_std_id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var string $name
      *
-     * @orm:Column(name="fct_std_nom", type="string")
+     * @ORM\Column(name="fct_std_nom", type="string")
      */
     private $name;
 
diff --git a/src/Sde/WebserviceBundle/Entity/Student.php b/src/Sde/WebserviceBundle/Entity/Student.php
index 64922b3..dd2a2ad 100644
--- a/src/Sde/WebserviceBundle/Entity/Student.php
+++ b/src/Sde/WebserviceBundle/Entity/Student.php
@@ -18,6 +18,7 @@
 
 namespace Sde\WebserviceBundle\Entity;
 
+use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -27,31 +28,31 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  *
  * @author Christophe Coevoet
  *
- * @orm:Table(name="bdu.bdu_eleves")
- * @orm:Entity(readOnly=true)
+ * @ORM\Table(name="bdu.bdu_eleves")
+ * @ORM\Entity(readOnly=true)
  */
 class Student implements NormalizableInterface
 {
     /**
      * @var integer
      *
-     * @orm:Column(name="ele_id", type="integer")
-     * @orm:Id
-     * @orm:GeneratedValue(strategy="AUTO")
+     * @ORM\Column(name="ele_id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var string
      *
-     * @orm:Column(name="ele_dn", type="string")
+     * @ORM\Column(name="ele_dn", type="string")
      */
     private $dn;
 
     /**
      * @var Collection
      *
-     * @orm:OneToMany(targetEntity="Sde\WebserviceBundle\Entity\Mandate", mappedBy="student")
+     * @ORM\OneToMany(targetEntity="Sde\WebserviceBundle\Entity\Mandate", mappedBy="student")
      */
     private $mandates;
 
diff --git a/src/Sde/WebserviceBundle/Repository/AssociationRepository.php b/src/Sde/WebserviceBundle/Repository/AssociationRepository.php
index edd4818..fb51529 100644
--- a/src/Sde/WebserviceBundle/Repository/AssociationRepository.php
+++ b/src/Sde/WebserviceBundle/Repository/AssociationRepository.php
@@ -36,7 +36,7 @@ class AssociationRepository extends EntityRepository
      */
     public function searchByName($name)
     {
-        $qb = new QueryBuilder($this->_em);
+        $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->select('a')
                 ->from('Sde\WebserviceBundle\Entity\Association', 'a')
                 ->where('a.name LIKE :name')
diff --git a/src/Sde/WebserviceBundle/Repository/MandateRepository.php b/src/Sde/WebserviceBundle/Repository/MandateRepository.php
index 21a244f..0a10718 100644
--- a/src/Sde/WebserviceBundle/Repository/MandateRepository.php
+++ b/src/Sde/WebserviceBundle/Repository/MandateRepository.php
@@ -115,7 +115,7 @@ class MandateRepository extends EntityRepository
      */
     private function getBaseQuery()
     {
-        $qb = new QueryBuilder($this->_em);
+        $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->select('m, p, a, s, sp')
                 ->from('Sde\WebserviceBundle\Entity\Mandate', 'm')
                 ->join('m.position', 'p')
diff --git a/src/Sde/WebserviceBundle/Util/Api.php b/src/Sde/WebserviceBundle/Util/Api.php
index 07e9593..0fa8f11 100644
--- a/src/Sde/WebserviceBundle/Util/Api.php
+++ b/src/Sde/WebserviceBundle/Util/Api.php
@@ -24,20 +24,6 @@ namespace Sde\WebserviceBundle\Util;
 class Api extends \Bdu_Api
 {
     /**
-     * Renvoie l'instance de l'API
-     *
-     * @return Bdu_Api
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            return new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
      * Get the dn from the uid of the student
      *
      * @param string $uid
@@ -48,11 +34,17 @@ class Api extends \Bdu_Api
         return 'uid='.$uid.',ou=people,dc=campus,dc=ecp,dc=fr';
     }
 
+    /**
+     * Get the base64-encoded photo of a student
+     *
+     * @param string $uid
+     * @return string
+     */
     public function getStudentPhotoAsString($uid)
     {
         $photo = '';
         try {
-            $results = $this->getUnitOfWork()->rawSearch(sprintf('uid=%s', $uid), array ("jpegphoto"));
+            $results = $this->unitOfWork->rawSearch(sprintf('uid=%s', $uid), array ("jpegphoto"));
             if ($results['count']) {
                 $photo = $results[0]['jpegphoto'][0];
             }