@@ -20,4 +20,4 @@ |
||
| 20 | 20 | * |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | -require_once __DIR__ . '/v1.php'; |
|
| 23 | +require_once __DIR__.'/v1.php'; |
|
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once __DIR__ . '/../lib/base.php'; |
|
| 22 | +require_once __DIR__.'/../lib/base.php'; |
|
| 23 | 23 | |
| 24 | 24 | header('Content-Type: application/json'); |
| 25 | 25 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | protected function execute(InputInterface $input, OutputInterface $output) { |
| 56 | 56 | $outputType = $input->getOption('output'); |
| 57 | 57 | if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) { |
| 58 | - $certificates = array_map(function (ICertificate $certificate) { |
|
| 58 | + $certificates = array_map(function(ICertificate $certificate) { |
|
| 59 | 59 | return [ |
| 60 | 60 | 'name' => $certificate->getName(), |
| 61 | 61 | 'common_name' => $certificate->getCommonName(), |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | 'Issued By' |
| 82 | 82 | ]); |
| 83 | 83 | |
| 84 | - $rows = array_map(function (ICertificate $certificate) { |
|
| 84 | + $rows = array_map(function(ICertificate $certificate) { |
|
| 85 | 85 | return [ |
| 86 | 86 | $certificate->getName(), |
| 87 | 87 | $certificate->getCommonName(), |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $privateKeyPath = $input->getOption('privateKey'); |
| 70 | 70 | $keyBundlePath = $input->getOption('certificate'); |
| 71 | 71 | $path = $input->getOption('path'); |
| 72 | - if(is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) { |
|
| 72 | + if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) { |
|
| 73 | 73 | $output->writeln('--privateKey, --certificate and --path are required.'); |
| 74 | 74 | return null; |
| 75 | 75 | } |
@@ -77,12 +77,12 @@ discard block |
||
| 77 | 77 | $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
| 78 | 78 | $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
| 79 | 79 | |
| 80 | - if($privateKey === false) { |
|
| 80 | + if ($privateKey === false) { |
|
| 81 | 81 | $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
| 82 | 82 | return null; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - if($keyBundle === false) { |
|
| 85 | + if ($keyBundle === false) { |
|
| 86 | 86 | $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
| 87 | 87 | return null; |
| 88 | 88 | } |
@@ -96,8 +96,8 @@ discard block |
||
| 96 | 96 | try { |
| 97 | 97 | $this->checker->writeCoreSignature($x509, $rsa, $path); |
| 98 | 98 | $output->writeln('Successfully signed "core"'); |
| 99 | - } catch (\Exception $e){ |
|
| 100 | - $output->writeln('Error: ' . $e->getMessage()); |
|
| 99 | + } catch (\Exception $e) { |
|
| 100 | + $output->writeln('Error: '.$e->getMessage()); |
|
| 101 | 101 | return 1; |
| 102 | 102 | } |
| 103 | 103 | return 0; |
@@ -75,23 +75,23 @@ discard block |
||
| 75 | 75 | $path = $input->getOption('path'); |
| 76 | 76 | $privateKeyPath = $input->getOption('privateKey'); |
| 77 | 77 | $keyBundlePath = $input->getOption('certificate'); |
| 78 | - if(is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) { |
|
| 78 | + if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) { |
|
| 79 | 79 | $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity'); |
| 80 | 80 | $output->writeln('This command requires the --path, --privateKey and --certificate.'); |
| 81 | 81 | $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"'); |
| 82 | - $output->writeln('For more information please consult the documentation: '. $documentationUrl); |
|
| 82 | + $output->writeln('For more information please consult the documentation: '.$documentationUrl); |
|
| 83 | 83 | return null; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
| 87 | 87 | $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
| 88 | 88 | |
| 89 | - if($privateKey === false) { |
|
| 89 | + if ($privateKey === false) { |
|
| 90 | 90 | $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
| 91 | 91 | return null; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - if($keyBundle === false) { |
|
| 94 | + if ($keyBundle === false) { |
|
| 95 | 95 | $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
| 96 | 96 | return null; |
| 97 | 97 | } |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | try { |
| 105 | 105 | $this->checker->writeAppSignature($path, $x509, $rsa); |
| 106 | 106 | $output->writeln('Successfully signed "'.$path.'"'); |
| 107 | - } catch (\Exception $e){ |
|
| 108 | - $output->writeln('Error: ' . $e->getMessage()); |
|
| 107 | + } catch (\Exception $e) { |
|
| 108 | + $output->writeln('Error: '.$e->getMessage()); |
|
| 109 | 109 | return 1; |
| 110 | 110 | } |
| 111 | 111 | return 0; |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | protected function execute(InputInterface $input, OutputInterface $output) { |
| 61 | 61 | $result = $this->checker->verifyCoreSignature(); |
| 62 | 62 | $this->writeArrayInOutputFormat($input, $output, $result); |
| 63 | - if (count($result)>0){ |
|
| 63 | + if (count($result) > 0) { |
|
| 64 | 64 | return 1; |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -56,20 +56,20 @@ |
||
| 56 | 56 | |
| 57 | 57 | protected function execute(InputInterface $input, OutputInterface $output) { |
| 58 | 58 | $user = $this->userManager->get($input->getArgument('uid')); |
| 59 | - if(is_null($user)) { |
|
| 59 | + if (is_null($user)) { |
|
| 60 | 60 | $output->writeln('<error>User does not exist</error>'); |
| 61 | 61 | return; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | $lastLogin = $user->getLastLogin(); |
| 65 | - if($lastLogin === 0) { |
|
| 66 | - $output->writeln('User ' . $user->getUID() . |
|
| 65 | + if ($lastLogin === 0) { |
|
| 66 | + $output->writeln('User '.$user->getUID(). |
|
| 67 | 67 | ' has never logged in, yet.'); |
| 68 | 68 | } else { |
| 69 | 69 | $date = new \DateTime(); |
| 70 | 70 | $date->setTimestamp($lastLogin); |
| 71 | - $output->writeln($user->getUID() . |
|
| 72 | - '`s last login: ' . $date->format('d.m.Y H:i')); |
|
| 71 | + $output->writeln($user->getUID(). |
|
| 72 | + '`s last login: '.$date->format('d.m.Y H:i')); |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | protected function execute(InputInterface $input, OutputInterface $output) { |
| 72 | - $users = $this->userManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset')); |
|
| 72 | + $users = $this->userManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset')); |
|
| 73 | 73 | $this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users)); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -78,10 +78,10 @@ discard block |
||
| 78 | 78 | * @return array |
| 79 | 79 | */ |
| 80 | 80 | private function formatUsers(array $users) { |
| 81 | - $keys = array_map(function (IUser $user) { |
|
| 81 | + $keys = array_map(function(IUser $user) { |
|
| 82 | 82 | return $user->getUID(); |
| 83 | 83 | }, $users); |
| 84 | - $values = array_map(function (IUser $user) { |
|
| 84 | + $values = array_map(function(IUser $user) { |
|
| 85 | 85 | return $user->getDisplayName(); |
| 86 | 86 | }, $users); |
| 87 | 87 | return array_combine($keys, $values); |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | protected function checkInput(InputInterface $input) { |
| 125 | 125 | $uid = $input->getArgument('uid'); |
| 126 | 126 | if (!$input->getOption('ignore-missing-user') && !$this->userManager->userExists($uid)) { |
| 127 | - throw new \InvalidArgumentException('The user "' . $uid . '" does not exists.'); |
|
| 127 | + throw new \InvalidArgumentException('The user "'.$uid.'" does not exists.'); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | if ($input->getArgument('key') === '' && $input->hasParameterOption('--default-value')) { |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | try { |
| 160 | 160 | $this->checkInput($input); |
| 161 | 161 | } catch (\InvalidArgumentException $e) { |
| 162 | - $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
| 162 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
| 163 | 163 | return 1; |
| 164 | 164 | } |
| 165 | 165 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $value = $this->config->getUserValue($uid, $app, $key, null); |
| 172 | 172 | if ($input->getArgument('value') !== null) { |
| 173 | 173 | if ($input->hasParameterOption('--update-only') && $value === null) { |
| 174 | - $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>'); |
|
| 174 | + $output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>'); |
|
| 175 | 175 | return 1; |
| 176 | 176 | } |
| 177 | 177 | |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | |
| 189 | 189 | } else if ($input->hasParameterOption('--delete')) { |
| 190 | 190 | if ($input->hasParameterOption('--error-if-not-exists') && $value === null) { |
| 191 | - $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>'); |
|
| 191 | + $output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>'); |
|
| 192 | 192 | return 1; |
| 193 | 193 | } |
| 194 | 194 | |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | $output->writeln($input->getOption('default-value')); |
| 212 | 212 | return 0; |
| 213 | 213 | } else { |
| 214 | - $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>'); |
|
| 214 | + $output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>'); |
|
| 215 | 215 | return 1; |
| 216 | 216 | } |
| 217 | 217 | } |