Merge pull request #731 from romainneutron/doctrine-namespace

[WIP][3.9] Move entities to Phrasea namespace
This commit is contained in:
Romain Neutron
2013-10-29 10:11:37 -07:00
241 changed files with 1256 additions and 1350 deletions

View File

@@ -14,6 +14,7 @@ use Alchemy\Phrasea\Metadata\Tag as PhraseaTag;
use Alchemy\Phrasea\Border\Attribute as BorderAttribute;
use Alchemy\Phrasea\Border\MetadataBag;
use Alchemy\Phrasea\Border\MetaFieldsBag;
use Alchemy\Phrasea\Model\Entities\LazaretSession;
use PHPExiftool\Driver\Metadata\MetadataBag as ExiftoolMetadataBag;
use PHPExiftool\Driver\Metadata\Metadata;
use Symfony\Component\Filesystem\Exception\IOException;
@@ -56,7 +57,7 @@ class task_period_archive extends task_abstract
/**
*
* @var \Entities\LazaretSession
* @var LazaretSession
*/
protected $lazaretSession;
@@ -2051,7 +2052,7 @@ class task_period_archive extends task_abstract
/**
* Return a LazaretSession
*
* @return \Entities\LazaretSession
* @return LazaretSession
*/
protected function getLazaretSession()
{
@@ -2059,7 +2060,7 @@ class task_period_archive extends task_abstract
return $this->lazaretSession;
}
$lazaretSession = new \Entities\LazaretSession();
$lazaretSession = new LazaretSession();
$this->dependencyContainer['EM']->persist($lazaretSession);
$this->dependencyContainer['EM']->flush();

View File

@@ -12,8 +12,8 @@ use Alchemy\Phrasea\Core\Configuration\Configuration;
use Alchemy\Phrasea\Exception\InvalidArgumentException;
use Alchemy\Phrasea\Notification\Mail\MailSuccessFTPSender;
use Alchemy\Phrasea\Notification\Receiver;
use Entities\FtpExport;
use Entities\FtpExportElement;
use Alchemy\Phrasea\Model\Entities\FtpExport;
use Alchemy\Phrasea\Model\Entities\FtpExportElement;
class task_period_ftp extends task_appboxAbstract
{
@@ -258,14 +258,14 @@ class task_period_ftp extends task_appboxAbstract
protected function retrieveContent(appbox $appbox)
{
foreach ($this->dependencyContainer['EM']
->getRepository('Entities\FtpExport')
->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
->findCrashedExports(new \DateTime('-1 month')) as $export) {
$this->dependencyContainer['EM']->remove($export);
}
$this->dependencyContainer['EM']->flush();
return $this->dependencyContainer['EM']
->getRepository('Entities\FtpExport')
->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
->findDoableExports();
}