@@ -129,7 +129,7 @@ |
||
| 129 | 129 | $data = $result->fetchAll(); |
| 130 | 130 | $result->closeCursor(); |
| 131 | 131 | |
| 132 | - $entities = array_map(function ($row) { |
|
| 132 | + $entities = array_map(function($row) { |
|
| 133 | 133 | return DefaultToken::fromRow($row); |
| 134 | 134 | }, $data); |
| 135 | 135 | |
@@ -103,6 +103,6 @@ |
||
| 103 | 103 | $time = new \DateTime('now', $timeZone); |
| 104 | 104 | $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM)); |
| 105 | 105 | |
| 106 | - return $timestampInfo . ' ' . $this->formatter->format($message); |
|
| 106 | + return $timestampInfo.' '.$this->formatter->format($message); |
|
| 107 | 107 | } |
| 108 | 108 | } |
@@ -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; |
@@ -54,8 +54,7 @@ |
||
| 54 | 54 | */ |
| 55 | 55 | public function getBody() { |
| 56 | 56 | return $this->stream ? |
| 57 | - $this->response->getBody()->detach(): |
|
| 58 | - $this->response->getBody()->getContents(); |
|
| 57 | + $this->response->getBody()->detach() : $this->response->getBody()->getContents(); |
|
| 59 | 58 | } |
| 60 | 59 | |
| 61 | 60 | /** |
@@ -30,25 +30,25 @@ |
||
| 30 | 30 | parent::__construct($iterator); |
| 31 | 31 | |
| 32 | 32 | $appFolders = \OC::$APPSROOTS; |
| 33 | - foreach($appFolders as $key => $appFolder) { |
|
| 33 | + foreach ($appFolders as $key => $appFolder) { |
|
| 34 | 34 | $appFolders[$key] = rtrim($appFolder['path'], '/'); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $excludedFolders = [ |
| 38 | - rtrim($root . '/data', '/'), |
|
| 39 | - rtrim($root . '/themes', '/'), |
|
| 40 | - rtrim($root . '/config', '/'), |
|
| 41 | - rtrim($root . '/apps', '/'), |
|
| 42 | - rtrim($root . '/assets', '/'), |
|
| 43 | - rtrim($root . '/lost+found', '/'), |
|
| 38 | + rtrim($root.'/data', '/'), |
|
| 39 | + rtrim($root.'/themes', '/'), |
|
| 40 | + rtrim($root.'/config', '/'), |
|
| 41 | + rtrim($root.'/apps', '/'), |
|
| 42 | + rtrim($root.'/assets', '/'), |
|
| 43 | + rtrim($root.'/lost+found', '/'), |
|
| 44 | 44 | // Ignore folders generated by updater since the updater is replaced |
| 45 | 45 | // after the integrity check is run. |
| 46 | 46 | // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846 |
| 47 | - rtrim($root . '/updater', '/'), |
|
| 48 | - rtrim($root . '/_oc_upgrade', '/'), |
|
| 47 | + rtrim($root.'/updater', '/'), |
|
| 48 | + rtrim($root.'/_oc_upgrade', '/'), |
|
| 49 | 49 | ]; |
| 50 | 50 | $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', ''); |
| 51 | - if($customDataDir !== '') { |
|
| 51 | + if ($customDataDir !== '') { |
|
| 52 | 52 | $excludedFolders[] = rtrim($customDataDir, '/'); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -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 | /** |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function execute($jobList, ILogger $logger = null) { |
| 59 | 59 | // add an interval of 15 mins |
| 60 | - $this->setInterval(15*60); |
|
| 60 | + $this->setInterval(15 * 60); |
|
| 61 | 61 | |
| 62 | 62 | $this->jobList = $jobList; |
| 63 | 63 | $this->logger = $logger; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | try { |
| 91 | 91 | $repair->addStep($step); |
| 92 | 92 | } catch (\Exception $ex) { |
| 93 | - $this->logger->logException($ex,[ |
|
| 93 | + $this->logger->logException($ex, [ |
|
| 94 | 94 | 'app' => 'migration' |
| 95 | 95 | ]); |
| 96 | 96 | |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | if ($command instanceof ICommand) { |
| 56 | 56 | // ensure the command can be serialized |
| 57 | 57 | $serialized = serialize($command); |
| 58 | - if(strlen($serialized) > 4000) { |
|
| 58 | + if (strlen($serialized) > 4000) { |
|
| 59 | 59 | throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)'); |
| 60 | 60 | } |
| 61 | 61 | $unserialized = unserialize($serialized); |