@@ -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) { |
@@ -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 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | try { |
| 27 | 27 | //Check if we can use this migration method: |
| 28 | - $version = (int)$this->connection->fetchColumn("SELECT keyValue AS version FROM `internal` WHERE `keyName` = 'dbVersion'"); |
|
| 28 | + $version = (int) $this->connection->fetchColumn("SELECT keyValue AS version FROM `internal` WHERE `keyName` = 'dbVersion'"); |
|
| 29 | 29 | $this->abortIf($version !== 26, "This database migration can only be used if the database version is 26! Install Part-DB 0.5.6 and update database there!"); |
| 30 | 30 | } catch (DBALException $ex) { |
| 31 | 31 | //when the table was not found, then you can not use this migration |
@@ -46,15 +46,15 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | /** Migrate the part locations for parts with known instock */ |
| 48 | 48 | $this->addSql( |
| 49 | - 'INSERT IGNORE INTO part_lots (id_part, id_store_location, amount, instock_unknown, last_modified, datetime_added) ' . |
|
| 50 | - 'SELECT parts.id, parts.id_storelocation, parts.instock, 0, NOW(), NOW() FROM parts ' . |
|
| 49 | + 'INSERT IGNORE INTO part_lots (id_part, id_store_location, amount, instock_unknown, last_modified, datetime_added) '. |
|
| 50 | + 'SELECT parts.id, parts.id_storelocation, parts.instock, 0, NOW(), NOW() FROM parts '. |
|
| 51 | 51 | 'WHERE parts.instock >= 0' |
| 52 | 52 | ); |
| 53 | 53 | |
| 54 | 54 | //Migrate part locations for parts with unknown instock |
| 55 | 55 | $this->addSql( |
| 56 | - 'INSERT IGNORE INTO part_lots (id_part, id_store_location, amount, instock_unknown, last_modified, datetime_added) ' . |
|
| 57 | - 'SELECT parts.id, parts.id_storelocation, 0, 1, NOW(), NOW() FROM parts ' . |
|
| 56 | + 'INSERT IGNORE INTO part_lots (id_part, id_store_location, amount, instock_unknown, last_modified, datetime_added) '. |
|
| 57 | + 'SELECT parts.id, parts.id_storelocation, 0, 1, NOW(), NOW() FROM parts '. |
|
| 58 | 58 | 'WHERE parts.instock = -2' |
| 59 | 59 | ); |
| 60 | 60 | |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | $normalizers = [ |
| 60 | 60 | new ObjectNormalizer() |
| 61 | 61 | ]; |
| 62 | - $encoders = [ |
|
| 62 | + $encoders = [ |
|
| 63 | 63 | new JsonEncoder() |
| 64 | 64 | ]; |
| 65 | 65 | $serializer = new Serializer($normalizers, $encoders); |
@@ -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 | } |
@@ -76,13 +76,13 @@ |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | //$new_url = str_replace($request->getPathInfo(), '/' . $locale . $request->getPathInfo(), $request->getUri()); |
| 79 | - $new_url = $request->getUriForPath('/' . $locale . $request->getPathInfo()); |
|
| 79 | + $new_url = $request->getUriForPath('/'.$locale.$request->getPathInfo()); |
|
| 80 | 80 | |
| 81 | 81 | //If either mod_rewrite is not enabled or the index.php version is enforced, add index.php to the string |
| 82 | 82 | if (($this->enforce_index_php || !$this->checkIfModRewriteAvailable()) |
| 83 | 83 | && strpos($new_url, 'index.php') === false) { |
| 84 | 84 | //Like Request::getUriForPath only with index.php |
| 85 | - $new_url = $request->getSchemeAndHttpHost(). $request->getBaseUrl().'/index.php/' . $locale . $request->getPathInfo(); |
|
| 85 | + $new_url = $request->getSchemeAndHttpHost().$request->getBaseUrl().'/index.php/'.$locale.$request->getPathInfo(); |
|
| 86 | 86 | } |
| 87 | 87 | return $this->redirect($new_url); |
| 88 | 88 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | 'label' => $this->trans->trans('entity.edit.not_selectable'), |
| 97 | 97 | 'help' => $this->trans->trans('entity.edit.not_selectable.help'), |
| 98 | 98 | 'label_attr' => ['class' => 'checkbox-custom'], |
| 99 | - 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity) ]) |
|
| 99 | + 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity)]) |
|
| 100 | 100 | |
| 101 | 101 | ->add('comment', CKEditorType::class, ['required' => false, 'empty_data' => '', |
| 102 | 102 | 'label' => $this->trans->trans('comment.label'), |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | //Buttons |
| 129 | 129 | $builder->add('save', SubmitType::class, [ |
| 130 | - 'label' => $is_new ? $this->trans->trans('entity.create') : $this->trans->trans('entity.edit.save'), |
|
| 130 | + 'label' => $is_new ? $this->trans->trans('entity.create') : $this->trans->trans('entity.edit.save'), |
|
| 131 | 131 | 'attr' => ['class' => $is_new ? 'btn-success' : ''], |
| 132 | 132 | 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity)]) |
| 133 | 133 | ->add('reset', ResetType::class, ['label' => 'entity.edit.reset', |