Completed
Pull Request — master (#10023)
by Joas
206:15 queued 184:34
created
lib/private/L10N/L10NString.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -56,19 +56,19 @@
 block discarded – undo
56 56
 		$translations = $this->l10n->getTranslations();
57 57
 
58 58
 		$text = $this->text;
59
-		if(array_key_exists($this->text, $translations)) {
60
-			if(is_array($translations[$this->text])) {
59
+		if (array_key_exists($this->text, $translations)) {
60
+			if (is_array($translations[$this->text])) {
61 61
 				$fn = $this->l10n->getPluralFormFunction();
62 62
 				$id = $fn($this->count);
63 63
 				$text = $translations[$this->text][$id];
64 64
 			}
65
-			else{
65
+			else {
66 66
 				$text = $translations[$this->text];
67 67
 			}
68 68
 		}
69 69
 
70 70
 		// Replace %n first (won't interfere with vsprintf)
71
-		$text = str_replace('%n', (string)$this->count, $text);
71
+		$text = str_replace('%n', (string) $this->count, $text);
72 72
 		return vsprintf($text, $this->parameters);
73 73
 	}
74 74
 
Please login to merge, or discard this patch.
lib/private/App/AppStore/Bundles/EducationBundle.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 	 * {@inheritDoc}
28 28
 	 */
29 29
 	public function getName() {
30
-		return (string)$this->l10n->t('Education Edition');
30
+		return (string) $this->l10n->t('Education Edition');
31 31
 	}
32 32
 
33 33
 	/**
Please login to merge, or discard this patch.
apps/files_sharing/lib/AppInfo/Application.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 		/**
52 52
 		 * Controllers
53 53
 		 */
54
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
54
+		$container->registerService('ShareController', function(SimpleContainer $c) use ($server) {
55 55
 			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
56 56
 			return new ShareController(
57 57
 				$c->query('AppName'),
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 				$server->query(Defaults::class)
72 72
 			);
73 73
 		});
74
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
74
+		$container->registerService('ExternalSharesController', function(SimpleContainer $c) {
75 75
 			return new ExternalSharesController(
76 76
 				$c->query('AppName'),
77 77
 				$c->query('Request'),
@@ -83,13 +83,13 @@  discard block
 block discarded – undo
83 83
 		/**
84 84
 		 * Core class wrappers
85 85
 		 */
86
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
86
+		$container->registerService('HttpClientService', function(SimpleContainer $c) use ($server) {
87 87
 			return $server->getHTTPClientService();
88 88
 		});
89
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
89
+		$container->registerService(ICloudIdManager::class, function(SimpleContainer $c) use ($server) {
90 90
 			return $server->getCloudIdManager();
91 91
 		});
92
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
92
+		$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server) {
93 93
 			$user = $server->getUserSession()->getUser();
94 94
 			$uid = $user ? $user->getUID() : null;
95 95
 			return new \OCA\Files_Sharing\External\Manager(
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 		/**
108 108
 		 * Middleware
109 109
 		 */
110
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
110
+		$container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server) {
111 111
 			return new SharingCheckMiddleware(
112 112
 				$c->query('AppName'),
113 113
 				$server->getConfig(),
@@ -118,14 +118,14 @@  discard block
 block discarded – undo
118 118
 			);
119 119
 		});
120 120
 
121
-		$container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) {
121
+		$container->registerService('OCSShareAPIMiddleware', function(SimpleContainer $c) use ($server) {
122 122
 			return new OCSShareAPIMiddleware(
123 123
 				$server->getShareManager(),
124 124
 				$server->getL10N($c->query('AppName'))
125 125
 			);
126 126
 		});
127 127
 
128
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
128
+		$container->registerService(ShareInfoMiddleware::class, function() use ($server) {
129 129
 			return new ShareInfoMiddleware(
130 130
 				$server->getShareManager()
131 131
 			);
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		$container->registerMiddleWare('OCSShareAPIMiddleware');
137 137
 		$container->registerMiddleWare(ShareInfoMiddleware::class);
138 138
 
139
-		$container->registerService('MountProvider', function (IContainer $c) {
139
+		$container->registerService('MountProvider', function(IContainer $c) {
140 140
 			/** @var \OCP\IServerContainer $server */
141 141
 			$server = $c->query('ServerContainer');
142 142
 			return new MountProvider(
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 			);
147 147
 		});
148 148
 
149
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
149
+		$container->registerService('ExternalMountProvider', function(IContainer $c) {
150 150
 			/** @var \OCP\IServerContainer $server */
151 151
 			$server = $c->query('ServerContainer');
152 152
 			return new \OCA\Files_Sharing\External\MountProvider(
Please login to merge, or discard this patch.
core/templates/403.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 // @codeCoverageIgnoreStart
3
-if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
3
+if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
4 4
 	require_once '../../lib/base.php';
5 5
 
6 6
 	$urlGenerator = \OC::$server->getURLGenerator();
7
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
7
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
8 8
 	exit;
9 9
 }
10 10
 // @codeCoverageIgnoreEnd
11 11
 ?>
12 12
 <ul>
13 13
 	<li class='error'>
14
-		<?php p($l->t( 'Access forbidden' )); ?><br>
15
-		<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
14
+		<?php p($l->t('Access forbidden')); ?><br>
15
+		<p class='hint'><?php if (isset($_['file'])) p($_['file'])?></p>
16 16
 	</li>
17 17
 </ul>
Please login to merge, or discard this patch.
core/templates/404.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,11 +3,11 @@
 block discarded – undo
3 3
 /** @var $l \OCP\IL10N */
4 4
 /** @var $theme OCP\Defaults */
5 5
 // @codeCoverageIgnoreStart
6
-if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
6
+if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
7 7
 	require_once '../../lib/base.php';
8 8
 
9 9
 	$urlGenerator = \OC::$server->getURLGenerator();
10
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
10
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
11 11
 	exit;
12 12
 }
13 13
 // @codeCoverageIgnoreEnd
Please login to merge, or discard this patch.
lib/private/Preview/Office.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,20 +41,20 @@
 block discarded – undo
41 41
 
42 42
 		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
43 43
 
44
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
44
+		$defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
45 45
 		$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
46 46
 
47
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
47
+		$exec = $this->cmd.$clParameters.escapeshellarg($tmpDir).' '.escapeshellarg($absPath);
48 48
 
49 49
 		shell_exec($exec);
50 50
 
51 51
 		//create imagick object from pdf
52 52
 		$pdfPreview = null;
53 53
 		try {
54
-			list($dirname, , , $filename) = array_values(pathinfo($absPath));
55
-			$pdfPreview = $dirname . '/' . $filename . '.pdf';
54
+			list($dirname,,, $filename) = array_values(pathinfo($absPath));
55
+			$pdfPreview = $dirname.'/'.$filename.'.pdf';
56 56
 
57
-			$pdf = new \imagick($pdfPreview . '[0]');
57
+			$pdf = new \imagick($pdfPreview.'[0]');
58 58
 			$pdf->setImageFormat('jpg');
59 59
 		} catch (\Exception $e) {
60 60
 			unlink($absPath);
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 class PgSqlFunctionBuilder extends FunctionBuilder {
27 27
 	public function concat($x, $y) {
28
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
28
+		return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')');
29 29
 	}
30 30
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 class SqliteFunctionBuilder extends FunctionBuilder {
27 27
 	public function concat($x, $y) {
28
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
28
+		return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')');
29 29
 	}
30 30
 }
Please login to merge, or discard this patch.
core/Command/App/ListApps.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	}
62 62
 
63 63
 	protected function execute(InputInterface $input, OutputInterface $output) {
64
-		if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false'){
64
+		if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false') {
65 65
 			$shippedFilter = $input->getOption('shipped') === 'true';
66 66
 		} else {
67 67
 			$shippedFilter = null;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 		//sort enabled apps above disabled apps
75 75
 		foreach ($apps as $app) {
76
-			if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter){
76
+			if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter) {
77 77
 				continue;
78 78
 			}
79 79
 			if ($this->manager->isInstalled($app)) {
Please login to merge, or discard this patch.