hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
This commit is contained in:
Romain Neutron
2013-11-08 19:04:26 +01:00
parent f39af8b64e ea6b93b88a
commit 2072f9e0e0
68 changed files with 250 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/base.php
View File

@@ -10,7 +10,8 @@
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Version;
use Alchemy\Phrasea\Core\Version as PhraseaVersion;
use vierbergenlars\SemVer\version;
abstract class base implements cache_cacheableInterface
{
@@ -347,7 +348,7 @@ abstract class base implements cache_cacheableInterface
return $recommends;
}
protected function setVersion(Version $version)
protected function setVersion(PhraseaVersion $version)
{
try {
$sql = '';
@@ -773,7 +774,7 @@ abstract class base implements cache_cacheableInterface
protected function apply_patches($from, $to, $post_process, Setup_Upgrade $upgrader, Application $app)
{
if (version_compare($from, $to, '=')) {
if (version::eq($from, $to)) {
return true;
}
@@ -799,7 +800,12 @@ abstract class base implements cache_cacheableInterface
if ( ! ! $post_process !== ! ! $patch->require_all_upgrades())
continue;
if ( ! version_compare($patch->get_release(), $from, '>') || ! version_compare($patch->get_release(), $to, '<=')) {
// if patch is older than current install
if (version::lte($patch->get_release(), $from)) {
continue;
}
// if patch is new than current target
if (version::gt($patch->get_release(), $to)) {
continue;
}