Merge branch '3.8'

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
This commit is contained in:
Romain Neutron
2013-11-08 19:04:26 +01:00
68 changed files with 250 additions and 158 deletions

View File

@@ -17,13 +17,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320 implements patchInterface
class patch_320alpha1a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a1';
private $release = '3.2.0-alpha.1';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320ab implements patchInterface
class patch_320alpha1b implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a1';
private $release = '3.2.0-alpha.1';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320a implements patchInterface
class patch_320alpha2a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a2';
private $release = '3.2.0-alpha.2';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320b implements patchInterface
class patch_320alpha3a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a3';
private $release = '3.2.0-alpha.3';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320c implements patchInterface
class patch_320alpha4a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a4';
private $release = '3.2.0-alpha.4';
/**
*

View File

@@ -22,13 +22,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320f implements patchInterface
class patch_320alpha4b implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a4';
private $release = '3.2.0-alpha.4';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320d implements patchInterface
class patch_320alpha5a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a5';
private $release = '3.2.0-alpha.5';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320e implements patchInterface
class patch_320alpha6a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a6';
private $release = '3.2.0-alpha.6';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_320h implements patchInterface
class patch_320alpha8a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.2.0.0.a8';
private $release = '3.2.0-alpha.8';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_360 implements patchInterface
class patch_360alpha1a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.6.0.a1';
private $release = '3.6.0-alpha.1';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_3602 implements patchInterface
class patch_360alpha1b implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.6.0.a1';
private $release = '3.6.0-alpha.1';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_3603 implements patchInterface
class patch_360alpha2a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.6.0.a2';
private $release = '3.6.0-alpha.2';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_3604 implements patchInterface
class patch_360alpha2b implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.6.0.a2';
private $release = '3.6.0-alpha.2';
/**
*

View File

@@ -17,13 +17,13 @@ use Doctrine\ORM\Tools\Pagination\Paginator;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_361 implements patchInterface
class patch_361alpha1a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.6.1';
private $release = '3.6.1-alpha.1';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370 implements patchInterface
class patch_370alpha1a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a2';
private $release = '3.7.0-alpha.1';
/**
*

View File

@@ -17,13 +17,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370a3 implements patchInterface
class patch_370alpha3a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a3';
private $release = '3.7.0-alpha.3';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370a4 implements patchInterface
class patch_370alpha4a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a4';
private $release = '3.7.0-alpha.4';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370a5 implements patchInterface
class patch_370alpha5a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a5';
private $release = '3.7.0-alpha.5';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370a6 implements patchInterface
class patch_370alpha6a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a6';
private $release = '3.7.0-alpha.6';
/**
*

View File

@@ -20,13 +20,13 @@ use MediaAlchemyst\Specification\Image as ImageSpec;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370a7 implements patchInterface
class patch_370alpha7a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a7';
private $release = '3.7.0-alpha.7';
/**
*

View File

@@ -17,13 +17,13 @@ use Alchemy\Phrasea\Model\Entities\Task;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370a8 implements patchInterface
class patch_370alpha8a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a8';
private $release = '3.7.0-alpha.8';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_370a9 implements patchInterface
class patch_370alpha9a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.0.a9';
private $release = '3.7.0-alpha.9';
/**
*

View File

@@ -12,12 +12,12 @@
use Alchemy\Phrasea\Application;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class patch_3715 implements patchInterface
class patch_3715alpha1a implements patchInterface
{
/**
* @var string
*/
private $release = '3.7.15';
private $release = '3.7.15-alpha1';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_371 implements patchInterface
class patch_371alpha1a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.1';
private $release = '3.7.1-alpha1';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_373 implements patchInterface
class patch_373alpha1a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.3';
private $release = '3.7.3-alpha1';
/**
*

View File

@@ -11,13 +11,13 @@
use Alchemy\Phrasea\Application;
class patch_379 implements patchInterface
class patch_379alpha1a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.7.9';
private $release = '3.7.9-alpha1';
/**
*

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3810 implements patchInterface
class patch_380alpha10a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a10';
private $release = '3.8.0-alpha.10';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -13,10 +13,10 @@ use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\Session;
use Alchemy\Phrasea\Model\Entities\SessionModule;
class patch_3811 implements patchInterface
class patch_380alpha11a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a11';
private $release = '3.8.0-alpha.11';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3813 implements patchInterface
class patch_380alpha13a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a13';
private $release = '3.8.0-alpha.13';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3814 implements patchInterface
class patch_380alpha14a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a14';
private $release = '3.8.0-alpha.14';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3815 implements patchInterface
class patch_380alpha15a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a15';
private $release = '3.8.0-alpha.15';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3816 implements patchInterface
class patch_380alpha16a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a16';
private $release = '3.8.0-alpha.16';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3817 implements patchInterface
class patch_380alpha17a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a17';
private $release = '3.8.0-alpha.17';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -12,10 +12,10 @@
use Alchemy\Phrasea\Application;
use Symfony\Component\Process\ExecutableFinder;
class patch_3818 implements patchInterface
class patch_380alpha18a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a18';
private $release = '3.8.0-alpha.18';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_380 implements patchInterface
class patch_380alpha2a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.8.0.a2';
private $release = '3.8.0-alpha.2';
/**
*

View File

@@ -16,13 +16,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_3802 implements patchInterface
class patch_380alpha2b implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.8.0.a2';
private $release = '3.8.0-alpha.2';
/**
*

View File

@@ -17,13 +17,13 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_380a3 implements patchInterface
class patch_380alpha3a implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.8.0.a3';
private $release = '3.8.0-alpha.3';
/**
*

View File

@@ -16,14 +16,14 @@ use Alchemy\Phrasea\Application;
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class patch_3803 implements patchInterface
class patch_380alpha3b implements patchInterface
{
/**
*
* @var string
*/
private $release = '3.8.0.a3';
private $release = '3.8.0-alpha.3';
/**
*

View File

@@ -12,10 +12,10 @@
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\AuthFailure;
class patch_3805 implements patchInterface
class patch_380alpha4a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a4';
private $release = '3.8.0-alpha.4';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3806 implements patchInterface
class patch_380alpha6a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a6';
private $release = '3.8.0-alpha.6';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3808 implements patchInterface
class patch_380alpha8a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a8';
private $release = '3.8.0-alpha.8';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3809 implements patchInterface
class patch_380alpha9a implements patchInterface
{
/** @var string */
private $release = '3.8.0.a9';
private $release = '3.8.0-alpha.9';
/** @var array */
private $concern = array(base::DATA_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3819 implements patchInterface
class patch_381alpha1a implements patchInterface
{
/** @var string */
private $release = '3.8.1';
private $release = '3.8.1-alpha.1';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -11,10 +11,10 @@
use Alchemy\Phrasea\Application;
class patch_3820 implements patchInterface
class patch_381alpha1b implements patchInterface
{
/** @var string */
private $release = '3.8.1';
private $release = '3.8.1-alpha.1';
/** @var array */
private $concern = array(base::DATA_BOX);

View File

@@ -0,0 +1,57 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2012 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
class patch_381alpha2a implements patchInterface
{
/** @var string */
private $release = '3.8.1-alpha.2';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
/**
* {@inheritdoc}
*/
public function get_release()
{
return $this->release;
}
/**
* {@inheritdoc}
*/
public function require_all_upgrades()
{
return false;
}
/**
* {@inheritdoc}
*/
public function concern()
{
return $this->concern;
}
/**
* {@inheritdoc}
*/
public function apply(base $databox, Application $app)
{
if (false !== strpos($app['phraseanet.registry']->get('GV_i18n_service'), 'localization.webservice.alchemyasp.com')) {
$app['phraseanet.registry']->set('GV_i18n_service', 'http://geonames.alchemyasp.com/', \registry::TYPE_STRING);
}
return true;
}
}

View File

@@ -12,10 +12,10 @@
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\FtpCredential;
class patch_390 implements patchInterface
class patch_390alpha1a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a1';
private $release = '3.9.0-alpha.1';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -14,10 +14,10 @@ use Alchemy\Phrasea\Model\Entities\Order;
use Alchemy\Phrasea\Model\Entities\OrderElement;
use Gedmo\Timestampable\TimestampableListener;
class patch_3901 implements patchInterface
class patch_390alpha1b implements patchInterface
{
/** @var string */
private $release = '3.9.0.a1';
private $release = '3.9.0-alpha.1';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -14,10 +14,10 @@ use Doctrine\ORM\EntityManager;
use Alchemy\Phrasea\Model\Entities\User;
use Gedmo\Timestampable\TimestampableListener;
class patch_3902 implements patchInterface
class patch_390alpha2a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a2';
private $release = '3.9.0-alpha.2';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -12,10 +12,10 @@
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\UserQuery;
class patch_3903 implements patchInterface
class patch_390alpha3a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a3';
private $release = '3.9.0-alpha.3';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -12,10 +12,10 @@
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\UserSetting;
class patch_3904 implements patchInterface
class patch_390alpha4a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a4';
private $release = '3.9.0-alpha.4';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -12,10 +12,10 @@
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\UserNotificationSetting;
class patch_3905 implements patchInterface
class patch_390alpha5a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a5';
private $release = '3.9.0-alpha.5';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -14,10 +14,10 @@ use Alchemy\Phrasea\Model\Entities\FtpExport;
use Alchemy\Phrasea\Model\Entities\FtpExportElement;
use Gedmo\Timestampable\TimestampableListener;
class patch_3906 implements patchInterface
class patch_390alpha6a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a6';
private $release = '3.9.0-alpha.6';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -17,10 +17,10 @@ use Alchemy\Phrasea\Model\Entities\FeedItem;
use Alchemy\Phrasea\Model\Entities\FeedPublisher;
use Alchemy\Phrasea\Model\Entities\FeedToken;
class patch_3907 implements patchInterface
class patch_390alpha7a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a7';
private $release = '3.9.0-alpha.7';
/** @var array */
private $concern = array(base::APPLICATION_BOX);

View File

@@ -12,10 +12,10 @@
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\Task;
class patch_3908 implements patchInterface
class patch_390alpha8a implements patchInterface
{
/** @var string */
private $release = '3.9.0.a8';
private $release = '3.9.0-alpha.8';
/** @var array */
private $concern = array(base::APPLICATION_BOX);