nextcloud / server

lib/public/Support/CrashReport/IReporter.php

Indentation +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@
  */
 interface IReporter {
 
-	/**
-	 * Report an (unhandled) exception
-	 *
-	 * @since 13.0.0
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 */
-	public function report($exception, array $context = []);
+    /**
+     * Report an (unhandled) exception
+     *
+     * @since 13.0.0
+     * @param Exception|Throwable $exception
+     * @param array $context
+     */
+    public function report($exception, array $context = []);
 }

lib/private/Hooks/EmitterTrait.php

Indentation +72 added lines, -72 removed lines

@@ -24,80 +24,80 @@
 
 trait EmitterTrait {
 
-	/**
-	 * @var callable[][] $listeners
-	 */
-	protected $listeners = array();
+    /**
+     * @var callable[][] $listeners
+     */
+    protected $listeners = array();
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
-		if (!isset($this->listeners[$eventName])) {
-			$this->listeners[$eventName] = array();
-		}
-		if (array_search($callback, $this->listeners[$eventName], true) === false) {
-			$this->listeners[$eventName][] = $callback;
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $eventName = $scope . '::' . $method;
+        if (!isset($this->listeners[$eventName])) {
+            $this->listeners[$eventName] = array();
+        }
+        if (array_search($callback, $this->listeners[$eventName], true) === false) {
+            $this->listeners[$eventName][] = $callback;
+        }
+    }
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$names = array();
-		$allNames = array_keys($this->listeners);
-		if ($scope and $method) {
-			$name = $scope . '::' . $method;
-			if (isset($this->listeners[$name])) {
-				$names[] = $name;
-			}
-		} elseif ($scope) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[0] == $scope) {
-					$names[] = $name;
-				}
-			}
-		} elseif ($method) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[1] == $method) {
-					$names[] = $name;
-				}
-			}
-		} else {
-			$names = $allNames;
-		}
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $names = array();
+        $allNames = array_keys($this->listeners);
+        if ($scope and $method) {
+            $name = $scope . '::' . $method;
+            if (isset($this->listeners[$name])) {
+                $names[] = $name;
+            }
+        } elseif ($scope) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[0] == $scope) {
+                    $names[] = $name;
+                }
+            }
+        } elseif ($method) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[1] == $method) {
+                    $names[] = $name;
+                }
+            }
+        } else {
+            $names = $allNames;
+        }
 
-		foreach ($names as $name) {
-			if ($callback) {
-				$index = array_search($callback, $this->listeners[$name], true);
-				if ($index !== false) {
-					unset($this->listeners[$name][$index]);
-				}
-			} else {
-				$this->listeners[$name] = array();
-			}
-		}
-	}
+        foreach ($names as $name) {
+            if ($callback) {
+                $index = array_search($callback, $this->listeners[$name], true);
+                if ($index !== false) {
+                    unset($this->listeners[$name][$index]);
+                }
+            } else {
+                $this->listeners[$name] = array();
+            }
+        }
+    }
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 */
-	protected function emit($scope, $method, array $arguments = array()) {
-		$eventName = $scope . '::' . $method;
-		if (isset($this->listeners[$eventName])) {
-			foreach ($this->listeners[$eventName] as $callback) {
-				call_user_func_array($callback, $arguments);
-			}
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     */
+    protected function emit($scope, $method, array $arguments = array()) {
+        $eventName = $scope . '::' . $method;
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $callback) {
+                call_user_func_array($callback, $arguments);
+            }
+        }
+    }
 }

lib/public/Defaults.php

Indentation +182 added lines, -182 removed lines

@@ -40,186 +40,186 @@
  */
 class Defaults {
 
-	/**
-	 * \OC_Defaults instance to retrieve the defaults
-	 * @since 6.0.0
-	 */
-	private $defaults;
-
-	/**
-	 * creates a \OC_Defaults instance which is used in all methods to retrieve the
-	 * actual defaults
-	 * @since 6.0.0
-	 */
-	public function __construct(\OC_Defaults $defaults = null) {
-		if ($defaults === null) {
-			$defaults = \OC::$server->getThemingDefaults();
-		}
-		$this->defaults = $defaults;
-	}
-
-	/**
-	 * get base URL for the organisation behind your ownCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getBaseUrl() {
-		return $this->defaults->getBaseUrl();
-	}
-
-	/**
-	 * link to the desktop sync client
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getSyncClientUrl() {
-		return $this->defaults->getSyncClientUrl();
-	}
-
-	/**
-	 * link to the iOS client
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getiOSClientUrl() {
-		return $this->defaults->getiOSClientUrl();
-	}
-
-	/**
-	 * link to the Android client
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getAndroidClientUrl() {
-		return $this->defaults->getAndroidClientUrl();
-	}
-
-	/**
-	 * base URL to the documentation of your ownCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getDocBaseUrl() {
-		return $this->defaults->getDocBaseUrl();
-	}
-
-	/**
-	 * name of your ownCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getName() {
-		return $this->defaults->getName();
-	}
-
-	/**
-	 * name of your ownCloud instance containing HTML styles
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getHTMLName() {
-		return $this->defaults->getHTMLName();
-	}
-
-	/**
-	 * Entity behind your onwCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getEntity() {
-		return $this->defaults->getEntity();
-	}
-
-	/**
-	 * ownCloud slogan
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getSlogan() {
-		return $this->defaults->getSlogan();
-	}
-
-	/**
-	 * logo claim
-	 * @return string
-	 * @since 6.0.0
-	 * @deprecated 13.0.0
-	 */
-	public function getLogoClaim() {
-		return '';
-	}
-
-	/**
-	 * footer, short version
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getShortFooter() {
-		return $this->defaults->getShortFooter();
-	}
-
-	/**
-	 * footer, long version
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getLongFooter() {
-		return $this->defaults->getLongFooter();
-	}
-
-	/**
-	 * Returns the AppId for the App Store for the iOS Client
-	 * @return string AppId
-	 * @since 8.0.0
-	 */
-	public function getiTunesAppId() {
-		return $this->defaults->getiTunesAppId();
-	}
-
-	/**
-	 * Themed logo url
-	 *
-	 * @param bool $useSvg Whether to point to the SVG image or a fallback
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getLogo($useSvg = true) {
-		return $this->defaults->getLogo($useSvg);
-	}
-
-	/**
-	 * Returns primary color
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getColorPrimary() {
-		return $this->defaults->getColorPrimary();
-	}
-
-	/**
-	 * @param string $key
-	 * @return string URL to doc with key
-	 * @since 12.0.0
-	 */
-	public function buildDocLinkToKey($key) {
-		return $this->defaults->buildDocLinkToKey($key);
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 * @since 12.0.0
-	 */
-	public function getTitle() {
-		return $this->defaults->getTitle();
-	}
-
-	/**
-	 * Returns primary color
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getTextColorPrimary() {
-		return $this->defaults->getTextColorPrimary();
-	}
+    /**
+     * \OC_Defaults instance to retrieve the defaults
+     * @since 6.0.0
+     */
+    private $defaults;
+
+    /**
+     * creates a \OC_Defaults instance which is used in all methods to retrieve the
+     * actual defaults
+     * @since 6.0.0
+     */
+    public function __construct(\OC_Defaults $defaults = null) {
+        if ($defaults === null) {
+            $defaults = \OC::$server->getThemingDefaults();
+        }
+        $this->defaults = $defaults;
+    }
+
+    /**
+     * get base URL for the organisation behind your ownCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getBaseUrl() {
+        return $this->defaults->getBaseUrl();
+    }
+
+    /**
+     * link to the desktop sync client
+     * @return string
+     * @since 6.0.0
+     */
+    public function getSyncClientUrl() {
+        return $this->defaults->getSyncClientUrl();
+    }
+
+    /**
+     * link to the iOS client
+     * @return string
+     * @since 8.0.0
+     */
+    public function getiOSClientUrl() {
+        return $this->defaults->getiOSClientUrl();
+    }
+
+    /**
+     * link to the Android client
+     * @return string
+     * @since 8.0.0
+     */
+    public function getAndroidClientUrl() {
+        return $this->defaults->getAndroidClientUrl();
+    }
+
+    /**
+     * base URL to the documentation of your ownCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getDocBaseUrl() {
+        return $this->defaults->getDocBaseUrl();
+    }
+
+    /**
+     * name of your ownCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getName() {
+        return $this->defaults->getName();
+    }
+
+    /**
+     * name of your ownCloud instance containing HTML styles
+     * @return string
+     * @since 8.0.0
+     */
+    public function getHTMLName() {
+        return $this->defaults->getHTMLName();
+    }
+
+    /**
+     * Entity behind your onwCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getEntity() {
+        return $this->defaults->getEntity();
+    }
+
+    /**
+     * ownCloud slogan
+     * @return string
+     * @since 6.0.0
+     */
+    public function getSlogan() {
+        return $this->defaults->getSlogan();
+    }
+
+    /**
+     * logo claim
+     * @return string
+     * @since 6.0.0
+     * @deprecated 13.0.0
+     */
+    public function getLogoClaim() {
+        return '';
+    }
+
+    /**
+     * footer, short version
+     * @return string
+     * @since 6.0.0
+     */
+    public function getShortFooter() {
+        return $this->defaults->getShortFooter();
+    }
+
+    /**
+     * footer, long version
+     * @return string
+     * @since 6.0.0
+     */
+    public function getLongFooter() {
+        return $this->defaults->getLongFooter();
+    }
+
+    /**
+     * Returns the AppId for the App Store for the iOS Client
+     * @return string AppId
+     * @since 8.0.0
+     */
+    public function getiTunesAppId() {
+        return $this->defaults->getiTunesAppId();
+    }
+
+    /**
+     * Themed logo url
+     *
+     * @param bool $useSvg Whether to point to the SVG image or a fallback
+     * @return string
+     * @since 12.0.0
+     */
+    public function getLogo($useSvg = true) {
+        return $this->defaults->getLogo($useSvg);
+    }
+
+    /**
+     * Returns primary color
+     * @return string
+     * @since 12.0.0
+     */
+    public function getColorPrimary() {
+        return $this->defaults->getColorPrimary();
+    }
+
+    /**
+     * @param string $key
+     * @return string URL to doc with key
+     * @since 12.0.0
+     */
+    public function buildDocLinkToKey($key) {
+        return $this->defaults->buildDocLinkToKey($key);
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     * @since 12.0.0
+     */
+    public function getTitle() {
+        return $this->defaults->getTitle();
+    }
+
+    /**
+     * Returns primary color
+     * @return string
+     * @since 13.0.0
+     */
+    public function getTextColorPrimary() {
+        return $this->defaults->getTextColorPrimary();
+    }
 }

apps/dav/lib/CalDAV/CalendarManager.php

Indentation +40 added lines, -40 removed lines

@@ -29,49 +29,49 @@
 
 class CalendarManager {
 
-	/** @var CalDavBackend */
-	private $backend;
+    /** @var CalDavBackend */
+    private $backend;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * CalendarManager constructor.
-	 *
-	 * @param CalDavBackend $backend
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 */
-	public function __construct(CalDavBackend $backend, IL10N $l10n, IConfig $config) {
-		$this->backend = $backend;
-		$this->l10n = $l10n;
-		$this->config = $config;
-	}
+    /**
+     * CalendarManager constructor.
+     *
+     * @param CalDavBackend $backend
+     * @param IL10N $l10n
+     * @param IConfig $config
+     */
+    public function __construct(CalDavBackend $backend, IL10N $l10n, IConfig $config) {
+        $this->backend = $backend;
+        $this->l10n = $l10n;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param string $userId
-	 */
-	public function setupCalendarProvider(IManager $cm, $userId) {
-		$calendars = $this->backend->getCalendarsForUser("principals/users/$userId");
-		$this->register($cm, $calendars);
-	}
+    /**
+     * @param IManager $cm
+     * @param string $userId
+     */
+    public function setupCalendarProvider(IManager $cm, $userId) {
+        $calendars = $this->backend->getCalendarsForUser("principals/users/$userId");
+        $this->register($cm, $calendars);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param array $calendars
-	 */
-	private function register(IManager $cm, array $calendars) {
-		foreach($calendars as $calendarInfo) {
-			$calendar = new Calendar($this->backend, $calendarInfo, $this->l10n, $this->config);
-			$cm->registerCalendar(new CalendarImpl(
-				$calendar,
-				$calendarInfo,
-				$this->backend
-			));
-		}
-	}
+    /**
+     * @param IManager $cm
+     * @param array $calendars
+     */
+    private function register(IManager $cm, array $calendars) {
+        foreach($calendars as $calendarInfo) {
+            $calendar = new Calendar($this->backend, $calendarInfo, $this->l10n, $this->config);
+            $cm->registerCalendar(new CalendarImpl(
+                $calendar,
+                $calendarInfo,
+                $this->backend
+            ));
+        }
+    }
 }

lib/public/Files/Config/ICachedMountFileInfo.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
  * @since 13.0.0
  */
 interface ICachedMountFileInfo extends ICachedMountInfo {
-	/**
-	 * Return the path for the file within the cached mount
-	 *
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getInternalPath();
+    /**
+     * Return the path for the file within the cached mount
+     *
+     * @return string
+     * @since 13.0.0
+     */
+    public function getInternalPath();
 
-	/**
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getPath();
+    /**
+     * @return string
+     * @since 13.0.0
+     */
+    public function getPath();
 }

core/Command/Maintenance/UpdateTheme.php

Indentation +24 added lines, -24 removed lines

@@ -32,33 +32,33 @@
 
 class UpdateTheme extends UpdateJS {
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
 
-	/** @var ICacheFactory */
-	protected $cacheFactory;
+    /** @var ICacheFactory */
+    protected $cacheFactory;
 
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector,
-		ICacheFactory $cacheFactory
-	) {
-		parent::__construct($mimetypeDetector);
-		$this->cacheFactory = $cacheFactory;
-	}
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector,
+        ICacheFactory $cacheFactory
+    ) {
+        parent::__construct($mimetypeDetector);
+        $this->cacheFactory = $cacheFactory;
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:theme:update')
-			->setDescription('Apply custom theme changes');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:theme:update')
+            ->setDescription('Apply custom theme changes');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		// run mimetypelist.js update since themes might change mimetype icons
-		parent::execute($input, $output);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        // run mimetypelist.js update since themes might change mimetype icons
+        parent::execute($input, $output);
 
-		// cleanup image cache
-		$c = $this->cacheFactory->createDistributed('imagePath');
-		$c->clear('');
-		$output->writeln('<info>Image cache cleared');
-	}
+        // cleanup image cache
+        $c = $this->cacheFactory->createDistributed('imagePath');
+        $c->clear('');
+        $output->writeln('<info>Image cache cleared');
+    }
 }

apps/dav/bin/chunkperf.php

Indentation +19 added lines, -19 removed lines

@@ -23,8 +23,8 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
-	exit;
+    echo "Invalid number of arguments" . PHP_EOL;
+    exit;
 }
 
 /**
@@ -33,15 +33,15 @@ 
  * @return mixed
  */
 function request($client, $method, $uploadUrl, $data = null, $headers = []) {
-	echo "$method $uploadUrl ... ";
-	$t0 = microtime(true);
-	$result = $client->request($method, $uploadUrl, $data, $headers);
-	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
-	}
-	return $result;
+    echo "$method $uploadUrl ... ";
+    $t0 = microtime(true);
+    $result = $client->request($method, $uploadUrl, $data, $headers);
+    $t1 = microtime(true);
+    echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
+    if (!in_array($result['statusCode'],  [200, 201])) {
+        echo $result['body'] . PHP_EOL;
+    }
+    return $result;
 }
 
 $baseUri = $argv[1];
@@ -51,9 +51,9 @@ 
 $chunkSize = $argv[5] * 1024 * 1024;
 
 $client = new \Sabre\DAV\Client([
-	'baseUri' => $baseUri,
-	'userName' => $userName,
-	'password' => $password
+    'baseUri' => $baseUri,
+    'userName' => $userName,
+    'password' => $password
 ]);
 
 $transfer = uniqid('transfer', true);
@@ -66,14 +66,14 @@ 
 
 $index = 0;
 while(!feof($stream)) {
-	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
-	$index++;
+    request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
+    $index++;
 }
 
 $destination = pathinfo($file, PATHINFO_BASENAME);
 //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
 request($client, 'MOVE', "$uploadUrl/.file", null, [
-	'Destination' => "$baseUri/files/$userName/$destination",
-	'OC-Total-Length' => filesize($file),
-	'X-OC-MTime' => filemtime($file)
+    'Destination' => "$baseUri/files/$userName/$destination",
+    'OC-Total-Length' => filesize($file),
+    'X-OC-MTime' => filemtime($file)
 ]);

lib/private/Files/ObjectStore/S3Signature.php

Indentation +187 added lines, -187 removed lines

@@ -14,191 +14,191 @@
  */
 class S3Signature implements SignatureInterface
 {
-	/** @var array Query string values that must be signed */
-	private $signableQueryString = [
-		'acl', 'cors', 'delete', 'lifecycle', 'location', 'logging',
-		'notification', 'partNumber', 'policy', 'requestPayment',
-		'response-cache-control', 'response-content-disposition',
-		'response-content-encoding', 'response-content-language',
-		'response-content-type', 'response-expires', 'restore', 'tagging',
-		'torrent', 'uploadId', 'uploads', 'versionId', 'versioning',
-		'versions', 'website'
-	];
-
-	/** @var array Sorted headers that must be signed */
-	private $signableHeaders = ['Content-MD5', 'Content-Type'];
-
-	/** @var \Aws\S3\S3UriParser S3 URI parser */
-	private $parser;
-
-	public function __construct()
-	{
-		$this->parser = new S3UriParser();
-		// Ensure that the signable query string parameters are sorted
-		sort($this->signableQueryString);
-	}
-
-	public function signRequest(
-		RequestInterface $request,
-		CredentialsInterface $credentials
-	) {
-		$request = $this->prepareRequest($request, $credentials);
-		$stringToSign = $this->createCanonicalizedString($request);
-		$auth = 'AWS '
-			. $credentials->getAccessKeyId() . ':'
-			. $this->signString($stringToSign, $credentials);
-
-		return $request->withHeader('Authorization', $auth);
-	}
-
-	public function presign(
-		RequestInterface $request,
-		CredentialsInterface $credentials,
-		$expires
-	) {
-		$query = [];
-		// URL encoding already occurs in the URI template expansion. Undo that
-		// and encode using the same encoding as GET object, PUT object, etc.
-		$uri = $request->getUri();
-		$path = S3Client::encodeKey(rawurldecode($uri->getPath()));
-		$request = $request->withUri($uri->withPath($path));
-
-		// Make sure to handle temporary credentials
-		if ($token = $credentials->getSecurityToken()) {
-			$request = $request->withHeader('X-Amz-Security-Token', $token);
-			$query['X-Amz-Security-Token'] = $token;
-		}
-
-		if ($expires instanceof \DateTime) {
-			$expires = $expires->getTimestamp();
-		} elseif (!is_numeric($expires)) {
-			$expires = strtotime($expires);
-		}
-
-		// Set query params required for pre-signed URLs
-		$query['AWSAccessKeyId'] = $credentials->getAccessKeyId();
-		$query['Expires'] = $expires;
-		$query['Signature'] = $this->signString(
-			$this->createCanonicalizedString($request, $expires),
-			$credentials
-		);
-
-		// Move X-Amz-* headers to the query string
-		foreach ($request->getHeaders() as $name => $header) {
-			$name = strtolower($name);
-			if (strpos($name, 'x-amz-') === 0) {
-				$query[$name] = implode(',', $header);
-			}
-		}
-
-		$queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986);
-
-		return $request->withUri($request->getUri()->withQuery($queryString));
-	}
-
-	/**
-	 * @param RequestInterface     $request
-	 * @param CredentialsInterface $creds
-	 *
-	 * @return RequestInterface
-	 */
-	private function prepareRequest(
-		RequestInterface $request,
-		CredentialsInterface $creds
-	) {
-		$modify = [
-			'remove_headers' => ['X-Amz-Date'],
-			'set_headers'    => ['Date' => gmdate(\DateTime::RFC2822)]
-		];
-
-		// Add the security token header if one is being used by the credentials
-		if ($token = $creds->getSecurityToken()) {
-			$modify['set_headers']['X-Amz-Security-Token'] = $token;
-		}
-
-		return Psr7\modify_request($request, $modify);
-	}
-
-	private function signString($string, CredentialsInterface $credentials)
-	{
-		return base64_encode(
-			hash_hmac('sha1', $string, $credentials->getSecretKey(), true)
-		);
-	}
-
-	private function createCanonicalizedString(
-		RequestInterface $request,
-		$expires = null
-	) {
-		$buffer = $request->getMethod() . "\n";
-
-		// Add the interesting headers
-		foreach ($this->signableHeaders as $header) {
-			$buffer .= $request->getHeaderLine($header) . "\n";
-		}
-
-		$date = $expires ?: $request->getHeaderLine('date');
-		$buffer .= "{$date}\n"
-			. $this->createCanonicalizedAmzHeaders($request)
-			. $this->createCanonicalizedResource($request);
-
-		return $buffer;
-	}
-
-	private function createCanonicalizedAmzHeaders(RequestInterface $request)
-	{
-		$headers = [];
-		foreach ($request->getHeaders() as $name => $header) {
-			$name = strtolower($name);
-			if (strpos($name, 'x-amz-') === 0) {
-				$value = implode(',', $header);
-				if (strlen($value) > 0) {
-					$headers[$name] = $name . ':' . $value;
-				}
-			}
-		}
-
-		if (!$headers) {
-			return '';
-		}
-
-		ksort($headers);
-
-		return implode("\n", $headers) . "\n";
-	}
-
-	private function createCanonicalizedResource(RequestInterface $request)
-	{
-		$data = $this->parser->parse($request->getUri());
-		$buffer = '/';
-
-		if ($data['bucket']) {
-			$buffer .= $data['bucket'];
-			if (!empty($data['key']) || !$data['path_style']) {
-				$buffer .= '/' . $data['key'];
-			}
-		}
-
-		// Add sub resource parameters if present.
-		$query = $request->getUri()->getQuery();
-
-		if ($query) {
-			$params = Psr7\parse_query($query);
-			$first = true;
-			foreach ($this->signableQueryString as $key) {
-				if (array_key_exists($key, $params)) {
-					$value = $params[$key];
-					$buffer .= $first ? '?' : '&';
-					$first = false;
-					$buffer .= $key;
-					// Don't add values for empty sub-resources
-					if (strlen($value)) {
-						$buffer .= "={$value}";
-					}
-				}
-			}
-		}
-
-		return $buffer;
-	}
+    /** @var array Query string values that must be signed */
+    private $signableQueryString = [
+        'acl', 'cors', 'delete', 'lifecycle', 'location', 'logging',
+        'notification', 'partNumber', 'policy', 'requestPayment',
+        'response-cache-control', 'response-content-disposition',
+        'response-content-encoding', 'response-content-language',
+        'response-content-type', 'response-expires', 'restore', 'tagging',
+        'torrent', 'uploadId', 'uploads', 'versionId', 'versioning',
+        'versions', 'website'
+    ];
+
+    /** @var array Sorted headers that must be signed */
+    private $signableHeaders = ['Content-MD5', 'Content-Type'];
+
+    /** @var \Aws\S3\S3UriParser S3 URI parser */
+    private $parser;
+
+    public function __construct()
+    {
+        $this->parser = new S3UriParser();
+        // Ensure that the signable query string parameters are sorted
+        sort($this->signableQueryString);
+    }
+
+    public function signRequest(
+        RequestInterface $request,
+        CredentialsInterface $credentials
+    ) {
+        $request = $this->prepareRequest($request, $credentials);
+        $stringToSign = $this->createCanonicalizedString($request);
+        $auth = 'AWS '
+            . $credentials->getAccessKeyId() . ':'
+            . $this->signString($stringToSign, $credentials);
+
+        return $request->withHeader('Authorization', $auth);
+    }
+
+    public function presign(
+        RequestInterface $request,
+        CredentialsInterface $credentials,
+        $expires
+    ) {
+        $query = [];
+        // URL encoding already occurs in the URI template expansion. Undo that
+        // and encode using the same encoding as GET object, PUT object, etc.
+        $uri = $request->getUri();
+        $path = S3Client::encodeKey(rawurldecode($uri->getPath()));
+        $request = $request->withUri($uri->withPath($path));
+
+        // Make sure to handle temporary credentials
+        if ($token = $credentials->getSecurityToken()) {
+            $request = $request->withHeader('X-Amz-Security-Token', $token);
+            $query['X-Amz-Security-Token'] = $token;
+        }
+
+        if ($expires instanceof \DateTime) {
+            $expires = $expires->getTimestamp();
+        } elseif (!is_numeric($expires)) {
+            $expires = strtotime($expires);
+        }
+
+        // Set query params required for pre-signed URLs
+        $query['AWSAccessKeyId'] = $credentials->getAccessKeyId();
+        $query['Expires'] = $expires;
+        $query['Signature'] = $this->signString(
+            $this->createCanonicalizedString($request, $expires),
+            $credentials
+        );
+
+        // Move X-Amz-* headers to the query string
+        foreach ($request->getHeaders() as $name => $header) {
+            $name = strtolower($name);
+            if (strpos($name, 'x-amz-') === 0) {
+                $query[$name] = implode(',', $header);
+            }
+        }
+
+        $queryString = http_build_query($query, null, '&', PHP_QUERY_RFC3986);
+
+        return $request->withUri($request->getUri()->withQuery($queryString));
+    }
+
+    /**
+     * @param RequestInterface     $request
+     * @param CredentialsInterface $creds
+     *
+     * @return RequestInterface
+     */
+    private function prepareRequest(
+        RequestInterface $request,
+        CredentialsInterface $creds
+    ) {
+        $modify = [
+            'remove_headers' => ['X-Amz-Date'],
+            'set_headers'    => ['Date' => gmdate(\DateTime::RFC2822)]
+        ];
+
+        // Add the security token header if one is being used by the credentials
+        if ($token = $creds->getSecurityToken()) {
+            $modify['set_headers']['X-Amz-Security-Token'] = $token;
+        }
+
+        return Psr7\modify_request($request, $modify);
+    }
+
+    private function signString($string, CredentialsInterface $credentials)
+    {
+        return base64_encode(
+            hash_hmac('sha1', $string, $credentials->getSecretKey(), true)
+        );
+    }
+
+    private function createCanonicalizedString(
+        RequestInterface $request,
+        $expires = null
+    ) {
+        $buffer = $request->getMethod() . "\n";
+
+        // Add the interesting headers
+        foreach ($this->signableHeaders as $header) {
+            $buffer .= $request->getHeaderLine($header) . "\n";
+        }
+
+        $date = $expires ?: $request->getHeaderLine('date');
+        $buffer .= "{$date}\n"
+            . $this->createCanonicalizedAmzHeaders($request)
+            . $this->createCanonicalizedResource($request);
+
+        return $buffer;
+    }
+
+    private function createCanonicalizedAmzHeaders(RequestInterface $request)
+    {
+        $headers = [];
+        foreach ($request->getHeaders() as $name => $header) {
+            $name = strtolower($name);
+            if (strpos($name, 'x-amz-') === 0) {
+                $value = implode(',', $header);
+                if (strlen($value) > 0) {
+                    $headers[$name] = $name . ':' . $value;
+                }
+            }
+        }
+
+        if (!$headers) {
+            return '';
+        }
+
+        ksort($headers);
+
+        return implode("\n", $headers) . "\n";
+    }
+
+    private function createCanonicalizedResource(RequestInterface $request)
+    {
+        $data = $this->parser->parse($request->getUri());
+        $buffer = '/';
+
+        if ($data['bucket']) {
+            $buffer .= $data['bucket'];
+            if (!empty($data['key']) || !$data['path_style']) {
+                $buffer .= '/' . $data['key'];
+            }
+        }
+
+        // Add sub resource parameters if present.
+        $query = $request->getUri()->getQuery();
+
+        if ($query) {
+            $params = Psr7\parse_query($query);
+            $first = true;
+            foreach ($this->signableQueryString as $key) {
+                if (array_key_exists($key, $params)) {
+                    $value = $params[$key];
+                    $buffer .= $first ? '?' : '&';
+                    $first = false;
+                    $buffer .= $key;
+                    // Don't add values for empty sub-resources
+                    if (strlen($value)) {
+                        $buffer .= "={$value}";
+                    }
+                }
+            }
+        }
+
+        return $buffer;
+    }
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php

Indentation +9 added lines, -9 removed lines

@@ -25,14 +25,14 @@
 
 
 class SqliteExpressionBuilder extends ExpressionBuilder {
-	/**
-	 * @inheritdoc
-	 */
-	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
-	}
+    /**
+     * @inheritdoc
+     */
+    public function like($x, $y, $type = null) {
+        return parent::like($x, $y, $type) . " ESCAPE '\\'";
+    }
 
-	public function iLike($x, $y, $type = null) {
-		return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y), $type);
-	}
+    public function iLike($x, $y, $type = null) {
+        return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y), $type);
+    }
 }