deblan/defis48
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev-master' of gitlab.deblan.org:deblan/defis48 into dev-master

Browse source
This commit is contained in:
Dorian Lods 2016-01-13 23:41:49 +01:00
parent f2ef9b00f7 e388c30966
commit 1cac80237d
5 changed files with 2 additions and 507 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
composer.json
View file

@ -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",

158
src/Mmi/Bundle/EnigmaBundle/Entity/Awnser.php~
View file

@ -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;
}
}

127
src/Mmi/Bundle/EnigmaBundle/Entity/Enigma.php~
View file

@ -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;
}
}

96
src/Mmi/Bundle/EnigmaBundle/Entity/Team.php~
View file

@ -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;
}
}

125
src/Mmi/Bundle/EnigmaBundle/Entity/Timer.php~
View file

@ -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;
}
}