Completed
Pull Request — master (#4049)
by Lukas
11:48
created
lib/private/Template/JSCombiner.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -71,19 +71,19 @@  discard block
 block discarded – undo
71 71
 			return false;
72 72
 		}
73 73
 
74
-		$path = explode('/', $root . '/' . $file);
74
+		$path = explode('/', $root.'/'.$file);
75 75
 
76 76
 		$fileName = array_pop($path);
77 77
 		$path = implode('/', $path);
78 78
 
79 79
 		try {
80 80
 			$folder = $this->appData->getFolder($app);
81
-		} catch(NotFoundException $e) {
81
+		} catch (NotFoundException $e) {
82 82
 			// creating css appdata folder
83 83
 			$folder = $this->appData->newFolder($app);
84 84
 		}
85 85
 
86
-		if($this->isCached($fileName, $folder)) {
86
+		if ($this->isCached($fileName, $folder)) {
87 87
 			return true;
88 88
 		}
89 89
 		return $this->cache($path, $fileName, $folder);
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
 	 * @return bool
96 96
 	 */
97 97
 	protected function isCached($fileName, ISimpleFolder $folder) {
98
-		$fileName = str_replace('.json', '.js', $fileName) . '.deps';
98
+		$fileName = str_replace('.json', '.js', $fileName).'.deps';
99 99
 		try {
100
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
100
+			$deps = $this->depsCache->get($folder->getName().'-'.$fileName);
101 101
 			if ($deps === null) {
102 102
 				$depFile = $folder->getFile($fileName);
103 103
 				$deps = $depFile->getContent();
104
-				$this->depsCache->set($folder->getName() . '-' . $fileName, $deps);
104
+				$this->depsCache->set($folder->getName().'-'.$fileName, $deps);
105 105
 			}
106 106
 			$deps = json_decode($deps, true);
107 107
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 			}
113 113
 
114 114
 			return true;
115
-		} catch(NotFoundException $e) {
115
+		} catch (NotFoundException $e) {
116 116
 			return false;
117 117
 		}
118 118
 	}
@@ -125,17 +125,17 @@  discard block
 block discarded – undo
125 125
 	 */
126 126
 	protected function cache($path, $fileName, ISimpleFolder $folder) {
127 127
 		$deps = [];
128
-		$fullPath = $path . '/' . $fileName;
128
+		$fullPath = $path.'/'.$fileName;
129 129
 		$data = json_decode(file_get_contents($fullPath));
130 130
 		$deps[$fullPath] = filemtime($fullPath);
131 131
 
132 132
 		$res = '';
133 133
 		foreach ($data as $file) {
134
-			$filePath = $path . '/' . $file;
134
+			$filePath = $path.'/'.$file;
135 135
 
136 136
 			if (is_file($filePath)) {
137 137
 				$res .= file_get_contents($filePath);
138
-				$res .= PHP_EOL . PHP_EOL;
138
+				$res .= PHP_EOL.PHP_EOL;
139 139
 				$deps[$filePath] = filemtime($filePath);
140 140
 			}
141 141
 		}
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
143 143
 		$fileName = str_replace('.json', '.js', $fileName);
144 144
 		try {
145 145
 			$cachedfile = $folder->getFile($fileName);
146
-		} catch(NotFoundException $e) {
146
+		} catch (NotFoundException $e) {
147 147
 			$cachedfile = $folder->newFile($fileName);
148 148
 		}
149 149
 
150
-		$depFileName = $fileName . '.deps';
150
+		$depFileName = $fileName.'.deps';
151 151
 		try {
152 152
 			$depFile = $folder->getFile($depFileName);
153 153
 		} catch (NotFoundException $e) {
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
183 183
 	 */
184 184
 	public function getContent($root, $file) {
185 185
 		/** @var array $data */
186
-		$data = json_decode(file_get_contents($root . '/' . $file));
187
-		if(!is_array($data)) {
186
+		$data = json_decode(file_get_contents($root.'/'.$file));
187
+		if (!is_array($data)) {
188 188
 			return [];
189 189
 		}
190 190
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 
195 195
 		$result = [];
196 196
 		foreach ($data as $f) {
197
-			$result[] = $path . '/' . $f;
197
+			$result[] = $path.'/'.$f;
198 198
 		}
199 199
 
200 200
 		return $result;
Please login to merge, or discard this patch.