@@ -68,7 +68,7 @@ |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | //$new_url = str_replace($request->getPathInfo(), '/' . $locale . $request->getPathInfo(), $request->getUri()); |
71 | - $new_url = $request->getUriForPath('/' . $locale . $request->getPathInfo()); |
|
71 | + $new_url = $request->getUriForPath('/'.$locale.$request->getPathInfo()); |
|
72 | 72 | return $this->redirect($new_url); |
73 | 73 | } |
74 | 74 | } |
75 | 75 | \ No newline at end of file |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | protected function configureOptions(OptionsResolver $resolver) |
53 | 53 | { |
54 | 54 | $resolver->setDefaults([ |
55 | - 'show_prefix' => function (Options $options) { |
|
55 | + 'show_prefix' => function(Options $options) { |
|
56 | 56 | if ($options['measurement_unit'] !== null) { |
57 | 57 | /** @var MeasurementUnit $unit */ |
58 | 58 | $unit = $options['measurement_unit']; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | return false; |
62 | 62 | }, |
63 | - 'is_integer' => function (Options $options) { |
|
63 | + 'is_integer' => function(Options $options) { |
|
64 | 64 | if ($options['measurement_unit'] !== null) { |
65 | 65 | /** @var MeasurementUnit $unit */ |
66 | 66 | $unit = $options['measurement_unit']; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | return true; |
70 | 70 | }, |
71 | - 'unit' => function (Options $options) { |
|
71 | + 'unit' => function(Options $options) { |
|
72 | 72 | if ($options['measurement_unit'] !== null) { |
73 | 73 | /** @var MeasurementUnit $unit */ |
74 | 74 | $unit = $options['measurement_unit']; |
@@ -77,12 +77,12 @@ discard block |
||
77 | 77 | return ''; |
78 | 78 | }, |
79 | 79 | 'decimals' => 2, |
80 | - 'error_mapping' => [ '.' => 'value'] |
|
80 | + 'error_mapping' => ['.' => 'value'] |
|
81 | 81 | ]); |
82 | 82 | |
83 | 83 | $resolver->setAllowedTypes('decimals', 'int'); |
84 | 84 | |
85 | - $resolver->setNormalizer('decimals', function (Options $options, $value) { |
|
85 | + $resolver->setNormalizer('decimals', function(Options $options, $value) { |
|
86 | 86 | // If the unit is integer based, then dont show any decimals |
87 | 87 | if ($options['is_integer']) { |
88 | 88 | return 0; |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | |
126 | 126 | //Otherwise just output it |
127 | 127 | if (!empty($options['unit'])) { |
128 | - $format_string = '%.' . $options['decimals'] . 'f ' . $options['unit']; |
|
128 | + $format_string = '%.'.$options['decimals'].'f '.$options['unit']; |
|
129 | 129 | } else { //Dont add space after number if no unit was specified |
130 | - $format_string = '%.' . $options['decimals'] . 'f'; |
|
130 | + $format_string = '%.'.$options['decimals'].'f'; |
|
131 | 131 | } |
132 | 132 | return sprintf($format_string, $value); |
133 | 133 | } |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function getPrefixByMagnitude(int $magnitude) : array |
57 | 57 | { |
58 | - $prefixes_pos = ['' ,'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y']; |
|
59 | - $prefixes_neg = ['' ,'m', 'μ', 'n', 'p', 'f', 'a', 'z', 'y']; |
|
58 | + $prefixes_pos = ['', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y']; |
|
59 | + $prefixes_neg = ['', 'm', 'μ', 'n', 'p', 'f', 'a', 'z', 'y']; |
|
60 | 60 | |
61 | 61 | if ($magnitude >= 0) { |
62 | 62 | $nearest = (int) floor(abs($magnitude) / 3); |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | $value /= $divisor; |
106 | 106 | //Build the format string, e.g.: %.2d km |
107 | 107 | if ($unit !== '' || $symbol !== '') { |
108 | - $format_string = '%.' . $decimals . 'f ' . $symbol . $unit; |
|
108 | + $format_string = '%.'.$decimals.'f '.$symbol.$unit; |
|
109 | 109 | } else { |
110 | - $format_string = '%.' . $decimals . 'f'; |
|
110 | + $format_string = '%.'.$decimals.'f'; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | return sprintf($format_string, $value); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $attachments = $form['attachments']; |
102 | 102 | foreach ($attachments as $attachment) { |
103 | 103 | /** @var $attachment FormInterface */ |
104 | - $this->attachmentHelper->upload( $attachment->getData(), $attachment['file']->getData()); |
|
104 | + $this->attachmentHelper->upload($attachment->getData(), $attachment['file']->getData()); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | $em->persist($entity); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | //Rebuild form, so it is based on the updated data. Important for the parent field! |
112 | 112 | //We can not use dynamic form events here, because the parent entity list is build from database! |
113 | 113 | $form = $this->createForm($this->form_class, $entity, ['attachment_class' => $this->attachment_class]); |
114 | - } elseif ($form->isSubmitted() && ! $form->isValid()) { |
|
114 | + } elseif ($form->isSubmitted() && !$form->isValid()) { |
|
115 | 115 | $this->addFlash('error', $this->translator->trans('entity.edit_flash.invalid')); |
116 | 116 | } |
117 | 117 | |
@@ -146,17 +146,17 @@ discard block |
||
146 | 146 | $attachments = $form['attachments']; |
147 | 147 | foreach ($attachments as $attachment) { |
148 | 148 | /** @var $attachment FormInterface */ |
149 | - $this->attachmentHelper->upload( $attachment->getData(), $attachment['file']->getData()); |
|
149 | + $this->attachmentHelper->upload($attachment->getData(), $attachment['file']->getData()); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | $em->persist($new_entity); |
153 | 153 | $em->flush(); |
154 | 154 | $this->addFlash('success', $this->translator->trans('entity.created_flash')); |
155 | 155 | |
156 | - return $this->redirectToRoute($this->route_base . '_edit', ['id' => $new_entity->getID()]); |
|
156 | + return $this->redirectToRoute($this->route_base.'_edit', ['id' => $new_entity->getID()]); |
|
157 | 157 | } |
158 | 158 | |
159 | - if ($form->isSubmitted() && ! $form->isValid()) { |
|
159 | + if ($form->isSubmitted() && !$form->isValid()) { |
|
160 | 160 | $this->addFlash('error', $this->translator->trans('entity.created_flash.invalid')); |
161 | 161 | } |
162 | 162 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | foreach ($errors as $name => $error) { |
178 | 178 | /** @var $error ConstraintViolationList */ |
179 | - $this->addFlash('error', $name . ':' . $error); |
|
179 | + $this->addFlash('error', $name.':'.$error); |
|
180 | 180 | } |
181 | 181 | } |
182 | 182 | |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | //Show errors to user: |
196 | 196 | foreach ($errors as $name => $error) { |
197 | 197 | /** @var $error ConstraintViolationList */ |
198 | - $this->addFlash('error', $name . ':' . $error); |
|
198 | + $this->addFlash('error', $name.':'.$error); |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | $this->addFlash('success', 'attachment_type.deleted'); |
240 | 240 | } |
241 | 241 | |
242 | - return $this->redirectToRoute($this->route_base . '_new'); |
|
242 | + return $this->redirectToRoute($this->route_base.'_new'); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | protected function _exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request) |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | |
251 | 251 | $entities = $em->getRepository($this->entity_class)->findAll(); |
252 | 252 | |
253 | - return $exporter->exportEntityFromRequest($entities,$request); |
|
253 | + return $exporter->exportEntityFromRequest($entities, $request); |
|
254 | 254 | } |
255 | 255 | |
256 | 256 | protected function _exportEntity(NamedDBElement $entity, EntityExporter $exporter, Request $request) |
@@ -49,7 +49,7 @@ 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 | |
54 | 54 | $finder = new Finder(); |
55 | 55 | //We look for files in the media folder only |
@@ -106,8 +106,8 @@ discard block |
||
106 | 106 | */ |
107 | 107 | protected function removeEmptySubFolders($path) |
108 | 108 | { |
109 | - $empty=true; |
|
110 | - foreach (glob($path . DIRECTORY_SEPARATOR . "*") as $file) |
|
109 | + $empty = true; |
|
110 | + foreach (glob($path.DIRECTORY_SEPARATOR."*") as $file) |
|
111 | 111 | { |
112 | 112 | $empty &= is_dir($file) && $this->removeEmptySubFolders($file); |
113 | 113 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | } |
115 | 115 | |
116 | 116 | //Otherwise prepend the project path |
117 | - $tmp = realpath($this->project_dir . DIRECTORY_SEPARATOR . $param_path); |
|
117 | + $tmp = realpath($this->project_dir.DIRECTORY_SEPARATOR.$param_path); |
|
118 | 118 | |
119 | 119 | //If path does not exist then disable the placeholder |
120 | 120 | if ($tmp === false) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | |
139 | 139 | foreach ($array as $item) { |
140 | 140 | $item = str_replace(['\\'], ['/'], $item); |
141 | - $ret[] = '/' . preg_quote($item, '/') . '/'; |
|
141 | + $ret[] = '/'.preg_quote($item, '/').'/'; |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | return $ret; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | //Older path entries are given via %BASE% which was the project root |
158 | 158 | |
159 | 159 | $count = 0; |
160 | - $placeholder_path = preg_replace($this->placeholders_regex, $this->pathes, $placeholder_path,-1,$count); |
|
160 | + $placeholder_path = preg_replace($this->placeholders_regex, $this->pathes, $placeholder_path, -1, $count); |
|
161 | 161 | |
162 | 162 | //A valid placeholder can have only one |
163 | 163 | if ($count !== 1) { |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | $sz = 'BKMGTP'; |
149 | 149 | $factor = (int) floor((strlen($bytes) - 1) / 3); |
150 | - return sprintf("%.{$decimals}f", $bytes / 1024 ** $factor) . @$sz[$factor]; |
|
150 | + return sprintf("%.{$decimals}f", $bytes / 1024 ** $factor).@$sz[$factor]; |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | MeasurementUnitAttachment::class => 'measurement_unit', StorelocationAttachment::class => 'storelocation', |
165 | 165 | SupplierAttachment::class => 'supplier', UserAttachment::class => 'user']; |
166 | 166 | |
167 | - $path = $this->base_path . DIRECTORY_SEPARATOR . $mapping[get_class($attachment)] . DIRECTORY_SEPARATOR . $attachment->getElement()->getID(); |
|
167 | + $path = $this->base_path.DIRECTORY_SEPARATOR.$mapping[get_class($attachment)].DIRECTORY_SEPARATOR.$attachment->getElement()->getID(); |
|
168 | 168 | return $path; |
169 | 169 | } |
170 | 170 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | //Sanatize filename |
187 | 187 | $originalFilename = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME); |
188 | - $newFilename = $attachment->getName() . '-' . uniqid('', false) . '.' . $file->guessExtension(); |
|
188 | + $newFilename = $attachment->getName().'-'.uniqid('', false).'.'.$file->guessExtension(); |
|
189 | 189 | |
190 | 190 | //Move our temporay attachment to its final location |
191 | 191 | $file_path = $file->move($folder, $newFilename)->getRealPath(); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | { |
23 | 23 | try { |
24 | 24 | //Check if we can use this migration method: |
25 | - $version = (int)$this->connection->fetchColumn("SELECT keyValue AS version FROM `internal` WHERE `keyName` = 'dbVersion'"); |
|
25 | + $version = (int) $this->connection->fetchColumn("SELECT keyValue AS version FROM `internal` WHERE `keyName` = 'dbVersion'"); |
|
26 | 26 | $this->skipIf(true, "Old Part-DB Database detected! Continue with upgrade..."); |
27 | 27 | } catch (DBALException $ex) { |
28 | 28 | //when the table was not found, we can proceed, because we have an empty DB! |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | |
87 | 87 | //Create table for user logs: |
88 | - $sql = $updateSteps[] = "CREATE TABLE `log` ". |
|
88 | + $sql = $updateSteps[] = "CREATE TABLE `log` ". |
|
89 | 89 | "( `id` INT NOT NULL AUTO_INCREMENT , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP() ,". |
90 | 90 | " `id_user` INT NOT NULL ,". |
91 | 91 | " `level` TINYINT NOT NULL ,". |
@@ -50,15 +50,15 @@ |
||
50 | 50 | |
51 | 51 | //Add a attachment for each footprint attachment |
52 | 52 | $this->addSql( |
53 | - 'INSERT IGNORE INTO attachments (element_id, type_id, name, class_name, path, last_modified, datetime_added) ' . |
|
54 | - "SELECT footprints.id, 1000, 'Footprint', 'Footprint', REPLACE(footprints.filename, '%BASE%/img/footprints', '%FOOTPRINTS%' ), NOW(), NOW() FROM footprints " . |
|
53 | + 'INSERT IGNORE INTO attachments (element_id, type_id, name, class_name, path, last_modified, datetime_added) '. |
|
54 | + "SELECT footprints.id, 1000, 'Footprint', 'Footprint', REPLACE(footprints.filename, '%BASE%/img/footprints', '%FOOTPRINTS%' ), NOW(), NOW() FROM footprints ". |
|
55 | 55 | "WHERE footprints.filename <> ''" |
56 | 56 | ); |
57 | 57 | |
58 | 58 | //Do the same for 3D Footprints |
59 | 59 | $this->addSql( |
60 | - 'INSERT IGNORE INTO attachments (element_id, type_id, name, class_name, path, last_modified, datetime_added) ' . |
|
61 | - "SELECT footprints.id, 1001, 'Footprint 3D', 'Footprint', REPLACE(footprints.filename_3d, '%BASE%/models', '%FOOTPRINTS3D%' ), NOW(), NOW() FROM footprints " . |
|
60 | + 'INSERT IGNORE INTO attachments (element_id, type_id, name, class_name, path, last_modified, datetime_added) '. |
|
61 | + "SELECT footprints.id, 1001, 'Footprint 3D', 'Footprint', REPLACE(footprints.filename_3d, '%BASE%/models', '%FOOTPRINTS3D%' ), NOW(), NOW() FROM footprints ". |
|
62 | 62 | "WHERE footprints.filename_3d <> ''" |
63 | 63 | ); |
64 | 64 |