From 479fec909f36f45d158d64201382e260dd3a15bd Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 13 Jan 2016 23:12:32 +0100
Subject: [PATCH 1/3] git

---
 .../Bundle/EnigmaBundle/Entity/Awnser.php~    | 158 ------------------
 .../Bundle/EnigmaBundle/Entity/Enigma.php~    | 127 --------------
 src/Mmi/Bundle/EnigmaBundle/Entity/Team.php~  |  96 -----------
 src/Mmi/Bundle/EnigmaBundle/Entity/Timer.php~ | 125 --------------
 4 files changed, 506 deletions(-)
 delete mode 100644 src/Mmi/Bundle/EnigmaBundle/Entity/Awnser.php~
 delete mode 100644 src/Mmi/Bundle/EnigmaBundle/Entity/Enigma.php~
 delete mode 100644 src/Mmi/Bundle/EnigmaBundle/Entity/Team.php~
 delete mode 100644 src/Mmi/Bundle/EnigmaBundle/Entity/Timer.php~

diff --git a/src/Mmi/Bundle/EnigmaBundle/Entity/Awnser.php~ b/src/Mmi/Bundle/EnigmaBundle/Entity/Awnser.php~
deleted file mode 100644
index 2e52034..0000000
--- a/src/Mmi/Bundle/EnigmaBundle/Entity/Awnser.php~
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Mmi\Bundle\EnigmaBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Awnser
- *
- * @ORM\Table(name="awnser")
- * @ORM\Entity(repositoryClass="Mmi\Bundle\EnigmaBundle\Repository\AwnserRepository")
- */
-class Awnser
-{
-
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="content", type="string", length=255)
-     */
-    private $content;
-
-
-    /**
-     * @var DateTime
-     *
-     * @ORM\Column(name="date", type="datetime")
-     */
-    private $date;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Team", inversedBy="Awnser")
-     * @ORM\JoinColumn(name="team_id", referencedColumnName="id")
-     */
-    private $team;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Enigma", inversedBy="Awnser")
-     * @ORM\JoinColumn(name="enigma_id", referencedColumnName="id")
-     */
-    private $enigma;
-
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set content
-     *
-     * @param string $content
-     *
-     * @return Awnser
-     */
-    public function setContent($content)
-    {
-        $this->content = $content;
-
-        return $this;
-    }
-
-    /**
-     * Get content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * Set team
-     *
-     * @param \Mmi\Bundle\EnigmaBundle\Entity\Team $team
-     *
-     * @return Awnser
-     */
-    public function setTeam(\Mmi\Bundle\EnigmaBundle\Entity\Team $team = null)
-    {
-        $this->team = $team;
-
-        return $this;
-    }
-
-    /**
-     * Get team
-     *
-     * @return \Mmi\Bundle\EnigmaBundle\Entity\Team
-     */
-    public function getTeam()
-    {
-        return $this->team;
-    }
-
-    /**
-     * Set enigma
-     *
-     * @param \Mmi\Bundle\EnigmaBundle\Entity\Enigma $enigma
-     *
-     * @return Awnser
-     */
-    public function setEnigma(\Mmi\Bundle\EnigmaBundle\Entity\Enigma $enigma = null)
-    {
-        $this->enigma = $enigma;
-
-        return $this;
-    }
-
-    /**
-     * Get enigma
-     *
-     * @return \Mmi\Bundle\EnigmaBundle\Entity\Enigma
-     */
-    public function getEnigma()
-    {
-        return $this->enigma;
-    }
-
-    /**
-     * Set date
-     *
-     * @param \DateTime $date
-     *
-     * @return Awnser
-     */
-    public function setDate($date)
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    /**
-     * Get date
-     *
-     * @return \DateTime
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-}
diff --git a/src/Mmi/Bundle/EnigmaBundle/Entity/Enigma.php~ b/src/Mmi/Bundle/EnigmaBundle/Entity/Enigma.php~
deleted file mode 100644
index a8ce667..0000000
--- a/src/Mmi/Bundle/EnigmaBundle/Entity/Enigma.php~
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Mmi\Bundle\EnigmaBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Enigma
- *
- * @ORM\Table(name="enigma")
- * @ORM\Entity(repositoryClass="Mmi\Bundle\EnigmaBundle\Repository\EnigmaRepository")
- */
-class Enigma
-{
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="title", type="string", length=255)
-     */
-    private $title;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="content", type="string", length=255)
-     */
-    private $content;
-    
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="hash", type="string", length=32)
-     */
-    private $hash;
-
-
-    /**
-     * Get id
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set title
-     *
-     * @param string $title
-     *
-     * @return Enigma
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    /**
-     * Get title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * Set content
-     *
-     * @param string $content
-     *
-     * @return Enigma
-     */
-    public function setContent($content)
-    {
-        $this->content = $content;
-
-        return $this;
-    }
-
-    /**
-     * Get content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * Set hash
-     *
-     * @param string $hash
-     *
-     * @return Enigma
-     */
-    public function setHash($hash)
-    {
-        $this->hash = $hash;
-
-        return $this;
-    }
-
-    /**
-     * Get hash
-     *
-     * @return string
-     */
-    public function getHash()
-    {
-        return $this->hash;
-    }
-}
diff --git a/src/Mmi/Bundle/EnigmaBundle/Entity/Team.php~ b/src/Mmi/Bundle/EnigmaBundle/Entity/Team.php~
deleted file mode 100644
index e2d0d0a..0000000
--- a/src/Mmi/Bundle/EnigmaBundle/Entity/Team.php~
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Mmi\Bundle\EnigmaBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Team
- *
- * @ORM\Table(name="team")
- * @ORM\Entity(repositoryClass="Mmi\Bundle\EnigmaBundle\Repository\TeamRepository")
- */
-class Team
-{
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="username", type="string", length=255, unique=true)
-     */
-    private $username;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="password", type="string", length=255)
-     */
-    private $password;
-
-
-    /**
-     * Get id
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set username
-     *
-     * @param string $username
-     *
-     * @return Team
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-
-        return $this;
-    }
-
-    /**
-     * Get username
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Set password
-     *
-     * @param string $password
-     *
-     * @return Team
-     */
-    public function setPassword($password)
-    {
-        $this->password = $password;
-
-        return $this;
-    }
-
-    /**
-     * Get password
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-}
diff --git a/src/Mmi/Bundle/EnigmaBundle/Entity/Timer.php~ b/src/Mmi/Bundle/EnigmaBundle/Entity/Timer.php~
deleted file mode 100644
index 5a86b78..0000000
--- a/src/Mmi/Bundle/EnigmaBundle/Entity/Timer.php~
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-namespace Mmi\Bundle\EnigmaBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Timer
- *
- * @ORM\Table(name="timer")
- * @ORM\Entity(repositoryClass="Mmi\Bundle\EnigmaBundle\Repository\TimerRepository")
- */
-class Timer
-{
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var DateTime
-     *
-     * @ORM\Column(name="date", type="datetime")
-     */
-    private $date;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Team", inversedBy="Awnser")
-     * @ORM\JoinColumn(name="team_id", referencedColumnName="id")
-     */
-    private $team;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Enigma", inversedBy="Awnser")
-     * @ORM\JoinColumn(name="enigma_id", referencedColumnName="id")
-     */
-    private $enigma;
-
-
-    /**
-     * Get id
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set date
-     *
-     * @param \DateTime $date
-     *
-     * @return Timer
-     */
-    public function setDate($date)
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    /**
-     * Get date
-     *
-     * @return \DateTime
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-
-    /**
-     * Set team
-     *
-     * @param integer $team
-     *
-     * @return Timer
-     */
-    public function setTeam($team)
-    {
-        $this->team = $team;
-
-        return $this;
-    }
-
-    /**
-     * Get team
-     *
-     * @return int
-     */
-    public function getTeam()
-    {
-        return $this->team;
-    }
-
-    /**
-     * Set enigma
-     *
-     * @param string $enigma
-     *
-     * @return Timer
-     */
-    public function setEnigma($enigma)
-    {
-        $this->enigma = $enigma;
-
-        return $this;
-    }
-
-    /**
-     * Get enigma
-     *
-     * @return string
-     */
-    public function getEnigma()
-    {
-        return $this->enigma;
-    }
-}

From c1a7b8d0467b240e389f7354134b8548b2c9a0c6 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 13 Jan 2016 23:23:44 +0100
Subject: [PATCH 2/3] Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 633190c..2e3a04e 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ $ bin/console server:run &
 Déploiement
 -----------
 
-Utilisation de mate (`/.mate`)
+Utilisation de mage (`/.mage`)
 
 ```
 $ vendor/bin/mage deploy to:production

From e388c3096667d17a5314b3b92151d9d1e28fa3d7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 13 Jan 2016 23:40:33 +0100
Subject: [PATCH 3/3] Sync

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 253028e..875ffc6 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
         "symfony/monolog-bundle": "^2.8",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^3.0.2",
-        "incenteev/composer-parameter-handler": "^2.0"
+        "incenteev/composer-parameter-handler": "^2.0",
+        "andres-montanez/magallanes": "^1.0"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",