From eb636ca37a712409b82d8dd82e7c53f43b6a456c Mon Sep 17 00:00:00 2001
From: gauthierb <gauthierb@d57fa8bc-6af1-4de9-8b7d-78e900e231e7>
Date: Wed, 9 Apr 2014 09:41:18 +0000
Subject: [PATCH] =?UTF-8?q?Renommage=20entit=C3=A9=20Periode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
composer.json | 2 +-
composer.lock | 58 +++++++++++--------
... => Application.Entity.Db.Periode.dcm.xml} | 2 +-
...pplication.Entity.Db.VolumeHoraire.dcm.xml | 2 +-
.../Db/{PeriodePaiement.php => Periode.php} | 26 ++++-----
.../Application/Entity/Db/VolumeHoraire.php | 8 +--
6 files changed, 53 insertions(+), 45 deletions(-)
rename module/Application/src/Application/Entity/Db/Mapping/{Application.Entity.Db.PeriodePaiement.dcm.xml => Application.Entity.Db.Periode.dcm.xml} (96%)
rename module/Application/src/Application/Entity/Db/{PeriodePaiement.php => Periode.php} (93%)
diff --git a/composer.json b/composer.json
index 1babd387ed..e9c6c26327 100755
--- a/composer.json
+++ b/composer.json
@@ -17,4 +17,4 @@
"zendframework/zend-test": ">=2.3",
"phpunit/PHPUnit": ">=3.7"
}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 2f35c1c4fb..47e4ab049c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -902,16 +902,16 @@
},
{
"name": "rwoverdijk/assetmanager",
- "version": "1.3.6",
+ "version": "1.3.7",
"source": {
"type": "git",
"url": "https://github.com/RWOverdijk/AssetManager.git",
- "reference": "d1b7cf231aa3ee08e1efe46f10f73c0874139f74"
+ "reference": "bfba7e3151b719aa8168136de897dff2bca9dead"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/RWOverdijk/AssetManager/zipball/d1b7cf231aa3ee08e1efe46f10f73c0874139f74",
- "reference": "d1b7cf231aa3ee08e1efe46f10f73c0874139f74",
+ "url": "https://api.github.com/repos/RWOverdijk/AssetManager/zipball/bfba7e3151b719aa8168136de897dff2bca9dead",
+ "reference": "bfba7e3151b719aa8168136de897dff2bca9dead",
"shasum": ""
},
"require": {
@@ -960,21 +960,21 @@
"zend framework 2",
"zf2"
],
- "time": "2014-03-28 19:32:51"
+ "time": "2014-04-07 04:56:33"
},
{
"name": "symfony/console",
- "version": "v2.4.2",
+ "version": "v2.4.3",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "940f217cbc3c8a33e5403e7c595495c4884400fe"
+ "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/940f217cbc3c8a33e5403e7c595495c4884400fe",
- "reference": "940f217cbc3c8a33e5403e7c595495c4884400fe",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/ef20f1f58d7f693ee888353962bd2db336e3bbcb",
+ "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb",
"shasum": ""
},
"require": {
@@ -1015,21 +1015,21 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2014-02-11 13:52:09"
+ "time": "2014-03-01 17:35:04"
},
{
"name": "symfony/process",
- "version": "v2.4.2",
+ "version": "v2.4.3",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "c175448bac997556f8ab972908a4e14c7291fb03"
+ "reference": "c09c3b08455c35688eee3e481fdfc85518ef01d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/c175448bac997556f8ab972908a4e14c7291fb03",
- "reference": "c175448bac997556f8ab972908a4e14c7291fb03",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/c09c3b08455c35688eee3e481fdfc85518ef01d7",
+ "reference": "c09c3b08455c35688eee3e481fdfc85518ef01d7",
"shasum": ""
},
"require": {
@@ -1064,7 +1064,7 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
- "time": "2014-02-11 13:52:09"
+ "time": "2014-03-26 11:35:33"
},
{
"name": "unicaen/unicaen-app",
@@ -3053,16 +3053,16 @@
},
{
"name": "zf-commons/zfc-user-doctrine-orm",
- "version": "0.1.1",
+ "version": "0.1.2",
"source": {
"type": "git",
"url": "https://github.com/ZF-Commons/ZfcUserDoctrineORM.git",
- "reference": "08be7b2a5e1ee31a3907582261c113531d2bf964"
+ "reference": "731e7807857c6fb12f1ad7f37694dea3855a226a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ZF-Commons/ZfcUserDoctrineORM/zipball/08be7b2a5e1ee31a3907582261c113531d2bf964",
- "reference": "08be7b2a5e1ee31a3907582261c113531d2bf964",
+ "url": "https://api.github.com/repos/ZF-Commons/ZfcUserDoctrineORM/zipball/731e7807857c6fb12f1ad7f37694dea3855a226a",
+ "reference": "731e7807857c6fb12f1ad7f37694dea3855a226a",
"shasum": ""
},
"require": {
@@ -3071,6 +3071,11 @@
"zf-commons/zfc-user": "0.*"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.1.x-dev"
+ }
+ },
"autoload": {
"psr-0": {
"ZfcUserDoctrineORM": "src/"
@@ -3080,6 +3085,9 @@
]
},
"notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
"authors": [
{
"name": "Kyle Spraggs",
@@ -3097,7 +3105,7 @@
"keywords": [
"zf2"
],
- "time": "2013-02-08 00:41:12"
+ "time": "2014-04-04 19:57:32"
}
],
"packages-dev": [
@@ -3470,17 +3478,17 @@
},
{
"name": "symfony/yaml",
- "version": "v2.4.2",
+ "version": "v2.4.3",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "bb6ddaf8956139d1b8c360b4b713ed0138e876b3"
+ "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/bb6ddaf8956139d1b8c360b4b713ed0138e876b3",
- "reference": "bb6ddaf8956139d1b8c360b4b713ed0138e876b3",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd",
+ "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd",
"shasum": ""
},
"require": {
@@ -3515,7 +3523,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-01-07 13:28:54"
+ "time": "2014-03-12 18:29:58"
},
{
"name": "zendframework/zend-dom",
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.PeriodePaiement.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Periode.dcm.xml
similarity index 96%
rename from module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.PeriodePaiement.dcm.xml
rename to module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Periode.dcm.xml
index 1b613d0ec0..63834008aa 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.PeriodePaiement.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Periode.dcm.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
- <entity name="Application\Entity\Db\PeriodePaiement" table="PERIODE_PAIEMENT">
+ <entity name="Application\Entity\Db\Periode" table="PERIODE">
<indexes>
<index name="IDX_C230EB2059860CDC" columns="HISTO_CREATEUR_ID"/>
<index name="IDX_C230EB207E9E2204" columns="HISTO_DESTRUCTEUR_ID"/>
diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml
index 83e2f5f6f0..0a2471b7c9 100644
--- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml
+++ b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.VolumeHoraire.dcm.xml
@@ -44,7 +44,7 @@
<join-column name="MOTIF_NON_PAIEMENT_ID" referenced-column-name="ID"/>
</join-columns>
</many-to-one>
- <many-to-one field="periode" target-entity="Application\Entity\Db\PeriodePaiement">
+ <many-to-one field="periode" target-entity="Application\Entity\Db\Periode">
<join-columns>
<join-column name="PERIODE_ID" referenced-column-name="ID"/>
</join-columns>
diff --git a/module/Application/src/Application/Entity/Db/PeriodePaiement.php b/module/Application/src/Application/Entity/Db/Periode.php
similarity index 93%
rename from module/Application/src/Application/Entity/Db/PeriodePaiement.php
rename to module/Application/src/Application/Entity/Db/Periode.php
index 834d09a2c2..f63d220985 100644
--- a/module/Application/src/Application/Entity/Db/PeriodePaiement.php
+++ b/module/Application/src/Application/Entity/Db/Periode.php
@@ -5,9 +5,9 @@ namespace Application\Entity\Db;
use Doctrine\ORM\Mapping as ORM;
/**
- * PeriodePaiement
+ * Periode
*/
-class PeriodePaiement
+class Periode
{
/**
* @var \DateTime
@@ -74,7 +74,7 @@ class PeriodePaiement
* Set histoCreation
*
* @param \DateTime $histoCreation
- * @return PeriodePaiement
+ * @return Periode
*/
public function setHistoCreation($histoCreation)
{
@@ -97,7 +97,7 @@ class PeriodePaiement
* Set histoDestruction
*
* @param \DateTime $histoDestruction
- * @return PeriodePaiement
+ * @return Periode
*/
public function setHistoDestruction($histoDestruction)
{
@@ -120,7 +120,7 @@ class PeriodePaiement
* Set histoModification
*
* @param \DateTime $histoModification
- * @return PeriodePaiement
+ * @return Periode
*/
public function setHistoModification($histoModification)
{
@@ -143,7 +143,7 @@ class PeriodePaiement
* Set libelle
*
* @param string $libelle
- * @return PeriodePaiement
+ * @return Periode
*/
public function setLibelle($libelle)
{
@@ -166,7 +166,7 @@ class PeriodePaiement
* Set validiteDebut
*
* @param \DateTime $validiteDebut
- * @return PeriodePaiement
+ * @return Periode
*/
public function setValiditeDebut($validiteDebut)
{
@@ -189,7 +189,7 @@ class PeriodePaiement
* Set validiteFin
*
* @param \DateTime $validiteFin
- * @return PeriodePaiement
+ * @return Periode
*/
public function setValiditeFin($validiteFin)
{
@@ -212,7 +212,7 @@ class PeriodePaiement
* Set ordre
*
* @param integer $ordre
- * @return PeriodePaiement
+ * @return Periode
*/
public function setOrdre($ordre)
{
@@ -245,7 +245,7 @@ class PeriodePaiement
* Set typeIntervenant
*
* @param \Application\Entity\Db\TypeIntervenant $typeIntervenant
- * @return PeriodePaiement
+ * @return Periode
*/
public function setTypeIntervenant(\Application\Entity\Db\TypeIntervenant $typeIntervenant = null)
{
@@ -268,7 +268,7 @@ class PeriodePaiement
* Set histoModificateur
*
* @param \Application\Entity\Db\Utilisateur $histoModificateur
- * @return PeriodePaiement
+ * @return Periode
*/
public function setHistoModificateur(\Application\Entity\Db\Utilisateur $histoModificateur = null)
{
@@ -291,7 +291,7 @@ class PeriodePaiement
* Set histoDestructeur
*
* @param \Application\Entity\Db\Utilisateur $histoDestructeur
- * @return PeriodePaiement
+ * @return Periode
*/
public function setHistoDestructeur(\Application\Entity\Db\Utilisateur $histoDestructeur = null)
{
@@ -314,7 +314,7 @@ class PeriodePaiement
* Set histoCreateur
*
* @param \Application\Entity\Db\Utilisateur $histoCreateur
- * @return PeriodePaiement
+ * @return Periode
*/
public function setHistoCreateur(\Application\Entity\Db\Utilisateur $histoCreateur = null)
{
diff --git a/module/Application/src/Application/Entity/Db/VolumeHoraire.php b/module/Application/src/Application/Entity/Db/VolumeHoraire.php
index cb97768a74..930671faa1 100644
--- a/module/Application/src/Application/Entity/Db/VolumeHoraire.php
+++ b/module/Application/src/Application/Entity/Db/VolumeHoraire.php
@@ -70,7 +70,7 @@ class VolumeHoraire
private $motifNonPaiement;
/**
- * @var \Application\Entity\Db\PeriodePaiement
+ * @var \Application\Entity\Db\Periode
*/
private $periode;
@@ -346,10 +346,10 @@ class VolumeHoraire
/**
* Set periode
*
- * @param \Application\Entity\Db\PeriodePaiement $periode
+ * @param \Application\Entity\Db\Periode $periode
* @return VolumeHoraire
*/
- public function setPeriode(\Application\Entity\Db\PeriodePaiement $periode = null)
+ public function setPeriode(\Application\Entity\Db\Periode $periode = null)
{
$this->periode = $periode;
@@ -359,7 +359,7 @@ class VolumeHoraire
/**
* Get periode
*
- * @return \Application\Entity\Db\PeriodePaiement
+ * @return \Application\Entity\Db\Periode
*/
public function getPeriode()
{
--
GitLab