Inspection of "OCC-154 Update Smarty von 2.x auf 3.x" - OpencachingDeutschland/oc-server3 - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — development (#895)

unknown

created 2022-09-14 07:46 UTC

Status

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -22,29 +22,29 @@
 block discarded – undo
         $builder
             ->add(
                 'email', EmailType::Class, [
-                           'attr' => [
-                               'autofocus' => 'autofocus',
-                               'size' => '10%',
-                               'style' => 'width: 250px;'
-                           ],
-                           'required' => true,
-                           'disabled' => false,
-                           'label' => false,
-                           'trim' => true
-                       ]
+                            'attr' => [
+                                'autofocus' => 'autofocus',
+                                'size' => '10%',
+                                'style' => 'width: 250px;'
+                            ],
+                            'required' => true,
+                            'disabled' => false,
+                            'label' => false,
+                            'trim' => true
+                        ]
             )
             ->add(
                 'activationCode', null, [
-                              'attr' => [
-                                  'size' => '10%',
-                                  'pattern' => '[A-F0-9]{13}',
-                                  'style' => 'width: 250px;'
-                              ],
-                              'required' => true,
-                              'disabled' => false,
-                              'label' => false,
-                              'trim' => true
-                          ]
+                                'attr' => [
+                                    'size' => '10%',
+                                    'pattern' => '[A-F0-9]{13}',
+                                    'style' => 'width: 250px;'
+                                ],
+                                'required' => true,
+                                'disabled' => false,
+                                'label' => false,
+                                'trim' => true
+                            ]
             )
             ->add(
                 'submit', SubmitType::class, [

Please login to merge, or discard this patch.

htdocs_symfony/src/Form/UserRegistrationForm.php 1 patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

@@ -27,102 +27,102 @@  discard block
 block discarded – undo
         $builder
             ->add(
                 'username', null, [
-                              'attr' => [
-                                  'autofocus' => 'autofocus',
-                                  'size' => '10%',
-                                  'pattern' => '[a-zA-Z0-9_-]{3,60}',
-                                  'style' => 'width: 250px;'
-                              ],
-                              'required' => true,
-                              'disabled' => false,
-                              'label' => false,
-                              'trim' => true
-                          ]
+                                'attr' => [
+                                    'autofocus' => 'autofocus',
+                                    'size' => '10%',
+                                    'pattern' => '[a-zA-Z0-9_-]{3,60}',
+                                    'style' => 'width: 250px;'
+                                ],
+                                'required' => true,
+                                'disabled' => false,
+                                'label' => false,
+                                'trim' => true
+                            ]
             )
             ->add(
                 'firstname', null, [
-                               'attr' => [
-                                   'size' => '10%',
-                                   'minlength' => '3',
-                                   'maxlength' => '100',
-                                   'style' => 'width: 250px;'
-                               ],
-                               'required' => false,
-                               'disabled' => false,
-                               'label' => false,
-                               'trim' => true
-                           ]
+                                'attr' => [
+                                    'size' => '10%',
+                                    'minlength' => '3',
+                                    'maxlength' => '100',
+                                    'style' => 'width: 250px;'
+                                ],
+                                'required' => false,
+                                'disabled' => false,
+                                'label' => false,
+                                'trim' => true
+                            ]
             )
             ->add(
                 'lastname', null, [
-                              'attr' => [
-                                  'size' => '10%',
-                                  'minlength' => '3',
-                                  'maxlength' => '100',
-                                  'style' => 'width: 250px;'
-                              ],
-                              'required' => false,
-                              'disabled' => false,
-                              'label' => false,
-                              'trim' => true
-                          ]
+                                'attr' => [
+                                    'size' => '10%',
+                                    'minlength' => '3',
+                                    'maxlength' => '100',
+                                    'style' => 'width: 250px;'
+                                ],
+                                'required' => false,
+                                'disabled' => false,
+                                'label' => false,
+                                'trim' => true
+                            ]
             )
             ->add(
                 'country', ChoiceType::Class, [
-                             'attr' => [
-                                 'expanded' => false,
-                                 'multiple' => false,
-                                 'style' => 'width: 250px;'
-                             ],
-                             'choices' => $options['countryList'],
-                             'required' => false,
-                             'disabled' => false,
-                             'label' => false,
-                         ]
+                                'attr' => [
+                                    'expanded' => false,
+                                    'multiple' => false,
+                                    'style' => 'width: 250px;'
+                                ],
+                                'choices' => $options['countryList'],
+                                'required' => false,
+                                'disabled' => false,
+                                'label' => false,
+                            ]
             )
             ->add(
                 'email', EmailType::Class, [
-                           'attr' => [
-                               'size' => '10%',
-                               'minlength' => '3',
-                               'maxlength' => '100',
-                               'style' => 'width: 250px;'
-                           ],
-                           'required' => true,
-                           'disabled' => false,
-                           'label' => false,
-                           'trim' => true
-                       ]
+                            'attr' => [
+                                'size' => '10%',
+                                'minlength' => '3',
+                                'maxlength' => '100',
+                                'style' => 'width: 250px;'
+                            ],
+                            'required' => true,
+                            'disabled' => false,
+                            'label' => false,
+                            'trim' => true
+                        ]
             )
             ->add(
                 'plainPassword', RepeatedType::Class, [
-                                   'options' => [
-                                       'attr' => [
-                                           'size' => '10%',
-                                           'minlength' => '8',
-                                           'maxlength' => '60',
-                                           // TODO: pattern anpassen. Aktuell: Minimum eight characters, at least one letter, one number and one special character.
-                                           'pattern' => '^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
-                                           'style' => 'width: 250px;'
-                                       ]
-                                   ],
-                                   'first_options' => ['label' => false, 'error_bubbling' => true],
-                                   'second_options' => ['label' => false],
-                                   'required' => true,
-                                   'disabled' => false,
-                                   'trim' => true,
-                                   'type' => PasswordType::class,
-                                   'invalid_message' => 'Your passwords do not match.',
-                                   'mapped' => false,
-                               ]
+                                    'options' => [
+                                        'attr' => [
+                                            'size' => '10%',
+                                            'minlength' => '8',
+                                            'maxlength' => '60',
+                                            // TODO: pattern anpassen. Aktuell: Minimum eight characters, at least one letter, one number and one special character.
+                                            'pattern' => '^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$',
+                                            'style' => 'width: 250px;'
+                                        ]
+                                    ],
+                                    'first_options' => ['label' => false, 'error_bubbling' => true],
+                                    'second_options' => ['label' => false],
+                                    'required' => true,
+                                    'disabled' => false,
+                                    'trim' => true,
+                                    'type' => PasswordType::class,
+                                    'invalid_message' => 'Your passwords do not match.',
+                                    'mapped' => false,
+                                ]
             )
             ->add(
                 'tos', CheckboxType::class, [
-                         'attr' => [],
-                         'label' => false,
-                         'mapped' => false,
-                         'required' => true,
-                     ]
+                            'attr' => [],
+                            'label' => false,
+                            'mapped' => false,
+                            'required' => true,
+                        ]
             )
             ->add(
                 'submit', SubmitType::class, [
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
     public function configureOptions(OptionsResolver $resolver)
     : void {
         $resolver->setDefaults([
-                                   'countryList' => [],
-                                   'data_class' => UserEntity::class,
-                               ]);
+                                    'countryList' => [],
+                                    'data_class' => UserEntity::class,
+                                ]);
     }
 }

Please login to merge, or discard this patch.

htdocs_symfony/public/index.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -20,8 +20,8 @@
 block discarded – undo
 if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) {
     Request::setTrustedProxies(
         explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_FOR
-                                       ^ Request::HEADER_X_FORWARDED_PROTO
-                                       ^ Request::HEADER_X_FORWARDED_PORT
+                                        ^ Request::HEADER_X_FORWARDED_PROTO
+                                        ^ Request::HEADER_X_FORWARDED_PORT
     );
 }
 

Please login to merge, or discard this patch.

htdocs_symfony/src/Controller/Backend/SupportController.php 1 patch

Indentation +65 added lines, -65 removed lines patch added patch discarded remove patch

@@ -187,9 +187,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/searchedCaches.html.twig', [
-                                                          'supportCachesForm' => $formSearch->createView(),
-                                                          'foundCaches' => $fetchedCaches
-                                                      ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'foundCaches' => $fetchedCaches
+                                                        ]
         );
     }
 
@@ -211,9 +211,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/reportedCaches.html.twig', [
-                                                          'supportCachesForm' => $formSearch->createView(),
-                                                          'reportedCaches_by_id' => $fetchedReports
-                                                      ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'reportedCaches_by_id' => $fetchedReports
+                                                        ]
         );
     }
 
@@ -233,10 +233,10 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/bonusCaches.html.twig', [
-                                                       'supportCachesForm' => $formSearch->createView(),
-                                                       'supportAssignBonusCacheForm' => $formAssignBonusCache->createView(),
-                                                       'bonusCaches_by_id' => $fetchedBonuscaches
-                                                   ]
+                                                        'supportCachesForm' => $formSearch->createView(),
+                                                        'supportAssignBonusCacheForm' => $formAssignBonusCache->createView(),
+                                                        'bonusCaches_by_id' => $fetchedBonuscaches
+                                                    ]
         );
     }
 
@@ -259,10 +259,10 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/bonusCachesAssignment.html.twig', [
-                                                                 'supportCachesForm' => $formSearch->createView(),
-                                                                 'bonus_Cache' => $wpID,
-                                                                 'caches_by_owner' => $fetchedOwnerCaches
-                                                             ]
+                                                                    'supportCachesForm' => $formSearch->createView(),
+                                                                    'bonus_Cache' => $wpID,
+                                                                    'caches_by_owner' => $fetchedOwnerCaches
+                                                                ]
         );
     }
 
@@ -290,10 +290,10 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/bonusCachesAssignment.html.twig', [
-                                                                 'supportCachesForm' => $formSearch->createView(),
-                                                                 'bonus_Cache' => $toBonusCache,
-                                                                 'caches_by_owner' => $fetchedOwnerCaches
-                                                             ]
+                                                                    'supportCachesForm' => $formSearch->createView(),
+                                                                    'bonus_Cache' => $toBonusCache,
+                                                                    'caches_by_owner' => $fetchedOwnerCaches
+                                                                ]
         );
     }
 
@@ -401,10 +401,10 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'SQLFlexForm' => $formSQLFlex->createView(),
-                                                           'suppSQLqueryFlex' => $fetchedInformation
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'SQLFlexForm' => $formSQLFlex->createView(),
+                                                            'suppSQLqueryFlex' => $fetchedInformation
+                                                        ]
         );
     }
 
@@ -541,16 +541,16 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/occ.html.twig', [
-                                               'supportCachesForm' => $formSearch->createView(),
-                                               'supportCommentFormUser' => $formCommentUser->createView(),
-                                               'supportCommentFormCache' => $formCommentCache->createView(),
-                                               'occ_cache_data' => $fetchedCacheData,
-                                               'occ_cache_comments' => $fetchedCacheComments,
-                                               'occ_cache_infos' => $fetchedCacheInfos,
-                                               'occ_user_data' => $fetchedUserData,
-                                               'occ_user_comments' => $fetchedUserComments,
-                                               'occ_user_relations' => $fetchedUserRelations
-                                           ]
+                                                'supportCachesForm' => $formSearch->createView(),
+                                                'supportCommentFormUser' => $formCommentUser->createView(),
+                                                'supportCommentFormCache' => $formCommentCache->createView(),
+                                                'occ_cache_data' => $fetchedCacheData,
+                                                'occ_cache_comments' => $fetchedCacheComments,
+                                                'occ_cache_infos' => $fetchedCacheInfos,
+                                                'occ_user_data' => $fetchedUserData,
+                                                'occ_user_comments' => $fetchedUserComments,
+                                                'occ_user_relations' => $fetchedUserRelations
+                                            ]
         );
     }
 
@@ -682,10 +682,10 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/userDetails.html.twig', [
-                                                       'supportCachesForm' => $formSearch->createView(),
-                                                       'supportUserAccountActions' => $formActions->createView(),
-                                                       'user_account_details' => $fetchedUserDetails
-                                                   ]
+                                                        'supportCachesForm' => $formSearch->createView(),
+                                                        'supportUserAccountActions' => $formActions->createView(),
+                                                        'user_account_details' => $fetchedUserDetails
+                                                    ]
         );
     }
 
@@ -781,9 +781,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery1' => $qb->executeQuery()->fetchAllAssociative()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery1' => $qb->executeQuery()->fetchAllAssociative()
+                                                        ]
         );
     }
 
@@ -809,9 +809,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery2' => $qb->executeQuery()->fetchAllAssociative()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery2' => $qb->executeQuery()->fetchAllAssociative()
+                                                        ]
         );
     }
 
@@ -844,9 +844,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery4' => $qb->executeQuery()->fetchAllAssociative()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery4' => $qb->executeQuery()->fetchAllAssociative()
+                                                        ]
         );
     }
 
@@ -863,9 +863,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
+                                                        ]
         );
     }
 
@@ -909,9 +909,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery6' => $qb_caches_list
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery6' => $qb_caches_list
+                                                        ]
         );
     }
 
@@ -1030,15 +1030,15 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/occ_gpx_import.html.twig', [
-                                                          'supportCachesForm' => $formSearch->createView(),
-                                                          'supportUploadGPXForm' => $formUpload->createView(),
-                                                          'amountProcessedCaches' => $amountProcessedCaches,
-                                                          'amountAssignedCaches' => $amountAssignedCaches,
-                                                          'amountUpdatedCaches' => $amountUpdatedCaches,
-                                                          'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
-                                                          'fetchedListingInfos' => $fetchedListingInfos,
-                                                          'differencesDetected' => $differencesDetected
-                                                      ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'supportUploadGPXForm' => $formUpload->createView(),
+                                                            'amountProcessedCaches' => $amountProcessedCaches,
+                                                            'amountAssignedCaches' => $amountAssignedCaches,
+                                                            'amountUpdatedCaches' => $amountUpdatedCaches,
+                                                            'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
+                                                            'fetchedListingInfos' => $fetchedListingInfos,
+                                                            'differencesDetected' => $differencesDetected
+                                                        ]
         );
     }
 
@@ -1205,11 +1205,11 @@  discard block
 block discarded – undo
                     ] as $checkItem) {
                         if ($wpt[$checkItem] != $fetchedExistingSupportListingInfoArray[$checkItem]) {
                             $newComment .= $checkItem
-                                           . ' changed from '
-                                           . $fetchedExistingSupportListingInfoArray[$checkItem]
-                                           . ' to '
-                                           . $wpt[$checkItem]
-                                           . PHP_EOL;
+                                            . ' changed from '
+                                            . $fetchedExistingSupportListingInfoArray[$checkItem]
+                                            . ' to '
+                                            . $wpt[$checkItem]
+                                            . PHP_EOL;
                         }
                     }
 

Please login to merge, or discard this patch.

htdocs_symfony/src/Form/SupportCommentField.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -24,22 +24,22 @@
 block discarded – undo
         $builder
             ->add(
                 'content_comment_field', TextareaType::class, [
-                                           'attr' => [
-                                               'maxlength' => '100000',
-                                               'overflow' => 'auto',
-                                               'rows' => '10',
-                                           ],
-                                           'required' => false,
-                                           'disabled' => false,
-                                           'label' => false,
-                                           'trim' => true
-                                       ]
+                                            'attr' => [
+                                                'maxlength' => '100000',
+                                                'overflow' => 'auto',
+                                                'rows' => '10',
+                                            ],
+                                            'required' => false,
+                                            'disabled' => false,
+                                            'label' => false,
+                                            'trim' => true
+                                        ]
             )
             ->add(
                 'save_comment_button', SubmitType::class, [
-                                         'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'],
-                                         'label' => '

Please login to merge, or discard this patch.

htdocs_symfony/src/Form/SupportImportGPX.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -27,14 +27,14 @@  discard block
 block discarded – undo
                                 ],
                                 'constraints' => [
                                     new File([
-                                                 'maxSize' => '20480000',
-                                                 'mimeTypes' => [
-                                                     'application/gpx+xml',
-                                                     'application/xml',
-                                                     'text/xml',
-                                                 ],
-                                                 'mimeTypesMessage' => 'Please upload a valid GPX/XML document',
-                                             ])
+                                                    'maxSize' => '20480000',
+                                                    'mimeTypes' => [
+                                                        'application/gpx+xml',
+                                                        'application/xml',
+                                                        'text/xml',
+                                                    ],
+                                                    'mimeTypesMessage' => 'Please upload a valid GPX/XML document',
+                                                ])
                                 ],
                                 'multiple' => false,
                                 'required' => true,
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
             )
             ->add(
                 'start_upload', SubmitType::class, [
-                                  'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 100px;'],
-                                  'label' => '

Please login to merge, or discard this patch.

htdocs/lib2/OcSmarty.class.php 1 patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -592,7 +592,7 @@  discard block
 block discarded – undo
 
         // ok ... redirect the get-data
         $target = ($opt['page']['https']['force_login'] ? 'https' : $opt['page']['protocol'])
-                  . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                    . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
         $this->redirect('login.php?target=' . urlencode($target));
     }
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
         $this->_dvar_math_regexp = '(?:[\+\*\/\%]|(?:-(?!>)))';
         $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
         $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
-                                   . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
+                                    . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
         $this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp;
 
         // matches config vars:
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
 
         // matches all valid variables (no quotes, no modifiers)
         $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-                              . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
+                                . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
 
         // matches valid variable syntax:
         // $foo
@@ -776,10 +776,10 @@  discard block
 block discarded – undo
         // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
         $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
         $this->_obj_restricted_param_regexp = '(?:'
-                                              . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
-                                              . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
+                                                . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
+                                                . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
         $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                                          . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
+                                            . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
         $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
                                     . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
         $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
         // |foo|bar
         // |foo:$foo->bar
         $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-                             . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
+                                . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
 
         // matches valid function name:
         // foo123
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
         // "text"|bar
         // $foo->bar
         $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-                               . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
+                                . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
 
         // matches valid parenthesised function parameters:
         //
@@ -823,8 +823,8 @@  discard block
 block discarded – undo
         //    $foo, $bar, "text"
         // $foo|bar, "foo"|bar, $foo->bar($foo)|bar
         $this->_parenth_param_regexp = '(?:\((?:\w+|'
-                                       . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                                       . $this->_param_regexp . ')))*)?\))';
+                                        . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
+                                        . $this->_param_regexp . ')))*)?\))';
 
         // matches valid function call:
         // foo()

Please login to merge, or discard this patch.

		@@ -592,7 +592,7 @@ discard block
		block discarded – undo
592	592
593	593	// ok ... redirect the get-data
594	594	$target = ($opt['page']['https']['force_login'] ? 'https' : $opt['page']['protocol'])
595		- . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
	595	+ . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
596	596	$this->redirect('login.php?target=' . urlencode($target));
597	597	}
598	598
		@@ -738,7 +738,7 @@ discard block
		block discarded – undo
738	738	$this->_dvar_math_regexp = '(?:[\+\*\/\%]\|(?:-(?!>)))';
739	739	$this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
740	740	$this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
741		- . ')(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . '))(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '\|' . $this->_dvar_math_var_regexp . '))?';
	741	+ . ')(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . '))(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '\|' . $this->_dvar_math_var_regexp . '))?';
742	742	$this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp;
743	743
744	744	// matches config vars:
		@@ -752,7 +752,7 @@ discard block
		block discarded – undo
752	752
753	753	// matches all valid variables (no quotes, no modifiers)
754	754	$this->_avar_regexp = '(?:' . $this->_dvar_regexp . '\|'
755		- . $this->_cvar_regexp . '\|' . $this->_svar_regexp . ')';
	755	+ . $this->_cvar_regexp . '\|' . $this->_svar_regexp . ')';
756	756
757	757	// matches valid variable syntax:
758	758	// $foo
		@@ -776,10 +776,10 @@ discard block
		block discarded – undo
776	776	// $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
777	777	$this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
778	778	$this->_obj_restricted_param_regexp = '(?:'
779		- . '(?:' . $this->_var_regexp . '\|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '\|' . $this->_num_const_regexp . ')'
780		- . '(?:\s,\s(?:' . $this->_var_regexp . '\|' . $this->_num_const_regexp . ')))?\))?))';
	779	+ . '(?:' . $this->_var_regexp . '\|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '\|' . $this->_num_const_regexp . ')'
	780	+ . '(?:\s,\s(?:' . $this->_var_regexp . '\|' . $this->_num_const_regexp . ')))?\))?))';
781	781	$this->_obj_single_param_regexp = '(?:\w+\|' . $this->_obj_restricted_param_regexp . '(?:\s,\s(?:(?:\w+\|'
782		- . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
	782	+ . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
783	783	$this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
784	784	. '(?:\s,\s' . $this->_obj_single_param_regexp . ')*)?\)';
785	785	$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
		@@ -794,7 +794,7 @@ discard block
		block discarded – undo
794	794	// \|foo\|bar
795	795	// \|foo:$foo->bar
796	796	$this->_mod_regexp = '(?:\\|@?\w+(?::(?:\w+\|' . $this->_num_const_regexp . '\|'
797		- . $this->_obj_call_regexp . '\|' . $this->_avar_regexp . '\|' . $this->_qstr_regexp .'))*)';
	797	+ . $this->_obj_call_regexp . '\|' . $this->_avar_regexp . '\|' . $this->_qstr_regexp .'))*)';
798	798
799	799	// matches valid function name:
800	800	// foo123
		@@ -815,7 +815,7 @@ discard block
		block discarded – undo
815	815	// "text"\|bar
816	816	// $foo->bar
817	817	$this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '\|'
818		- . $this->_var_regexp . '\|' . $this->_num_const_regexp . '\|\w+)(?>' . $this->_mod_regexp . ')\s)';
	818	+ . $this->_var_regexp . '\|' . $this->_num_const_regexp . '\|\w+)(?>' . $this->_mod_regexp . ')\s)';
819	819
820	820	// matches valid parenthesised function parameters:
821	821	//
		@@ -823,8 +823,8 @@ discard block
		block discarded – undo
823	823	// $foo, $bar, "text"
824	824	// $foo\|bar, "foo"\|bar, $foo->bar($foo)\|bar
825	825	$this->_parenth_param_regexp = '(?:\((?:\w+\|'
826		- . $this->_param_regexp . '(?:\s,\s(?:(?:\w+\|'
827		- . $this->_param_regexp . ')))*)?\))';
	826	+ . $this->_param_regexp . '(?:\s,\s(?:(?:\w+\|'
	827	+ . $this->_param_regexp . ')))*)?\))';
828	828
829	829	// matches valid function call:
830	830	// foo()

		@@ -22,29 +22,29 @@
		block discarded – undo
22	22	$builder
23	23	->add(
24	24	'email', EmailType::Class, [
25		- 'attr' => [
26		- 'autofocus' => 'autofocus',
27		- 'size' => '10%',
28		- 'style' => 'width: 250px;'
29		- ],
30		- 'required' => true,
31		- 'disabled' => false,
32		- 'label' => false,
33		- 'trim' => true
34		- ]
	25	+ 'attr' => [
	26	+ 'autofocus' => 'autofocus',
	27	+ 'size' => '10%',
	28	+ 'style' => 'width: 250px;'
	29	+ ],
	30	+ 'required' => true,
	31	+ 'disabled' => false,
	32	+ 'label' => false,
	33	+ 'trim' => true
	34	+ ]
35	35	)
36	36	->add(
37	37	'activationCode', null, [
38		- 'attr' => [
39		- 'size' => '10%',
40		- 'pattern' => '[A-F0-9]{13}',
41		- 'style' => 'width: 250px;'
42		- ],
43		- 'required' => true,
44		- 'disabled' => false,
45		- 'label' => false,
46		- 'trim' => true
47		- ]
	38	+ 'attr' => [
	39	+ 'size' => '10%',
	40	+ 'pattern' => '[A-F0-9]{13}',
	41	+ 'style' => 'width: 250px;'
	42	+ ],
	43	+ 'required' => true,
	44	+ 'disabled' => false,
	45	+ 'label' => false,
	46	+ 'trim' => true
	47	+ ]
48	48	)
49	49	->add(
50	50	'submit', SubmitType::class, [

		@@ -27,102 +27,102 @@ discard block
		block discarded – undo
27	27	$builder
28	28	->add(
29	29	'username', null, [
30		- 'attr' => [
31		- 'autofocus' => 'autofocus',
32		- 'size' => '10%',
33		- 'pattern' => '[a-zA-Z0-9_-]{3,60}',
34		- 'style' => 'width: 250px;'
35		- ],
36		- 'required' => true,
37		- 'disabled' => false,
38		- 'label' => false,
39		- 'trim' => true
40		- ]
	30	+ 'attr' => [
	31	+ 'autofocus' => 'autofocus',
	32	+ 'size' => '10%',
	33	+ 'pattern' => '[a-zA-Z0-9_-]{3,60}',
	34	+ 'style' => 'width: 250px;'
	35	+ ],
	36	+ 'required' => true,
	37	+ 'disabled' => false,
	38	+ 'label' => false,
	39	+ 'trim' => true
	40	+ ]
41	41	)
42	42	->add(
43	43	'firstname', null, [
44		- 'attr' => [
45		- 'size' => '10%',
46		- 'minlength' => '3',
47		- 'maxlength' => '100',
48		- 'style' => 'width: 250px;'
49		- ],
50		- 'required' => false,
51		- 'disabled' => false,
52		- 'label' => false,
53		- 'trim' => true
54		- ]
	44	+ 'attr' => [
	45	+ 'size' => '10%',
	46	+ 'minlength' => '3',
	47	+ 'maxlength' => '100',
	48	+ 'style' => 'width: 250px;'
	49	+ ],
	50	+ 'required' => false,
	51	+ 'disabled' => false,
	52	+ 'label' => false,
	53	+ 'trim' => true
	54	+ ]
55	55	)
56	56	->add(
57	57	'lastname', null, [
58		- 'attr' => [
59		- 'size' => '10%',
60		- 'minlength' => '3',
61		- 'maxlength' => '100',
62		- 'style' => 'width: 250px;'
63		- ],
64		- 'required' => false,
65		- 'disabled' => false,
66		- 'label' => false,
67		- 'trim' => true
68		- ]
	58	+ 'attr' => [
	59	+ 'size' => '10%',
	60	+ 'minlength' => '3',
	61	+ 'maxlength' => '100',
	62	+ 'style' => 'width: 250px;'
	63	+ ],
	64	+ 'required' => false,
	65	+ 'disabled' => false,
	66	+ 'label' => false,
	67	+ 'trim' => true
	68	+ ]
69	69	)
70	70	->add(
71	71	'country', ChoiceType::Class, [
72		- 'attr' => [
73		- 'expanded' => false,
74		- 'multiple' => false,
75		- 'style' => 'width: 250px;'
76		- ],
77		- 'choices' => $options['countryList'],
78		- 'required' => false,
79		- 'disabled' => false,
80		- 'label' => false,
81		- ]
	72	+ 'attr' => [
	73	+ 'expanded' => false,
	74	+ 'multiple' => false,
	75	+ 'style' => 'width: 250px;'
	76	+ ],
	77	+ 'choices' => $options['countryList'],
	78	+ 'required' => false,
	79	+ 'disabled' => false,
	80	+ 'label' => false,
	81	+ ]
82	82	)
83	83	->add(
84	84	'email', EmailType::Class, [
85		- 'attr' => [
86		- 'size' => '10%',
87		- 'minlength' => '3',
88		- 'maxlength' => '100',
89		- 'style' => 'width: 250px;'
90		- ],
91		- 'required' => true,
92		- 'disabled' => false,
93		- 'label' => false,
94		- 'trim' => true
95		- ]
	85	+ 'attr' => [
	86	+ 'size' => '10%',
	87	+ 'minlength' => '3',
	88	+ 'maxlength' => '100',
	89	+ 'style' => 'width: 250px;'
	90	+ ],
	91	+ 'required' => true,
	92	+ 'disabled' => false,
	93	+ 'label' => false,
	94	+ 'trim' => true
	95	+ ]
96	96	)
97	97	->add(
98	98	'plainPassword', RepeatedType::Class, [
99		- 'options' => [
100		- 'attr' => [
101		- 'size' => '10%',
102		- 'minlength' => '8',
103		- 'maxlength' => '60',
104		- // TODO: pattern anpassen. Aktuell: Minimum eight characters, at least one letter, one number and one special character.
105		- 'pattern' => '^(?=.[A-Za-z])(?=.\d)(?=.[@$!%#?&])[A-Za-z\d@$!%*#?&]{8,}$',
106		- 'style' => 'width: 250px;'
107		- ]
108		- ],
109		- 'first_options' => ['label' => false, 'error_bubbling' => true],
110		- 'second_options' => ['label' => false],
111		- 'required' => true,
112		- 'disabled' => false,
113		- 'trim' => true,
114		- 'type' => PasswordType::class,
115		- 'invalid_message' => 'Your passwords do not match.',
116		- 'mapped' => false,
117		- ]
	99	+ 'options' => [
	100	+ 'attr' => [
	101	+ 'size' => '10%',
	102	+ 'minlength' => '8',
	103	+ 'maxlength' => '60',
	104	+ // TODO: pattern anpassen. Aktuell: Minimum eight characters, at least one letter, one number and one special character.
	105	+ 'pattern' => '^(?=.[A-Za-z])(?=.\d)(?=.[@$!%#?&])[A-Za-z\d@$!%*#?&]{8,}$',
	106	+ 'style' => 'width: 250px;'
	107	+ ]
	108	+ ],
	109	+ 'first_options' => ['label' => false, 'error_bubbling' => true],
	110	+ 'second_options' => ['label' => false],
	111	+ 'required' => true,
	112	+ 'disabled' => false,
	113	+ 'trim' => true,
	114	+ 'type' => PasswordType::class,
	115	+ 'invalid_message' => 'Your passwords do not match.',
	116	+ 'mapped' => false,
	117	+ ]
118	118	)
119	119	->add(
120	120	'tos', CheckboxType::class, [
121		- 'attr' => [],
122		- 'label' => false,
123		- 'mapped' => false,
124		- 'required' => true,
125		- ]
	121	+ 'attr' => [],
	122	+ 'label' => false,
	123	+ 'mapped' => false,
	124	+ 'required' => true,
	125	+ ]
126	126	)
127	127	->add(
128	128	'submit', SubmitType::class, [
		@@ -140,8 +140,8 @@ discard block
		block discarded – undo
140	140	public function configureOptions(OptionsResolver $resolver)
141	141	: void {
142	142	$resolver->setDefaults([
143		- 'countryList' => [],
144		- 'data_class' => UserEntity::class,
145		- ]);
	143	+ 'countryList' => [],
	144	+ 'data_class' => UserEntity::class,
	145	+ ]);
146	146	}
147	147	}

		@@ -20,8 +20,8 @@
		block discarded – undo
20	20	if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) {
21	21	Request::setTrustedProxies(
22	22	explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_FOR
23		- ^ Request::HEADER_X_FORWARDED_PROTO
24		- ^ Request::HEADER_X_FORWARDED_PORT
	23	+ ^ Request::HEADER_X_FORWARDED_PROTO
	24	+ ^ Request::HEADER_X_FORWARDED_PORT
25	25	);
26	26	}
27	27

		@@ -187,9 +187,9 @@ discard block
		block discarded – undo
187	187
188	188	return $this->render(
189	189	'backend/support/searchedCaches.html.twig', [
190		- 'supportCachesForm' => $formSearch->createView(),
191		- 'foundCaches' => $fetchedCaches
192		- ]
	190	+ 'supportCachesForm' => $formSearch->createView(),
	191	+ 'foundCaches' => $fetchedCaches
	192	+ ]
193	193	);
194	194	}
195	195
		@@ -211,9 +211,9 @@ discard block
		block discarded – undo
211	211
212	212	return $this->render(
213	213	'backend/support/reportedCaches.html.twig', [
214		- 'supportCachesForm' => $formSearch->createView(),
215		- 'reportedCaches_by_id' => $fetchedReports
216		- ]
	214	+ 'supportCachesForm' => $formSearch->createView(),
	215	+ 'reportedCaches_by_id' => $fetchedReports
	216	+ ]
217	217	);
218	218	}
219	219
		@@ -233,10 +233,10 @@ discard block
		block discarded – undo
233	233
234	234	return $this->render(
235	235	'backend/support/bonusCaches.html.twig', [
236		- 'supportCachesForm' => $formSearch->createView(),
237		- 'supportAssignBonusCacheForm' => $formAssignBonusCache->createView(),
238		- 'bonusCaches_by_id' => $fetchedBonuscaches
239		- ]
	236	+ 'supportCachesForm' => $formSearch->createView(),
	237	+ 'supportAssignBonusCacheForm' => $formAssignBonusCache->createView(),
	238	+ 'bonusCaches_by_id' => $fetchedBonuscaches
	239	+ ]
240	240	);
241	241	}
242	242
		@@ -259,10 +259,10 @@ discard block
		block discarded – undo
259	259
260	260	return $this->render(
261	261	'backend/support/bonusCachesAssignment.html.twig', [
262		- 'supportCachesForm' => $formSearch->createView(),
263		- 'bonus_Cache' => $wpID,
264		- 'caches_by_owner' => $fetchedOwnerCaches
265		- ]
	262	+ 'supportCachesForm' => $formSearch->createView(),
	263	+ 'bonus_Cache' => $wpID,
	264	+ 'caches_by_owner' => $fetchedOwnerCaches
	265	+ ]
266	266	);
267	267	}
268	268
		@@ -290,10 +290,10 @@ discard block
		block discarded – undo
290	290
291	291	return $this->render(
292	292	'backend/support/bonusCachesAssignment.html.twig', [
293		- 'supportCachesForm' => $formSearch->createView(),
294		- 'bonus_Cache' => $toBonusCache,
295		- 'caches_by_owner' => $fetchedOwnerCaches
296		- ]
	293	+ 'supportCachesForm' => $formSearch->createView(),
	294	+ 'bonus_Cache' => $toBonusCache,
	295	+ 'caches_by_owner' => $fetchedOwnerCaches
	296	+ ]
297	297	);
298	298	}
299	299
		@@ -401,10 +401,10 @@ discard block
		block discarded – undo
401	401
402	402	return $this->render(
403	403	'backend/support/databaseQueries.html.twig', [
404		- 'supportCachesForm' => $formSearch->createView(),
405		- 'SQLFlexForm' => $formSQLFlex->createView(),
406		- 'suppSQLqueryFlex' => $fetchedInformation
407		- ]
	404	+ 'supportCachesForm' => $formSearch->createView(),
	405	+ 'SQLFlexForm' => $formSQLFlex->createView(),
	406	+ 'suppSQLqueryFlex' => $fetchedInformation
	407	+ ]
408	408	);
409	409	}
410	410
		@@ -541,16 +541,16 @@ discard block
		block discarded – undo
541	541
542	542	return $this->render(
543	543	'backend/support/occ.html.twig', [
544		- 'supportCachesForm' => $formSearch->createView(),
545		- 'supportCommentFormUser' => $formCommentUser->createView(),
546		- 'supportCommentFormCache' => $formCommentCache->createView(),
547		- 'occ_cache_data' => $fetchedCacheData,
548		- 'occ_cache_comments' => $fetchedCacheComments,
549		- 'occ_cache_infos' => $fetchedCacheInfos,
550		- 'occ_user_data' => $fetchedUserData,
551		- 'occ_user_comments' => $fetchedUserComments,
552		- 'occ_user_relations' => $fetchedUserRelations
553		- ]
	544	+ 'supportCachesForm' => $formSearch->createView(),
	545	+ 'supportCommentFormUser' => $formCommentUser->createView(),
	546	+ 'supportCommentFormCache' => $formCommentCache->createView(),
	547	+ 'occ_cache_data' => $fetchedCacheData,
	548	+ 'occ_cache_comments' => $fetchedCacheComments,
	549	+ 'occ_cache_infos' => $fetchedCacheInfos,
	550	+ 'occ_user_data' => $fetchedUserData,
	551	+ 'occ_user_comments' => $fetchedUserComments,
	552	+ 'occ_user_relations' => $fetchedUserRelations
	553	+ ]
554	554	);
555	555	}
556	556
		@@ -682,10 +682,10 @@ discard block
		block discarded – undo
682	682
683	683	return $this->render(
684	684	'backend/support/userDetails.html.twig', [
685		- 'supportCachesForm' => $formSearch->createView(),
686		- 'supportUserAccountActions' => $formActions->createView(),
687		- 'user_account_details' => $fetchedUserDetails
688		- ]
	685	+ 'supportCachesForm' => $formSearch->createView(),
	686	+ 'supportUserAccountActions' => $formActions->createView(),
	687	+ 'user_account_details' => $fetchedUserDetails
	688	+ ]
689	689	);
690	690	}
691	691
		@@ -781,9 +781,9 @@ discard block
		block discarded – undo
781	781
782	782	return $this->render(
783	783	'backend/support/databaseQueries.html.twig', [
784		- 'supportCachesForm' => $formSearch->createView(),
785		- 'suppSQLquery1' => $qb->executeQuery()->fetchAllAssociative()
786		- ]
	784	+ 'supportCachesForm' => $formSearch->createView(),
	785	+ 'suppSQLquery1' => $qb->executeQuery()->fetchAllAssociative()
	786	+ ]
787	787	);
788	788	}
789	789
		@@ -809,9 +809,9 @@ discard block
		block discarded – undo
809	809
810	810	return $this->render(
811	811	'backend/support/databaseQueries.html.twig', [
812		- 'supportCachesForm' => $formSearch->createView(),
813		- 'suppSQLquery2' => $qb->executeQuery()->fetchAllAssociative()
814		- ]
	812	+ 'supportCachesForm' => $formSearch->createView(),
	813	+ 'suppSQLquery2' => $qb->executeQuery()->fetchAllAssociative()
	814	+ ]
815	815	);
816	816	}
817	817
		@@ -844,9 +844,9 @@ discard block
		block discarded – undo
844	844
845	845	return $this->render(
846	846	'backend/support/databaseQueries.html.twig', [
847		- 'supportCachesForm' => $formSearch->createView(),
848		- 'suppSQLquery4' => $qb->executeQuery()->fetchAllAssociative()
849		- ]
	847	+ 'supportCachesForm' => $formSearch->createView(),
	848	+ 'suppSQLquery4' => $qb->executeQuery()->fetchAllAssociative()
	849	+ ]
850	850	);
851	851	}
852	852
		@@ -863,9 +863,9 @@ discard block
		block discarded – undo
863	863
864	864	return $this->render(
865	865	'backend/support/databaseQueries.html.twig', [
866		- 'supportCachesForm' => $formSearch->createView(),
867		- 'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
868		- ]
	866	+ 'supportCachesForm' => $formSearch->createView(),
	867	+ 'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
	868	+ ]
869	869	);
870	870	}
871	871
		@@ -909,9 +909,9 @@ discard block
		block discarded – undo
909	909
910	910	return $this->render(
911	911	'backend/support/databaseQueries.html.twig', [
912		- 'supportCachesForm' => $formSearch->createView(),
913		- 'suppSQLquery6' => $qb_caches_list
914		- ]
	912	+ 'supportCachesForm' => $formSearch->createView(),
	913	+ 'suppSQLquery6' => $qb_caches_list
	914	+ ]
915	915	);
916	916	}
917	917
		@@ -1030,15 +1030,15 @@ discard block
		block discarded – undo
1030	1030
1031	1031	return $this->render(
1032	1032	'backend/support/occ_gpx_import.html.twig', [
1033		- 'supportCachesForm' => $formSearch->createView(),
1034		- 'supportUploadGPXForm' => $formUpload->createView(),
1035		- 'amountProcessedCaches' => $amountProcessedCaches,
1036		- 'amountAssignedCaches' => $amountAssignedCaches,
1037		- 'amountUpdatedCaches' => $amountUpdatedCaches,
1038		- 'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
1039		- 'fetchedListingInfos' => $fetchedListingInfos,
1040		- 'differencesDetected' => $differencesDetected
1041		- ]
	1033	+ 'supportCachesForm' => $formSearch->createView(),
	1034	+ 'supportUploadGPXForm' => $formUpload->createView(),
	1035	+ 'amountProcessedCaches' => $amountProcessedCaches,
	1036	+ 'amountAssignedCaches' => $amountAssignedCaches,
	1037	+ 'amountUpdatedCaches' => $amountUpdatedCaches,
	1038	+ 'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
	1039	+ 'fetchedListingInfos' => $fetchedListingInfos,
	1040	+ 'differencesDetected' => $differencesDetected
	1041	+ ]
1042	1042	);
1043	1043	}
1044	1044
		@@ -1205,11 +1205,11 @@ discard block
		block discarded – undo
1205	1205	] as $checkItem) {
1206	1206	if ($wpt[$checkItem] != $fetchedExistingSupportListingInfoArray[$checkItem]) {
1207	1207	$newComment .= $checkItem
1208		- . ' changed from '
1209		- . $fetchedExistingSupportListingInfoArray[$checkItem]
1210		- . ' to '
1211		- . $wpt[$checkItem]
1212		- . PHP_EOL;
	1208	+ . ' changed from '
	1209	+ . $fetchedExistingSupportListingInfoArray[$checkItem]
	1210	+ . ' to '
	1211	+ . $wpt[$checkItem]
	1212	+ . PHP_EOL;
1213	1213	}
1214	1214	}
1215	1215

		@@ -24,22 +24,22 @@
		block discarded – undo
24	24	$builder
25	25	->add(
26	26	'content_comment_field', TextareaType::class, [
27		- 'attr' => [
28		- 'maxlength' => '100000',
29		- 'overflow' => 'auto',
30		- 'rows' => '10',
31		- ],
32		- 'required' => false,
33		- 'disabled' => false,
34		- 'label' => false,
35		- 'trim' => true
36		- ]
	27	+ 'attr' => [
	28	+ 'maxlength' => '100000',
	29	+ 'overflow' => 'auto',
	30	+ 'rows' => '10',
	31	+ ],
	32	+ 'required' => false,
	33	+ 'disabled' => false,
	34	+ 'label' => false,
	35	+ 'trim' => true
	36	+ ]
37	37	)
38	38	->add(
39	39	'save_comment_button', SubmitType::class, [
40		- 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'],
41		- 'label' => '

		@@ -27,14 +27,14 @@ discard block
		block discarded – undo
27	27	],
28	28	'constraints' => [
29	29	new File([
30		- 'maxSize' => '20480000',
31		- 'mimeTypes' => [
32		- 'application/gpx+xml',
33		- 'application/xml',
34		- 'text/xml',
35		- ],
36		- 'mimeTypesMessage' => 'Please upload a valid GPX/XML document',
37		- ])
	30	+ 'maxSize' => '20480000',
	31	+ 'mimeTypes' => [
	32	+ 'application/gpx+xml',
	33	+ 'application/xml',
	34	+ 'text/xml',
	35	+ ],
	36	+ 'mimeTypesMessage' => 'Please upload a valid GPX/XML document',
	37	+ ])
38	38	],
39	39	'multiple' => false,
40	40	'required' => true,
		@@ -45,9 +45,9 @@ discard block
		block discarded – undo
45	45	)
46	46	->add(
47	47	'start_upload', SubmitType::class, [
48		- 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 100px;'],
49		- 'label' => '

OpencachingDeutschland / oc-server3

Pull Request — development (#895)

Status

Category

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +65 added lines, -65 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch