nextcloud / server

lib/public/Diagnostics/IQuery.php

Indentation +30 added lines, -30 removed lines

@@ -30,38 +30,38 @@
  * @since 8.0.0
  */
 interface IQuery {
-	/**
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getSql();
+    /**
+     * @return string
+     * @since 8.0.0
+     */
+    public function getSql();
 
-	/**
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getParams();
+    /**
+     * @return array
+     * @since 8.0.0
+     */
+    public function getParams();
 
-	/**
-	 * @return float
-	 * @since 8.0.0
-	 */
-	public function getDuration();
+    /**
+     * @return float
+     * @since 8.0.0
+     */
+    public function getDuration();
 
-	/**
-	 * @return float
-	 * @since 11.0.0
-	 */
-	public function getStartTime();
+    /**
+     * @return float
+     * @since 11.0.0
+     */
+    public function getStartTime();
 
-	/**
-	 * @return array
-	 * @since 11.0.0
-	 */
-	public function getStacktrace();
-	/**
-	 * @return array
-	 * @since 12.0.0
-	 */
-	public function getStart();
+    /**
+     * @return array
+     * @since 11.0.0
+     */
+    public function getStacktrace();
+    /**
+     * @return array
+     * @since 12.0.0
+     */
+    public function getStart();
 }

lib/private/Diagnostics/EventLogger.php

Indentation +46 added lines, -46 removed lines

@@ -28,56 +28,56 @@
 use OCP\Diagnostics\IEventLogger;
 
 class EventLogger implements IEventLogger {
-	/**
-	 * @var \OC\Diagnostics\Event[]
-	 */
-	private $events = [];
+    /**
+     * @var \OC\Diagnostics\Event[]
+     */
+    private $events = [];
 	
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function start($id, $description) {
-		if ($this->activated){
-			$this->events[$id] = new Event($id, $description, microtime(true));
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function start($id, $description) {
+        if ($this->activated){
+            $this->events[$id] = new Event($id, $description, microtime(true));
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function end($id) {
-		if ($this->activated && isset($this->events[$id])) {
-			$timing = $this->events[$id];
-			$timing->end(microtime(true));
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function end($id) {
+        if ($this->activated && isset($this->events[$id])) {
+            $timing = $this->events[$id];
+            $timing->end(microtime(true));
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function log($id, $description, $start, $end) {
-		if ($this->activated) {
-			$this->events[$id] = new Event($id, $description, $start);
-			$this->events[$id]->end($end);
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function log($id, $description, $start, $end) {
+        if ($this->activated) {
+            $this->events[$id] = new Event($id, $description, $start);
+            $this->events[$id]->end($end);
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getEvents() {
-		return $this->events;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getEvents() {
+        return $this->events;
+    }
 	
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @inheritdoc
 	 */
 	public function start($id, $description) {
-		if ($this->activated){
+		if ($this->activated) {
 			$this->events[$id] = new Event($id, $description, microtime(true));
 		}
 	}

lib/private/Files/Utils/Scanner.php

Spacing +15 added lines, -15 removed lines

@@ -118,17 +118,17 @@ 
 	protected function attachListener($mount) {
 		$scanner = $mount->getStorage()->getScanner();
 		$emitter = $this;
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint().$path));
 		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint().$path));
 		});
 	}
 
@@ -160,13 +160,13 @@ 
 			$scanner = $storage->getScanner();
 			$this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function($path) use ($storage) {
 				$this->triggerPropagator($storage, $path);
 			});
 
@@ -219,13 +219,13 @@ 
 			$scanner->setUseTransactions(false);
 			$this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function($path) use ($storage) {
 				$this->postProcessEntry($storage, $path);
 			});
 
@@ -247,7 +247,7 @@ 
 				}
 				$propagator->commitBatch();
 			} catch (StorageNotAvailableException $e) {
-				$this->logger->error('Storage ' . $storage->getId() . ' not available');
+				$this->logger->error('Storage '.$storage->getId().' not available');
 				$this->logger->logException($e);
 				$this->emit('\OC\Files\Utils\Scanner', 'StorageNotAvailable', [$e]);
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
 
 	/**
 	 * @param string $dir
-	 * @param $recursive
+	 * @param boolean $recursive
 	 * @param callable|null $mountFilter
 	 * @throws ForbiddenException
 	 * @throws NotFoundException

Indentation +207 added lines, -207 removed lines

@@ -50,238 +50,238 @@
  * @package OC\Files\Utils
  */
 class Scanner extends PublicEmitter {
-	const MAX_ENTRIES_TO_COMMIT = 10000;
+    const MAX_ENTRIES_TO_COMMIT = 10000;
 
-	/**
-	 * @var string $user
-	 */
-	private $user;
+    /**
+     * @var string $user
+     */
+    private $user;
 
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	protected $db;
+    /**
+     * @var \OCP\IDBConnection
+     */
+    protected $db;
 
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
+    /**
+     * @var ILogger
+     */
+    protected $logger;
 
-	/**
-	 * Whether to use a DB transaction
-	 *
-	 * @var bool
-	 */
-	protected $useTransaction;
+    /**
+     * Whether to use a DB transaction
+     *
+     * @var bool
+     */
+    protected $useTransaction;
 
-	/**
-	 * Number of entries scanned to commit
-	 *
-	 * @var int
-	 */
-	protected $entriesToCommit;
+    /**
+     * Number of entries scanned to commit
+     *
+     * @var int
+     */
+    protected $entriesToCommit;
 
-	/**
-	 * @param string $user
-	 * @param \OCP\IDBConnection $db
-	 * @param ILogger $logger
-	 */
-	public function __construct($user, $db, ILogger $logger) {
-		$this->logger = $logger;
-		$this->user = $user;
-		$this->db = $db;
-		// when DB locking is used, no DB transactions will be used
-		$this->useTransaction = !(\OC::$server->getLockingProvider() instanceof DBLockingProvider);
-	}
+    /**
+     * @param string $user
+     * @param \OCP\IDBConnection $db
+     * @param ILogger $logger
+     */
+    public function __construct($user, $db, ILogger $logger) {
+        $this->logger = $logger;
+        $this->user = $user;
+        $this->db = $db;
+        // when DB locking is used, no DB transactions will be used
+        $this->useTransaction = !(\OC::$server->getLockingProvider() instanceof DBLockingProvider);
+    }
 
-	/**
-	 * get all storages for $dir
-	 *
-	 * @param string $dir
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	protected function getMounts($dir) {
-		//TODO: move to the node based fileapi once that's done
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($this->user);
+    /**
+     * get all storages for $dir
+     *
+     * @param string $dir
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    protected function getMounts($dir) {
+        //TODO: move to the node based fileapi once that's done
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($this->user);
 
-		$mountManager = Filesystem::getMountManager();
-		$mounts = $mountManager->findIn($dir);
-		$mounts[] = $mountManager->find($dir);
-		$mounts = array_reverse($mounts); //start with the mount of $dir
+        $mountManager = Filesystem::getMountManager();
+        $mounts = $mountManager->findIn($dir);
+        $mounts[] = $mountManager->find($dir);
+        $mounts = array_reverse($mounts); //start with the mount of $dir
 
-		return $mounts;
-	}
+        return $mounts;
+    }
 
-	/**
-	 * attach listeners to the scanner
-	 *
-	 * @param \OC\Files\Mount\MountPoint $mount
-	 */
-	protected function attachListener($mount) {
-		$scanner = $mount->getStorage()->getScanner();
-		$emitter = $this;
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
-		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
-		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
-		});
-		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
-			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
-		});
-	}
+    /**
+     * attach listeners to the scanner
+     *
+     * @param \OC\Files\Mount\MountPoint $mount
+     */
+    protected function attachListener($mount) {
+        $scanner = $mount->getStorage()->getScanner();
+        $emitter = $this;
+        $scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
+        });
+        $scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
+        });
+        $scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
+        });
+        $scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
+            $emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
+        });
+    }
 
-	/**
-	 * @param string $dir
-	 */
-	public function backgroundScan($dir) {
-		$mounts = $this->getMounts($dir);
-		foreach ($mounts as $mount) {
-			$storage = $mount->getStorage();
-			if (is_null($storage)) {
-				continue;
-			}
+    /**
+     * @param string $dir
+     */
+    public function backgroundScan($dir) {
+        $mounts = $this->getMounts($dir);
+        foreach ($mounts as $mount) {
+            $storage = $mount->getStorage();
+            if (is_null($storage)) {
+                continue;
+            }
 
-			// don't bother scanning failed storages (shortcut for same result)
-			if ($storage->instanceOfStorage(FailedStorage::class)) {
-				continue;
-			}
+            // don't bother scanning failed storages (shortcut for same result)
+            if ($storage->instanceOfStorage(FailedStorage::class)) {
+                continue;
+            }
 
-			// don't scan the root storage
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Local') && $mount->getMountPoint() === '/') {
-				continue;
-			}
+            // don't scan the root storage
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Local') && $mount->getMountPoint() === '/') {
+                continue;
+            }
 
-			// don't scan received local shares, these can be scanned when scanning the owner's storage
-			if ($storage->instanceOfStorage(SharedStorage::class)) {
-				continue;
-			}
-			$scanner = $storage->getScanner();
-			$this->attachListener($mount);
+            // don't scan received local shares, these can be scanned when scanning the owner's storage
+            if ($storage->instanceOfStorage(SharedStorage::class)) {
+                continue;
+            }
+            $scanner = $storage->getScanner();
+            $this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
-				$this->triggerPropagator($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
-				$this->triggerPropagator($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
-				$this->triggerPropagator($storage, $path);
-			});
+            $scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+                $this->triggerPropagator($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+                $this->triggerPropagator($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+                $this->triggerPropagator($storage, $path);
+            });
 
-			$propagator = $storage->getPropagator();
-			$propagator->beginBatch();
-			$scanner->backgroundScan();
-			$propagator->commitBatch();
-		}
-	}
+            $propagator = $storage->getPropagator();
+            $propagator->beginBatch();
+            $scanner->backgroundScan();
+            $propagator->commitBatch();
+        }
+    }
 
-	/**
-	 * @param string $dir
-	 * @param $recursive
-	 * @param callable|null $mountFilter
-	 * @throws ForbiddenException
-	 * @throws NotFoundException
-	 */
-	public function scan($dir = '', $recursive = \OC\Files\Cache\Scanner::SCAN_RECURSIVE, callable $mountFilter = null) {
-		if (!Filesystem::isValidPath($dir)) {
-			throw new \InvalidArgumentException('Invalid path to scan');
-		}
-		$mounts = $this->getMounts($dir);
-		foreach ($mounts as $mount) {
-			if ($mountFilter && !$mountFilter($mount)) {
-				continue;
-			}
-			$storage = $mount->getStorage();
-			if (is_null($storage)) {
-				continue;
-			}
+    /**
+     * @param string $dir
+     * @param $recursive
+     * @param callable|null $mountFilter
+     * @throws ForbiddenException
+     * @throws NotFoundException
+     */
+    public function scan($dir = '', $recursive = \OC\Files\Cache\Scanner::SCAN_RECURSIVE, callable $mountFilter = null) {
+        if (!Filesystem::isValidPath($dir)) {
+            throw new \InvalidArgumentException('Invalid path to scan');
+        }
+        $mounts = $this->getMounts($dir);
+        foreach ($mounts as $mount) {
+            if ($mountFilter && !$mountFilter($mount)) {
+                continue;
+            }
+            $storage = $mount->getStorage();
+            if (is_null($storage)) {
+                continue;
+            }
 
-			// don't bother scanning failed storages (shortcut for same result)
-			if ($storage->instanceOfStorage(FailedStorage::class)) {
-				continue;
-			}
+            // don't bother scanning failed storages (shortcut for same result)
+            if ($storage->instanceOfStorage(FailedStorage::class)) {
+                continue;
+            }
 
-			// if the home storage isn't writable then the scanner is run as the wrong user
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
-				(!$storage->isCreatable('') or !$storage->isCreatable('files'))
-			) {
-				if ($storage->file_exists('') or $storage->getCache()->inCache('')) {
-					throw new ForbiddenException();
-				} else {// if the root exists in neither the cache nor the storage the user isn't setup yet
-					break;
-				}
+            // if the home storage isn't writable then the scanner is run as the wrong user
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
+                (!$storage->isCreatable('') or !$storage->isCreatable('files'))
+            ) {
+                if ($storage->file_exists('') or $storage->getCache()->inCache('')) {
+                    throw new ForbiddenException();
+                } else {// if the root exists in neither the cache nor the storage the user isn't setup yet
+                    break;
+                }
 
-			}
+            }
 
-			// don't scan received local shares, these can be scanned when scanning the owner's storage
-			if ($storage->instanceOfStorage(SharedStorage::class)) {
-				continue;
-			}
-			$relativePath = $mount->getInternalPath($dir);
-			$scanner = $storage->getScanner();
-			$scanner->setUseTransactions(false);
-			$this->attachListener($mount);
+            // don't scan received local shares, these can be scanned when scanning the owner's storage
+            if ($storage->instanceOfStorage(SharedStorage::class)) {
+                continue;
+            }
+            $relativePath = $mount->getInternalPath($dir);
+            $scanner = $storage->getScanner();
+            $scanner->setUseTransactions(false);
+            $this->attachListener($mount);
 
-			$scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
-				$this->postProcessEntry($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
-				$this->postProcessEntry($storage, $path);
-			});
-			$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
-				$this->postProcessEntry($storage, $path);
-			});
+            $scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) {
+                $this->postProcessEntry($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) {
+                $this->postProcessEntry($storage, $path);
+            });
+            $scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) {
+                $this->postProcessEntry($storage, $path);
+            });
 
-			if (!$storage->file_exists($relativePath)) {
-				throw new NotFoundException($dir);
-			}
+            if (!$storage->file_exists($relativePath)) {
+                throw new NotFoundException($dir);
+            }
 
-			if ($this->useTransaction) {
-				$this->db->beginTransaction();
-			}
-			try {
-				$propagator = $storage->getPropagator();
-				$propagator->beginBatch();
-				$scanner->scan($relativePath, $recursive, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
-				$cache = $storage->getCache();
-				if ($cache instanceof Cache) {
-					// only re-calculate for the root folder we scanned, anything below that is taken care of by the scanner
-					$cache->correctFolderSize($relativePath);
-				}
-				$propagator->commitBatch();
-			} catch (StorageNotAvailableException $e) {
-				$this->logger->error('Storage ' . $storage->getId() . ' not available');
-				$this->logger->logException($e);
-				$this->emit('\OC\Files\Utils\Scanner', 'StorageNotAvailable', [$e]);
-			}
-			if ($this->useTransaction) {
-				$this->db->commit();
-			}
-		}
-	}
+            if ($this->useTransaction) {
+                $this->db->beginTransaction();
+            }
+            try {
+                $propagator = $storage->getPropagator();
+                $propagator->beginBatch();
+                $scanner->scan($relativePath, $recursive, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
+                $cache = $storage->getCache();
+                if ($cache instanceof Cache) {
+                    // only re-calculate for the root folder we scanned, anything below that is taken care of by the scanner
+                    $cache->correctFolderSize($relativePath);
+                }
+                $propagator->commitBatch();
+            } catch (StorageNotAvailableException $e) {
+                $this->logger->error('Storage ' . $storage->getId() . ' not available');
+                $this->logger->logException($e);
+                $this->emit('\OC\Files\Utils\Scanner', 'StorageNotAvailable', [$e]);
+            }
+            if ($this->useTransaction) {
+                $this->db->commit();
+            }
+        }
+    }
 
-	private function triggerPropagator(IStorage $storage, $internalPath) {
-		$storage->getPropagator()->propagateChange($internalPath, time());
-	}
+    private function triggerPropagator(IStorage $storage, $internalPath) {
+        $storage->getPropagator()->propagateChange($internalPath, time());
+    }
 
-	private function postProcessEntry(IStorage $storage, $internalPath) {
-		$this->triggerPropagator($storage, $internalPath);
-		if ($this->useTransaction) {
-			$this->entriesToCommit++;
-			if ($this->entriesToCommit >= self::MAX_ENTRIES_TO_COMMIT) {
-				$propagator = $storage->getPropagator();
-				$this->entriesToCommit = 0;
-				$this->db->commit();
-				$propagator->commitBatch();
-				$this->db->beginTransaction();
-				$propagator->beginBatch();
-			}
-		}
-	}
+    private function postProcessEntry(IStorage $storage, $internalPath) {
+        $this->triggerPropagator($storage, $internalPath);
+        if ($this->useTransaction) {
+            $this->entriesToCommit++;
+            if ($this->entriesToCommit >= self::MAX_ENTRIES_TO_COMMIT) {
+                $propagator = $storage->getPropagator();
+                $this->entriesToCommit = 0;
+                $this->db->commit();
+                $propagator->commitBatch();
+                $this->db->beginTransaction();
+                $propagator->beginBatch();
+            }
+        }
+    }
 }
 

apps/files_external/lib/Config/ExternalMountPoint.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 use OC\Files\Mount\MountPoint;
 
 class ExternalMountPoint extends MountPoint {
-	public function getMountType() {
-		return 'external';
-	}
+    public function getMountType() {
+        return 'external';
+    }
 }

apps/dav/lib/Connector/Sabre/ObjectTree.php

Spacing +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
 			if (isset($info['transferid'])) {
 				// getNodePath is called for multiple nodes within a chunk
 				// upload call
-				$path = $dir . '/' . $info['name'];
+				$path = $dir.'/'.$info['name'];
 				$path = ltrim($path, '/');
 			}
 		}
@@ -161,7 +161,7 @@ 
 			} catch (StorageNotAvailableException $e) {
 				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
 			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+				throw new \Sabre\DAV\Exception\NotFound('Storage '.$path.' is invalid');
 			} catch (LockedException $e) {
 				throw new \Sabre\DAV\Exception\Locked();
 			} catch (ForbiddenException $e) {
@@ -170,7 +170,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info->getType() === 'dir') {

Indentation +200 added lines, -200 removed lines

@@ -42,204 +42,204 @@
 
 class ObjectTree extends CachingTree {
 
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $fileView;
-
-	/**
-	 * @var  \OCP\Files\Mount\IMountManager
-	 */
-	protected $mountManager;
-
-	/**
-	 * Creates the object
-	 */
-	public function __construct() {
-	}
-
-	/**
-	 * @param \Sabre\DAV\INode $rootNode
-	 * @param \OC\Files\View $view
-	 * @param  \OCP\Files\Mount\IMountManager $mountManager
-	 */
-	public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OCP\Files\Mount\IMountManager $mountManager) {
-		$this->rootNode = $rootNode;
-		$this->fileView = $view;
-		$this->mountManager = $mountManager;
-	}
-
-	/**
-	 * If the given path is a chunked file name, converts it
-	 * to the real file name. Only applies if the OC-CHUNKED header
-	 * is present.
-	 *
-	 * @param string $path chunk file path to convert
-	 *
-	 * @return string path to real file
-	 */
-	private function resolveChunkFile($path) {
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			// resolve to real file name to find the proper node
-			list($dir, $name) = \Sabre\Uri\split($path);
-			if ($dir === '/' || $dir === '.') {
-				$dir = '';
-			}
-
-			$info = \OC_FileChunking::decodeName($name);
-			// only replace path if it was really the chunked file
-			if (isset($info['transferid'])) {
-				// getNodePath is called for multiple nodes within a chunk
-				// upload call
-				$path = $dir . '/' . $info['name'];
-				$path = ltrim($path, '/');
-			}
-		}
-		return $path;
-	}
-
-	/**
-	 * Returns the INode object for the requested path
-	 *
-	 * @param string $path
-	 * @return \Sabre\DAV\INode
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function getNodeForPath($path) {
-		if (!$this->fileView) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
-		}
-
-		$path = trim($path, '/');
-
-		if (isset($this->cache[$path])) {
-			return $this->cache[$path];
-		}
-
-		if ($path) {
-			try {
-				$this->fileView->verifyPath($path, basename($path));
-			} catch (\OCP\Files\InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			}
-		}
-
-		// Is it the root node?
-		if (!strlen($path)) {
-			return $this->rootNode;
-		}
-
-		if (pathinfo($path, PATHINFO_EXTENSION) === 'part') {
-			// read from storage
-			$absPath = $this->fileView->getAbsolutePath($path);
-			$mount = $this->fileView->getMount($path);
-			$storage = $mount->getStorage();
-			$internalPath = $mount->getInternalPath($absPath);
-			if ($storage && $storage->file_exists($internalPath)) {
-				/**
-				 * @var \OC\Files\Storage\Storage $storage
-				 */
-				// get data directly
-				$data = $storage->getMetaData($internalPath);
-				$info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
-			} else {
-				$info = null;
-			}
-		} else {
-			// resolve chunk file name to real name, if applicable
-			$path = $this->resolveChunkFile($path);
-
-			// read from cache
-			try {
-				$info = $this->fileView->getFileInfo($path);
-
-				if ($info instanceof \OCP\Files\FileInfo && $info->getStorage()->instanceOfStorage(FailedStorage::class)) {
-					throw new StorageNotAvailableException();
-				}
-			} catch (StorageNotAvailableException $e) {
-				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
-			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
-			} catch (LockedException $e) {
-				throw new \Sabre\DAV\Exception\Locked();
-			} catch (ForbiddenException $e) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		}
-
-		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
-		}
-
-		if ($info->getType() === 'dir') {
-			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this);
-		} else {
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
-		}
-
-		$this->cache[$path] = $node;
-		return $node;
-
-	}
-
-	/**
-	 * Copies a file or directory.
-	 *
-	 * This method must work recursively and delete the destination
-	 * if it exists
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 * @throws FileLocked
-	 * @throws Forbidden
-	 * @throws InvalidPath
-	 * @throws \Exception
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 * @return void
-	 */
-	public function copy($source, $destination) {
-		if (!$this->fileView) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
-		}
-
-
-		$info = $this->fileView->getFileInfo(dirname($destination));
-		if ($this->fileView->file_exists($destination)) {
-			$destinationPermission = $info && $info->isUpdateable();
-		} else {
-			$destinationPermission = $info && $info->isCreatable();
-		}
-		if (!$destinationPermission) {
-			throw new Forbidden('No permissions to copy object.');
-		}
-
-		// this will trigger existence check
-		$this->getNodeForPath($source);
-
-		list($destinationDir, $destinationName) = \Sabre\Uri\split($destination);
-		try {
-			$this->fileView->verifyPath($destinationDir, $destinationName);
-		} catch (\OCP\Files\InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage());
-		}
-
-		try {
-			$this->fileView->copy($source, $destination);
-		} catch (StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
-		list($destinationDir,) = \Sabre\Uri\split($destination);
-		$this->markDirty($destinationDir);
-	}
+    /**
+     * @var \OC\Files\View
+     */
+    protected $fileView;
+
+    /**
+     * @var  \OCP\Files\Mount\IMountManager
+     */
+    protected $mountManager;
+
+    /**
+     * Creates the object
+     */
+    public function __construct() {
+    }
+
+    /**
+     * @param \Sabre\DAV\INode $rootNode
+     * @param \OC\Files\View $view
+     * @param  \OCP\Files\Mount\IMountManager $mountManager
+     */
+    public function init(\Sabre\DAV\INode $rootNode, \OC\Files\View $view, \OCP\Files\Mount\IMountManager $mountManager) {
+        $this->rootNode = $rootNode;
+        $this->fileView = $view;
+        $this->mountManager = $mountManager;
+    }
+
+    /**
+     * If the given path is a chunked file name, converts it
+     * to the real file name. Only applies if the OC-CHUNKED header
+     * is present.
+     *
+     * @param string $path chunk file path to convert
+     *
+     * @return string path to real file
+     */
+    private function resolveChunkFile($path) {
+        if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            // resolve to real file name to find the proper node
+            list($dir, $name) = \Sabre\Uri\split($path);
+            if ($dir === '/' || $dir === '.') {
+                $dir = '';
+            }
+
+            $info = \OC_FileChunking::decodeName($name);
+            // only replace path if it was really the chunked file
+            if (isset($info['transferid'])) {
+                // getNodePath is called for multiple nodes within a chunk
+                // upload call
+                $path = $dir . '/' . $info['name'];
+                $path = ltrim($path, '/');
+            }
+        }
+        return $path;
+    }
+
+    /**
+     * Returns the INode object for the requested path
+     *
+     * @param string $path
+     * @return \Sabre\DAV\INode
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function getNodeForPath($path) {
+        if (!$this->fileView) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
+        }
+
+        $path = trim($path, '/');
+
+        if (isset($this->cache[$path])) {
+            return $this->cache[$path];
+        }
+
+        if ($path) {
+            try {
+                $this->fileView->verifyPath($path, basename($path));
+            } catch (\OCP\Files\InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            }
+        }
+
+        // Is it the root node?
+        if (!strlen($path)) {
+            return $this->rootNode;
+        }
+
+        if (pathinfo($path, PATHINFO_EXTENSION) === 'part') {
+            // read from storage
+            $absPath = $this->fileView->getAbsolutePath($path);
+            $mount = $this->fileView->getMount($path);
+            $storage = $mount->getStorage();
+            $internalPath = $mount->getInternalPath($absPath);
+            if ($storage && $storage->file_exists($internalPath)) {
+                /**
+                 * @var \OC\Files\Storage\Storage $storage
+                 */
+                // get data directly
+                $data = $storage->getMetaData($internalPath);
+                $info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
+            } else {
+                $info = null;
+            }
+        } else {
+            // resolve chunk file name to real name, if applicable
+            $path = $this->resolveChunkFile($path);
+
+            // read from cache
+            try {
+                $info = $this->fileView->getFileInfo($path);
+
+                if ($info instanceof \OCP\Files\FileInfo && $info->getStorage()->instanceOfStorage(FailedStorage::class)) {
+                    throw new StorageNotAvailableException();
+                }
+            } catch (StorageNotAvailableException $e) {
+                throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
+            } catch (StorageInvalidException $e) {
+                throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+            } catch (LockedException $e) {
+                throw new \Sabre\DAV\Exception\Locked();
+            } catch (ForbiddenException $e) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        }
+
+        if (!$info) {
+            throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+        }
+
+        if ($info->getType() === 'dir') {
+            $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this);
+        } else {
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
+        }
+
+        $this->cache[$path] = $node;
+        return $node;
+
+    }
+
+    /**
+     * Copies a file or directory.
+     *
+     * This method must work recursively and delete the destination
+     * if it exists
+     *
+     * @param string $source
+     * @param string $destination
+     * @throws FileLocked
+     * @throws Forbidden
+     * @throws InvalidPath
+     * @throws \Exception
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     * @return void
+     */
+    public function copy($source, $destination) {
+        if (!$this->fileView) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
+        }
+
+
+        $info = $this->fileView->getFileInfo(dirname($destination));
+        if ($this->fileView->file_exists($destination)) {
+            $destinationPermission = $info && $info->isUpdateable();
+        } else {
+            $destinationPermission = $info && $info->isCreatable();
+        }
+        if (!$destinationPermission) {
+            throw new Forbidden('No permissions to copy object.');
+        }
+
+        // this will trigger existence check
+        $this->getNodeForPath($source);
+
+        list($destinationDir, $destinationName) = \Sabre\Uri\split($destination);
+        try {
+            $this->fileView->verifyPath($destinationDir, $destinationName);
+        } catch (\OCP\Files\InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage());
+        }
+
+        try {
+            $this->fileView->copy($source, $destination);
+        } catch (StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+
+        list($destinationDir,) = \Sabre\Uri\split($destination);
+        $this->markDirty($destinationDir);
+    }
 }

lib/private/App/AppStore/Bundles/SocialSharingBundle.php

Indentation +18 added lines, -18 removed lines

@@ -23,24 +23,24 @@
 
 class SocialSharingBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return (string)$this->l10n->t('Social sharing bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'socialsharing_twitter',
-			'socialsharing_googleplus',
-			'socialsharing_facebook',
-			'socialsharing_email',
-			'socialsharing_diaspora',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'socialsharing_twitter',
+            'socialsharing_googleplus',
+            'socialsharing_facebook',
+            'socialsharing_email',
+            'socialsharing_diaspora',
+        ];
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
+		return (string) $this->l10n->t('Social sharing bundle');
 	}
 
 	/**

lib/public/Files/Mount/IMountPoint.php

Indentation +88 added lines, -88 removed lines

@@ -29,103 +29,103 @@
  */
 interface IMountPoint {
 
-	/**
-	 * get complete path to the mount point
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getMountPoint();
+    /**
+     * get complete path to the mount point
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getMountPoint();
 
-	/**
-	 * Set the mountpoint
-	 *
-	 * @param string $mountPoint new mount point
-	 * @since 8.0.0
-	 */
-	public function setMountPoint($mountPoint);
+    /**
+     * Set the mountpoint
+     *
+     * @param string $mountPoint new mount point
+     * @since 8.0.0
+     */
+    public function setMountPoint($mountPoint);
 
-	/**
-	 * Get the storage that is mounted
-	 *
-	 * @return \OC\Files\Storage\Storage
-	 * @since 8.0.0
-	 */
-	public function getStorage();
+    /**
+     * Get the storage that is mounted
+     *
+     * @return \OC\Files\Storage\Storage
+     * @since 8.0.0
+     */
+    public function getStorage();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getStorageId();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getNumericStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getNumericStorageId();
 
-	/**
-	 * Get the path relative to the mountpoint
-	 *
-	 * @param string $path absolute path to a file or folder
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getInternalPath($path);
+    /**
+     * Get the path relative to the mountpoint
+     *
+     * @param string $path absolute path to a file or folder
+     * @return string
+     * @since 8.0.0
+     */
+    public function getInternalPath($path);
 
-	/**
-	 * Apply a storage wrapper to the mounted storage
-	 *
-	 * @param callable $wrapper
-	 * @since 8.0.0
-	 */
-	public function wrapStorage($wrapper);
+    /**
+     * Apply a storage wrapper to the mounted storage
+     *
+     * @param callable $wrapper
+     * @since 8.0.0
+     */
+    public function wrapStorage($wrapper);
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 * @since 8.0.0
-	 */
-	public function getOption($name, $default);
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     * @since 8.0.0
+     */
+    public function getOption($name, $default);
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getOptions();
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     * @since 8.1.0
+     */
+    public function getOptions();
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getStorageRootId();
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getStorageRootId();
 
-	/**
-	 * Get the id of the configured mount
-	 *
-	 * @return int|null mount id or null if not applicable
-	 * @since 9.1.0
-	 */
-	public function getMountId();
+    /**
+     * Get the id of the configured mount
+     *
+     * @return int|null mount id or null if not applicable
+     * @since 9.1.0
+     */
+    public function getMountId();
 
-	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
-	 * in the web interface
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getMountType();
+    /**
+     * Get the type of mount point, used to distinguish things like shares and external storages
+     * in the web interface
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getMountType();
 }

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	}
 
 	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
+		if ($argument['retryNo'] === 5) {
 			return;
 		}
 

Indentation +66 added lines, -66 removed lines

@@ -30,78 +30,78 @@
 use OCP\ILogger;
 
 class RetryJob extends Job {
-	/** @var IClientService */
-	private $clientService;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string */
-	private $lookupServer;
-	/** @var int how much time should be between two tries (10 minutes) */
-	private $interval = 600;
+    /** @var IClientService */
+    private $clientService;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string */
+    private $lookupServer;
+    /** @var int how much time should be between two tries (10 minutes) */
+    private $interval = 600;
 
-	/**
-	 * @param IClientService $clientService
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IClientService $clientService,
-								IJobList $jobList,
-								IConfig $config) {
-		$this->clientService = $clientService;
-		$this->jobList = $jobList;
+    /**
+     * @param IClientService $clientService
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IClientService $clientService,
+                                IJobList $jobList,
+                                IConfig $config) {
+        $this->clientService = $clientService;
+        $this->jobList = $jobList;
 
-		$this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$this->lookupServer = rtrim($this->lookupServer, '/');
-		$this->lookupServer .= '/users';
-	}
+        $this->lookupServer = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $this->lookupServer = rtrim($this->lookupServer, '/');
+        $this->lookupServer .= '/users';
+    }
 
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		if ($this->shouldRun($this->argument)) {
-			parent::execute($jobList, $logger);
-			$jobList->remove($this, $this->argument);
-		}
-	}
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        if ($this->shouldRun($this->argument)) {
+            parent::execute($jobList, $logger);
+            $jobList->remove($this, $this->argument);
+        }
+    }
 
-	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
-			return;
-		}
+    protected function run($argument) {
+        if($argument['retryNo'] === 5) {
+            return;
+        }
 
-		$client = $this->clientService->newClient();
+        $client = $this->clientService->newClient();
 
-		try {
-			$client->post($this->lookupServer,
-				[
-					'body' => json_encode($argument['dataArray']),
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $argument['dataArray'],
-					'retryNo' => $argument['retryNo'] + 1,
-					'lastRun' => time(),
-				]
-			);
+        try {
+            $client->post($this->lookupServer,
+                [
+                    'body' => json_encode($argument['dataArray']),
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $argument['dataArray'],
+                    'retryNo' => $argument['retryNo'] + 1,
+                    'lastRun' => time(),
+                ]
+            );
 
-		}
-	}
+        }
+    }
 
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun($argument) {
-		return !isset($argument['lastRun']) || ((time() - $argument['lastRun']) > $this->interval);
-	}
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun($argument) {
+        return !isset($argument['lastRun']) || ((time() - $argument['lastRun']) > $this->interval);
+    }
 }

themes/example/defaults.php

Spacing +3 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 	 */
 	public function getShortFooter() {
 		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -133,13 +133,13 @@ 
 	 */
 	public function getLongFooter() {
 		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
 
 	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/12/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/12/go.php?to='.$key;
 	}
 
 

Indentation +109 added lines, -109 removed lines

@@ -20,114 +20,114 @@
 
 class OC_Theme {
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		return 'https://nextcloud.com';
-	}
-
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		return 'https://docs.nextcloud.com';
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		return 'Custom Cloud Co.';
-	}
-
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		return 'Your custom cloud, personalized for you!';
-	}
-
-	/**
-	 * Returns logo claim
-	 * @return string logo claim
-	 * @deprecated 13.0.0 not used anymore
-	 */
-	public function getLogoClaim() {
-		return '';
-	}
-
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/12/go.php?to=' . $key;
-	}
-
-
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return '#745bca';
-	}
-
-	/**
-	 * Returns variables to overload defaults from core/css/variables.scss
-	 * @return array
-	 */
-	public function getScssVariables() {
-		return [
-			'color-primary' => '#745bca'
-		];
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        return 'https://nextcloud.com';
+    }
+
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        return 'https://docs.nextcloud.com';
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        return 'Custom Cloud Co.';
+    }
+
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        return 'Your custom cloud, personalized for you!';
+    }
+
+    /**
+     * Returns logo claim
+     * @return string logo claim
+     * @deprecated 13.0.0 not used anymore
+     */
+    public function getLogoClaim() {
+        return '';
+    }
+
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        $footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        $footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    public function buildDocLinkToKey($key) {
+        return $this->getDocBaseUrl() . '/server/12/go.php?to=' . $key;
+    }
+
+
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getColorPrimary() {
+        return '#745bca';
+    }
+
+    /**
+     * Returns variables to overload defaults from core/css/variables.scss
+     * @return array
+     */
+    public function getScssVariables() {
+        return [
+            'color-primary' => '#745bca'
+        ];
+    }
 
 }