Inspection of "OCC-148 update symfony from 5.3 to 5.4, Php from 7..." - OpencachingDeutschland/oc-server3 - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — development (#887)

unknown

created 2022-08-23 20:03 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/src/Controller/Backend/SupportController.php 1 patch

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

@@ -186,9 +186,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/searchedCaches.html.twig', [
-                                                          'supportCachesForm' => $formSearch->createView(),
-                                                          'foundCaches' => $fetchedCaches
-                                                      ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'foundCaches' => $fetchedCaches
+                                                        ]
         );
     }
 
@@ -209,9 +209,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
+                                                        ]
         );
     }
 
@@ -231,10 +231,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
+                                                    ]
         );
     }
 
@@ -256,10 +256,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
+                                                                ]
         );
     }
 
@@ -286,10 +286,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
+                                                                ]
         );
     }
 
@@ -397,10 +397,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
+                                                        ]
         );
     }
 
@@ -531,16 +531,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
+                                            ]
         );
     }
 
@@ -669,10 +669,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
+                                                    ]
         );
     }
 
@@ -764,9 +764,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery1' => $qb->execute()->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery1' => $qb->execute()->fetchAll()
+                                                        ]
         );
     }
 
@@ -791,9 +791,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery2' => $qb->execute()->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery2' => $qb->execute()->fetchAll()
+                                                        ]
         );
     }
 
@@ -825,9 +825,9 @@  discard block
 block discarded – undo
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery4' => $qb->execute()->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery4' => $qb->execute()->fetchAll()
+                                                        ]
         );
     }
 
@@ -844,9 +844,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()
+                                                        ]
         );
     }
 
@@ -889,9 +889,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
+                                                        ]
         );
     }
 
@@ -1004,15 +1004,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
+                                                        ]
         );
     }
 
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
 
             if ((($fetchedListingInfo->nodeListingAvailable == true) && ($fetchedOCCache->status != 1))
                 || (($fetchedListingInfo->nodeListingAvailable
-                     == false)
+                        == false)
                     && ($fetchedOCCache->status == 1))
             ) {
                 array_push($tempArray, 'OC status != import status');
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
 
             if ((($fetchedListingInfo->nodeListingArchived == true) && ($fetchedOCCache->status != 3))
                 || (($fetchedListingInfo->nodeListingAvailable
-                     == false)
+                        == false)
                     && ($fetchedOCCache->status == 3))
             ) {
                 array_push($tempArray, 'OC status != import status');
@@ -1175,11 +1175,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/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_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.

		@@ -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	}

		@@ -186,9 +186,9 @@ discard block
		block discarded – undo
186	186
187	187	return $this->render(
188	188	'backend/support/searchedCaches.html.twig', [
189		- 'supportCachesForm' => $formSearch->createView(),
190		- 'foundCaches' => $fetchedCaches
191		- ]
	189	+ 'supportCachesForm' => $formSearch->createView(),
	190	+ 'foundCaches' => $fetchedCaches
	191	+ ]
192	192	);
193	193	}
194	194
		@@ -209,9 +209,9 @@ discard block
		block discarded – undo
209	209
210	210	return $this->render(
211	211	'backend/support/reportedCaches.html.twig', [
212		- 'supportCachesForm' => $formSearch->createView(),
213		- 'reportedCaches_by_id' => $fetchedReports
214		- ]
	212	+ 'supportCachesForm' => $formSearch->createView(),
	213	+ 'reportedCaches_by_id' => $fetchedReports
	214	+ ]
215	215	);
216	216	}
217	217
		@@ -231,10 +231,10 @@ discard block
		block discarded – undo
231	231
232	232	return $this->render(
233	233	'backend/support/bonusCaches.html.twig', [
234		- 'supportCachesForm' => $formSearch->createView(),
235		- 'supportAssignBonusCacheForm' => $formAssignBonusCache->createView(),
236		- 'bonusCaches_by_id' => $fetchedBonuscaches
237		- ]
	234	+ 'supportCachesForm' => $formSearch->createView(),
	235	+ 'supportAssignBonusCacheForm' => $formAssignBonusCache->createView(),
	236	+ 'bonusCaches_by_id' => $fetchedBonuscaches
	237	+ ]
238	238	);
239	239	}
240	240
		@@ -256,10 +256,10 @@ discard block
		block discarded – undo
256	256
257	257	return $this->render(
258	258	'backend/support/bonusCachesAssignment.html.twig', [
259		- 'supportCachesForm' => $formSearch->createView(),
260		- 'bonus_Cache' => $wpID,
261		- 'caches_by_owner' => $fetchedOwnerCaches
262		- ]
	259	+ 'supportCachesForm' => $formSearch->createView(),
	260	+ 'bonus_Cache' => $wpID,
	261	+ 'caches_by_owner' => $fetchedOwnerCaches
	262	+ ]
263	263	);
264	264	}
265	265
		@@ -286,10 +286,10 @@ discard block
		block discarded – undo
286	286
287	287	return $this->render(
288	288	'backend/support/bonusCachesAssignment.html.twig', [
289		- 'supportCachesForm' => $formSearch->createView(),
290		- 'bonus_Cache' => $toBonusCache,
291		- 'caches_by_owner' => $fetchedOwnerCaches
292		- ]
	289	+ 'supportCachesForm' => $formSearch->createView(),
	290	+ 'bonus_Cache' => $toBonusCache,
	291	+ 'caches_by_owner' => $fetchedOwnerCaches
	292	+ ]
293	293	);
294	294	}
295	295
		@@ -397,10 +397,10 @@ discard block
		block discarded – undo
397	397
398	398	return $this->render(
399	399	'backend/support/databaseQueries.html.twig', [
400		- 'supportCachesForm' => $formSearch->createView(),
401		- 'SQLFlexForm' => $formSQLFlex->createView(),
402		- 'suppSQLqueryFlex' => $fetchedInformation
403		- ]
	400	+ 'supportCachesForm' => $formSearch->createView(),
	401	+ 'SQLFlexForm' => $formSQLFlex->createView(),
	402	+ 'suppSQLqueryFlex' => $fetchedInformation
	403	+ ]
404	404	);
405	405	}
406	406
		@@ -531,16 +531,16 @@ discard block
		block discarded – undo
531	531
532	532	return $this->render(
533	533	'backend/support/occ.html.twig', [
534		- 'supportCachesForm' => $formSearch->createView(),
535		- 'supportCommentFormUser' => $formCommentUser->createView(),
536		- 'supportCommentFormCache' => $formCommentCache->createView(),
537		- 'occ_cache_data' => $fetchedCacheData,
538		- 'occ_cache_comments' => $fetchedCacheComments,
539		- 'occ_cache_infos' => $fetchedCacheInfos,
540		- 'occ_user_data' => $fetchedUserData,
541		- 'occ_user_comments' => $fetchedUserComments,
542		- 'occ_user_relations' => $fetchedUserRelations
543		- ]
	534	+ 'supportCachesForm' => $formSearch->createView(),
	535	+ 'supportCommentFormUser' => $formCommentUser->createView(),
	536	+ 'supportCommentFormCache' => $formCommentCache->createView(),
	537	+ 'occ_cache_data' => $fetchedCacheData,
	538	+ 'occ_cache_comments' => $fetchedCacheComments,
	539	+ 'occ_cache_infos' => $fetchedCacheInfos,
	540	+ 'occ_user_data' => $fetchedUserData,
	541	+ 'occ_user_comments' => $fetchedUserComments,
	542	+ 'occ_user_relations' => $fetchedUserRelations
	543	+ ]
544	544	);
545	545	}
546	546
		@@ -669,10 +669,10 @@ discard block
		block discarded – undo
669	669
670	670	return $this->render(
671	671	'backend/support/userDetails.html.twig', [
672		- 'supportCachesForm' => $formSearch->createView(),
673		- 'supportUserAccountActions' => $formActions->createView(),
674		- 'user_account_details' => $fetchedUserDetails
675		- ]
	672	+ 'supportCachesForm' => $formSearch->createView(),
	673	+ 'supportUserAccountActions' => $formActions->createView(),
	674	+ 'user_account_details' => $fetchedUserDetails
	675	+ ]
676	676	);
677	677	}
678	678
		@@ -764,9 +764,9 @@ discard block
		block discarded – undo
764	764
765	765	return $this->render(
766	766	'backend/support/databaseQueries.html.twig', [
767		- 'supportCachesForm' => $formSearch->createView(),
768		- 'suppSQLquery1' => $qb->execute()->fetchAll()
769		- ]
	767	+ 'supportCachesForm' => $formSearch->createView(),
	768	+ 'suppSQLquery1' => $qb->execute()->fetchAll()
	769	+ ]
770	770	);
771	771	}
772	772
		@@ -791,9 +791,9 @@ discard block
		block discarded – undo
791	791
792	792	return $this->render(
793	793	'backend/support/databaseQueries.html.twig', [
794		- 'supportCachesForm' => $formSearch->createView(),
795		- 'suppSQLquery2' => $qb->execute()->fetchAll()
796		- ]
	794	+ 'supportCachesForm' => $formSearch->createView(),
	795	+ 'suppSQLquery2' => $qb->execute()->fetchAll()
	796	+ ]
797	797	);
798	798	}
799	799
		@@ -825,9 +825,9 @@ discard block
		block discarded – undo
825	825
826	826	return $this->render(
827	827	'backend/support/databaseQueries.html.twig', [
828		- 'supportCachesForm' => $formSearch->createView(),
829		- 'suppSQLquery4' => $qb->execute()->fetchAll()
830		- ]
	828	+ 'supportCachesForm' => $formSearch->createView(),
	829	+ 'suppSQLquery4' => $qb->execute()->fetchAll()
	830	+ ]
831	831	);
832	832	}
833	833
		@@ -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		- 'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
849		- ]
	847	+ 'supportCachesForm' => $formSearch->createView(),
	848	+ 'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
	849	+ ]
850	850	);
851	851	}
852	852
		@@ -889,9 +889,9 @@ discard block
		block discarded – undo
889	889
890	890	return $this->render(
891	891	'backend/support/databaseQueries.html.twig', [
892		- 'supportCachesForm' => $formSearch->createView(),
893		- 'suppSQLquery6' => $qb_caches_list
894		- ]
	892	+ 'supportCachesForm' => $formSearch->createView(),
	893	+ 'suppSQLquery6' => $qb_caches_list
	894	+ ]
895	895	);
896	896	}
897	897
		@@ -1004,15 +1004,15 @@ discard block
		block discarded – undo
1004	1004
1005	1005	return $this->render(
1006	1006	'backend/support/occ_gpx_import.html.twig', [
1007		- 'supportCachesForm' => $formSearch->createView(),
1008		- 'supportUploadGPXForm' => $formUpload->createView(),
1009		- 'amountProcessedCaches' => $amountProcessedCaches,
1010		- 'amountAssignedCaches' => $amountAssignedCaches,
1011		- 'amountUpdatedCaches' => $amountUpdatedCaches,
1012		- 'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
1013		- 'fetchedListingInfos' => $fetchedListingInfos,
1014		- 'differencesDetected' => $differencesDetected
1015		- ]
	1007	+ 'supportCachesForm' => $formSearch->createView(),
	1008	+ 'supportUploadGPXForm' => $formUpload->createView(),
	1009	+ 'amountProcessedCaches' => $amountProcessedCaches,
	1010	+ 'amountAssignedCaches' => $amountAssignedCaches,
	1011	+ 'amountUpdatedCaches' => $amountUpdatedCaches,
	1012	+ 'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
	1013	+ 'fetchedListingInfos' => $fetchedListingInfos,
	1014	+ 'differencesDetected' => $differencesDetected
	1015	+ ]
1016	1016	);
1017	1017	}
1018	1018
		@@ -1065,7 +1065,7 @@ discard block
		block discarded – undo
1065	1065
1066	1066	if ((($fetchedListingInfo->nodeListingAvailable == true) && ($fetchedOCCache->status != 1))
1067	1067	\|\| (($fetchedListingInfo->nodeListingAvailable
1068		- == false)
	1068	+ == false)
1069	1069	&& ($fetchedOCCache->status == 1))
1070	1070	) {
1071	1071	array_push($tempArray, 'OC status != import status');
		@@ -1075,7 +1075,7 @@ discard block
		block discarded – undo
1075	1075
1076	1076	if ((($fetchedListingInfo->nodeListingArchived == true) && ($fetchedOCCache->status != 3))
1077	1077	\|\| (($fetchedListingInfo->nodeListingAvailable
1078		- == false)
	1078	+ == false)
1079	1079	&& ($fetchedOCCache->status == 3))
1080	1080	) {
1081	1081	array_push($tempArray, 'OC status != import status');
		@@ -1175,11 +1175,11 @@ discard block
		block discarded – undo
1175	1175	] as $checkItem) {
1176	1176	if ($wpt[$checkItem] != $fetchedExistingSupportListingInfoArray[$checkItem]) {
1177	1177	$newComment .= $checkItem
1178		- . ' changed from '
1179		- . $fetchedExistingSupportListingInfoArray[$checkItem]
1180		- . ' to '
1181		- . $wpt[$checkItem]
1182		- . PHP_EOL;
	1178	+ . ' changed from '
	1179	+ . $fetchedExistingSupportListingInfoArray[$checkItem]
	1180	+ . ' to '
	1181	+ . $wpt[$checkItem]
	1182	+ . PHP_EOL;
1183	1183	}
1184	1184	}
1185	1185

		@@ -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' => '

		@@ -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' => '

OpencachingDeutschland / oc-server3

Pull Request — development (#887)

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 +67 added lines, -67 removed lines patch added patch discarded remove patch

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

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