Merge pull request #816 from ArthurHoaro/project/master-version

Use 'dev' version on the master branch

diff --cc application/Updater.php
index efbfc832d352cb4872dd96a4f5a3e3162a88c4e3,1bc5be0c3d24ad9b0c1bd8b8f6f0eabaab9c71ed..0fb68c5aa151bedffe10e5c79e8207997ee812de
--- 1/application/Updater.php
--- 2/application/Updater.php
+++ b/application/Updater.php
@@@ -378,24 -378,52 +378,68 @@@ class Update
  
          $this->conf->set('plugins.PIWIK_URL', 'http://'. $this->conf->get('plugins.PIWIK_URL'));
          $this->conf->write($this->isLoggedIn);
 +
 +        return true;
 +    }
 +
 +    /**
 +     * Use ATOM feed as default.
 +     */
 +    public function updateMethodAtomDefault()
 +    {
 +        if (!$this->conf->exists('feed.show_atom') || $this->conf->get('feed.show_atom') === true) {
 +            return true;
 +        }
 +
 +        $this->conf->set('feed.show_atom', true);
 +        $this->conf->write($this->isLoggedIn);
 +
          return true;
      }
+ 
+     /**
+      * Update updates.check_updates_branch setting.
+      *
+      * If the current major version digit matches the latest branch
+      * major version digit, we set the branch to `latest`,
+      * otherwise we'll check updates on the `stable` branch.
+      *
+      * No update required for the dev version.
+      *
+      * Note: due to hardcoded URL and lack of dependency injection, this is not unit testable.
+      *
+      * FIXME! This needs to be removed when we switch to first digit major version
+      *        instead of the second one since the versionning process will change.
+      */
+     public function updateMethodCheckUpdateRemoteBranch()
+     {
+         if (shaarli_version === 'dev' || $this->conf->get('updates.check_updates_branch') === 'latest') {
+             return true;
+         }
+ 
+         // Get latest branch major version digit
+         $latestVersion = ApplicationUtils::getLatestGitVersionCode(
+             'https://raw.githubusercontent.com/shaarli/Shaarli/latest/shaarli_version.php',
+             5
+         );
+         if (preg_match('/(\d+)\.\d+$/', $latestVersion, $matches) === false) {
+             return false;
+         }
+         $latestMajor = $matches[1];
+ 
+         // Get current major version digit
+         preg_match('/(\d+)\.\d+$/', shaarli_version, $matches);
+         $currentMajor = $matches[1];
+ 
+         if ($currentMajor === $latestMajor) {
+             $branch = 'latest';
+         } else {
+             $branch = 'stable';
+         }
+         $this->conf->set('updates.check_updates_branch', $branch);
+         $this->conf->write($this->isLoggedIn);
+         return true;
+     }
  }
  
  /**