@@ -54,19 +54,19 @@ |
||
| 54 | 54 | |
| 55 | 55 | // If string starts with "file://" ignore the certificate |
| 56 | 56 | $query = 'file://'; |
| 57 | - if(strtolower(substr($data, 0, strlen($query))) === $query) { |
|
| 57 | + if (strtolower(substr($data, 0, strlen($query))) === $query) { |
|
| 58 | 58 | throw new \Exception('Certificate could not get parsed.'); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | $info = openssl_x509_parse($data); |
| 62 | - if(!is_array($info)) { |
|
| 62 | + if (!is_array($info)) { |
|
| 63 | 63 | throw new \Exception('Certificate could not get parsed.'); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null; |
| 67 | 67 | $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null; |
| 68 | - $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt); |
|
| 69 | - $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt); |
|
| 68 | + $this->issueDate = new \DateTime('@'.$info['validFrom_time_t'], $gmt); |
|
| 69 | + $this->expireDate = new \DateTime('@'.$info['validTo_time_t'], $gmt); |
|
| 70 | 70 | $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null; |
| 71 | 71 | $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null; |
| 72 | 72 | } |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @return string |
| 66 | 66 | */ |
| 67 | 67 | private function buildFileNameWithSuffix($absolutePath, $postFix = '') { |
| 68 | - if($postFix !== '') { |
|
| 69 | - $postFix = '.' . ltrim($postFix, '.'); |
|
| 68 | + if ($postFix !== '') { |
|
| 69 | + $postFix = '.'.ltrim($postFix, '.'); |
|
| 70 | 70 | $postFix = str_replace(['\\', '/'], '', $postFix); |
| 71 | 71 | $absolutePath .= '-'; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - return $absolutePath . $postFix; |
|
| 74 | + return $absolutePath.$postFix; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | // If a postfix got specified sanitize it and create a postfixed |
| 93 | 93 | // temporary file |
| 94 | - if($postFix !== '') { |
|
| 94 | + if ($postFix !== '') { |
|
| 95 | 95 | $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix); |
| 96 | 96 | touch($fileNameWithPostfix); |
| 97 | 97 | chmod($fileNameWithPostfix, 0600); |
@@ -127,11 +127,11 @@ discard block |
||
| 127 | 127 | $this->current[] = $uniqueFileName; |
| 128 | 128 | |
| 129 | 129 | // Build a name without postfix |
| 130 | - $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix); |
|
| 130 | + $path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix); |
|
| 131 | 131 | mkdir($path, 0700); |
| 132 | 132 | $this->current[] = $path; |
| 133 | 133 | |
| 134 | - return $path . '/'; |
|
| 134 | + return $path.'/'; |
|
| 135 | 135 | } else { |
| 136 | 136 | $this->log->warning( |
| 137 | 137 | 'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions', |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | if ($dh) { |
| 191 | 191 | while (($file = readdir($dh)) !== false) { |
| 192 | 192 | if (substr($file, 0, 7) === self::TMP_PREFIX) { |
| 193 | - $path = $this->tmpBaseDir . '/' . $file; |
|
| 193 | + $path = $this->tmpBaseDir.'/'.$file; |
|
| 194 | 194 | $mtime = filemtime($path); |
| 195 | 195 | if ($mtime < $cutOfTime) { |
| 196 | 196 | $files[] = $path; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - public static function register($debug=false) { |
|
| 43 | + public static function register($debug = false) { |
|
| 44 | 44 | $handler = new ErrorHandler(); |
| 45 | 45 | |
| 46 | 46 | if ($debug) { |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | //Fatal errors handler |
| 63 | 63 | public static function onShutdown() { |
| 64 | 64 | $error = error_get_last(); |
| 65 | - if($error && self::$logger) { |
|
| 65 | + if ($error && self::$logger) { |
|
| 66 | 66 | //ob_end_clean(); |
| 67 | - $msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line']; |
|
| 67 | + $msg = $error['message'].' at '.$error['file'].'#'.$error['line']; |
|
| 68 | 68 | self::$logger->critical(self::removePassword($msg), array('app' => 'PHP')); |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | public static function onException($exception) { |
| 78 | 78 | $class = get_class($exception); |
| 79 | 79 | $msg = $exception->getMessage(); |
| 80 | - $msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine(); |
|
| 80 | + $msg = "$class: $msg at ".$exception->getFile().'#'.$exception->getLine(); |
|
| 81 | 81 | self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -86,14 +86,14 @@ discard block |
||
| 86 | 86 | if (error_reporting() === 0) { |
| 87 | 87 | return; |
| 88 | 88 | } |
| 89 | - $msg = $message . ' at ' . $file . '#' . $line; |
|
| 89 | + $msg = $message.' at '.$file.'#'.$line; |
|
| 90 | 90 | self::$logger->error(self::removePassword($msg), array('app' => 'PHP')); |
| 91 | 91 | |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | //Recoverable handler which catch all errors, warnings and notices |
| 95 | 95 | public static function onAll($number, $message, $file, $line) { |
| 96 | - $msg = $message . ' at ' . $file . '#' . $line; |
|
| 96 | + $msg = $message.' at '.$file.'#'.$line; |
|
| 97 | 97 | self::$logger->debug(self::removePassword($msg), array('app' => 'PHP')); |
| 98 | 98 | |
| 99 | 99 | } |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | private $max_log_size; |
| 35 | 35 | public function run($dummy) { |
| 36 | 36 | $systemConfig = \OC::$server->getSystemConfig(); |
| 37 | - $logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log'); |
|
| 37 | + $logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log'); |
|
| 38 | 38 | $this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', false); |
| 39 | 39 | if ($this->max_log_size) { |
| 40 | 40 | $filesize = @filesize($logFile); |
@@ -59,9 +59,9 @@ discard block |
||
| 59 | 59 | public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) { |
| 60 | 60 | $this->initProviders(); |
| 61 | 61 | $results = array(); |
| 62 | - foreach($this->providers as $provider) { |
|
| 62 | + foreach ($this->providers as $provider) { |
|
| 63 | 63 | /** @var $provider Provider */ |
| 64 | - if ( ! $provider->providesResultsFor($inApps) ) { |
|
| 64 | + if (!$provider->providesResultsFor($inApps)) { |
|
| 65 | 65 | continue; |
| 66 | 66 | } |
| 67 | 67 | if ($provider instanceof PagedProvider) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | public function removeProvider($provider) { |
| 97 | 97 | $this->registeredProviders = array_filter( |
| 98 | 98 | $this->registeredProviders, |
| 99 | - function ($element) use ($provider) { |
|
| 99 | + function($element) use ($provider) { |
|
| 100 | 100 | return ($element['class'] != $provider); |
| 101 | 101 | } |
| 102 | 102 | ); |
@@ -117,10 +117,10 @@ discard block |
||
| 117 | 117 | * Create instances of all the registered search providers |
| 118 | 118 | */ |
| 119 | 119 | private function initProviders() { |
| 120 | - if( ! empty($this->providers) ) { |
|
| 120 | + if (!empty($this->providers)) { |
|
| 121 | 121 | return; |
| 122 | 122 | } |
| 123 | - foreach($this->registeredProviders as $provider) { |
|
| 123 | + foreach ($this->registeredProviders as $provider) { |
|
| 124 | 124 | $class = $provider['class']; |
| 125 | 125 | $options = $provider['options']; |
| 126 | 126 | $this->providers[] = new $class($options); |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | // FIXME: Required for CI |
| 82 | 82 | if (!defined('PHPUNIT_RUN')) { |
| 83 | 83 | $webRoot = \OC::$WEBROOT; |
| 84 | - if($webRoot === '') { |
|
| 84 | + if ($webRoot === '') { |
|
| 85 | 85 | $webRoot = '/'; |
| 86 | 86 | } |
| 87 | 87 | setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true); |
@@ -146,7 +146,7 @@ |
||
| 146 | 146 | throw new \InvalidArgumentException('The given notifier information is invalid'); |
| 147 | 147 | } |
| 148 | 148 | if (isset($this->notifiersInfo[$notifier['id']])) { |
| 149 | - throw new \InvalidArgumentException('The given notifier ID ' . $notifier['id'] . ' is already in use'); |
|
| 149 | + throw new \InvalidArgumentException('The given notifier ID '.$notifier['id'].' is already in use'); |
|
| 150 | 150 | } |
| 151 | 151 | $this->notifiersInfo[$notifier['id']] = $notifier['name']; |
| 152 | 152 | } |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | * @return string |
| 62 | 62 | */ |
| 63 | 63 | public function __toString() { |
| 64 | - return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n"; |
|
| 64 | + return __CLASS__.": [{$this->code}]: {$this->message} ({$this->hint})\n"; |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 59 | 59 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 60 | 60 | |
| 61 | -class Repair implements IOutput{ |
|
| 61 | +class Repair implements IOutput { |
|
| 62 | 62 | /* @var IRepairStep[] */ |
| 63 | 63 | private $repairSteps; |
| 64 | 64 | /** @var EventDispatcher */ |