@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | protected $httpClient; |
73 | 73 | protected $mimeTypes; |
74 | 74 | |
75 | - public function __construct (AttachmentPathResolver $pathResolver, bool $allow_attachments_downloads, |
|
75 | + public function __construct(AttachmentPathResolver $pathResolver, bool $allow_attachments_downloads, |
|
76 | 76 | HttpClientInterface $httpClient, MimeTypesInterface $mimeTypes) |
77 | 77 | { |
78 | 78 | $this->pathResolver = $pathResolver; |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $attachment->getName() |
122 | 122 | ); |
123 | 123 | |
124 | - return $safeName . '-' . uniqid('', false) . '.' . $extension; |
|
124 | + return $safeName.'-'.uniqid('', false).'.'.$extension; |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | //Ensure the given attachment class is known to mapping |
142 | 142 | if (!isset($this->folder_mapping[get_class($attachment)])) { |
143 | 143 | throw new \InvalidArgumentException( |
144 | - 'The given attachment class is not known! The passed class was: ' . get_class($attachment) |
|
144 | + 'The given attachment class is not known! The passed class was: '.get_class($attachment) |
|
145 | 145 | ); |
146 | 146 | } |
147 | 147 | //Ensure the attachment has an assigned element |
@@ -153,8 +153,8 @@ discard block |
||
153 | 153 | |
154 | 154 | //Build path |
155 | 155 | return |
156 | - $base_path . DIRECTORY_SEPARATOR //Base path |
|
157 | - . $this->folder_mapping[get_class($attachment)] . DIRECTORY_SEPARATOR . $attachment->getElement()->getID(); |
|
156 | + $base_path.DIRECTORY_SEPARATOR //Base path |
|
157 | + . $this->folder_mapping[get_class($attachment)].DIRECTORY_SEPARATOR.$attachment->getElement()->getID(); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | /** |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | |
228 | 228 | $ext = pathinfo($filename, PATHINFO_EXTENSION); |
229 | 229 | $new_path = $this->generateAttachmentPath($attachment, $secure_location) |
230 | - . DIRECTORY_SEPARATOR . $this->generateAttachmentFilename($attachment, $ext); |
|
230 | + . DIRECTORY_SEPARATOR.$this->generateAttachmentFilename($attachment, $ext); |
|
231 | 231 | |
232 | 232 | //Move file to new directory |
233 | 233 | $fs = new Filesystem(); |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | |
258 | 258 | $fs = new Filesystem(); |
259 | 259 | $attachment_folder = $this->generateAttachmentPath($attachment, $options['secure_attachment']); |
260 | - $tmp_path = $attachment_folder . DIRECTORY_SEPARATOR . $this->generateAttachmentFilename($attachment, 'tmp'); |
|
260 | + $tmp_path = $attachment_folder.DIRECTORY_SEPARATOR.$this->generateAttachmentFilename($attachment, 'tmp'); |
|
261 | 261 | |
262 | 262 | try { |
263 | 263 | $response = $this->httpClient->request('GET', $url, [ |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | ]); |
266 | 266 | |
267 | 267 | if (200 !== $response->getStatusCode()) { |
268 | - throw new AttachmentDownloadException('Status code: ' . $response->getStatusCode()); |
|
268 | + throw new AttachmentDownloadException('Status code: '.$response->getStatusCode()); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | //Open a temporary file in the attachment folder |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | } |
307 | 307 | |
308 | 308 | //Rename the file to its new name and save path to attachment entity |
309 | - $new_path = $attachment_folder . DIRECTORY_SEPARATOR . $this->generateAttachmentFilename($attachment, $new_ext); |
|
309 | + $new_path = $attachment_folder.DIRECTORY_SEPARATOR.$this->generateAttachmentFilename($attachment, $new_ext); |
|
310 | 310 | $fs->rename($tmp_path, $new_path); |
311 | 311 | |
312 | 312 | //Make our file path relative to %BASE% |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | $io = new SymfonyStyle($input, $output); |
50 | 50 | |
51 | 51 | $mediaPath = $this->pathResolver->getMediaPath(); |
52 | - $io->note("The media path is " . $mediaPath); |
|
52 | + $io->note("The media path is ".$mediaPath); |
|
53 | 53 | $securePath = $this->pathResolver->getSecurePath(); |
54 | - $io->note("The secure media path is ". $securePath); |
|
54 | + $io->note("The secure media path is ".$securePath); |
|
55 | 55 | |
56 | 56 | $finder = new Finder(); |
57 | 57 | //We look for files in the media folder only |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | */ |
111 | 111 | protected function removeEmptySubFolders($path) |
112 | 112 | { |
113 | - $empty=true; |
|
114 | - foreach (glob($path . DIRECTORY_SEPARATOR . "*") as $file) |
|
113 | + $empty = true; |
|
114 | + foreach (glob($path.DIRECTORY_SEPARATOR."*") as $file) |
|
115 | 115 | { |
116 | 116 | $empty &= is_dir($file) && $this->removeEmptySubFolders($file); |
117 | 117 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | $banner = $this->getParameter('banner'); |
56 | 56 | if (empty($banner)) { |
57 | 57 | $banner_path = $this->kernel->getProjectDir() |
58 | - . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'banner.md'; |
|
58 | + . DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'banner.md'; |
|
59 | 59 | |
60 | 60 | return file_get_contents($banner_path); |
61 | 61 | } |
@@ -173,6 +173,6 @@ |
||
173 | 173 | |
174 | 174 | $sz = 'BKMGTP'; |
175 | 175 | $factor = (int) floor((strlen($bytes) - 1) / 3); |
176 | - return sprintf("%.{$decimals}f", $bytes / 1024 ** $factor) . @$sz[$factor]; |
|
176 | + return sprintf("%.{$decimals}f", $bytes / 1024 ** $factor).@$sz[$factor]; |
|
177 | 177 | } |
178 | 178 | } |
179 | 179 | \ No newline at end of file |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | protected function configureOptions(OptionsResolver $resolver) |
57 | 57 | { |
58 | 58 | $resolver->setDefaults([ |
59 | - 'limit' => 15, //Given only 15 entries |
|
59 | + 'limit' => 15, //Given only 15 entries |
|
60 | 60 | //'allowed_extensions' => [], //Filter the filenames. For example ['jpg', 'jpeg'] to only get jpegs. |
61 | 61 | //'placeholders' => Attachment::BUILTIN_PLACEHOLDER, //By default use all builtin ressources, |
62 | 62 | 'empty_returns_all' => false //Return the whole list of ressources when empty keyword is given |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | public function getListOfRessources() : array |
73 | 73 | { |
74 | 74 | try { |
75 | - return $this->cache->get('attachment_builtin_ressources', function () { |
|
75 | + return $this->cache->get('attachment_builtin_ressources', function() { |
|
76 | 76 | $results = []; |
77 | 77 | |
78 | 78 | $finder = new Finder(); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | } */ |
147 | 147 | |
148 | 148 | //Ignore case |
149 | - $regex = '/.*' . $keyword . '.*/i'; |
|
149 | + $regex = '/.*'.$keyword.'.*/i'; |
|
150 | 150 | |
151 | 151 | return preg_grep($regex, $base_list); |
152 | 152 | } |
@@ -73,7 +73,7 @@ |
||
73 | 73 | self::$utc_timezone |
74 | 74 | ); |
75 | 75 | |
76 | - if (! $converted) { |
|
76 | + if (!$converted) { |
|
77 | 77 | throw ConversionException::conversionFailedFormat( |
78 | 78 | $value, |
79 | 79 | $this->getName(), |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | } catch (AttachmentDownloadException $ex) { |
116 | 116 | $this->addFlash( |
117 | 117 | 'error', |
118 | - $this->translator->trans('attachment.download_failed') . ' ' . $ex->getMessage() |
|
118 | + $this->translator->trans('attachment.download_failed').' '.$ex->getMessage() |
|
119 | 119 | ); |
120 | 120 | } |
121 | 121 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | //Rebuild form, so it is based on the updated data. Important for the parent field! |
128 | 128 | //We can not use dynamic form events here, because the parent entity list is build from database! |
129 | 129 | $form = $this->createForm($this->form_class, $entity, ['attachment_class' => $this->attachment_class]); |
130 | - } elseif ($form->isSubmitted() && ! $form->isValid()) { |
|
130 | + } elseif ($form->isSubmitted() && !$form->isValid()) { |
|
131 | 131 | $this->addFlash('error', $this->translator->trans('entity.edit_flash.invalid')); |
132 | 132 | } |
133 | 133 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | } catch (AttachmentDownloadException $ex) { |
172 | 172 | $this->addFlash( |
173 | 173 | 'error', |
174 | - $this->translator->trans('attachment.download_failed') . ' ' . $ex->getMessage() |
|
174 | + $this->translator->trans('attachment.download_failed').' '.$ex->getMessage() |
|
175 | 175 | ); |
176 | 176 | } |
177 | 177 | } |
@@ -180,10 +180,10 @@ discard block |
||
180 | 180 | $em->flush(); |
181 | 181 | $this->addFlash('success', $this->translator->trans('entity.created_flash')); |
182 | 182 | |
183 | - return $this->redirectToRoute($this->route_base . '_edit', ['id' => $new_entity->getID()]); |
|
183 | + return $this->redirectToRoute($this->route_base.'_edit', ['id' => $new_entity->getID()]); |
|
184 | 184 | } |
185 | 185 | |
186 | - if ($form->isSubmitted() && ! $form->isValid()) { |
|
186 | + if ($form->isSubmitted() && !$form->isValid()) { |
|
187 | 187 | $this->addFlash('error', $this->translator->trans('entity.created_flash.invalid')); |
188 | 188 | } |
189 | 189 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | |
204 | 204 | foreach ($errors as $name => $error) { |
205 | 205 | /** @var $error ConstraintViolationList */ |
206 | - $this->addFlash('error', $name . ':' . $error); |
|
206 | + $this->addFlash('error', $name.':'.$error); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | //Show errors to user: |
223 | 223 | foreach ($errors as $name => $error) { |
224 | 224 | /** @var $error ConstraintViolationList */ |
225 | - $this->addFlash('error', $name . ':' . $error); |
|
225 | + $this->addFlash('error', $name.':'.$error); |
|
226 | 226 | } |
227 | 227 | } |
228 | 228 | |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | $this->addFlash('error', 'csfr_invalid'); |
269 | 269 | } |
270 | 270 | |
271 | - return $this->redirectToRoute($this->route_base . '_new'); |
|
271 | + return $this->redirectToRoute($this->route_base.'_new'); |
|
272 | 272 | } |
273 | 273 | |
274 | 274 | protected function _exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request) |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | |
280 | 280 | $entities = $em->getRepository($this->entity_class)->findAll(); |
281 | 281 | |
282 | - return $exporter->exportEntityFromRequest($entities,$request); |
|
282 | + return $exporter->exportEntityFromRequest($entities, $request); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | protected function _exportEntity(NamedDBElement $entity, EntityExporter $exporter, Request $request) |
@@ -18,14 +18,14 @@ discard block |
||
18 | 18 | $admins->setName('admins'); |
19 | 19 | //Perm values taken from Version 1 |
20 | 20 | $admins->getPermissions()->setRawPermissionValues([ |
21 | - 'system' => '21','groups' => '1365','users' => '87381','self' => '85','config' => '85', |
|
22 | - 'database' => '21','parts' => '1431655765','parts_name' => '5','parts_description' => '5', |
|
23 | - 'parts_footprint' => '5','parts_manufacturer' => '5','parts_comment' => '5','parts_order' => '5', |
|
24 | - 'parts_orderdetails' => '341','parts_prices' => '341','parts_attachments' => '341','devices' => '5461', |
|
25 | - 'devices_parts' => '325','storelocations' => '5461','footprints' => '5461','categories' => '5461', |
|
26 | - 'suppliers' => '5461','manufacturers' => '5461','attachment_types' => '1365','tools' => '1365', |
|
27 | - 'labels' => '21','parts_category' => '5','parts_minamount' => '5','parts_lots' => '85','parts_tags' => '5', |
|
28 | - 'parts_unit' => '5','parts_mass' => '5','parts_status' => '5','parts_mpn' => '5','currencies' => '5461', |
|
21 | + 'system' => '21', 'groups' => '1365', 'users' => '87381', 'self' => '85', 'config' => '85', |
|
22 | + 'database' => '21', 'parts' => '1431655765', 'parts_name' => '5', 'parts_description' => '5', |
|
23 | + 'parts_footprint' => '5', 'parts_manufacturer' => '5', 'parts_comment' => '5', 'parts_order' => '5', |
|
24 | + 'parts_orderdetails' => '341', 'parts_prices' => '341', 'parts_attachments' => '341', 'devices' => '5461', |
|
25 | + 'devices_parts' => '325', 'storelocations' => '5461', 'footprints' => '5461', 'categories' => '5461', |
|
26 | + 'suppliers' => '5461', 'manufacturers' => '5461', 'attachment_types' => '1365', 'tools' => '1365', |
|
27 | + 'labels' => '21', 'parts_category' => '5', 'parts_minamount' => '5', 'parts_lots' => '85', 'parts_tags' => '5', |
|
28 | + 'parts_unit' => '5', 'parts_mass' => '5', 'parts_status' => '5', 'parts_mpn' => '5', 'currencies' => '5461', |
|
29 | 29 | 'measurement_units' => '5461' |
30 | 30 | ]); |
31 | 31 | $this->setReference(self::ADMINS, $admins); |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | $readonly = new Group(); |
35 | 35 | $readonly->setName('readonly'); |
36 | 36 | $readonly->getPermissions()->setRawPermissionValues([ |
37 | - 'system' => '2','groups' => '2730','users' => '43690','self' => '25','config' => '170', |
|
38 | - 'database' => '42','parts' => '2778027689','parts_name' => '9','parts_description' => '9', |
|
39 | - 'parts_footprint' => '9','parts_manufacturer' => '9','parts_comment' => '9','parts_order' => '9', |
|
40 | - 'parts_orderdetails' => '681','parts_prices' => '681','parts_attachments' => '681','devices' => '1705', |
|
41 | - 'devices_parts' => '649','storelocations' => '1705','footprints' => '1705','categories' => '1705', |
|
42 | - 'suppliers' => '1705','manufacturers' => '1705','attachment_types' => '681','tools' => '1366', |
|
43 | - 'labels' => '165','parts_category' => '9','parts_minamount' => '9','parts_lots' => '169','parts_tags' => '9', |
|
44 | - 'parts_unit' => '9','parts_mass' => '9','parts_status' => '9','parts_mpn' => '9','currencies' => '9897', |
|
37 | + 'system' => '2', 'groups' => '2730', 'users' => '43690', 'self' => '25', 'config' => '170', |
|
38 | + 'database' => '42', 'parts' => '2778027689', 'parts_name' => '9', 'parts_description' => '9', |
|
39 | + 'parts_footprint' => '9', 'parts_manufacturer' => '9', 'parts_comment' => '9', 'parts_order' => '9', |
|
40 | + 'parts_orderdetails' => '681', 'parts_prices' => '681', 'parts_attachments' => '681', 'devices' => '1705', |
|
41 | + 'devices_parts' => '649', 'storelocations' => '1705', 'footprints' => '1705', 'categories' => '1705', |
|
42 | + 'suppliers' => '1705', 'manufacturers' => '1705', 'attachment_types' => '681', 'tools' => '1366', |
|
43 | + 'labels' => '165', 'parts_category' => '9', 'parts_minamount' => '9', 'parts_lots' => '169', 'parts_tags' => '9', |
|
44 | + 'parts_unit' => '9', 'parts_mass' => '9', 'parts_status' => '9', 'parts_mpn' => '9', 'currencies' => '9897', |
|
45 | 45 | 'measurement_units' => '9897' |
46 | 46 | ]); |
47 | 47 | $this->setReference(self::READONLY, $readonly); |
@@ -50,14 +50,14 @@ discard block |
||
50 | 50 | $users = new Group(); |
51 | 51 | $users->setName('users'); |
52 | 52 | $users->getPermissions()->setRawPermissionValues([ |
53 | - 'system' => '42','groups' => '2730','users' => '43690','self' => '89','config' => '105', |
|
54 | - 'database' => '41','parts' => '1431655765','parts_name' => '5','parts_description' => '5', |
|
55 | - 'parts_footprint' => '5','parts_manufacturer' => '5','parts_comment' => '5','parts_order' => '5', |
|
56 | - 'parts_orderdetails' => '341','parts_prices' => '341','parts_attachments' => '341','devices' => '5461', |
|
57 | - 'devices_parts' => '325','storelocations' => '5461','footprints' => '5461','categories' => '5461', |
|
58 | - 'suppliers' => '5461','manufacturers' => '5461','attachment_types' => '1365','tools' => '1365', |
|
59 | - 'labels' => '85','parts_category' => '5','parts_minamount' => '5','parts_lots' => '85','parts_tags' => '5', |
|
60 | - 'parts_unit' => '5','parts_mass' => '5','parts_status' => '5','parts_mpn' => '5','currencies' => '5461', |
|
53 | + 'system' => '42', 'groups' => '2730', 'users' => '43690', 'self' => '89', 'config' => '105', |
|
54 | + 'database' => '41', 'parts' => '1431655765', 'parts_name' => '5', 'parts_description' => '5', |
|
55 | + 'parts_footprint' => '5', 'parts_manufacturer' => '5', 'parts_comment' => '5', 'parts_order' => '5', |
|
56 | + 'parts_orderdetails' => '341', 'parts_prices' => '341', 'parts_attachments' => '341', 'devices' => '5461', |
|
57 | + 'devices_parts' => '325', 'storelocations' => '5461', 'footprints' => '5461', 'categories' => '5461', |
|
58 | + 'suppliers' => '5461', 'manufacturers' => '5461', 'attachment_types' => '1365', 'tools' => '1365', |
|
59 | + 'labels' => '85', 'parts_category' => '5', 'parts_minamount' => '5', 'parts_lots' => '85', 'parts_tags' => '5', |
|
60 | + 'parts_unit' => '5', 'parts_mass' => '5', 'parts_status' => '5', 'parts_mpn' => '5', 'currencies' => '5461', |
|
61 | 61 | 'measurement_units' => '5461' |
62 | 62 | ]); |
63 | 63 | $this->setReference(self::USERS, $users); |
@@ -588,6 +588,6 @@ |
||
588 | 588 | public function __toString() |
589 | 589 | { |
590 | 590 | $tmp = $this->isDisabled() ? ' [DISABLED]' : ''; |
591 | - return $this->getFullName(true) . $tmp; |
|
591 | + return $this->getFullName(true).$tmp; |
|
592 | 592 | } |
593 | 593 | } |