Permalink
Browse files

Use 'dev' version on the master branch

Allowed check branches are now `latest` and `stable`.
  • Loading branch information...
ArthurHoaro committed Mar 12, 2017
1 parent 7fc5f07 commit b897c81f8cbf117828fb710f0827f124025f9a89
Showing with 19 additions and 11 deletions.
  1. +5 −8 application/ApplicationUtils.php
  2. +2 −2 index.php
  3. +1 −1 shaarli_version.php
  4. +11 −0 tests/ApplicationUtilsTest.php
@@ -5,7 +5,7 @@
class ApplicationUtils
{
private static $GIT_URL = 'https://raw.githubusercontent.com/shaarli/Shaarli';
private static $GIT_BRANCHES = array('master', 'stable');
private static $GIT_BRANCHES = array('latest', 'stable');
private static $VERSION_FILE = 'shaarli_version.php';
private static $VERSION_START_TAG = '<?php /* ';
private static $VERSION_END_TAG = ' */ ?>';
@@ -65,13 +65,10 @@ public static function checkUpdate($currentVersion,
$isLoggedIn,
$branch='stable')
{
if (! $isLoggedIn) {
// Do not check versions for visitors
return false;
}
if (empty($enableCheck)) {
// Do not check if the user doesn't want to
// Do not check versions for visitors
// Do not check if the user doesn't want to
// Do not check with dev version
if (! $isLoggedIn || empty($enableCheck) || $currentVersion === 'dev') {
return false;
}
View
@@ -1,6 +1,6 @@
<?php
/**
* Shaarli v0.8.3 - Shaare your links...
* Shaarli dev - Shaare your links...
*
* The personal, minimalist, super-fast, database free, bookmarking service.
*
@@ -25,7 +25,7 @@
/*
* PHP configuration
*/
define('shaarli_version', '0.8.2');
define('shaarli_version', 'dev');
// http://server.com/x/shaarli --> /shaarli/
define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0)));
View
@@ -1 +1 @@
<?php /* 0.8.3 */ ?>
<?php /* dev */ ?>
@@ -332,4 +332,15 @@ public function testCheckCurrentResourcePermissionsErrors()
ApplicationUtils::checkResourcePermissions($conf)
);
}
/**
* Check update with 'dev' as curent version (master branch).
* It should always return false.
*/
public function testCheckUpdateDev()
{
$this->assertFalse(
ApplicationUtils::checkUpdate('dev', self::$testUpdateFile, 100, true, true)
);
}
}

0 comments on commit b897c81

Please sign in to comment.