nextcloud / server

apps/workflowengine/lib/Check/RequestURL.php

Indentation +55 added lines, -55 removed lines

@@ -27,66 +27,66 @@
 
 class RequestURL extends AbstractStringCheck {
 
-	/** @var string */
-	protected $url;
+    /** @var string */
+    protected $url;
 
-	/** @var IRequest */
-	protected $request;
+    /** @var IRequest */
+    protected $request;
 
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(IL10N $l, IRequest $request) {
-		parent::__construct($l);
-		$this->request = $request;
-	}
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(IL10N $l, IRequest $request) {
+        parent::__construct($l);
+        $this->request = $request;
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value)  {
-		$actualValue = $this->getActualValue();
-		if (in_array($operator, ['is', '!is'])) {
-			switch ($value) {
-				case 'webdav':
-					if ($operator === 'is') {
-						return $this->isWebDAVRequest();
-					} else {
-						return !$this->isWebDAVRequest();
-					}
-			}
-		}
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value)  {
+        $actualValue = $this->getActualValue();
+        if (in_array($operator, ['is', '!is'])) {
+            switch ($value) {
+                case 'webdav':
+                    if ($operator === 'is') {
+                        return $this->isWebDAVRequest();
+                    } else {
+                        return !$this->isWebDAVRequest();
+                    }
+            }
+        }
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->url !== null) {
-			return $this->url;
-		}
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->url !== null) {
+            return $this->url;
+        }
 
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
-		$this->url .= $this->request->getServerHost();// E.g. localhost
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
+        $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
+        $this->url .= $this->request->getServerHost();// E.g. localhost
+        $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
+        $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
 
-		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
-	}
+        return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
+    }
 
-	/**
-	 * @return bool
-	 */
-	protected function isWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
-			$this->request->getPathInfo() === '/dav/files' ||
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0
-		);
-	}
+    /**
+     * @return bool
+     */
+    protected function isWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
+            $this->request->getPathInfo() === '/dav/files' ||
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0
+        );
+    }
 }

apps/workflowengine/lib/Check/RequestUserAgent.php

Indentation +41 added lines, -41 removed lines

@@ -27,48 +27,48 @@
 
 class RequestUserAgent extends AbstractStringCheck {
 
-	/** @var IRequest */
-	protected $request;
+    /** @var IRequest */
+    protected $request;
 
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(IL10N $l, IRequest $request) {
-		parent::__construct($l);
-		$this->request = $request;
-	}
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(IL10N $l, IRequest $request) {
+        parent::__construct($l);
+        $this->request = $request;
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value)  {
-		$actualValue = $this->getActualValue();
-		if (in_array($operator, ['is', '!is'])) {
-			switch ($value) {
-				case 'android':
-					$operator = $operator === 'is' ? 'matches' : '!matches';
-					$value = IRequest::USER_AGENT_CLIENT_ANDROID;
-					break;
-				case 'ios':
-					$operator = $operator === 'is' ? 'matches' : '!matches';
-					$value = IRequest::USER_AGENT_CLIENT_IOS;
-					break;
-				case 'desktop':
-					$operator = $operator === 'is' ? 'matches' : '!matches';
-					$value = IRequest::USER_AGENT_CLIENT_DESKTOP;
-					break;
-			}
-		}
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value)  {
+        $actualValue = $this->getActualValue();
+        if (in_array($operator, ['is', '!is'])) {
+            switch ($value) {
+                case 'android':
+                    $operator = $operator === 'is' ? 'matches' : '!matches';
+                    $value = IRequest::USER_AGENT_CLIENT_ANDROID;
+                    break;
+                case 'ios':
+                    $operator = $operator === 'is' ? 'matches' : '!matches';
+                    $value = IRequest::USER_AGENT_CLIENT_IOS;
+                    break;
+                case 'desktop':
+                    $operator = $operator === 'is' ? 'matches' : '!matches';
+                    $value = IRequest::USER_AGENT_CLIENT_DESKTOP;
+                    break;
+            }
+        }
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		return (string) $this->request->getHeader('User-Agent');
-	}
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        return (string) $this->request->getHeader('User-Agent');
+    }
 }

apps/workflowengine/lib/Check/RequestRemoteAddress.php

Indentation +122 added lines, -122 removed lines

@@ -29,126 +29,126 @@
 
 class RequestRemoteAddress implements ICheck {
 
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IRequest */
-	protected $request;
-
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(IL10N $l, IRequest $request) {
-		$this->l = $l;
-		$this->request = $request;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		// A different path doesn't change time, so nothing to do here.
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$actualValue = $this->request->getRemoteAddress();
-		$decodedValue = explode('/', $value);
-
-		if ($operator === 'matchesIPv4') {
-			return $this->matchIPv4($actualValue, $decodedValue[0], $decodedValue[1]);
-		} else if ($operator === '!matchesIPv4') {
-			return !$this->matchIPv4($actualValue, $decodedValue[0], $decodedValue[1]);
-		} else if ($operator === 'matchesIPv6') {
-			return $this->matchIPv6($actualValue, $decodedValue[0], $decodedValue[1]);
-		} else {
-			return !$this->matchIPv6($actualValue, $decodedValue[0], $decodedValue[1]);
-		}
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['matchesIPv4', '!matchesIPv4', 'matchesIPv6', '!matchesIPv6'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
-
-		$decodedValue = explode('/', $value);
-		if (sizeof($decodedValue) !== 2) {
-			throw new \UnexpectedValueException($this->l->t('The given IP range is invalid'), 2);
-		}
-
-		if (in_array($operator, ['matchesIPv4', '!matchesIPv4'])) {
-			if (!filter_var($decodedValue[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv4'), 3);
-			}
-			if ($decodedValue[1] > 32 || $decodedValue[1] <= 0) {
-				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv4'), 4);
-			}
-		} else {
-			if (!filter_var($decodedValue[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv6'), 3);
-			}
-			if ($decodedValue[1] > 128 || $decodedValue[1] <= 0) {
-				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv6'), 4);
-			}
-		}
-	}
-
-	/**
-	 * Based on http://stackoverflow.com/a/594134
-	 * @param string $ip
-	 * @param string $rangeIp
-	 * @param int $bits
-	 * @return bool
-	 */
-	protected function matchIPv4($ip, $rangeIp, $bits) {
-		$rangeDecimal = ip2long($rangeIp);
-		$ipDecimal = ip2long($ip);
-		$mask = -1 << (32 - $bits);
-		return ($ipDecimal & $mask) === ($rangeDecimal & $mask);
-	}
-
-	/**
-	 * Based on http://stackoverflow.com/a/7951507
-	 * @param string $ip
-	 * @param string $rangeIp
-	 * @param int $bits
-	 * @return bool
-	 */
-	protected function matchIPv6($ip, $rangeIp, $bits) {
-		$ipNet = inet_pton($ip);
-		$binaryIp = $this->ipv6ToBits($ipNet);
-		$ipNetBits = substr($binaryIp, 0, $bits);
-
-		$rangeNet = inet_pton($rangeIp);
-		$binaryRange = $this->ipv6ToBits($rangeNet);
-		$rangeNetBits = substr($binaryRange, 0, $bits);
-
-		return $ipNetBits === $rangeNetBits;
-	}
-
-	/**
-	 * Based on http://stackoverflow.com/a/7951507
-	 * @param string $packedIp
-	 * @return string
-	 */
-	protected function ipv6ToBits($packedIp) {
-		$unpackedIp = unpack('A16', $packedIp);
-		$unpackedIp = str_split($unpackedIp[1]);
-		$binaryIp = '';
-		foreach ($unpackedIp as $char) {
-			$binaryIp .= str_pad(decbin(ord($char)), 8, '0', STR_PAD_LEFT);
-		}
-		return str_pad($binaryIp, 128, '0', STR_PAD_RIGHT);
-	}
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IRequest */
+    protected $request;
+
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(IL10N $l, IRequest $request) {
+        $this->l = $l;
+        $this->request = $request;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        // A different path doesn't change time, so nothing to do here.
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $actualValue = $this->request->getRemoteAddress();
+        $decodedValue = explode('/', $value);
+
+        if ($operator === 'matchesIPv4') {
+            return $this->matchIPv4($actualValue, $decodedValue[0], $decodedValue[1]);
+        } else if ($operator === '!matchesIPv4') {
+            return !$this->matchIPv4($actualValue, $decodedValue[0], $decodedValue[1]);
+        } else if ($operator === 'matchesIPv6') {
+            return $this->matchIPv6($actualValue, $decodedValue[0], $decodedValue[1]);
+        } else {
+            return !$this->matchIPv6($actualValue, $decodedValue[0], $decodedValue[1]);
+        }
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['matchesIPv4', '!matchesIPv4', 'matchesIPv6', '!matchesIPv6'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
+
+        $decodedValue = explode('/', $value);
+        if (sizeof($decodedValue) !== 2) {
+            throw new \UnexpectedValueException($this->l->t('The given IP range is invalid'), 2);
+        }
+
+        if (in_array($operator, ['matchesIPv4', '!matchesIPv4'])) {
+            if (!filter_var($decodedValue[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv4'), 3);
+            }
+            if ($decodedValue[1] > 32 || $decodedValue[1] <= 0) {
+                throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv4'), 4);
+            }
+        } else {
+            if (!filter_var($decodedValue[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv6'), 3);
+            }
+            if ($decodedValue[1] > 128 || $decodedValue[1] <= 0) {
+                throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv6'), 4);
+            }
+        }
+    }
+
+    /**
+     * Based on http://stackoverflow.com/a/594134
+     * @param string $ip
+     * @param string $rangeIp
+     * @param int $bits
+     * @return bool
+     */
+    protected function matchIPv4($ip, $rangeIp, $bits) {
+        $rangeDecimal = ip2long($rangeIp);
+        $ipDecimal = ip2long($ip);
+        $mask = -1 << (32 - $bits);
+        return ($ipDecimal & $mask) === ($rangeDecimal & $mask);
+    }
+
+    /**
+     * Based on http://stackoverflow.com/a/7951507
+     * @param string $ip
+     * @param string $rangeIp
+     * @param int $bits
+     * @return bool
+     */
+    protected function matchIPv6($ip, $rangeIp, $bits) {
+        $ipNet = inet_pton($ip);
+        $binaryIp = $this->ipv6ToBits($ipNet);
+        $ipNetBits = substr($binaryIp, 0, $bits);
+
+        $rangeNet = inet_pton($rangeIp);
+        $binaryRange = $this->ipv6ToBits($rangeNet);
+        $rangeNetBits = substr($binaryRange, 0, $bits);
+
+        return $ipNetBits === $rangeNetBits;
+    }
+
+    /**
+     * Based on http://stackoverflow.com/a/7951507
+     * @param string $packedIp
+     * @return string
+     */
+    protected function ipv6ToBits($packedIp) {
+        $unpackedIp = unpack('A16', $packedIp);
+        $unpackedIp = str_split($unpackedIp[1]);
+        $binaryIp = '';
+        foreach ($unpackedIp as $char) {
+            $binaryIp .= str_pad(decbin(ord($char)), 8, '0', STR_PAD_LEFT);
+        }
+        return str_pad($binaryIp, 128, '0', STR_PAD_RIGHT);
+    }
 }

apps/workflowengine/lib/Check/FileSystemTags.php

Indentation +126 added lines, -126 removed lines

@@ -32,130 +32,130 @@
 
 class FileSystemTags implements ICheck {
 
-	/** @var array */
-	protected $fileIds;
-
-	/** @var array */
-	protected $fileSystemTags;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var ISystemTagManager */
-	protected $systemTagManager;
-
-	/** @var ISystemTagObjectMapper */
-	protected $systemTagObjectMapper;
-
-	/** @var IStorage */
-	protected $storage;
-
-	/** @var string */
-	protected $path;
-
-	/**
-	 * @param IL10N $l
-	 * @param ISystemTagManager $systemTagManager
-	 * @param ISystemTagObjectMapper $systemTagObjectMapper
-	 */
-	public function __construct(IL10N $l, ISystemTagManager $systemTagManager, ISystemTagObjectMapper $systemTagObjectMapper) {
-		$this->l = $l;
-		$this->systemTagManager = $systemTagManager;
-		$this->systemTagObjectMapper = $systemTagObjectMapper;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		$this->storage = $storage;
-		$this->path = $path;
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$systemTags = $this->getSystemTags();
-		return ($operator === 'is') === in_array($value, $systemTags);
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['is', '!is'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
-
-		try {
-			$this->systemTagManager->getTagsByIds($value);
-		} catch (TagNotFoundException $e) {
-			throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 2);
-		} catch (\InvalidArgumentException $e) {
-			throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 3);
-		}
-	}
-
-	/**
-	 * Get the ids of the assigned system tags
-	 * @return string[]
-	 */
-	protected function getSystemTags() {
-		$cache = $this->storage->getCache();
-		$fileIds = $this->getFileIds($cache, $this->path);
-
-		$systemTags = [];
-		foreach ($fileIds as $i => $fileId) {
-			if (isset($this->fileSystemTags[$fileId])) {
-				$systemTags[] = $this->fileSystemTags[$fileId];
-				unset($fileIds[$i]);
-			}
-		}
-
-		if (!empty($fileIds)) {
-			$mappedSystemTags = $this->systemTagObjectMapper->getTagIdsForObjects($fileIds, 'files');
-			foreach ($mappedSystemTags as $fileId => $fileSystemTags) {
-				$this->fileSystemTags[$fileId] = $fileSystemTags;
-				$systemTags[] = $fileSystemTags;
-			}
-		}
-
-		$systemTags = call_user_func_array('array_merge', $systemTags);
-		$systemTags = array_unique($systemTags);
-		return $systemTags;
-	}
-
-	/**
-	 * Get the file ids of the given path and its parents
-	 * @param ICache $cache
-	 * @param string $path
-	 * @return int[]
-	 */
-	protected function getFileIds(ICache $cache, $path) {
-		$cacheId = $cache->getNumericStorageId();
-		if (isset($this->fileIds[$cacheId][$path])) {
-			return $this->fileIds[$cacheId][$path];
-		}
-
-		if ($path !== dirname($path)) {
-			$parentIds = $this->getFileIds($cache, dirname($path));
-		} else {
-			return [];
-		}
-
-		$fileId = $cache->getId($path);
-		if ($fileId !== -1) {
-			$parentIds[] = $cache->getId($path);
-		}
-
-		$this->fileIds[$cacheId][$path] = $parentIds;
-
-		return $parentIds;
-	}
+    /** @var array */
+    protected $fileIds;
+
+    /** @var array */
+    protected $fileSystemTags;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var ISystemTagManager */
+    protected $systemTagManager;
+
+    /** @var ISystemTagObjectMapper */
+    protected $systemTagObjectMapper;
+
+    /** @var IStorage */
+    protected $storage;
+
+    /** @var string */
+    protected $path;
+
+    /**
+     * @param IL10N $l
+     * @param ISystemTagManager $systemTagManager
+     * @param ISystemTagObjectMapper $systemTagObjectMapper
+     */
+    public function __construct(IL10N $l, ISystemTagManager $systemTagManager, ISystemTagObjectMapper $systemTagObjectMapper) {
+        $this->l = $l;
+        $this->systemTagManager = $systemTagManager;
+        $this->systemTagObjectMapper = $systemTagObjectMapper;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        $this->storage = $storage;
+        $this->path = $path;
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $systemTags = $this->getSystemTags();
+        return ($operator === 'is') === in_array($value, $systemTags);
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['is', '!is'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
+
+        try {
+            $this->systemTagManager->getTagsByIds($value);
+        } catch (TagNotFoundException $e) {
+            throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 2);
+        } catch (\InvalidArgumentException $e) {
+            throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 3);
+        }
+    }
+
+    /**
+     * Get the ids of the assigned system tags
+     * @return string[]
+     */
+    protected function getSystemTags() {
+        $cache = $this->storage->getCache();
+        $fileIds = $this->getFileIds($cache, $this->path);
+
+        $systemTags = [];
+        foreach ($fileIds as $i => $fileId) {
+            if (isset($this->fileSystemTags[$fileId])) {
+                $systemTags[] = $this->fileSystemTags[$fileId];
+                unset($fileIds[$i]);
+            }
+        }
+
+        if (!empty($fileIds)) {
+            $mappedSystemTags = $this->systemTagObjectMapper->getTagIdsForObjects($fileIds, 'files');
+            foreach ($mappedSystemTags as $fileId => $fileSystemTags) {
+                $this->fileSystemTags[$fileId] = $fileSystemTags;
+                $systemTags[] = $fileSystemTags;
+            }
+        }
+
+        $systemTags = call_user_func_array('array_merge', $systemTags);
+        $systemTags = array_unique($systemTags);
+        return $systemTags;
+    }
+
+    /**
+     * Get the file ids of the given path and its parents
+     * @param ICache $cache
+     * @param string $path
+     * @return int[]
+     */
+    protected function getFileIds(ICache $cache, $path) {
+        $cacheId = $cache->getNumericStorageId();
+        if (isset($this->fileIds[$cacheId][$path])) {
+            return $this->fileIds[$cacheId][$path];
+        }
+
+        if ($path !== dirname($path)) {
+            $parentIds = $this->getFileIds($cache, dirname($path));
+        } else {
+            return [];
+        }
+
+        $fileId = $cache->getId($path);
+        if ($fileId !== -1) {
+            $parentIds[] = $cache->getId($path);
+        }
+
+        $this->fileIds[$cacheId][$path] = $parentIds;
+
+        return $parentIds;
+    }
 }

apps/workflowengine/lib/Manager.php

Indentation +314 added lines, -314 removed lines

@@ -34,318 +34,318 @@
 
 class Manager implements IManager {
 
-	/** @var IStorage */
-	protected $storage;
-
-	/** @var string */
-	protected $path;
-
-	/** @var array[] */
-	protected $operations = [];
-
-	/** @var array[] */
-	protected $checks = [];
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IServerContainer|\OC\Server */
-	protected $container;
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IServerContainer $container
-	 * @param IL10N $l
-	 */
-	public function __construct(IDBConnection $connection, IServerContainer $container, IL10N $l) {
-		$this->connection = $connection;
-		$this->container = $container;
-		$this->l = $l;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		$this->storage = $storage;
-		$this->path = $path;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getMatchingOperations($class, $returnFirstMatchingOperationOnly = true) {
-		$operations = $this->getOperations($class);
-
-		$matches = [];
-		foreach ($operations as $operation) {
-			$checkIds = json_decode($operation['checks'], true);
-			$checks = $this->getChecks($checkIds);
-
-			foreach ($checks as $check) {
-				if (!$this->check($check)) {
-					// Check did not match, continue with the next operation
-					continue 2;
-				}
-			}
-
-			if ($returnFirstMatchingOperationOnly) {
-				return $operation;
-			}
-			$matches[] = $operation;
-		}
-
-		return $matches;
-	}
-
-	/**
-	 * @param array $check
-	 * @return bool
-	 */
-	protected function check(array $check) {
-		try {
-			$checkInstance = $this->container->query($check['class']);
-		} catch (QueryException $e) {
-			// Check does not exist, assume it matches.
-			return true;
-		}
-
-		if ($checkInstance instanceof ICheck) {
-			$checkInstance->setFileInfo($this->storage, $this->path);
-			return $checkInstance->executeCheck($check['operator'], $check['value']);
-		} else {
-			// Check is invalid
-			throw new \UnexpectedValueException($this->l->t('Check %s is invalid or does not exist', $check['class']));
-		}
-	}
-
-	/**
-	 * @param string $class
-	 * @return array[]
-	 */
-	public function getOperations($class) {
-		if (isset($this->operations[$class])) {
-			return $this->operations[$class];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-
-		$query->select('*')
-			->from('flow_operations')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)));
-		$result = $query->execute();
-
-		$this->operations[$class] = [];
-		while ($row = $result->fetch()) {
-			$this->operations[$class][] = $row;
-		}
-		$result->closeCursor();
-
-		return $this->operations[$class];
-	}
-
-	/**
-	 * @param int $id
-	 * @return array
-	 * @throws \UnexpectedValueException
-	 */
-	protected function getOperation($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('flow_operations')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			return $row;
-		}
-
-		throw new \UnexpectedValueException($this->l->t('Operation #%s does not exist', $id));
-	}
-
-	/**
-	 * @param string $class
-	 * @param string $name
-	 * @param array[] $checks
-	 * @param string $operation
-	 * @return array The added operation
-	 * @throws \UnexpectedValueException
-	 */
-	public function addOperation($class, $name, array $checks, $operation) {
-		$this->validateOperation($class, $name, $checks, $operation);
-
-		$checkIds = [];
-		foreach ($checks as $check) {
-			$checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('flow_operations')
-			->values([
-				'class' => $query->createNamedParameter($class),
-				'name' => $query->createNamedParameter($name),
-				'checks' => $query->createNamedParameter(json_encode(array_unique($checkIds))),
-				'operation' => $query->createNamedParameter($operation),
-			]);
-		$query->execute();
-
-		$id = $query->getLastInsertId();
-		return $this->getOperation($id);
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $name
-	 * @param array[] $checks
-	 * @param string $operation
-	 * @return array The updated operation
-	 * @throws \UnexpectedValueException
-	 */
-	public function updateOperation($id, $name, array $checks, $operation) {
-		$row = $this->getOperation($id);
-		$this->validateOperation($row['class'], $name, $checks, $operation);
-
-		$checkIds = [];
-		foreach ($checks as $check) {
-			$checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->update('flow_operations')
-			->set('name', $query->createNamedParameter($name))
-			->set('checks', $query->createNamedParameter(json_encode(array_unique($checkIds))))
-			->set('operation', $query->createNamedParameter($operation))
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$query->execute();
-
-		return $this->getOperation($id);
-	}
-
-	/**
-	 * @param int $id
-	 * @return bool
-	 * @throws \UnexpectedValueException
-	 */
-	public function deleteOperation($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('flow_operations')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		return (bool) $query->execute();
-	}
-
-	/**
-	 * @param string $class
-	 * @param string $name
-	 * @param array[] $checks
-	 * @param string $operation
-	 * @throws \UnexpectedValueException
-	 */
-	protected function validateOperation($class, $name, array $checks, $operation) {
-		try {
-			/** @var IOperation $instance */
-			$instance = $this->container->query($class);
-		} catch (QueryException $e) {
-			throw new \UnexpectedValueException($this->l->t('Operation %s does not exist', $class));
-		}
-
-		if (!($instance instanceof IOperation)) {
-			throw new \UnexpectedValueException($this->l->t('Operation %s is invalid', $class));
-		}
-
-		$instance->validateOperation($name, $checks, $operation);
-
-		foreach ($checks as $check) {
-			try {
-				/** @var ICheck $instance */
-				$instance = $this->container->query($check['class']);
-			} catch (QueryException $e) {
-				throw new \UnexpectedValueException($this->l->t('Check %s does not exist', $class));
-			}
-
-			if (!($instance instanceof ICheck)) {
-				throw new \UnexpectedValueException($this->l->t('Check %s is invalid', $class));
-			}
-
-			$instance->validateCheck($check['operator'], $check['value']);
-		}
-	}
-
-	/**
-	 * @param int[] $checkIds
-	 * @return array[]
-	 */
-	public function getChecks(array $checkIds) {
-		$checkIds = array_map('intval', $checkIds);
-
-		$checks = [];
-		foreach ($checkIds as $i => $checkId) {
-			if (isset($this->checks[$checkId])) {
-				$checks[$checkId] = $this->checks[$checkId];
-				unset($checkIds[$i]);
-			}
-		}
-
-		if (empty($checkIds)) {
-			return $checks;
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('flow_checks')
-			->where($query->expr()->in('id', $query->createNamedParameter($checkIds, IQueryBuilder::PARAM_INT_ARRAY)));
-		$result = $query->execute();
-
-		while ($row = $result->fetch()) {
-			$this->checks[(int) $row['id']] = $row;
-			$checks[(int) $row['id']] = $row;
-		}
-		$result->closeCursor();
-
-		$checkIds = array_diff($checkIds, array_keys($checks));
-
-		if (!empty($checkIds)) {
-			$missingCheck = array_pop($checkIds);
-			throw new \UnexpectedValueException($this->l->t('Check #%s does not exist', $missingCheck));
-		}
-
-		return $checks;
-	}
-
-	/**
-	 * @param string $class
-	 * @param string $operator
-	 * @param string $value
-	 * @return int Check unique ID
-	 */
-	protected function addCheck($class, $operator, $value) {
-		$hash = md5($class . '::' . $operator . '::' . $value);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('flow_checks')
-			->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
-		$result = $query->execute();
-
-		if ($row = $result->fetch()) {
-			$result->closeCursor();
-			return (int) $row['id'];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('flow_checks')
-			->values([
-				'class' => $query->createNamedParameter($class),
-				'operator' => $query->createNamedParameter($operator),
-				'value' => $query->createNamedParameter($value),
-				'hash' => $query->createNamedParameter($hash),
-			]);
-		$query->execute();
-
-		return $query->getLastInsertId();
-	}
+    /** @var IStorage */
+    protected $storage;
+
+    /** @var string */
+    protected $path;
+
+    /** @var array[] */
+    protected $operations = [];
+
+    /** @var array[] */
+    protected $checks = [];
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IServerContainer|\OC\Server */
+    protected $container;
+
+    /** @var IL10N */
+    protected $l;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IServerContainer $container
+     * @param IL10N $l
+     */
+    public function __construct(IDBConnection $connection, IServerContainer $container, IL10N $l) {
+        $this->connection = $connection;
+        $this->container = $container;
+        $this->l = $l;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        $this->storage = $storage;
+        $this->path = $path;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMatchingOperations($class, $returnFirstMatchingOperationOnly = true) {
+        $operations = $this->getOperations($class);
+
+        $matches = [];
+        foreach ($operations as $operation) {
+            $checkIds = json_decode($operation['checks'], true);
+            $checks = $this->getChecks($checkIds);
+
+            foreach ($checks as $check) {
+                if (!$this->check($check)) {
+                    // Check did not match, continue with the next operation
+                    continue 2;
+                }
+            }
+
+            if ($returnFirstMatchingOperationOnly) {
+                return $operation;
+            }
+            $matches[] = $operation;
+        }
+
+        return $matches;
+    }
+
+    /**
+     * @param array $check
+     * @return bool
+     */
+    protected function check(array $check) {
+        try {
+            $checkInstance = $this->container->query($check['class']);
+        } catch (QueryException $e) {
+            // Check does not exist, assume it matches.
+            return true;
+        }
+
+        if ($checkInstance instanceof ICheck) {
+            $checkInstance->setFileInfo($this->storage, $this->path);
+            return $checkInstance->executeCheck($check['operator'], $check['value']);
+        } else {
+            // Check is invalid
+            throw new \UnexpectedValueException($this->l->t('Check %s is invalid or does not exist', $check['class']));
+        }
+    }
+
+    /**
+     * @param string $class
+     * @return array[]
+     */
+    public function getOperations($class) {
+        if (isset($this->operations[$class])) {
+            return $this->operations[$class];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+
+        $query->select('*')
+            ->from('flow_operations')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)));
+        $result = $query->execute();
+
+        $this->operations[$class] = [];
+        while ($row = $result->fetch()) {
+            $this->operations[$class][] = $row;
+        }
+        $result->closeCursor();
+
+        return $this->operations[$class];
+    }
+
+    /**
+     * @param int $id
+     * @return array
+     * @throws \UnexpectedValueException
+     */
+    protected function getOperation($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('flow_operations')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            return $row;
+        }
+
+        throw new \UnexpectedValueException($this->l->t('Operation #%s does not exist', $id));
+    }
+
+    /**
+     * @param string $class
+     * @param string $name
+     * @param array[] $checks
+     * @param string $operation
+     * @return array The added operation
+     * @throws \UnexpectedValueException
+     */
+    public function addOperation($class, $name, array $checks, $operation) {
+        $this->validateOperation($class, $name, $checks, $operation);
+
+        $checkIds = [];
+        foreach ($checks as $check) {
+            $checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('flow_operations')
+            ->values([
+                'class' => $query->createNamedParameter($class),
+                'name' => $query->createNamedParameter($name),
+                'checks' => $query->createNamedParameter(json_encode(array_unique($checkIds))),
+                'operation' => $query->createNamedParameter($operation),
+            ]);
+        $query->execute();
+
+        $id = $query->getLastInsertId();
+        return $this->getOperation($id);
+    }
+
+    /**
+     * @param int $id
+     * @param string $name
+     * @param array[] $checks
+     * @param string $operation
+     * @return array The updated operation
+     * @throws \UnexpectedValueException
+     */
+    public function updateOperation($id, $name, array $checks, $operation) {
+        $row = $this->getOperation($id);
+        $this->validateOperation($row['class'], $name, $checks, $operation);
+
+        $checkIds = [];
+        foreach ($checks as $check) {
+            $checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->update('flow_operations')
+            ->set('name', $query->createNamedParameter($name))
+            ->set('checks', $query->createNamedParameter(json_encode(array_unique($checkIds))))
+            ->set('operation', $query->createNamedParameter($operation))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $query->execute();
+
+        return $this->getOperation($id);
+    }
+
+    /**
+     * @param int $id
+     * @return bool
+     * @throws \UnexpectedValueException
+     */
+    public function deleteOperation($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('flow_operations')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        return (bool) $query->execute();
+    }
+
+    /**
+     * @param string $class
+     * @param string $name
+     * @param array[] $checks
+     * @param string $operation
+     * @throws \UnexpectedValueException
+     */
+    protected function validateOperation($class, $name, array $checks, $operation) {
+        try {
+            /** @var IOperation $instance */
+            $instance = $this->container->query($class);
+        } catch (QueryException $e) {
+            throw new \UnexpectedValueException($this->l->t('Operation %s does not exist', $class));
+        }
+
+        if (!($instance instanceof IOperation)) {
+            throw new \UnexpectedValueException($this->l->t('Operation %s is invalid', $class));
+        }
+
+        $instance->validateOperation($name, $checks, $operation);
+
+        foreach ($checks as $check) {
+            try {
+                /** @var ICheck $instance */
+                $instance = $this->container->query($check['class']);
+            } catch (QueryException $e) {
+                throw new \UnexpectedValueException($this->l->t('Check %s does not exist', $class));
+            }
+
+            if (!($instance instanceof ICheck)) {
+                throw new \UnexpectedValueException($this->l->t('Check %s is invalid', $class));
+            }
+
+            $instance->validateCheck($check['operator'], $check['value']);
+        }
+    }
+
+    /**
+     * @param int[] $checkIds
+     * @return array[]
+     */
+    public function getChecks(array $checkIds) {
+        $checkIds = array_map('intval', $checkIds);
+
+        $checks = [];
+        foreach ($checkIds as $i => $checkId) {
+            if (isset($this->checks[$checkId])) {
+                $checks[$checkId] = $this->checks[$checkId];
+                unset($checkIds[$i]);
+            }
+        }
+
+        if (empty($checkIds)) {
+            return $checks;
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('flow_checks')
+            ->where($query->expr()->in('id', $query->createNamedParameter($checkIds, IQueryBuilder::PARAM_INT_ARRAY)));
+        $result = $query->execute();
+
+        while ($row = $result->fetch()) {
+            $this->checks[(int) $row['id']] = $row;
+            $checks[(int) $row['id']] = $row;
+        }
+        $result->closeCursor();
+
+        $checkIds = array_diff($checkIds, array_keys($checks));
+
+        if (!empty($checkIds)) {
+            $missingCheck = array_pop($checkIds);
+            throw new \UnexpectedValueException($this->l->t('Check #%s does not exist', $missingCheck));
+        }
+
+        return $checks;
+    }
+
+    /**
+     * @param string $class
+     * @param string $operator
+     * @param string $value
+     * @return int Check unique ID
+     */
+    protected function addCheck($class, $operator, $value) {
+        $hash = md5($class . '::' . $operator . '::' . $value);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('flow_checks')
+            ->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
+        $result = $query->execute();
+
+        if ($row = $result->fetch()) {
+            $result->closeCursor();
+            return (int) $row['id'];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('flow_checks')
+            ->values([
+                'class' => $query->createNamedParameter($class),
+                'operator' => $query->createNamedParameter($operator),
+                'value' => $query->createNamedParameter($value),
+                'hash' => $query->createNamedParameter($hash),
+            ]);
+        $query->execute();
+
+        return $query->getLastInsertId();
+    }
 }

apps/workflowengine/appinfo/routes.php

Indentation +7 added lines, -7 removed lines

@@ -20,11 +20,11 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'flowOperations#getOperations', 'url' => '/operations', 'verb' => 'GET'],
-		['name' => 'flowOperations#addOperation', 'url' => '/operations', 'verb' => 'POST'],
-		['name' => 'flowOperations#updateOperation', 'url' => '/operations/{id}', 'verb' => 'PUT'],
-		['name' => 'flowOperations#deleteOperation', 'url' => '/operations/{id}', 'verb' => 'DELETE'],
-		['name' => 'requestTime#getTimezones', 'url' => '/timezones', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'flowOperations#getOperations', 'url' => '/operations', 'verb' => 'GET'],
+        ['name' => 'flowOperations#addOperation', 'url' => '/operations', 'verb' => 'POST'],
+        ['name' => 'flowOperations#updateOperation', 'url' => '/operations/{id}', 'verb' => 'PUT'],
+        ['name' => 'flowOperations#deleteOperation', 'url' => '/operations/{id}', 'verb' => 'DELETE'],
+        ['name' => 'requestTime#getTimezones', 'url' => '/timezones', 'verb' => 'GET'],
+    ]
 ];

apps/testing/locking/fakedblockingprovider.php

Indentation +34 added lines, -34 removed lines

@@ -27,44 +27,44 @@
 use OCP\ILogger;
 
 class FakeDBLockingProvider extends \OC\Lock\DBLockingProvider {
-	// Lock for 10 hours just to be sure
-	const TTL = 36000;
+    // Lock for 10 hours just to be sure
+    const TTL = 36000;
 
-	/**
-	 * Need a new child, because parent::connection is private instead of protected...
-	 * @var IDBConnection
-	 */
-	protected $db;
+    /**
+     * Need a new child, because parent::connection is private instead of protected...
+     * @var IDBConnection
+     */
+    protected $db;
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
-		parent::__construct($connection, $logger, $timeFactory);
-		$this->db = $connection;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param \OCP\ILogger $logger
+     * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
+        parent::__construct($connection, $logger, $timeFactory);
+        $this->db = $connection;
+    }
 
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock($path, $type) {
-		// we DONT keep shared locks till the end of the request
-		if ($type === self::LOCK_SHARED) {
-			$this->db->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = 1',
-				[$path]
-			);
-		}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    public function releaseLock($path, $type) {
+        // we DONT keep shared locks till the end of the request
+        if ($type === self::LOCK_SHARED) {
+            $this->db->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = 1',
+                [$path]
+            );
+        }
 
-		parent::releaseLock($path, $type);
-	}
+        parent::releaseLock($path, $type);
+    }
 
-	public function __destruct() {
-		// Prevent cleaning up at the end of the live time.
-		// parent::__destruct();
-	}
+    public function __destruct() {
+        // Prevent cleaning up at the end of the live time.
+        // parent::__destruct();
+    }
 }

apps/testing/locking/provisioning.php

Indentation +190 added lines, -190 removed lines

@@ -35,194 +35,194 @@
 
 class Provisioning {
 
-	/** @var ILockingProvider */
-	protected $lockingProvider;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IRequest */
-	protected $request;
-
-	/**
-	 * @param ILockingProvider $lockingProvider
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IRequest $request
-	 */
-	public function __construct(ILockingProvider $lockingProvider, IDBConnection $connection, IConfig $config, IRequest $request) {
-		$this->lockingProvider = $lockingProvider;
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->request = $request;
-	}
-
-	/**
-	 * @return ILockingProvider
-	 */
-	protected function getLockingProvider() {
-		if ($this->lockingProvider instanceof DBLockingProvider) {
-			return \OC::$server->query('OCA\Testing\Locking\FakeDBLockingProvider');
-		} else {
-			throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return int
-	 */
-	protected function getType($parameters) {
-		return isset($parameters['type']) ? (int) $parameters['type'] : 0;
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return int
-	 */
-	protected function getPath($parameters) {
-		$node = \OC::$server->getRootFolder()
-			->getUserFolder($parameters['user'])
-			->get($this->request->getParam('path'));
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
-	}
-
-	/**
-	 * @return \OC_OCS_Result
-	 */
-	public function isLockingEnabled() {
-		try {
-			$this->getLockingProvider();
-			return new \OC_OCS_Result(null, 100);
-		} catch (\RuntimeException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_IMPLEMENTED, $e->getMessage());
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function acquireLock(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new \OC_OCS_Result(null, 100);
-		} catch (LockedException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function changeLock(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new \OC_OCS_Result(null, 100);
-		} catch (LockedException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function releaseLock(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
-			return new \OC_OCS_Result(null, 100);
-		} catch (LockedException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function isLocked(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		if ($lockingProvider->isLocked($path, $type)) {
-			return new \OC_OCS_Result(null, 100);
-		}
-
-		return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function releaseAll(array $parameters) {
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		foreach ($this->config->getAppKeys('testing') as $lock) {
-			if (strpos($lock, 'locking_') === 0) {
-				$path = substr($lock, strlen('locking_'));
-
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} else if ($type === ILockingProvider::LOCK_SHARED && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} else {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				}
-			}
-		}
-
-		return new \OC_OCS_Result(null, 100);
-	}
+    /** @var ILockingProvider */
+    protected $lockingProvider;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IRequest */
+    protected $request;
+
+    /**
+     * @param ILockingProvider $lockingProvider
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IRequest $request
+     */
+    public function __construct(ILockingProvider $lockingProvider, IDBConnection $connection, IConfig $config, IRequest $request) {
+        $this->lockingProvider = $lockingProvider;
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->request = $request;
+    }
+
+    /**
+     * @return ILockingProvider
+     */
+    protected function getLockingProvider() {
+        if ($this->lockingProvider instanceof DBLockingProvider) {
+            return \OC::$server->query('OCA\Testing\Locking\FakeDBLockingProvider');
+        } else {
+            throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return int
+     */
+    protected function getType($parameters) {
+        return isset($parameters['type']) ? (int) $parameters['type'] : 0;
+    }
+
+    /**
+     * @param array $parameters
+     * @return int
+     */
+    protected function getPath($parameters) {
+        $node = \OC::$server->getRootFolder()
+            ->getUserFolder($parameters['user'])
+            ->get($this->request->getParam('path'));
+        return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+    }
+
+    /**
+     * @return \OC_OCS_Result
+     */
+    public function isLockingEnabled() {
+        try {
+            $this->getLockingProvider();
+            return new \OC_OCS_Result(null, 100);
+        } catch (\RuntimeException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_IMPLEMENTED, $e->getMessage());
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function acquireLock(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->acquireLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new \OC_OCS_Result(null, 100);
+        } catch (LockedException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function changeLock(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->changeLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new \OC_OCS_Result(null, 100);
+        } catch (LockedException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function releaseLock(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->releaseLock($path, $type);
+            $this->config->deleteAppValue('testing', 'locking_' . $path);
+            return new \OC_OCS_Result(null, 100);
+        } catch (LockedException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function isLocked(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        if ($lockingProvider->isLocked($path, $type)) {
+            return new \OC_OCS_Result(null, 100);
+        }
+
+        return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function releaseAll(array $parameters) {
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        foreach ($this->config->getAppKeys('testing') as $lock) {
+            if (strpos($lock, 'locking_') === 0) {
+                $path = substr($lock, strlen('locking_'));
+
+                if ($type === ILockingProvider::LOCK_EXCLUSIVE && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_EXCLUSIVE) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } else if ($type === ILockingProvider::LOCK_SHARED && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_SHARED) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } else {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                }
+            }
+        }
+
+        return new \OC_OCS_Result(null, 100);
+    }
 }

apps/testing/lib/Config.php

Indentation +33 added lines, -33 removed lines

@@ -27,45 +27,45 @@
 
 class Config {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/**
-	 * @param IConfig $config
-	 * @param IRequest $request
-	 */
-	public function __construct(IConfig $config, IRequest $request) {
-		$this->config = $config;
-		$this->request = $request;
-	}
+    /**
+     * @param IConfig $config
+     * @param IRequest $request
+     */
+    public function __construct(IConfig $config, IRequest $request) {
+        $this->config = $config;
+        $this->request = $request;
+    }
 
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function setAppValue($parameters) {
-		$app = $parameters['appid'];
-		$configKey = $parameters['configkey'];
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function setAppValue($parameters) {
+        $app = $parameters['appid'];
+        $configKey = $parameters['configkey'];
 
-		$value = $this->request->getParam('value');
-		$this->config->setAppValue($app, $configKey, $value);
+        $value = $this->request->getParam('value');
+        $this->config->setAppValue($app, $configKey, $value);
 
-		return new \OC_OCS_Result();
-	}
+        return new \OC_OCS_Result();
+    }
 
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function deleteAppValue($parameters) {
-		$app = $parameters['appid'];
-		$configKey = $parameters['configkey'];
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function deleteAppValue($parameters) {
+        $app = $parameters['appid'];
+        $configKey = $parameters['configkey'];
 
-		$this->config->deleteAppValue($app, $configKey);
+        $this->config->deleteAppValue($app, $configKey);
 
-		return new \OC_OCS_Result();
-	}
+        return new \OC_OCS_Result();
+    }
 }