Bump version so it is run once

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Author: rullzer

lib/private/Repair/ClearGeneratedAvatarCache.php

@@ -49,19 +49,17 @@ public function getName() {
 	/**
 	 * Check if this repair step should run
 	 *
-	 * @param Array $toVersion the version we're upgrading to
-	 * @return void
+	 * @return boolean
 	 */
-	private function shouldRun(Array $toVersion) {
-		$fromVersion      = $this->config->getSystemValue('version', '0.0.0.0');
-		$fromVersionMajor = explode('.', $fromVersion)[0];
+	private function shouldRun() {
+		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
 
-		// Only run on major upgrade
-		return version_compare($fromVersionMajor, $toVersion[0], '<');
+		// was added to 15.0.0.4
+		return version_compare($versionFromBeforeUpdate, '15.0.0.4', '<=');
 	}
 
-	public function run(IOutput $output, bool $force = false) {
-		if ($this->shouldRun(Util::getVersion()) || $force) {
+	public function run(IOutput $output) {
+		if ($this->shouldRun()) {
 			try {
 				$this->avatarManager->clearCachedAvatars();
 				$output->info('Avatar cache cleared');

tests/lib/Repair/ClearGeneratedAvatarCacheTest.php

@@ -52,25 +52,31 @@ protected function setUp() {
 		$this->repair = new ClearGeneratedAvatarCache($this->config, $this->avatarManager);
 	}
 
-	public function dataVersions() {
+	public function shouldRunDataProvider() {
 		return [
-			['0.0.0.0', '15.0.1.2', true],
-			['10.0.0.0', '10.0.1.2', false],
-			['0.1.0', '0.0.1.2', false],
-			['15.0.0.0', '15.0.1.2', false],
-			['14.0.0.5', '15.0.0.2', true]
+			['11.0.0.0', true],
+			['15.0.0.3', true],
+			['13.0.5.2', true],
+			['12.0.0.0', true],
+			['16.0.0.1', false],
+			['15.0.0.2', true],
+			['13.0.0.0', true],
+			['15.0.0.5', false]
 		];
 	}
 
 	/**
-	 * @dataProvider dataVersions
+	 * @dataProvider shouldRunDataProvider
+	 *
+	 * @param string $from
+	 * @param boolean $expected
 	 */
-	public function testRun($fromVersion, $toVersion, $expected) {
-		$this->config->expects($this->once())
-		     ->method('getSystemValue')
-		     ->with('version', '0.0.0.0')
-		     ->willReturn($fromVersion);
+	public function testShouldRun($from, $expected) {
+		$this->config->expects($this->any())
+		       ->method('getSystemValue')
+		       ->with('version', '0.0.0.0')
+		       ->willReturn($from);
 
-		$this->assertEquals($expected, $this->invokePrivate($this->repair, 'shouldRun', [explode('.', $toVersion)]));
+		$this->assertEquals($expected, $this->invokePrivate($this->repair, 'shouldRun'));
 	}
 }

version.php

@@ -29,7 +29,7 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
 
-$OC_Version = array(15, 0, 0, 3);
+$OC_Version = array(15, 0, 0, 4);
 
 // The human readable string
 $OC_VersionString = '15.0.0 alpha';